Regenerate everything

This commit is contained in:
Dustin Carlino 2023-12-31 10:18:57 +00:00
parent 2c01219d8c
commit 6685b358d9
5 changed files with 2510 additions and 1285 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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();

View File

@ -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)),
);

File diff suppressed because it is too large Load Diff