Regenerate everything

a-b-street · Dec 31, 2023 · 6685b35 · 6685b35
1 parent 2c01219
commit 6685b35
Show file tree

Hide file tree

Showing 5 changed files with 2,510 additions and 1,285 deletions.
diff --git a/apps/game/src/devtools/kml.rs b/apps/game/src/devtools/kml.rs
@@ -262,7 +262,7 @@ fn load_objects(
     let bldg_lookup: HashMap<String, BuildingID> = map
         .all_buildings()
         .iter()
-        .map(|b| (b.orig_id.inner().to_string(), b.id))
+        .map(|b| (b.orig_id.inner_id().to_string(), b.id))
         .collect();
     let cs = &app.cs;
 

diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
@@ -18,7 +18,7 @@ pub use self::roads::RoadEditor;
 pub use self::routes::RouteEditor;
 pub use self::stop_signs::StopSignEditor;
 pub use self::traffic_signals::TrafficSignalEditor;
-pub use self::validate::{check_blackholes, check_sidewalk_connectivity};
+pub use self::validate::{check_sidewalk_connectivity};
 use crate::app::{App, Transition};
 use crate::common::{tool_panel, CommonState, Warping};
 use crate::debug::DebugMode;

diff --git a/apps/game/src/info/building.rs b/apps/game/src/info/building.rs
@@ -27,7 +27,7 @@ fn info_body(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BuildingI
         kv.push(("Name", names.get(app.opts.language.as_ref()).to_string()));
     }
     if app.opts.dev {
-        kv.push(("OSM ID", format!("{}", b.orig_id.inner())));
+        kv.push(("OSM ID", format!("{}", b.orig_id.inner_id())));
     }
 
     let num_spots = b.num_parking_spots();

diff --git a/apps/osm_viewer/src/viewer.rs b/apps/osm_viewer/src/viewer.rs
@@ -138,7 +138,7 @@ impl Viewer {
                 col.push(
                     ctx.style()
                         .btn_outline
-                        .text(format!("Open OSM ID {}", b.orig_id.inner()))
+                        .text(format!("Open OSM ID {}", b.orig_id.inner_id()))
                         .build_widget(ctx, format!("open {}", b.orig_id)),
                 );
 
@@ -187,7 +187,7 @@ impl Viewer {
                 col.push(
                     ctx.style()
                         .btn_outline
-                        .text(format!("Open OSM ID {}", pl.osm_id.inner()))
+                        .text(format!("Open OSM ID {}", pl.osm_id.inner_id()))
                         .build_widget(ctx, format!("open {}", pl.osm_id)),
                 );