-
-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Display a simple count of amenities reachable from a building. #393
- Loading branch information
1 parent
bf9d34d
commit 29da713
Showing
4 changed files
with
110 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,111 @@ | ||
| use std::collections::HashMap; | ||
|
|
||
| use abstutil::MultiMap; | ||
| use geom::{Duration, Polygon}; | ||
| use map_model::{connectivity, BuildingID}; | ||
| use widgetry::{Color, Drawable, EventCtx, GeomBatch}; | ||
|
|
||
| use crate::app::App; | ||
| use crate::common::Grid; | ||
| use crate::helpers::amenity_type; | ||
|
|
||
| /// Represents the area reachable from a single building. | ||
| pub struct Isochrone { | ||
| /// Colored polygon contours, uploaded to the GPU and ready for drawing | ||
| pub draw: Drawable, | ||
| /* TODO This is a good place to store the buildings within 5 mins, 10 mins, etc | ||
| * and maybe some summary of the types of amenities within these ranges */ | ||
| /// How far away is each building from the start? | ||
| pub time_to_reach_building: HashMap<BuildingID, Duration>, | ||
| /// Per category of amenity (defined by helpers::amenity_type), what buildings have that? | ||
| pub amenities_reachable: MultiMap<&'static str, BuildingID>, | ||
| } | ||
|
|
||
| impl Isochrone { | ||
| pub fn new(ctx: &mut EventCtx, app: &App, start: BuildingID) -> Isochrone { | ||
| // To generate the polygons covering areas between 0-5 mins, 5-10 mins, etc, we have to feed | ||
| // in a 2D grid of costs. Use a 100x100 meter resolution. | ||
| let bounds = app.primary.map.get_bounds(); | ||
| let resolution_m = 100.0; | ||
| // The costs we're storing are currenly durations, but the contour crate needs f64, so | ||
| // just store the number of seconds. | ||
| let mut grid: Grid<f64> = Grid::new( | ||
| (bounds.width() / resolution_m).ceil() as usize, | ||
| (bounds.height() / resolution_m).ceil() as usize, | ||
| 0.0, | ||
| ); | ||
|
|
||
| // Calculate the cost from the start building to every other building in the map | ||
| for (b, cost) in | ||
| connectivity::all_costs_from(&app.primary.map, start, Duration::minutes(15)) | ||
| { | ||
| // What grid cell does the building belong to? | ||
| let pt = app.primary.map.get_b(b).polygon.center(); | ||
| let idx = grid.idx( | ||
| ((pt.x() - bounds.min_x) / resolution_m) as usize, | ||
| ((pt.y() - bounds.min_y) / resolution_m) as usize, | ||
| ); | ||
| // Don't add! If two buildings map to the same cell, we should pick a finer resolution. | ||
| grid.data[idx] = cost.inner_seconds(); | ||
| } | ||
| let time_to_reach_building = | ||
| connectivity::all_costs_from(&app.primary.map, start, Duration::minutes(15)); | ||
| let draw = draw_isochrone(app, &time_to_reach_building).upload(ctx); | ||
|
|
||
| // Generate polygons covering the contour line where the cost in the grid crosses these | ||
| // threshold values. | ||
| let thresholds = vec![ | ||
| 0.1, | ||
| Duration::minutes(5).inner_seconds(), | ||
| Duration::minutes(10).inner_seconds(), | ||
| Duration::minutes(15).inner_seconds(), | ||
| ]; | ||
| // And color the polygon for each threshold | ||
| let colors = vec![ | ||
| Color::GREEN.alpha(0.5), | ||
| Color::ORANGE.alpha(0.5), | ||
| Color::RED.alpha(0.5), | ||
| ]; | ||
| let smooth = false; | ||
| let c = contour::ContourBuilder::new(grid.width as u32, grid.height as u32, smooth); | ||
| let mut batch = GeomBatch::new(); | ||
| // The last feature returned will be larger than the last threshold value. We don't want to | ||
| // display that at all. zip() will omit this last pair, since colors.len() == | ||
| // thresholds.len() - 1. | ||
| // | ||
| // TODO Actually, this still isn't working. I think each polygon is everything > the | ||
| // threshold, not everything between two thresholds? | ||
| for (feature, color) in c | ||
| .contours(&grid.data, &thresholds) | ||
| .unwrap() | ||
| .into_iter() | ||
| .zip(colors) | ||
| { | ||
| match feature.geometry.unwrap().value { | ||
| geojson::Value::MultiPolygon(polygons) => { | ||
| for p in polygons { | ||
| batch.push(color, Polygon::from_geojson(&p).scale(resolution_m)); | ||
| } | ||
| let mut amenities_reachable = MultiMap::new(); | ||
| for b in time_to_reach_building.keys() { | ||
| let bldg = app.primary.map.get_b(*b); | ||
| for amenity in &bldg.amenities { | ||
| if let Some(category) = amenity_type(&amenity.amenity_type) { | ||
| amenities_reachable.insert(category, bldg.id); | ||
| } | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
|
|
||
| Isochrone { | ||
| draw: batch.upload(ctx), | ||
| draw, | ||
| time_to_reach_building, | ||
| amenities_reachable, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn draw_isochrone(app: &App, time_to_reach_building: &HashMap<BuildingID, Duration>) -> GeomBatch { | ||
| // To generate the polygons covering areas between 0-5 mins, 5-10 mins, etc, we have to feed | ||
| // in a 2D grid of costs. Use a 100x100 meter resolution. | ||
| let bounds = app.primary.map.get_bounds(); | ||
| let resolution_m = 100.0; | ||
| // The costs we're storing are currenly durations, but the contour crate needs f64, so | ||
| // just store the number of seconds. | ||
| let mut grid: Grid<f64> = Grid::new( | ||
| (bounds.width() / resolution_m).ceil() as usize, | ||
| (bounds.height() / resolution_m).ceil() as usize, | ||
| 0.0, | ||
| ); | ||
|
|
||
| // Calculate the cost from the start building to every other building in the map | ||
| for (b, cost) in time_to_reach_building { | ||
| // What grid cell does the building belong to? | ||
| let pt = app.primary.map.get_b(*b).polygon.center(); | ||
| let idx = grid.idx( | ||
| ((pt.x() - bounds.min_x) / resolution_m) as usize, | ||
| ((pt.y() - bounds.min_y) / resolution_m) as usize, | ||
| ); | ||
| // Don't add! If two buildings map to the same cell, we should pick a finer resolution. | ||
| grid.data[idx] = cost.inner_seconds(); | ||
| } | ||
|
|
||
| // Generate polygons covering the contour line where the cost in the grid crosses these | ||
| // threshold values. | ||
| let thresholds = vec![ | ||
| 0.1, | ||
| Duration::minutes(5).inner_seconds(), | ||
| Duration::minutes(10).inner_seconds(), | ||
| Duration::minutes(15).inner_seconds(), | ||
| ]; | ||
| // And color the polygon for each threshold | ||
| let colors = vec![ | ||
| Color::GREEN.alpha(0.5), | ||
| Color::ORANGE.alpha(0.5), | ||
| Color::RED.alpha(0.5), | ||
| ]; | ||
| let smooth = false; | ||
| let c = contour::ContourBuilder::new(grid.width as u32, grid.height as u32, smooth); | ||
| let mut batch = GeomBatch::new(); | ||
| // The last feature returned will be larger than the last threshold value. We don't want to | ||
| // display that at all. zip() will omit this last pair, since colors.len() == | ||
| // thresholds.len() - 1. | ||
| // | ||
| // TODO Actually, this still isn't working. I think each polygon is everything > the | ||
| // threshold, not everything between two thresholds? | ||
| for (feature, color) in c | ||
| .contours(&grid.data, &thresholds) | ||
| .unwrap() | ||
| .into_iter() | ||
| .zip(colors) | ||
| { | ||
| match feature.geometry.unwrap().value { | ||
| geojson::Value::MultiPolygon(polygons) => { | ||
| for p in polygons { | ||
| batch.push(color, Polygon::from_geojson(&p).scale(resolution_m)); | ||
| } | ||
| } | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
|
|
||
| batch | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters