a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-28 12:12:00 +03:00
Code Issues Projects Releases Wiki Activity

optionally use real intersection polygons in map editor, including for grabbing

Browse Source
This commit is contained in:
Dustin Carlino 2019-10-23 13:38:58 -07:00
parent 2313b06995
commit f7ca317422
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
map_editor/src/main.rs
View File

@ -51,10 +51,17 @@ impl UI {
let load = args.optional_free();
let include_bldgs = args.enabled("--bldgs");
let edit_fixes = args.optional("--fixes");
let intersection_geom = args.enabled("--geom");
args.done();
let model = if let Some(path) = load {
Model::import(&path, include_bldgs, edit_fixes, ctx.prerender)
Model::import(
&path,
include_bldgs,
edit_fixes,
intersection_geom,
ctx.prerender,
)
} else {
Model::blank()
};
@ -150,9 +157,10 @@ impl GUI for UI {
self.model.toggle_i_type(i, ctx.prerender);
} else if ctx.input.key_pressed(Key::L, "label intersection") {
self.state = State::LabelingIntersection(i, Wizard::new());
} else if ctx
.input
.key_pressed(Key::P, "preview intersection geometry")
} else if !self.model.intersection_geom
&& ctx
.input
.key_pressed(Key::P, "preview intersection geometry")
{
let (draw, labels) = preview_intersection(i, &self.model, ctx);
self.state = State::PreviewIntersection(draw, labels, false);
@ -268,7 +276,9 @@ impl GUI for UI {
self.state = State::EnteringWarp(Wizard::new());
} else if self.menu.action("produce OSM parking diff") {
upstream::find_parking_diffs(&self.model.map);
} else if self.menu.action("preview all intersections") {
} else if !self.model.intersection_geom
&& self.menu.action("preview all intersections")
{
let (draw, labels) = preview_all_intersections(&self.model, ctx);
self.state = State::PreviewIntersection(draw, labels, false);
} else if self.menu.action("find overlapping intersections") {

22
map_editor/src/model.rs
View File

@ -24,6 +24,7 @@ pub struct Model {
include_bldgs: bool,
fixes: MapFixes,
edit_fixes: Option<String>,
pub intersection_geom: bool,
}
// Construction
@ -37,6 +38,7 @@ impl Model {
fixes: MapFixes::new(),
edit_fixes: None,
world: World::new(&Bounds::new()),
intersection_geom: false,
}
}
@ -44,6 +46,7 @@ impl Model {
path: &str,
include_bldgs: bool,
edit_fixes: Option<String>,
intersection_geom: bool,
prerender: &Prerender,
) -> Model {
let mut timer = Timer::new("import map");
@ -52,6 +55,7 @@ impl Model {
model.edit_fixes = edit_fixes;
model.map = read_binary(path, &mut timer).unwrap();
model.fixes.gps_bounds = model.map.gps_bounds.clone();
model.intersection_geom = intersection_geom;
let mut all_fixes = MapFixes::load(&mut timer);
model.map.apply_fixes(&all_fixes, &mut timer);
@ -265,12 +269,20 @@ impl Model {
IntersectionType::StopSign => Color::RED,
IntersectionType::Border => Color::BLUE,
};
let poly = if self.intersection_geom && !self.map.roads_per_intersection(id).is_empty() {
let (poly, _, _) = self.map.preview_intersection(id, &mut Timer::throwaway());
poly
} else {
Circle::new(i.point, INTERSECTION_RADIUS).to_polygon()
};
self.world.add(
prerender,
Object::new(
ID::Intersection(id),
if i.synthetic { color.alpha(0.5) } else { color },
Circle::new(i.point, INTERSECTION_RADIUS).to_polygon(),
poly,
)
.maybe_label(i.label.clone()),
);
@ -721,12 +733,16 @@ impl Model {
self.stop_showing_pts(id);
self.road_deleted(id);
self.world.delete(ID::Intersection(self.map.roads[&id].i1));
self.world.delete(ID::Intersection(self.map.roads[&id].i2));
let mut pts = self.map.roads[&id].center_points.clone();
pts[idx] = point;
self.map.override_road_points(id, pts);
self.road_added(id, prerender);
self.intersection_added(self.map.roads[&id].i1, prerender);
self.intersection_added(self.map.roads[&id].i2, prerender);
self.show_r_points(id, prerender);
}
@ -735,12 +751,16 @@ impl Model {
self.stop_showing_pts(id);
self.road_deleted(id);
self.world.delete(ID::Intersection(self.map.roads[&id].i1));
self.world.delete(ID::Intersection(self.map.roads[&id].i2));
let mut pts = self.map.roads[&id].center_points.clone();
pts.remove(idx);
self.map.override_road_points(id, pts);
self.road_added(id, prerender);
self.intersection_added(self.map.roads[&id].i1, prerender);
self.intersection_added(self.map.roads[&id].i2, prerender);
self.show_r_points(id, prerender);
}