From c5210e988732626788118db89c6b8c16a4d3b803 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Tue, 20 Jul 2021 11:31:44 -0700 Subject: [PATCH] Actually, keep the broken list of ways, to manually run with backtraces --- game/src/debug/mod.rs | 5 +++++ map_model/src/make/initial/geometry.rs | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/game/src/debug/mod.rs b/game/src/debug/mod.rs index f904fd82c8..7c23580373 100644 --- a/game/src/debug/mod.rs +++ b/game/src/debug/mod.rs @@ -1087,6 +1087,11 @@ fn reimport_map( Box::new(|ctx, app, success, _| { if !success { if let Some(ways) = rollback { + if let Err(err) = + std::fs::copy("merge_osm_ways.json", "BROKEN_merge_osm_ways.json") + { + warn!("No merged road file? {}", err); + } abstio::write_json("merge_osm_ways.json".to_string(), &ways); } } diff --git a/map_model/src/make/initial/geometry.rs b/map_model/src/make/initial/geometry.rs index 7da5a5636f..6428729195 100644 --- a/map_model/src/make/initial/geometry.rs +++ b/map_model/src/make/initial/geometry.rs @@ -564,8 +564,7 @@ fn on_off_ramp( } roads.get_mut(&thin.id).unwrap().trimmed_center_pts = trimmed_thin; - // Trim the thick - // extra ends at the intersection + // Trim the thick extra ends at the intersection let extra = if roads[&thick_id].dst_i == i { roads[&thick_id] .trimmed_center_pts