When the pre-trimmed endpoint for a merged intersection is inexplicab…

…ly not on a road's center line, just skip instead of crashing. This allows us to roll out the dog-leg intersection merging for many more maps and see pretty much universal improvement in map geometry! #654 [rebuild] [release]
a-b-street · Feb 20, 2022 · cb6a628 · cb6a628
1 parent efe5f76
commit cb6a628
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 163 deletions.
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -372,6 +372,7 @@ fn regenerate_everything_externally() -> Result<()> {
     let path = "regenerate.sh";
     let mut f = File::create(path)?;
     writeln!(f, "#!/bin/sh")?;
+    writeln!(f, "set -e")?;
     writeln!(f, "pueue parallel 16")?;
     for city in CityName::list_all_cities_from_importer_config() {
         let job = Job::full_for_city(city);

diff --git a/data/MANIFEST.json b/data/MANIFEST.json
@@ -796,9 +796,9 @@
       "compressed_size_bytes": 1621830
     },
     "data/input/gb/dunton_hills/raw_maps/center.bin": {
-      "checksum": "8605ad71adb1c186bacabd9e02cc08ba",
+      "checksum": "a3e873c60faa1bcf5444ab21816d144b",
       "uncompressed_size_bytes": 11475037,
-      "compressed_size_bytes": 2731071
+      "compressed_size_bytes": 2842851
     },
     "data/input/gb/ebbsfleet/osm/center.osm": {
       "checksum": "e30b891681f4725c272b8ae761767cc2",
@@ -836,9 +836,9 @@
       "compressed_size_bytes": 101803
     },
     "data/input/gb/exeter_red_cow_village/raw_maps/center.bin": {
-      "checksum": "e6e033064c20e0adfbdae4d23470d145",
+      "checksum": "3222e723cfd1d6befe5dff48acfb29cd",
       "uncompressed_size_bytes": 14460937,
-      "compressed_size_bytes": 2961396
+      "compressed_size_bytes": 3055660
     },
     "data/input/gb/great_kneighton/desire_lines_disag.geojson": {
       "checksum": "1cb0f5fc91626099dca6582c97f49c43",
@@ -1351,9 +1351,9 @@
       "compressed_size_bytes": 3836448
     },
     "data/input/gb/london/screenshots/kennington.zip": {
-      "checksum": "d26bd29d1dd214cef38601b80c13e747",
-      "uncompressed_size_bytes": 6576887,
-      "compressed_size_bytes": 6575697
+      "checksum": "874332e17524047b57d09b0d82745e7d",
+      "uncompressed_size_bytes": 6640183,
+      "compressed_size_bytes": 6639039
     },
     "data/input/gb/long_marston/osm/center.osm": {
       "checksum": "c7c25ca197870b843ac79c591c1275f3",
@@ -1481,9 +1481,9 @@
       "compressed_size_bytes": 18667608
     },
     "data/input/gb/newcastle_upon_tyne/raw_maps/center.bin": {
-      "checksum": "e11df9d7cca9a3c48fee9542bdab8571",
+      "checksum": "cc3630ac627487cb5befc1bff15e5196",
       "uncompressed_size_bytes": 5714124,
-      "compressed_size_bytes": 1041559
+      "compressed_size_bytes": 1104136
     },
     "data/input/gb/northwick_park/osm/center.osm": {
       "checksum": "2c08bf6cbd7b2d656d41eefb019fcbd6",
@@ -1571,9 +1571,9 @@
       "compressed_size_bytes": 38835936
     },
     "data/input/gb/taunton_firepool/raw_maps/center.bin": {
-      "checksum": "25789bb0f86d1da6af3508734704c3a5",
+      "checksum": "d1cb1d1e2c651f064c243f771ebb25b7",
       "uncompressed_size_bytes": 20215248,
-      "compressed_size_bytes": 3677382
+      "compressed_size_bytes": 3729483
     },
     "data/input/gb/taunton_garden/osm/center.osm": {
       "checksum": "8c5cbbe8cc6a5d437be1308d894eacd6",
@@ -1946,9 +1946,9 @@
       "compressed_size_bytes": 3190962
     },
     "data/input/pl/krakow/screenshots/center.zip": {
-      "checksum": "bb45a419fc32a6758e9b54448d506b3f",
-      "uncompressed_size_bytes": 36708734,
-      "compressed_size_bytes": 36705106
+      "checksum": "5aa6d5d4072a5db568fe4038e29efe9f",
+      "uncompressed_size_bytes": 37106193,
+      "compressed_size_bytes": 37102755
     },
     "data/input/pl/warsaw/osm/center.osm": {
       "checksum": "b41830dd375674ffc9f7ec15d6cf9c0c",
@@ -2556,9 +2556,9 @@
       "compressed_size_bytes": 380137
     },
     "data/input/us/phoenix/screenshots/tempe.zip": {
-      "checksum": "576578987a925a04faa0f069db5a918d",
-      "uncompressed_size_bytes": 10043399,
-      "compressed_size_bytes": 10041540
+      "checksum": "5ce55d58f4d016454fa88835d08ce010",
+      "uncompressed_size_bytes": 10131205,
+      "compressed_size_bytes": 10129355
     },
     "data/input/us/providence/osm/downtown.osm": {
       "checksum": "463b986adc83ae4d1174496a4ce744d1",
@@ -2641,9 +2641,9 @@
       "compressed_size_bytes": 484488577
     },
     "data/input/us/san_francisco/raw_maps/downtown.bin": {
-      "checksum": "61cf11c9bcd545480fc4cbec8e9f9021",
+      "checksum": "a0b9281a869cd1828eb5b613c13d9d59",
       "uncompressed_size_bytes": 26074639,
-      "compressed_size_bytes": 7169091
+      "compressed_size_bytes": 7169095
     },
     "data/input/us/seattle/blockface.bin": {
       "checksum": "c5402f77d7cb81a1a7bfb60e90b699c8",
@@ -2836,9 +2836,9 @@
       "compressed_size_bytes": 188141553
     },
     "data/input/us/seattle/raw_maps/arboretum.bin": {
-      "checksum": "8b00860a588a42862b418f7fb21ab872",
+      "checksum": "c9f6542a0cfc192d2e7548b12c3b4d01",
       "uncompressed_size_bytes": 3030782,
-      "compressed_size_bytes": 698393
+      "compressed_size_bytes": 698390
     },
     "data/input/us/seattle/raw_maps/central_seattle.bin": {
       "checksum": "a0ee0c370b28c81c365b41c254a0ef4c",
@@ -2906,9 +2906,9 @@
       "compressed_size_bytes": 4916499
     },
     "data/input/us/seattle/screenshots/downtown.zip": {
-      "checksum": "d63a7d4db3f3884e4f3ff7582aee7044",
-      "uncompressed_size_bytes": 28054661,
-      "compressed_size_bytes": 28046882
+      "checksum": "8273db98d898edb6155c7802ff4e940f",
+      "uncompressed_size_bytes": 28442955,
+      "compressed_size_bytes": 28434868
     },
     "data/input/us/seattle/screenshots/montlake.zip": {
       "checksum": "88cadd6ebef45233affc5c3cf29998fb",
@@ -3331,14 +3331,14 @@
       "compressed_size_bytes": 2279682
     },
     "data/system/gb/bristol/maps/east.bin": {
-      "checksum": "c39f8a95d39c8979d16bf5619fdcc971",
-      "uncompressed_size_bytes": 28347895,
-      "compressed_size_bytes": 10564596
+      "checksum": "b455306b4ea0e5c176bfe9436ce07053",
+      "uncompressed_size_bytes": 27883178,
+      "compressed_size_bytes": 10393159
     },
     "data/system/gb/bristol/scenarios/east/background.bin": {
-      "checksum": "2941956405e8da09306e5508aedb47fc",
+      "checksum": "114bde00673a9d66e2a4d77582b7ca8d",
       "uncompressed_size_bytes": 8043532,
-      "compressed_size_bytes": 2081991
+      "compressed_size_bytes": 2082334
     },
     "data/system/gb/cambridge/maps/north.bin": {
       "checksum": "c0e6854dc2a1d015147bc9999a4c4e6d",
@@ -3446,19 +3446,19 @@
       "compressed_size_bytes": 25611
     },
     "data/system/gb/clackers_brook/scenarios/center/base_with_bg.bin": {
-      "checksum": "b48fff764c538fef4ae852e0615a6cc4",
-      "uncompressed_size_bytes": 4300263,
-      "compressed_size_bytes": 1101569
+      "checksum": "3c39dcbbc6f61f78f7a6c776c0abd94c",
+      "uncompressed_size_bytes": 4581990,
+      "compressed_size_bytes": 1177193
     },
     "data/system/gb/clackers_brook/scenarios/center/go_active.bin": {
       "checksum": "a3458ae3d2150b186db50d86099fa4d8",
       "uncompressed_size_bytes": 88362,
       "compressed_size_bytes": 25967
     },
     "data/system/gb/clackers_brook/scenarios/center/go_active_with_bg.bin": {
-      "checksum": "e3d0d2960890c3f1dddca19195129f49",
-      "uncompressed_size_bytes": 4300337,
-      "compressed_size_bytes": 1101887
+      "checksum": "3e792759ace5e607037f6d1bdd42275a",
+      "uncompressed_size_bytes": 4582064,
+      "compressed_size_bytes": 1177563
     },
     "data/system/gb/cricklewood/maps/center.bin": {
       "checksum": "2418a83ce67956add4ec5efa5d1bd506",
@@ -3496,19 +3496,19 @@
       "compressed_size_bytes": 68419
     },
     "data/system/gb/culm/scenarios/center/base_with_bg.bin": {
-      "checksum": "99e6491651b4fa61f286cc598d72021d",
-      "uncompressed_size_bytes": 7910525,
-      "compressed_size_bytes": 2120422
+      "checksum": "2cbdb0a02385f65c941001d51226646f",
+      "uncompressed_size_bytes": 7596368,
+      "compressed_size_bytes": 2036028
     },
     "data/system/gb/culm/scenarios/center/go_active.bin": {
       "checksum": "b30806c6b1425dd40e01058e721c3d55",
       "uncompressed_size_bytes": 245636,
       "compressed_size_bytes": 69235
     },
     "data/system/gb/culm/scenarios/center/go_active_with_bg.bin": {
-      "checksum": "5f1be9b8b476d4982515ffe50c3c3102",
-      "uncompressed_size_bytes": 7911130,
-      "compressed_size_bytes": 2121248
+      "checksum": "51803864cf2935f2010b066820ab6956",
+      "uncompressed_size_bytes": 7596973,
+      "compressed_size_bytes": 2036902
     },
     "data/system/gb/dickens_heath/maps/center.bin": {
       "checksum": "8931d73b42a42cb6d2e6d4527fb90ded",
@@ -3561,9 +3561,9 @@
       "compressed_size_bytes": 860473
     },
     "data/system/gb/dunton_hills/maps/center.bin": {
-      "checksum": "87a70a0a16507d2f5c844b009821b5e4",
-      "uncompressed_size_bytes": 44573896,
-      "compressed_size_bytes": 17089704
+      "checksum": "7056e72f4df261066f87caa50ca5fffb",
+      "uncompressed_size_bytes": 44600396,
+      "compressed_size_bytes": 17220049
     },
     "data/system/gb/dunton_hills/scenarios/center/base.bin": {
       "checksum": "db6b81e9ae14250e168a5f465f54c8b4",
@@ -3611,9 +3611,9 @@
       "compressed_size_bytes": 1573452
     },
     "data/system/gb/exeter_red_cow_village/maps/center.bin": {
-      "checksum": "9056ecd260e52a38c72a4ca51a6f5a36",
-      "uncompressed_size_bytes": 40055255,
-      "compressed_size_bytes": 15245564
+      "checksum": "db5442a49b9c7490b08e4fcff96b98c8",
+      "uncompressed_size_bytes": 40057275,
+      "compressed_size_bytes": 15335550
     },
     "data/system/gb/exeter_red_cow_village/scenarios/center/base.bin": {
       "checksum": "84c2c31b33f8a6fb57ccd6eb7e50414f",
@@ -3811,9 +3811,9 @@
       "compressed_size_bytes": 4123847
     },
     "data/system/gb/leeds/city.bin": {
-      "checksum": "56fe43e24ebd0d5657819acefba6f855",
-      "uncompressed_size_bytes": 621577,
-      "compressed_size_bytes": 301735
+      "checksum": "0bd7a032e08a47de09037a2574bbe175",
+      "uncompressed_size_bytes": 340327,
+      "compressed_size_bytes": 166479
     },
     "data/system/gb/leeds/maps/central.bin": {
       "checksum": "20922f49517a814dd7f98368b6ca43bd",
@@ -3976,9 +3976,9 @@
       "compressed_size_bytes": 9128337
     },
     "data/system/gb/london/maps/kennington.bin": {
-      "checksum": "23feca8761384aa8f49d95da395a9375",
-      "uncompressed_size_bytes": 4548147,
-      "compressed_size_bytes": 1642934
+      "checksum": "dfd26166bcc058904bdd01dc75bbae58",
+      "uncompressed_size_bytes": 4476032,
+      "compressed_size_bytes": 1619718
     },
     "data/system/gb/london/maps/kensington_and_chelsea.bin": {
       "checksum": "ea9378844592a7e2c47d983d70522990",
@@ -4121,9 +4121,9 @@
       "compressed_size_bytes": 15560819
     },
     "data/system/gb/london/scenarios/kennington/background.bin": {
-      "checksum": "1e2e50d4f139f0d0190f6fbea196f0bc",
+      "checksum": "48415ae4ac741c0baa975ce13a1493ed",
       "uncompressed_size_bytes": 19620357,
-      "compressed_size_bytes": 4711943
+      "compressed_size_bytes": 4712644
     },
     "data/system/gb/london/scenarios/kensington_and_chelsea/background.bin": {
       "checksum": "70e54b06d95c899152bb246846a0ca1e",
@@ -4311,9 +4311,9 @@
       "compressed_size_bytes": 3755523
     },
     "data/system/gb/newcastle_upon_tyne/maps/center.bin": {
-      "checksum": "83832083a0d19fad71393bc766db04c8",
-      "uncompressed_size_bytes": 21366808,
-      "compressed_size_bytes": 8025946
+      "checksum": "0993cb311dd7a3f7da636a325782f4f6",
+      "uncompressed_size_bytes": 21370828,
+      "compressed_size_bytes": 8098213
     },
     "data/system/gb/newcastle_upon_tyne/scenarios/center/background.bin": {
       "checksum": "8311f4ed8b823080a9fcde5698e4978b",
@@ -4406,9 +4406,9 @@
       "compressed_size_bytes": 1775348
     },
     "data/system/gb/taunton_firepool/maps/center.bin": {
-      "checksum": "37cdafb29e49ce8a66319de0c5b70e2a",
-      "uncompressed_size_bytes": 32872500,
-      "compressed_size_bytes": 12388777
+      "checksum": "2bb3888917827a2ca08508eb7e1ada64",
+      "uncompressed_size_bytes": 32880360,
+      "compressed_size_bytes": 12435458
     },
     "data/system/gb/taunton_firepool/scenarios/center/base.bin": {
       "checksum": "d53fb0f372dcdf849fbfe269ffb3ca79",
@@ -4746,9 +4746,9 @@
       "compressed_size_bytes": 4573110
     },
     "data/system/pl/krakow/maps/center.bin": {
-      "checksum": "1715678c0928ee8b7d31469c8a1db7ce",
-      "uncompressed_size_bytes": 36778999,
-      "compressed_size_bytes": 12057459
+      "checksum": "9a62d1a06f3c2e5085cbcc720355f10f",
+      "uncompressed_size_bytes": 36710358,
+      "compressed_size_bytes": 12033064
     },
     "data/system/pl/warsaw/maps/center.bin": {
       "checksum": "e8c6043b5b8ab486714ac276b8fa9745",
@@ -4861,9 +4861,9 @@
       "compressed_size_bytes": 18470711
     },
     "data/system/us/phoenix/maps/tempe.bin": {
-      "checksum": "720c0818fff2c2ec6e40c7a98eca17fb",
-      "uncompressed_size_bytes": 7067264,
-      "compressed_size_bytes": 2658871
+      "checksum": "cf7059e0193b58dbf6bf1a485ad085e9",
+      "uncompressed_size_bytes": 6999167,
+      "compressed_size_bytes": 2632220
     },
     "data/system/us/providence/maps/downtown.bin": {
       "checksum": "35f0ef917d206f4ea3a42259fd83401c",
@@ -4891,19 +4891,19 @@
       "compressed_size_bytes": 21305614
     },
     "data/system/us/seattle/maps/downtown.bin": {
-      "checksum": "c8dc9ed0d0cae0fb460bb8406d61a211",
-      "uncompressed_size_bytes": 21191421,
-      "compressed_size_bytes": 8252381
+      "checksum": "e617c0546dfcfe968bf92842c70e2383",
+      "uncompressed_size_bytes": 21057324,
+      "compressed_size_bytes": 8203600
     },
     "data/system/us/seattle/maps/huge_seattle.bin": {
       "checksum": "b930b7eb014d3e7a2cf21cc8dee2f40c",
       "uncompressed_size_bytes": 255620606,
       "compressed_size_bytes": 103300612
     },
     "data/system/us/seattle/maps/lakeslice.bin": {
-      "checksum": "a9c0a4319a56b2eb828c04ce5b87d0a6",
-      "uncompressed_size_bytes": 18791953,
-      "compressed_size_bytes": 7386218
+      "checksum": "f6e4d94dabce16230fd643e53d3f39f5",
+      "uncompressed_size_bytes": 18625839,
+      "compressed_size_bytes": 7329642
     },
     "data/system/us/seattle/maps/montlake.bin": {
       "checksum": "b0974b3680feccb5b951238f4b3fd83d",
@@ -4976,19 +4976,19 @@
       "compressed_size_bytes": 12682906
     },
     "data/system/us/seattle/scenarios/downtown/weekday.bin": {
-      "checksum": "1515a040cd797968f426af63c531a1ac",
+      "checksum": "14a330d4d9ebba12952552ece05dba91",
       "uncompressed_size_bytes": 40179345,
-      "compressed_size_bytes": 10223302
+      "compressed_size_bytes": 10224513
     },
     "data/system/us/seattle/scenarios/huge_seattle/weekday.bin": {
       "checksum": "b05abc1aff052e54ca0523a53aa10653",
       "uncompressed_size_bytes": 121003518,
       "compressed_size_bytes": 32402375
     },
     "data/system/us/seattle/scenarios/lakeslice/weekday.bin": {
-      "checksum": "0e5158209a6f4f056c484ba47df2f964",
+      "checksum": "cdf679d098dfabc3f22370180f5d7745",
       "uncompressed_size_bytes": 9493224,
-      "compressed_size_bytes": 2404481
+      "compressed_size_bytes": 2404347
     },
     "data/system/us/seattle/scenarios/montlake/weekday.bin": {
       "checksum": "fbb3641f64d599b7d036d48f809dd991",