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

Show unwalkable roads. #393

Browse Source 
Many issues with this -- service roads highlighted when you deselect
shoulders, no real sidewalk data yet, highways light up -- but it's a
start.
This commit is contained in:
Dustin Carlino 2020-12-28 13:13:14 -08:00
parent 32a3159d19
commit adc2ac0fc6
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fifteen_min/src/viewer.rs
View File

@ -9,7 +9,7 @@ use geom::{Distance, Duration};
use map_gui::tools::{nice_map_name, open_browser, CityPicker, ColorLegend, PopupMsg};
use map_gui::ID;
use map_model::connectivity::WalkingOptions;
use map_model::{AmenityType, Building, BuildingID};
use map_model::{AmenityType, Building, BuildingID, LaneType};
use widgetry::table::{Col, Filter, Table};
use widgetry::{
lctrl, Btn, Cached, Checkbox, Choice, Color, Drawable, EventCtx, GeomBatch, GfxCtx,
@ -29,6 +29,7 @@ pub struct Viewer {
hovering_on_bldg: Cached<HoverKey, HoverOnBuilding>,
// TODO Can't use Cached due to a double borrow
hovering_on_category: Option<(AmenityType, Drawable)>,
draw_unwalkable_roads: Drawable,
}
impl Viewer {
@ -45,6 +46,7 @@ impl Viewer {
let isochrone = Isochrone::new(ctx, app, start.id, options);
let highlight_start = draw_star(ctx, start);
let panel = build_panel(ctx, app, start, &isochrone);
let draw_unwalkable_roads = draw_unwalkable_roads(ctx, app, &isochrone.options);
Box::new(Viewer {
panel,
@ -52,6 +54,7 @@ impl Viewer {
isochrone,
hovering_on_bldg: Cached::new(),
hovering_on_category: None,
draw_unwalkable_roads,
})
}
}
@ -163,6 +166,7 @@ impl State<App> for Viewer {
},
Outcome::Changed => {
let options = options_from_controls(&self.panel);
self.draw_unwalkable_roads = draw_unwalkable_roads(ctx, app, &options);
self.isochrone = Isochrone::new(ctx, app, self.isochrone.start, options);
self.panel = build_panel(
ctx,
@ -180,6 +184,7 @@ impl State<App> for Viewer {
fn draw(&self, g: &mut GfxCtx, _: &App) {
g.redraw(&self.isochrone.draw);
g.redraw(&self.highlight_start);
g.redraw(&self.draw_unwalkable_roads);
self.panel.draw(g);
if let Some(ref hover) = self.hovering_on_bldg.value() {
g.draw_mouse_tooltip(hover.tooltip.clone());
@ -220,6 +225,8 @@ fn options_to_controls(ctx: &mut EventCtx, opts: &Options) -> Widget {
.map(|(label, speed)| Choice::new(label, speed))
.collect(),
));
rows.push(ColorLegend::row(ctx, Color::BLUE, "unwalkable roads"));
}
Options::Biking => {}
}
@ -520,3 +527,27 @@ impl State<App> for ExploreAmenities {
}
}
}
fn draw_unwalkable_roads(ctx: &mut EventCtx, app: &App, opts: &Options) -> Drawable {
let allow_shoulders = match opts {
Options::Walking(ref opts) => opts.allow_shoulders,
Options::Biking => {
return Drawable::empty(ctx);
}
};
let mut batch = GeomBatch::new();
'ROADS: for road in app.map.all_roads() {
if road.is_light_rail() {
continue;
}
for (_, _, lt) in road.lanes_ltr() {
if lt == LaneType::Sidewalk || (lt == LaneType::Shoulder && allow_shoulders) {
continue 'ROADS;
}
}
// TODO Skip highways
batch.push(Color::BLUE.alpha(0.5), road.get_thick_polygon(&app.map));
}
ctx.upload(batch)
}