mirror of
https://github.com/a-b-street/abstreet.git
synced 2024-11-24 01:15:12 +03:00
Import Charleville-Mézières. So many new places from Twitter!
Few workarounds based on importing crashes found.
This commit is contained in:
Dustin Carlino
parent
c9cef2ac8c
commit
1fa57a1e17
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,6 +12,7 @@ data/system/at/salzburg
|
||||
data/system/ca/montreal
|
||||
data/system/de/berlin
|
||||
data/system/de/rostock
|
||||
data/system/fr/charleville_mezieres
|
||||
data/system/fr/paris
|
||||
data/system/gb/allerton_bywater
|
||||
data/system/gb/ashton_park
|
||||
|
||||
@ -110,6 +110,61 @@
|
||||
"uncompressed_size_bytes": 9251311,
|
||||
"compressed_size_bytes": 2019689
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/champagne-ardenne-latest.osm.pbf": {
|
||||
"checksum": "f1c9149c597c01b6bfb6de42bd1523d0",
|
||||
"uncompressed_size_bytes": 87454590,
|
||||
"compressed_size_bytes": 87369392
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/secteur1.osm": {
|
||||
"checksum": "bf0ad4aa76108eb9d4ae1d94e05a61d4",
|
||||
"uncompressed_size_bytes": 3162598,
|
||||
"compressed_size_bytes": 337230
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/secteur2.osm": {
|
||||
"checksum": "4577fdea37a134f4877b535dda8e1b5b",
|
||||
"uncompressed_size_bytes": 8463497,
|
||||
"compressed_size_bytes": 868510
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/secteur3.osm": {
|
||||
"checksum": "f821b25108f40a193a4f94e456478051",
|
||||
"uncompressed_size_bytes": 6104083,
|
||||
"compressed_size_bytes": 656975
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/secteur4.osm": {
|
||||
"checksum": "22cd1fa1ff4cf1c07072d4c66d714019",
|
||||
"uncompressed_size_bytes": 11306571,
|
||||
"compressed_size_bytes": 1177149
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/osm/secteur5.osm": {
|
||||
"checksum": "4df6ed5c913c22222b1caaa66c7c0fa0",
|
||||
"uncompressed_size_bytes": 8535274,
|
||||
"compressed_size_bytes": 889604
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/raw_maps/secteur1.bin": {
|
||||
"checksum": "79e961ce45c9ece57dd66a05631436f2",
|
||||
"uncompressed_size_bytes": 877351,
|
||||
"compressed_size_bytes": 216454
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/raw_maps/secteur2.bin": {
|
||||
"checksum": "a6d312fbecfd05e095a590bebc8d86d6",
|
||||
"uncompressed_size_bytes": 2546047,
|
||||
"compressed_size_bytes": 607240
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/raw_maps/secteur3.bin": {
|
||||
"checksum": "a8994f9fc73f1649565bd1076966ba09",
|
||||
"uncompressed_size_bytes": 1886350,
|
||||
"compressed_size_bytes": 437759
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/raw_maps/secteur4.bin": {
|
||||
"checksum": "eb64a44fbcd860bd14423d10c2231669",
|
||||
"uncompressed_size_bytes": 3433386,
|
||||
"compressed_size_bytes": 849217
|
||||
},
|
||||
"data/input/fr/charleville_mezieres/raw_maps/secteur5.bin": {
|
||||
"checksum": "48b9cc6cac36f20a3d459c8d32a8efb1",
|
||||
"uncompressed_size_bytes": 2714829,
|
||||
"compressed_size_bytes": 644209
|
||||
},
|
||||
"data/input/fr/paris/osm/center.osm": {
|
||||
"checksum": "224841aa32fafd0212b0b2e3cc200e9a",
|
||||
"uncompressed_size_bytes": 107158714,
|
||||
@ -1380,6 +1435,36 @@
|
||||
"uncompressed_size_bytes": 16923990,
|
||||
"compressed_size_bytes": 5737196
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/city.bin": {
|
||||
"checksum": "95fd9a4dcff29e38ec583e430d096bd1",
|
||||
"uncompressed_size_bytes": 292296,
|
||||
"compressed_size_bytes": 148289
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/maps/secteur1.bin": {
|
||||
"checksum": "24d57f69a9ca1c3e345b2286804d023a",
|
||||
"uncompressed_size_bytes": 1473565,
|
||||
"compressed_size_bytes": 521332
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/maps/secteur2.bin": {
|
||||
"checksum": "d437dfc94209918606b088fdd606f860",
|
||||
"uncompressed_size_bytes": 4334895,
|
||||
"compressed_size_bytes": 1598143
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/maps/secteur3.bin": {
|
||||
"checksum": "e4cfbb1bc1aae4f2e73d2bc557511277",
|
||||
"uncompressed_size_bytes": 3383714,
|
||||
"compressed_size_bytes": 1176333
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/maps/secteur4.bin": {
|
||||
"checksum": "4cd94efb131231279473938239f0d404",
|
||||
"uncompressed_size_bytes": 5299482,
|
||||
"compressed_size_bytes": 1890334
|
||||
},
|
||||
"data/system/fr/charleville_mezieres/maps/secteur5.bin": {
|
||||
"checksum": "ecd34858f871d93fb8d0bdba22b73172",
|
||||
"uncompressed_size_bytes": 4955392,
|
||||
"compressed_size_bytes": 1779281
|
||||
},
|
||||
"data/system/fr/paris/city.bin": {
|
||||
"checksum": "f9e23c4fdf13d83185f4c939fec15465",
|
||||
"uncompressed_size_bytes": 3566644,
|
||||
|
||||
18
importer/config/fr/charleville_mezieres/cfg.json
Normal file
18
importer/config/fr/charleville_mezieres/cfg.json
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
"osm_url": "https://download.geofabrik.de/europe/france/champagne-ardenne-latest.osm.pbf",
|
||||
"map_config": {
|
||||
"driving_side": "Right",
|
||||
"bikes_can_use_bus_lanes": true,
|
||||
"inferred_sidewalks": true,
|
||||
"separate_cycleways": true,
|
||||
"street_parking_spot_length": 8.0
|
||||
},
|
||||
"onstreet_parking": "JustOSM",
|
||||
"public_offstreet_parking": "None",
|
||||
"private_offstreet_parking": {
|
||||
"FixedPerBldg": 3
|
||||
},
|
||||
"elevation": null,
|
||||
"include_railroads": true,
|
||||
"extra_buildings": null
|
||||
}
|
||||
39
importer/config/fr/charleville_mezieres/secteur1.poly
Normal file
39
importer/config/fr/charleville_mezieres/secteur1.poly
Normal file
@ -0,0 +1,39 @@
|
||||
boundary
|
||||
1
|
||||
4.717201 49.759246
|
||||
4.717126 49.7597
|
||||
4.713414 49.76074
|
||||
4.713693 49.761877
|
||||
4.714808 49.765161
|
||||
4.709508 49.765231
|
||||
4.701977 49.767656
|
||||
4.701569 49.76864
|
||||
4.701419 49.770733
|
||||
4.695196 49.775805
|
||||
4.693866 49.776193
|
||||
4.692278 49.775777
|
||||
4.69054 49.774364
|
||||
4.683673 49.770691
|
||||
4.680648 49.76731
|
||||
4.678395 49.76749
|
||||
4.676979 49.766409
|
||||
4.677343 49.763789
|
||||
4.677086 49.76232
|
||||
4.675756 49.760587
|
||||
4.675906 49.758286
|
||||
4.677 49.757441
|
||||
4.681377 49.75611
|
||||
4.68569 49.756179
|
||||
4.689531 49.756041
|
||||
4.691613 49.757122
|
||||
4.691591 49.758744
|
||||
4.69245 49.760019
|
||||
4.696612 49.761419
|
||||
4.698308 49.76128
|
||||
4.701269 49.760075
|
||||
4.704058 49.759423
|
||||
4.707277 49.75909
|
||||
4.716804 49.759229
|
||||
4.717201 49.759246
|
||||
END
|
||||
END
|
||||
152
importer/config/fr/charleville_mezieres/secteur2.poly
Normal file
152
importer/config/fr/charleville_mezieres/secteur2.poly
Normal file
@ -0,0 +1,152 @@
|
||||
boundary
|
||||
1
|
||||
4.68002 49.789234
|
||||
4.69077 49.782736
|
||||
4.690728 49.78178
|
||||
4.695148 49.779328
|
||||
4.699396 49.77682
|
||||
4.69916 49.776474
|
||||
4.704997 49.773605
|
||||
4.710018 49.775947
|
||||
4.715297 49.774797
|
||||
4.715661 49.774977
|
||||
4.715726 49.776404
|
||||
4.716648 49.776529
|
||||
4.717593 49.777527
|
||||
4.717314 49.778316
|
||||
4.717464 49.779162
|
||||
4.716906 49.780727
|
||||
4.717421 49.782529
|
||||
4.720253 49.783415
|
||||
4.723751 49.784094
|
||||
4.725725 49.78408
|
||||
4.729523 49.783637
|
||||
4.729722 49.784146
|
||||
4.730081 49.784118
|
||||
4.730253 49.785355
|
||||
4.729738 49.78559
|
||||
4.730038 49.787447
|
||||
4.73168 49.788716
|
||||
4.731613 49.788925
|
||||
4.732186 49.789391
|
||||
4.732972 49.790269
|
||||
4.732951 49.791447
|
||||
4.733192 49.79188
|
||||
4.733643 49.792129
|
||||
4.733101 49.792499
|
||||
4.732071 49.794217
|
||||
4.730853 49.795163
|
||||
4.730655 49.795852
|
||||
4.730832 49.796562
|
||||
4.731325 49.797185
|
||||
4.730939 49.798501
|
||||
4.731052 49.798926
|
||||
4.730355 49.800962
|
||||
4.731696 49.801274
|
||||
4.732897 49.801856
|
||||
4.73433 49.802337
|
||||
4.733541 49.803698
|
||||
4.731867 49.805083
|
||||
4.729979 49.805768
|
||||
4.728101 49.807132
|
||||
4.724652 49.809275
|
||||
4.723451 49.811948
|
||||
4.723488 49.813505
|
||||
4.723284 49.814499
|
||||
4.723451 49.815063
|
||||
4.723622 49.81552
|
||||
4.723987 49.815977
|
||||
4.725006 49.816835
|
||||
4.726326 49.817514
|
||||
4.727994 49.818181
|
||||
4.729759 49.818583
|
||||
4.729308 49.818735
|
||||
4.728606 49.818753
|
||||
4.726701 49.81876
|
||||
4.723306 49.8184
|
||||
4.722898 49.818445
|
||||
4.721214 49.818365
|
||||
4.719551 49.818538
|
||||
4.718569 49.818822
|
||||
4.717603 49.818971
|
||||
4.716284 49.820473
|
||||
4.715812 49.820781
|
||||
4.715817 49.820905
|
||||
4.715077 49.821123
|
||||
4.714487 49.821445
|
||||
4.713054 49.823148
|
||||
4.713199 49.82347
|
||||
4.713124 49.823799
|
||||
4.711702 49.824612
|
||||
4.711273 49.824525
|
||||
4.708967 49.825003
|
||||
4.708012 49.826173
|
||||
4.708065 49.826886
|
||||
4.707529 49.826927
|
||||
4.706714 49.82744
|
||||
4.706467 49.826609
|
||||
4.70534 49.825931
|
||||
4.704686 49.825668
|
||||
4.703559 49.825529
|
||||
4.703119 49.824643
|
||||
4.702293 49.824007
|
||||
4.702551 49.822345
|
||||
4.701896 49.820739
|
||||
4.701757 49.81905
|
||||
4.700255 49.817458
|
||||
4.701757 49.815105
|
||||
4.700673 49.814661
|
||||
4.698688 49.813166
|
||||
4.697326 49.812861
|
||||
4.699139 49.812065
|
||||
4.69798 49.809497
|
||||
4.699686 49.808479
|
||||
4.699193 49.808015
|
||||
4.698152 49.808527
|
||||
4.697594 49.808022
|
||||
4.696795 49.807021
|
||||
4.697605 49.806634
|
||||
4.697261 49.80628
|
||||
4.697669 49.806024
|
||||
4.696859 49.805439
|
||||
4.697149 49.804823
|
||||
4.697235 49.804155
|
||||
4.695711 49.804324
|
||||
4.695185 49.803476
|
||||
4.69503 49.803483
|
||||
4.693732 49.801551
|
||||
4.693125 49.801735
|
||||
4.692138 49.800346
|
||||
4.693056 49.800076
|
||||
4.692342 49.799584
|
||||
4.692546 49.799283
|
||||
4.691275 49.798843
|
||||
4.690722 49.798982
|
||||
4.690465 49.798597
|
||||
4.690926 49.798383
|
||||
4.690272 49.79742
|
||||
4.691586 49.79698
|
||||
4.691328 49.796492
|
||||
4.691232 49.796153
|
||||
4.690545 49.796205
|
||||
4.689864 49.796208
|
||||
4.690052 49.79591
|
||||
4.688469 49.795121
|
||||
4.686726 49.794241
|
||||
4.686833 49.794086
|
||||
4.685991 49.793486
|
||||
4.685041 49.793054
|
||||
4.684017 49.792174
|
||||
4.683711 49.792212
|
||||
4.683775 49.792074
|
||||
4.684355 49.791436
|
||||
4.683427 49.791114
|
||||
4.683228 49.791232
|
||||
4.681876 49.790539
|
||||
4.682134 49.790356
|
||||
4.680766 49.790023
|
||||
4.680642 49.790086
|
||||
4.679897 49.789871
|
||||
4.68002 49.789234
|
||||
END
|
||||
END
|
||||
77
importer/config/fr/charleville_mezieres/secteur3.poly
Normal file
77
importer/config/fr/charleville_mezieres/secteur3.poly
Normal file
@ -0,0 +1,77 @@
|
||||
boundary
|
||||
1
|
||||
4.743605 49.769063
|
||||
4.730129 49.765522
|
||||
4.719315 49.766139
|
||||
4.717748 49.766346
|
||||
4.716375 49.766755
|
||||
4.714798 49.765189
|
||||
4.713703 49.761904
|
||||
4.713414 49.76074
|
||||
4.717115 49.75968
|
||||
4.717169 49.759243
|
||||
4.711332 49.759146
|
||||
4.711332 49.756956
|
||||
4.714508 49.756512
|
||||
4.715924 49.755486
|
||||
4.717169 49.75532
|
||||
4.726524 49.753767
|
||||
4.734013 49.755306
|
||||
4.734195 49.755625
|
||||
4.736706 49.755521
|
||||
4.741352 49.756256
|
||||
4.744667 49.756207
|
||||
4.750128 49.755964
|
||||
4.752671 49.755666
|
||||
4.7559 49.75523
|
||||
4.758121 49.754287
|
||||
4.759537 49.755209
|
||||
4.760224 49.756186
|
||||
4.76017 49.756325
|
||||
4.761447 49.757309
|
||||
4.760749 49.757462
|
||||
4.762402 49.759284
|
||||
4.760921 49.759596
|
||||
4.761844 49.761308
|
||||
4.759998 49.761024
|
||||
4.756984 49.760989
|
||||
4.756973 49.762459
|
||||
4.754698 49.762202
|
||||
4.754548 49.76259
|
||||
4.753454 49.762341
|
||||
4.753336 49.762819
|
||||
4.758024 49.764184
|
||||
4.75973 49.763838
|
||||
4.762144 49.763983
|
||||
4.767637 49.764046
|
||||
4.76856 49.763963
|
||||
4.768871 49.764995
|
||||
4.769912 49.765314
|
||||
4.769826 49.764039
|
||||
4.772229 49.765057
|
||||
4.771972 49.766346
|
||||
4.773195 49.766409
|
||||
4.775341 49.767372
|
||||
4.776295 49.76654
|
||||
4.778817 49.76812
|
||||
4.780759 49.768425
|
||||
4.782958 49.769257
|
||||
4.784943 49.770594
|
||||
4.783698 49.771169
|
||||
4.783216 49.770996
|
||||
4.780909 49.771918
|
||||
4.780426 49.772472
|
||||
4.779761 49.774218
|
||||
4.77798 49.773782
|
||||
4.777797 49.772652
|
||||
4.769858 49.770961
|
||||
4.768882 49.770511
|
||||
4.767337 49.770483
|
||||
4.763174 49.769991
|
||||
4.752295 49.768107
|
||||
4.749463 49.768017
|
||||
4.746544 49.768294
|
||||
4.746019 49.768564
|
||||
4.743605 49.769063
|
||||
END
|
||||
END
|
||||
46
importer/config/fr/charleville_mezieres/secteur4.poly
Normal file
46
importer/config/fr/charleville_mezieres/secteur4.poly
Normal file
@ -0,0 +1,46 @@
|
||||
boundary
|
||||
1
|
||||
4.730129 49.765522
|
||||
4.743562 49.769084
|
||||
4.745557 49.76882
|
||||
4.747424 49.768973
|
||||
4.748497 49.770012
|
||||
4.748304 49.770428
|
||||
4.745493 49.770109
|
||||
4.742897 49.770497
|
||||
4.741201 49.772784
|
||||
4.740279 49.774544
|
||||
4.73824 49.777412
|
||||
4.736481 49.77956
|
||||
4.733927 49.781624
|
||||
4.73043 49.783356
|
||||
4.729486 49.783619
|
||||
4.725494 49.784077
|
||||
4.723928 49.78409
|
||||
4.72013 49.78355
|
||||
4.717426 49.782483
|
||||
4.71689 49.780751
|
||||
4.717512 49.779241
|
||||
4.71719 49.778437
|
||||
4.717534 49.777565
|
||||
4.716675 49.776484
|
||||
4.715667 49.77647
|
||||
4.715602 49.775084
|
||||
4.715216 49.774779
|
||||
4.70998 49.775985
|
||||
4.704895 49.773615
|
||||
4.699134 49.776453
|
||||
4.696805 49.774571
|
||||
4.699187 49.772673
|
||||
4.701462 49.770816
|
||||
4.701676 49.768654
|
||||
4.702213 49.76767
|
||||
4.70497 49.766714
|
||||
4.709637 49.765286
|
||||
4.714851 49.765217
|
||||
4.716429 49.766769
|
||||
4.717802 49.766333
|
||||
4.719282 49.766159
|
||||
4.730129 49.765522
|
||||
END
|
||||
END
|
||||
69
importer/config/fr/charleville_mezieres/secteur5.poly
Normal file
69
importer/config/fr/charleville_mezieres/secteur5.poly
Normal file
@ -0,0 +1,69 @@
|
||||
boundary
|
||||
1
|
||||
4.703071 49.759576
|
||||
4.703178 49.757108
|
||||
4.700453 49.754627
|
||||
4.701655 49.752769
|
||||
4.700475 49.750662
|
||||
4.701161 49.749816
|
||||
4.700496 49.749858
|
||||
4.700646 49.749511
|
||||
4.69981 49.748402
|
||||
4.700282 49.748
|
||||
4.699509 49.746239
|
||||
4.700711 49.744658
|
||||
4.700496 49.742412
|
||||
4.700518 49.741608
|
||||
4.698458 49.737517
|
||||
4.703393 49.736393
|
||||
4.703844 49.737101
|
||||
4.706161 49.737045
|
||||
4.707899 49.738238
|
||||
4.708736 49.737822
|
||||
4.709551 49.736851
|
||||
4.710817 49.738432
|
||||
4.713027 49.737711
|
||||
4.717577 49.735922
|
||||
4.719121 49.734355
|
||||
4.721117 49.732815
|
||||
4.722726 49.733842
|
||||
4.725924 49.733328
|
||||
4.729421 49.733037
|
||||
4.729893 49.734133
|
||||
4.730988 49.733731
|
||||
4.73294 49.735256
|
||||
4.734035 49.734868
|
||||
4.736331 49.737919
|
||||
4.739141 49.740096
|
||||
4.73736 49.741455
|
||||
4.735837 49.741996
|
||||
4.735515 49.741677
|
||||
4.735043 49.741663
|
||||
4.735601 49.743604
|
||||
4.735258 49.743688
|
||||
4.735365 49.744409
|
||||
4.736009 49.744284
|
||||
4.736331 49.744714
|
||||
4.735515 49.745005
|
||||
4.736266 49.746156
|
||||
4.736845 49.746031
|
||||
4.737468 49.746696
|
||||
4.736803 49.746766
|
||||
4.738026 49.748014
|
||||
4.737189 49.748513
|
||||
4.737897 49.748943
|
||||
4.736137 49.750495
|
||||
4.736481 49.750717
|
||||
4.735858 49.752284
|
||||
4.735944 49.754779
|
||||
4.733992 49.755292
|
||||
4.726589 49.753753
|
||||
4.715881 49.7555
|
||||
4.71453 49.756512
|
||||
4.711311 49.756969
|
||||
4.711311 49.759146
|
||||
4.707255 49.759132
|
||||
4.703994 49.759395
|
||||
4.703071 49.759576
|
||||
END
|
||||
END
|
||||
@ -113,6 +113,7 @@ fn regenerate_everything(config: ImporterConfiguration) {
|
||||
// TODO Autodetect this based on number of maps per city?
|
||||
if city == CityName::new("gb", "leeds")
|
||||
|| city == CityName::new("us", "nyc")
|
||||
|| city == CityName::new("fr", "charleville_mezieres")
|
||||
|| city == CityName::new("fr", "paris")
|
||||
|| city == CityName::new("at", "salzburg")
|
||||
{
|
||||
|
||||
@ -72,6 +72,11 @@ pub fn nice_map_name(name: &MapName) -> &str {
|
||||
_ => &name.map,
|
||||
},
|
||||
"fr" => match (name.city.city.as_ref(), name.map.as_ref()) {
|
||||
("charleville_mezieres", "secteur1") => "Charleville-Mézières (secteur 1)",
|
||||
("charleville_mezieres", "secteur2") => "Charleville-Mézières (secteur 2)",
|
||||
("charleville_mezieres", "secteur3") => "Charleville-Mézières (secteur 3)",
|
||||
("charleville_mezieres", "secteur4") => "Charleville-Mézières (secteur 4)",
|
||||
("charleville_mezieres", "secteur5") => "Charleville-Mézières (secteur 5)",
|
||||
("paris", "center") => "Paris (city center)",
|
||||
("paris", "north") => "Paris (north)",
|
||||
("paris", "south") => "Paris (south)",
|
||||
|
||||
@ -69,14 +69,13 @@ pub fn make_all_parking_lots(
|
||||
.buffer_dist(driveway_buffer, map)
|
||||
})
|
||||
{
|
||||
driveway = Some((
|
||||
PolyLine::must_new(vec![
|
||||
sidewalk_line.pt1(),
|
||||
sidewalk_line.pt2(),
|
||||
driving_pos.pt(map),
|
||||
]),
|
||||
driving_pos,
|
||||
));
|
||||
if let Ok(pl) = PolyLine::new(vec![
|
||||
sidewalk_line.pt1(),
|
||||
sidewalk_line.pt2(),
|
||||
driving_pos.pt(map),
|
||||
]) {
|
||||
driveway = Some((pl, driving_pos));
|
||||
}
|
||||
}
|
||||
if let Some((driveway_line, driving_pos)) = driveway {
|
||||
let id = ParkingLotID(results.len());
|
||||
|
||||
@ -6,7 +6,7 @@ use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalcul
|
||||
use serde::{Deserialize, Serialize};
|
||||
use thread_local::ThreadLocal;
|
||||
|
||||
use abstutil::MultiMap;
|
||||
use abstutil::{prettyprint_usize, MultiMap};
|
||||
|
||||
use crate::pathfind::node_map::{deserialize_nodemap, NodeMap};
|
||||
use crate::pathfind::uber_turns::{IntersectionCluster, UberTurn};
|
||||
@ -62,7 +62,18 @@ impl VehiclePathfinder {
|
||||
// built, seed from the node ordering.
|
||||
let graph = if let Some(seed) = seed {
|
||||
let node_ordering = seed.graph.get_node_ordering();
|
||||
fast_paths::prepare_with_order(&input_graph, &node_ordering).unwrap()
|
||||
// TODO This shouldn't happen, but it is for buses reusing the car graph. Figure out
|
||||
// what's actually breaking instead of papering over the problem.
|
||||
if input_graph.get_num_nodes() != node_ordering.len() {
|
||||
error!(
|
||||
"Can't reuse node ordering; {} vs {}",
|
||||
prettyprint_usize(input_graph.get_num_nodes()),
|
||||
prettyprint_usize(node_ordering.len())
|
||||
);
|
||||
fast_paths::prepare(&input_graph)
|
||||
} else {
|
||||
fast_paths::prepare_with_order(&input_graph, &node_ordering).unwrap()
|
||||
}
|
||||
} else {
|
||||
fast_paths::prepare(&input_graph)
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user