diff --git a/docs/design/map/article.md b/docs/design/map/article.md index 16b05757d1..fde1b8b74b 100644 --- a/docs/design/map/article.md +++ b/docs/design/map/article.md @@ -18,7 +18,7 @@ functionality - OSM models entire roads coarsely, sometimes with some metadata about the presence of bus- or bike-only lanes -![OSM](screenshots/lanes_osm.png) +![OSM](screenshots/lanes_osm.gif) - A/B Street breaks roads down into individual lanes - Sidewalks for pedestrian movement, including bus stops and paths to buildings @@ -29,17 +29,17 @@ functionality automatic. Lane types and number of lanes come from heuristics on OSM metadata and extra shapefiles from King County GIS. -![A/B Street](screenshots/lanes_abst.png) +![A/B Street](screenshots/lanes_abst.gif) ### Intersections (geometry) OSM doesn't explicitly model intersections at all; some ways just share points. -![OSM](screenshots/intersections_osm.png) +![OSM](screenshots/intersections_osm.gif) In A/B Street, lanes and intersections have disjoint geometry. -![A/B Street](screenshots/intersections_abst.png) +![A/B Street](screenshots/intersections_abst.gif) This means that cars and pedestrians stop and queue at the correct position before crossing an intersection. @@ -49,58 +49,61 @@ before crossing an intersection. The intersection geometry is calculated automatically. It's usually pretty robust: -![A/B Street](screenshots/intersection_good_geom.png) +![A/B Street](screenshots/intersection_good_geom.gif) But OSM ways often have many "intersections" very close together. These appear as extremely short roads in A/B Street, which complicates traffic modeling. -![A/B Street](screenshots/short_roads_bridge_before.png) +![A/B Street](screenshots/short_roads_bridge_before.gif) These can be merged automatically, which works reasonably well sometimes: -![A/B Street](screenshots/short_roads_bridge_after.png) +![A/B Street](screenshots/short_roads_bridge_after.gif) But some cases are very complex; this is Montlake and 520 without merging short roads: -![A/B Street](screenshots/short_roads_montlake_before.png) +![A/B Street](screenshots/short_roads_montlake_before.gif) As of April 2019, short road merging is disabled because it doesn't always work well: -![A/B Street](screenshots/short_roads_montlake_after.png) +![A/B Street](screenshots/short_roads_montlake_after.gif) Some highway on-ramps in OSM are modeled with particularly unusual geometry, overlapping an arterial road: -![OSM](screenshots/highway_onramp_osm.png) +![OSM](screenshots/highway_onramp_osm.gif) A/B Street detects and fixes these cases -![A/B Street](screenshots/highway_onramp_abst.png) +![A/B Street](screenshots/highway_onramp_abst.gif) ### Intersections (semantics) -A/B Street models turns through intersections. Some turns can conflict +A/B Street models turns between lanes through intersections. Some turns +conflict. For stop-sign controlled intersections, the bigger road by default has +priority. -- turns connect lanes, the turns have a path. turns conflict or don't. +![A/B Street](screenshots/turns.gif) -- stop signs (some directions stop and others dont), traffic signals with - multiple phases - - "reasonable" defaults inferred, editor for the rest +Intersections controlled by traffic signals have a default set of timed phases. +Users can edit these. + +![A/B Street](screenshots/traffic_signal.gif) ### Clipping / boundaries How should the boundary of the map be handled? Without proper clipping, roads and lakes go out-of-bounds, often with very strange, long roads to nowhere. -![before](screenshots/clipping_before.png) +![before](screenshots/clipping_before.gif) Proper clipping trims polygons to fit properly. Roads that cross the boundary terminate at special border intersections, which can model traffic flowing into or out of the map. -![after](screenshots/clipping_after.png) +![after](screenshots/clipping_after.gif) ### Buildings @@ -109,7 +112,7 @@ commercial. Additional data from King County GIS reveals how many units some apartments have. This will be used to generate a realistic number of trips between residential and commercial areas. -![A/B Street](screenshots/buildings.png) +![A/B Street](screenshots/buildings.gif) ## Model diff --git a/docs/design/map/screenshots/buildings.gif b/docs/design/map/screenshots/buildings.gif new file mode 100644 index 0000000000..1a42ab43eb Binary files /dev/null and b/docs/design/map/screenshots/buildings.gif differ diff --git a/docs/design/map/screenshots/buildings.png b/docs/design/map/screenshots/buildings.png deleted file mode 100644 index 183d9a4066..0000000000 Binary files a/docs/design/map/screenshots/buildings.png and /dev/null differ diff --git a/docs/design/map/screenshots/clipping_after.gif b/docs/design/map/screenshots/clipping_after.gif new file mode 100644 index 0000000000..6a94d8163b Binary files /dev/null and b/docs/design/map/screenshots/clipping_after.gif differ diff --git a/docs/design/map/screenshots/clipping_after.png b/docs/design/map/screenshots/clipping_after.png deleted file mode 100644 index a12ab2eaeb..0000000000 Binary files a/docs/design/map/screenshots/clipping_after.png and /dev/null differ diff --git a/docs/design/map/screenshots/clipping_before.gif b/docs/design/map/screenshots/clipping_before.gif new file mode 100644 index 0000000000..02b43aa705 Binary files /dev/null and b/docs/design/map/screenshots/clipping_before.gif differ diff --git a/docs/design/map/screenshots/clipping_before.png b/docs/design/map/screenshots/clipping_before.png deleted file mode 100644 index 03da8e34aa..0000000000 Binary files a/docs/design/map/screenshots/clipping_before.png and /dev/null differ diff --git a/docs/design/map/screenshots/highway_onramp_abst.gif b/docs/design/map/screenshots/highway_onramp_abst.gif new file mode 100644 index 0000000000..9746c7e18f Binary files /dev/null and b/docs/design/map/screenshots/highway_onramp_abst.gif differ diff --git a/docs/design/map/screenshots/highway_onramp_abst.png b/docs/design/map/screenshots/highway_onramp_abst.png deleted file mode 100644 index 78ffabb959..0000000000 Binary files a/docs/design/map/screenshots/highway_onramp_abst.png and /dev/null differ diff --git a/docs/design/map/screenshots/highway_onramp_osm.gif b/docs/design/map/screenshots/highway_onramp_osm.gif new file mode 100644 index 0000000000..e09c7176d4 Binary files /dev/null and b/docs/design/map/screenshots/highway_onramp_osm.gif differ diff --git a/docs/design/map/screenshots/highway_onramp_osm.png b/docs/design/map/screenshots/highway_onramp_osm.png deleted file mode 100644 index da40a5895f..0000000000 Binary files a/docs/design/map/screenshots/highway_onramp_osm.png and /dev/null differ diff --git a/docs/design/map/screenshots/intersection_good_geom.gif b/docs/design/map/screenshots/intersection_good_geom.gif new file mode 100644 index 0000000000..49e954099f Binary files /dev/null and b/docs/design/map/screenshots/intersection_good_geom.gif differ diff --git a/docs/design/map/screenshots/intersection_good_geom.png b/docs/design/map/screenshots/intersection_good_geom.png deleted file mode 100644 index caf146e62e..0000000000 Binary files a/docs/design/map/screenshots/intersection_good_geom.png and /dev/null differ diff --git a/docs/design/map/screenshots/intersections_abst.gif b/docs/design/map/screenshots/intersections_abst.gif new file mode 100644 index 0000000000..10f244e217 Binary files /dev/null and b/docs/design/map/screenshots/intersections_abst.gif differ diff --git a/docs/design/map/screenshots/intersections_abst.png b/docs/design/map/screenshots/intersections_abst.png deleted file mode 100644 index b454bdcc66..0000000000 Binary files a/docs/design/map/screenshots/intersections_abst.png and /dev/null differ diff --git a/docs/design/map/screenshots/intersections_osm.gif b/docs/design/map/screenshots/intersections_osm.gif new file mode 100644 index 0000000000..0d2511c451 Binary files /dev/null and b/docs/design/map/screenshots/intersections_osm.gif differ diff --git a/docs/design/map/screenshots/intersections_osm.png b/docs/design/map/screenshots/intersections_osm.png deleted file mode 100644 index d30a67062d..0000000000 Binary files a/docs/design/map/screenshots/intersections_osm.png and /dev/null differ diff --git a/docs/design/map/screenshots/lanes_abst.gif b/docs/design/map/screenshots/lanes_abst.gif new file mode 100644 index 0000000000..9cc473be97 Binary files /dev/null and b/docs/design/map/screenshots/lanes_abst.gif differ diff --git a/docs/design/map/screenshots/lanes_abst.png b/docs/design/map/screenshots/lanes_abst.png deleted file mode 100644 index 0fcc3eb69b..0000000000 Binary files a/docs/design/map/screenshots/lanes_abst.png and /dev/null differ diff --git a/docs/design/map/screenshots/lanes_osm.gif b/docs/design/map/screenshots/lanes_osm.gif new file mode 100644 index 0000000000..4bf88d6da0 Binary files /dev/null and b/docs/design/map/screenshots/lanes_osm.gif differ diff --git a/docs/design/map/screenshots/lanes_osm.png b/docs/design/map/screenshots/lanes_osm.png deleted file mode 100644 index 7575f42d95..0000000000 Binary files a/docs/design/map/screenshots/lanes_osm.png and /dev/null differ diff --git a/docs/design/map/screenshots/short_roads_bridge_after.gif b/docs/design/map/screenshots/short_roads_bridge_after.gif new file mode 100644 index 0000000000..c9d915a94f Binary files /dev/null and b/docs/design/map/screenshots/short_roads_bridge_after.gif differ diff --git a/docs/design/map/screenshots/short_roads_bridge_after.png b/docs/design/map/screenshots/short_roads_bridge_after.png deleted file mode 100644 index 117483108f..0000000000 Binary files a/docs/design/map/screenshots/short_roads_bridge_after.png and /dev/null differ diff --git a/docs/design/map/screenshots/short_roads_bridge_before.gif b/docs/design/map/screenshots/short_roads_bridge_before.gif new file mode 100644 index 0000000000..ad45fd0e06 Binary files /dev/null and b/docs/design/map/screenshots/short_roads_bridge_before.gif differ diff --git a/docs/design/map/screenshots/short_roads_bridge_before.png b/docs/design/map/screenshots/short_roads_bridge_before.png deleted file mode 100644 index 2bdf6af8d0..0000000000 Binary files a/docs/design/map/screenshots/short_roads_bridge_before.png and /dev/null differ diff --git a/docs/design/map/screenshots/short_roads_montlake_after.gif b/docs/design/map/screenshots/short_roads_montlake_after.gif new file mode 100644 index 0000000000..6fd4a366f0 Binary files /dev/null and b/docs/design/map/screenshots/short_roads_montlake_after.gif differ diff --git a/docs/design/map/screenshots/short_roads_montlake_after.png b/docs/design/map/screenshots/short_roads_montlake_after.png deleted file mode 100644 index 7c8c252a99..0000000000 Binary files a/docs/design/map/screenshots/short_roads_montlake_after.png and /dev/null differ diff --git a/docs/design/map/screenshots/short_roads_montlake_before.gif b/docs/design/map/screenshots/short_roads_montlake_before.gif new file mode 100644 index 0000000000..48b8406d83 Binary files /dev/null and b/docs/design/map/screenshots/short_roads_montlake_before.gif differ diff --git a/docs/design/map/screenshots/short_roads_montlake_before.png b/docs/design/map/screenshots/short_roads_montlake_before.png deleted file mode 100644 index a01fb36a18..0000000000 Binary files a/docs/design/map/screenshots/short_roads_montlake_before.png and /dev/null differ diff --git a/docs/design/map/screenshots/traffic_signal.gif b/docs/design/map/screenshots/traffic_signal.gif new file mode 100644 index 0000000000..e1c2e5e86b Binary files /dev/null and b/docs/design/map/screenshots/traffic_signal.gif differ diff --git a/docs/design/map/screenshots/turns.gif b/docs/design/map/screenshots/turns.gif new file mode 100644 index 0000000000..5c38ac89a2 Binary files /dev/null and b/docs/design/map/screenshots/turns.gif differ