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

Bring in alleyways from OSM! [rebuild] (#351)

Browse Source
This commit is contained in:
Dustin Carlino 2020-09-27 12:20:27 -07:00 committed by GitHub
parent 84891f8b96
commit 371d26f707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 2857 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
book/src/project/CHANGELOG.md
View File

@ -598,3 +598,11 @@ changes here.
- show how long a car has been parked in one spot
- bugfix for some pathfinding costs around uber-turns
- start to show a trip's purpose
0.2.13
- alleyways from OSM imported
- traffic signal minimum time now constrained by crosswalks; thanks Sam!
- UI changes in progress for trip tables, summaries, bulk edit
- more API / Python example work for congestion capping
- bug fixes: isometric buildings, documentation links, dropdown widgets, turn restrictions

10
convert_osm/src/extract.rs
View File

@ -423,8 +423,11 @@ fn is_road(tags: &mut Tags, opts: &Options) -> bool {
// Service roads can represent lots of things, most of which we don't want to keep yet. What's
// allowed here is just based on what's been encountered so far in Seattle and Kraków.
if highway == "service" && !tags.is_any("psv", vec!["yes", "bus"]) && !tags.is("bus", "yes") {
return false;
if highway == "service" {
let for_buses = tags.is_any("psv", vec!["bus", "yes"]) || tags.is("bus", "yes");
if !for_buses && !tags.is("service", "alley") {
return false;
}
}
// Not sure what this means, found in Seoul.
@ -439,8 +442,7 @@ fn is_road(tags: &mut Tags, opts: &Options) -> bool {
if !tags.contains_key(osm::PARKING_LEFT)
&& !tags.contains_key(osm::PARKING_RIGHT)
&& !tags.contains_key(osm::PARKING_BOTH)
&& !tags.is(osm::HIGHWAY, "motorway")
&& !tags.is(osm::HIGHWAY, "motorway_link")
&& !tags.is_any(osm::HIGHWAY, vec!["motorway", "motorway_link", "service"])
&& !tags.is("junction", "roundabout")
{
tags.insert(osm::PARKING_BOTH, "no_parking");

2
convert_osm/src/parking.rs
View File

@ -54,7 +54,7 @@ fn use_parking_hints(map: &mut RawMap, path: String, timer: &mut Timer) {
let mut closest: FindClosest<(OriginalRoad, bool)> =
FindClosest::new(&map.gps_bounds.to_bounds());
for (id, r) in &map.roads {
if r.is_light_rail() || r.is_footway() {
if r.is_light_rail() || r.is_footway() || r.is_service() {
continue;
}
let center = PolyLine::must_new(r.center_points.clone());

2
convert_osm/src/snappy.rs
View File

@ -33,7 +33,7 @@ pub fn snap_cycleways(map: &RawMap, timer: &mut Timer) {
let mut road_edges: HashMap<(OriginalRoad, Direction), PolyLine> = HashMap::new();
for (id, r) in &map.roads {
if r.is_light_rail() || r.is_footway() {
if r.is_light_rail() || r.is_footway() || r.is_service() {
continue;
}
let (pl, total_width) = r.get_geometry(*id, map.config.driving_side);

132
data/MANIFEST.txt
View File

@ -1,50 +1,50 @@
data/input/berlin/EWR201812E_Matrix.csv,7966d3e37c45e7ffa4ee26bb6c8cec28,https://www.dropbox.com/s/38fl51jxp5iwuz3/EWR201812E_Matrix.csv.zip?dl=0
data/input/berlin/berlin_center_separate_cycleways.bin,93091325d95085cb94d4c08289c5fe28,https://www.dropbox.com/s/nas6r3pzesmrbdj/berlin_center_separate_cycleways.bin.zip?dl=0
data/input/berlin/berlin_center_separate_cycleways.bin,fe36fb81042a1de9aebc372e1113e021,https://www.dropbox.com/s/nas6r3pzesmrbdj/berlin_center_separate_cycleways.bin.zip?dl=0
data/input/berlin/berlin_center_snapped_cycleways.bin,2ff14b60c55ada6154bad1ce71f1ddb5,https://www.dropbox.com/s/n1kdzjv2iq4gewt/berlin_center_snapped_cycleways.bin.zip?dl=0
data/input/berlin/footways.bin,19d6608e9bc85800706e004e4530a81b,https://www.dropbox.com/s/c36724ayytwwpz8/footways.bin.zip?dl=0
data/input/berlin/osm/berlin-latest.osm.pbf,8e7f5ecf37631bb975f062593c5add99,https://www.dropbox.com/s/6lssl37uhbyo7gr/berlin-latest.osm.pbf.zip?dl=0
data/input/berlin/osm/berlin_center.osm,7411c1f8e1e5ff792445a7cd575f5379,https://www.dropbox.com/s/erk27mw2aar4zft/berlin_center.osm.zip?dl=0
data/input/berlin/planning_areas.bin,f1a3bd5118a0e4982b64c2307e01d82a,https://www.dropbox.com/s/pbovhfr6zw0s0ob/planning_areas.bin.zip?dl=0
data/input/berlin/planning_areas.kml,1bfc2044f1f5f40acdcdded1a644ad22,https://www.dropbox.com/s/9bvbshrtjw14tm7/planning_areas.kml.zip?dl=0
data/input/berlin/service_roads.bin,ac7817c9b0df7da5801f405f09600e6b,https://www.dropbox.com/s/p40petrc2fzzlm2/service_roads.bin.zip?dl=0
data/input/berlin/service_roads.bin,be06e4b4136771f8e03a2ba7a5f9b8cd,https://www.dropbox.com/s/g4km7xhshigwz8g/service_roads.bin.zip?dl=0
data/input/krakow/footways.bin,017e85fd6da69b67a1a7a790506f52ff,https://www.dropbox.com/s/xxwivqmxev2ecl6/footways.bin.zip?dl=0
data/input/krakow/krakow_center_separate_cycleways.bin,bfed7442e6d837bee42bd3c4f604984c,https://www.dropbox.com/s/dqrc5w5jxpv9nfc/krakow_center_separate_cycleways.bin.zip?dl=0
data/input/krakow/krakow_center_separate_cycleways.bin,3e8c32ef7fc2245f1dafeec6df2d77f5,https://www.dropbox.com/s/dqrc5w5jxpv9nfc/krakow_center_separate_cycleways.bin.zip?dl=0
data/input/krakow/krakow_center_snapped_cycleways.bin,03c50c05dcb636229f827879ae2b983e,https://www.dropbox.com/s/03f9g4gubb9x3y3/krakow_center_snapped_cycleways.bin.zip?dl=0
data/input/krakow/osm/krakow_center.osm,b914bbcd42a7f769a40a90970cea35f2,https://www.dropbox.com/s/pf3avtszpw732jd/krakow_center.osm.zip?dl=0
data/input/krakow/osm/malopolskie-latest.osm.pbf,9505917bbacc478177e36605e89b6d77,https://www.dropbox.com/s/vehjfvwx25v1qnd/malopolskie-latest.osm.pbf.zip?dl=0
data/input/krakow/service_roads.bin,a6a5d22bb3dba66b5a4cad72f6842eb9,https://www.dropbox.com/s/is31c2ejl8nun28/service_roads.bin.zip?dl=0
data/input/krakow/service_roads.bin,a702f4fa6680793c7e1047668d8d0b69,https://www.dropbox.com/s/bz2aqd023jr3lhb/service_roads.bin.zip?dl=0
data/input/london/footways.bin,95816ac4d77d857c561a61830d1998a0,https://www.dropbox.com/s/sw8dnlv4h4jloai/footways.bin.zip?dl=0
data/input/london/osm/greater-london-latest.osm.pbf,ef110d0831b482bb7336c82e36b115ed,https://www.dropbox.com/s/wzwjgcd3wsc4sx1/greater-london-latest.osm.pbf.zip?dl=0
data/input/london/osm/southbank.osm,b86babace41d69a9e5b8be2310a725ae,https://www.dropbox.com/s/qip39avqaijvxy6/southbank.osm.zip?dl=0
data/input/london/service_roads.bin,a35c865d02cb919770e61d57cae9468c,https://www.dropbox.com/s/oxmq3f76obc4b5n/service_roads.bin.zip?dl=0
data/input/london/southbank_separate_cycleways.bin,ee9193475b56c07739de5923bd37d96e,https://www.dropbox.com/s/pahf7kbiuh1j2yr/southbank_separate_cycleways.bin.zip?dl=0
data/input/london/southbank_snapped_cycleways.bin,983b40d415a17e80c69e24880db6a8ae,https://www.dropbox.com/s/l4anoe33yuut4vs/southbank_snapped_cycleways.bin.zip?dl=0
data/input/raw_maps/ballard.bin,308cca786a71d7646295673cdb96a44a,https://www.dropbox.com/s/4h4zpvl0dw8na0g/ballard.bin.zip?dl=0
data/input/raw_maps/berlin_center.bin,34a9a85bc7426c179a57c74d9ab38429,https://www.dropbox.com/s/hmkzcfz2yx5fhob/berlin_center.bin.zip?dl=0
data/input/raw_maps/downtown.bin,65cb26c87fe79061fba8b9f3795aff0c,https://www.dropbox.com/s/4g1lemr05hmd1z2/downtown.bin.zip?dl=0
data/input/raw_maps/huge_seattle.bin,5e89e9bfa32e2bc930e975183c1756f8,https://www.dropbox.com/s/pf7w6rkx732u8lj/huge_seattle.bin.zip?dl=0
data/input/raw_maps/krakow_center.bin,eaa2660948ac6114a8c324c9913e2307,https://www.dropbox.com/s/shvevlsp6j4yojq/krakow_center.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,da510e124fcd675c879cfb85254fc8e5,https://www.dropbox.com/s/muxu6igt47ksl5b/lakeslice.bin.zip?dl=0
data/input/raw_maps/montlake.bin,d2a127582e269f91c3b041be32a154dc,https://www.dropbox.com/s/k6hp41of4x1qu8t/montlake.bin.zip?dl=0
data/input/raw_maps/south_seattle.bin,6ebd639dedc39b94336089f92051c6ae,https://www.dropbox.com/s/kh31h5yg196mkyu/south_seattle.bin.zip?dl=0
data/input/raw_maps/southbank.bin,d8268aea4733a53a7dd5f413ff68a8e4,https://www.dropbox.com/s/vlbkmr1dur3xq22/southbank.bin.zip?dl=0
data/input/raw_maps/tel_aviv.bin,bfadfb5b381b3ddf79caacf0fa14eacf,https://www.dropbox.com/s/r5l3h50m6aaw4sf/tel_aviv.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,110245690f5bc93593fb712417c25284,https://www.dropbox.com/s/ita82zqfhew9tyw/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,6ed40e087bf8e6f59f5a089538629625,https://www.dropbox.com/s/fpjz13ufgrlf4tg/west_seattle.bin.zip?dl=0
data/input/raw_maps/xian.bin,f6d849f76d0b3d903661e29c615efe31,https://www.dropbox.com/s/pzy1pqdakyhv8y3/xian.bin.zip?dl=0
data/input/screenshots/downtown.zip,f452998807972a64c27b1cd255b7b6af,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/krakow_center.zip,de18c0ca835eca5b090cdb9a64829b73,https://www.dropbox.com/s/azea6v6mnxbe0vc/krakow_center.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,9d8dd3ea30fe0f4791a7c097d6683643,https://www.dropbox.com/s/06mwgdt6orow3rk/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,0bc4a873a3f050dd2cb960623fe33a37,https://www.dropbox.com/s/eblgq5zj3gflhwx/montlake.zip.zip?dl=0
data/input/screenshots/southbank.zip,270cdc093df43b5ca4174947947c9061,https://www.dropbox.com/s/2smj2sw9gq7ajwx/southbank.zip.zip?dl=0
data/input/screenshots/udistrict.zip,22ee84a30838cb5fe10deecd68a57496,https://www.dropbox.com/s/nlyxnfy11qszk50/udistrict.zip.zip?dl=0
data/input/london/service_roads.bin,4f651a450d9d6b73618db015c34a03ad,https://www.dropbox.com/s/c477mruya21q9a0/service_roads.bin.zip?dl=0
data/input/london/southbank_separate_cycleways.bin,b97f296c73f39d03bc8da5a6c6d7cff5,https://www.dropbox.com/s/pahf7kbiuh1j2yr/southbank_separate_cycleways.bin.zip?dl=0
data/input/london/southbank_snapped_cycleways.bin,6cbbe9d6c102a1d35c17ddd1acd7841a,https://www.dropbox.com/s/l4anoe33yuut4vs/southbank_snapped_cycleways.bin.zip?dl=0
data/input/raw_maps/ballard.bin,b31f250dda9644484b20d2c52198712b,https://www.dropbox.com/s/0zkyic2cvlepsus/ballard.bin.zip?dl=0
data/input/raw_maps/berlin_center.bin,bd6acbb9a316382d1a18187b6ce132f5,https://www.dropbox.com/s/p8irq9yu8jsqr9f/berlin_center.bin.zip?dl=0
data/input/raw_maps/downtown.bin,fcae9978fc4f9ae2ba82cec29ee36c69,https://www.dropbox.com/s/83afzy7uvv7mdte/downtown.bin.zip?dl=0
data/input/raw_maps/huge_seattle.bin,3a882c5d3d5fcc1ff77d7ab44a840ee6,https://www.dropbox.com/s/j6f6osgf1nw0fno/huge_seattle.bin.zip?dl=0
data/input/raw_maps/krakow_center.bin,9ed18471f0a3461fffab0ddcebd44ff8,https://www.dropbox.com/s/v2wi7o894uzk7ms/krakow_center.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,e921c7ceee160cd4692eda87b8883d39,https://www.dropbox.com/s/brzi84tdfjp6dnq/lakeslice.bin.zip?dl=0
data/input/raw_maps/montlake.bin,411a3fd9c5ff99bf57cdb97800373279,https://www.dropbox.com/s/xht8m0v3q23mb8c/montlake.bin.zip?dl=0
data/input/raw_maps/south_seattle.bin,cd0fc51c78ae57995afda590f74ad3c0,https://www.dropbox.com/s/ivzkf5rybzrj2ax/south_seattle.bin.zip?dl=0
data/input/raw_maps/southbank.bin,1e372b963da2c09e711cae6e2d4f481e,https://www.dropbox.com/s/ajlh4z2838l54wd/southbank.bin.zip?dl=0
data/input/raw_maps/tel_aviv.bin,c49e439e73bfd05956bacd3d9dee4de0,https://www.dropbox.com/s/fpv6gd2lz8p5tvj/tel_aviv.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,e5f5df40433614218aafcb0a219976dd,https://www.dropbox.com/s/9sxijbb84bx8m7z/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,162d9ea39c68e69e417134be9a9dca19,https://www.dropbox.com/s/c2ecdlun4uv7hm1/west_seattle.bin.zip?dl=0
data/input/raw_maps/xian.bin,6bd3b6f92460f4335203b0fb6efe9f91,https://www.dropbox.com/s/rgtbw69tx48ig76/xian.bin.zip?dl=0
data/input/screenshots/downtown.zip,8bf2652bf23e0c823e0129dd030cc181,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/krakow_center.zip,e9d2edd8d1371946db74013d717bae28,https://www.dropbox.com/s/azea6v6mnxbe0vc/krakow_center.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,47090f1a89efe1dfd662414379225339,https://www.dropbox.com/s/06mwgdt6orow3rk/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,b470cc40232077f01a2ecf8d3bc1c06e,https://www.dropbox.com/s/eblgq5zj3gflhwx/montlake.zip.zip?dl=0
data/input/screenshots/southbank.zip,96e2c498ac4a0e80ae52ef0525cdfc54,https://www.dropbox.com/s/2smj2sw9gq7ajwx/southbank.zip.zip?dl=0
data/input/screenshots/udistrict.zip,9ef78c8b436e199dee338476282a8f5d,https://www.dropbox.com/s/nlyxnfy11qszk50/udistrict.zip.zip?dl=0
data/input/seattle/N47W122.hgt,0db4e23e51f7680538b0bbbc72208e07,https://www.dropbox.com/s/mmb4mgutwotijdw/N47W122.hgt.zip?dl=0
data/input/seattle/ballard_separate_cycleways.bin,f9c3d386a6efd1205ef95b952c6e36ef,https://www.dropbox.com/s/m6hkrevqtedehk5/ballard_separate_cycleways.bin.zip?dl=0
data/input/seattle/ballard_snapped_cycleways.bin,850176d55dd001dbcba67697ea2af295,https://www.dropbox.com/s/fwfez964qnmgpqi/ballard_snapped_cycleways.bin.zip?dl=0
data/input/seattle/ballard_separate_cycleways.bin,eced4f09e89dec84cc6c0d66f671dc6c,https://www.dropbox.com/s/8x5g7h0509kg7qf/ballard_separate_cycleways.bin.zip?dl=0
data/input/seattle/ballard_snapped_cycleways.bin,67d84e6e231b62e6e3bd0c80a5580775,https://www.dropbox.com/s/fwfez964qnmgpqi/ballard_snapped_cycleways.bin.zip?dl=0
data/input/seattle/blockface.bin,add872bab9040ae911366328a230f8b5,https://www.dropbox.com/s/rxd2care60tbe75/blockface.bin.zip?dl=0
data/input/seattle/blockface.kml,350bd9e59bf2af4e885a7c0741e6ee6b,https://www.dropbox.com/s/ukknmpjdvilncq9/blockface.kml.zip?dl=0
data/input/seattle/downtown_separate_cycleways.bin,20cfb371e35b3289c6a5a93d8b0bb590,https://www.dropbox.com/s/76ta1jxgaavyazp/downtown_separate_cycleways.bin.zip?dl=0
data/input/seattle/downtown_snapped_cycleways.bin,26c9b3d0ef94ac36d04e73fd09e81ff2,https://www.dropbox.com/s/04udsnariucippl/downtown_snapped_cycleways.bin.zip?dl=0
data/input/seattle/downtown_separate_cycleways.bin,5c0a044d9d099b3170dd1d5ab033f3fe,https://www.dropbox.com/s/1dcpfu6jfdpvply/downtown_separate_cycleways.bin.zip?dl=0
data/input/seattle/downtown_snapped_cycleways.bin,ece26188973856f10bcebe54b84b14da,https://www.dropbox.com/s/04udsnariucippl/downtown_snapped_cycleways.bin.zip?dl=0
data/input/seattle/footways.bin,9914bda6407ecdc9cf9cac5fe18fa3ed,https://www.dropbox.com/s/8m55quuf5b6pvy7/footways.bin.zip?dl=0
data/input/seattle/google_transit/agency.txt,75f564fcc06b1950b7b33acf9d61f696,https://www.dropbox.com/s/z0idqw556c8ouu0/agency.txt.zip?dl=0
data/input/seattle/google_transit/block.txt,bc4926e7436fe46b2a48117e2d564c9c,https://www.dropbox.com/s/bemtme7l3sjmr8b/block.txt.zip?dl=0
@ -58,11 +58,11 @@ data/input/seattle/google_transit/shapes.txt,aebada05d6d05c78551adb634b748e22,ht
data/input/seattle/google_transit/stop_times.txt,1f1d148b266142b72ab24816d76a9cee,https://www.dropbox.com/s/zvg6o7olxagd3rt/stop_times.txt.zip?dl=0
data/input/seattle/google_transit/stops.txt,da1ff7000efdf2166d861479a69d80a4,https://www.dropbox.com/s/w4g0leglckiv4es/stops.txt.zip?dl=0
data/input/seattle/google_transit/trips.txt,e8efe1d2e130e248942188284d88ab09,https://www.dropbox.com/s/lw0hhnqttns2h8z/trips.txt.zip?dl=0
data/input/seattle/huge_seattle_separate_cycleways.bin,e2f795feca6478bd51681eea772b9def,https://www.dropbox.com/s/g6xszcsb6rufjg0/huge_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/huge_seattle_snapped_cycleways.bin,937653a61b7773d6dacc7c571631cf05,https://www.dropbox.com/s/n613496yq3f4kcq/huge_seattle_snapped_cycleways.bin.zip?dl=0
data/input/seattle/lakeslice_separate_cycleways.bin,ded02b6b86f55c354edfd70dc1f1d148,https://www.dropbox.com/s/6950drh3io9as4b/lakeslice_separate_cycleways.bin.zip?dl=0
data/input/seattle/huge_seattle_separate_cycleways.bin,32621c420b548ab947ff104e2183fb51,https://www.dropbox.com/s/2tzsrdixszz3ta5/huge_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/huge_seattle_snapped_cycleways.bin,66acb0a91b74333a6c4d5c513694e741,https://www.dropbox.com/s/n613496yq3f4kcq/huge_seattle_snapped_cycleways.bin.zip?dl=0
data/input/seattle/lakeslice_separate_cycleways.bin,ed716c400654bcc02ac6ddc17b985caf,https://www.dropbox.com/s/5rl1kfkgnr9tf27/lakeslice_separate_cycleways.bin.zip?dl=0
data/input/seattle/lakeslice_snapped_cycleways.bin,30916279d151f97fd7ff6653eaef8719,https://www.dropbox.com/s/5uf52oy8qubzzcl/lakeslice_snapped_cycleways.bin.zip?dl=0
data/input/seattle/montlake_separate_cycleways.bin,48861f380ae126c7785c0a42959e1a6b,https://www.dropbox.com/s/ccxptd8i12gw1c0/montlake_separate_cycleways.bin.zip?dl=0
data/input/seattle/montlake_separate_cycleways.bin,66c1569ff4fd4b5c258b6c6d8aec2064,https://www.dropbox.com/s/d0t5rob9pfeq0x5/montlake_separate_cycleways.bin.zip?dl=0
data/input/seattle/montlake_snapped_cycleways.bin,bad5e9c0a0ca11b8e73d79e47ab903a2,https://www.dropbox.com/s/yqv2zvt66ceyaij/montlake_snapped_cycleways.bin.zip?dl=0
data/input/seattle/offstreet_parking.bin,a33c05e8962dfe10a7a14b9eb6413803,https://www.dropbox.com/s/7j2gwb18685kd5u/offstreet_parking.bin.zip?dl=0
data/input/seattle/offstreet_parking.kml,e24d1c308ca739df73621846c7b7847c,https://www.dropbox.com/s/dkkkpywob7cdo57/offstreet_parking.kml.zip?dl=0
@ -78,45 +78,45 @@ data/input/seattle/osm/west_seattle.osm,d56c6a21ae20c82f93bc6ae8a245d632,https:/
data/input/seattle/parcels.bin,dd1164448cdad013449174f913a2ffe0,https://www.dropbox.com/s/vncvdtn2m1locno/parcels.bin.zip?dl=0
data/input/seattle/parcels_urbansim.txt,db63d7d606e8702d12f9399e87e6a00f,https://www.dropbox.com/s/6g8rbsf200dssj3/parcels_urbansim.txt.zip?dl=0
data/input/seattle/popdat.bin,df343c597aea0fa3625072bcbb14dddb,https://www.dropbox.com/s/kp8qpi9rxwt0yc1/popdat.bin.zip?dl=0
data/input/seattle/service_roads.bin,5ec98d294527481d9a7ca19aa9075f04,https://www.dropbox.com/s/3ziu4ro1zsprlfy/service_roads.bin.zip?dl=0
data/input/seattle/south_seattle_separate_cycleways.bin,d6f2025fbadc2c3d353b6d37a70b0b72,https://www.dropbox.com/s/9rdcslg3m5oqf1a/south_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/south_seattle_snapped_cycleways.bin,1885851a5e2501fe2d547ffdae065404,https://www.dropbox.com/s/lcu1u73kubxty9k/south_seattle_snapped_cycleways.bin.zip?dl=0
data/input/seattle/service_roads.bin,9a621840d4900d05694a3542e65f06f4,https://www.dropbox.com/s/ilb2s4grisn39ec/service_roads.bin.zip?dl=0
data/input/seattle/south_seattle_separate_cycleways.bin,a0a00cf44142d85c9c44e48dcfec91de,https://www.dropbox.com/s/2oik1twruqvll9y/south_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/south_seattle_snapped_cycleways.bin,92bb9e7d7b8d89e63ecb4d9fe54e3b7f,https://www.dropbox.com/s/lcu1u73kubxty9k/south_seattle_snapped_cycleways.bin.zip?dl=0
data/input/seattle/trips_2014.csv,d4a8e733045b28c0385fb81359d6df03,https://www.dropbox.com/s/5ppravwmk6bf20d/trips_2014.csv.zip?dl=0
data/input/seattle/udistrict_separate_cycleways.bin,2adff54085d4f8bbb680c1010ab43147,https://www.dropbox.com/s/ool543m16vxd15z/udistrict_separate_cycleways.bin.zip?dl=0
data/input/seattle/udistrict_snapped_cycleways.bin,4850ed6b8adfafde1ad0d07d69a041c8,https://www.dropbox.com/s/zpznqax43fxl7xp/udistrict_snapped_cycleways.bin.zip?dl=0
data/input/seattle/west_seattle_separate_cycleways.bin,69fd6614cf167714ecc52b85feca167d,https://www.dropbox.com/s/3uyes7djzky1jhg/west_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/udistrict_separate_cycleways.bin,6802e70a10fb964e42bd82e9a96e3f7a,https://www.dropbox.com/s/b8yjqbn9am30mhv/udistrict_separate_cycleways.bin.zip?dl=0
data/input/seattle/udistrict_snapped_cycleways.bin,68b15964b06a13e27d4c33fc4f410482,https://www.dropbox.com/s/zpznqax43fxl7xp/udistrict_snapped_cycleways.bin.zip?dl=0
data/input/seattle/west_seattle_separate_cycleways.bin,9ab5a959640a7d78ba21e0fd11186ea5,https://www.dropbox.com/s/qdqna8m2odvte2e/west_seattle_separate_cycleways.bin.zip?dl=0
data/input/seattle/west_seattle_snapped_cycleways.bin,4a8e438b0795360aa7fec1ebacd64233,https://www.dropbox.com/s/f7dz2e4o6k4c2ix/west_seattle_snapped_cycleways.bin.zip?dl=0
data/input/tel_aviv/footways.bin,4fb70e32d0cc3ddeaa8924c240bc9d5b,https://www.dropbox.com/s/ka38f1kwjgm0fpo/footways.bin.zip?dl=0
data/input/tel_aviv/osm/israel-and-palestine-latest.osm.pbf,d5b0d6a26bfdedd32cc5c9c26e6fd426,https://www.dropbox.com/s/ehwhbhp03zuy1qn/israel-and-palestine-latest.osm.pbf.zip?dl=0
data/input/tel_aviv/osm/tel_aviv.osm,eeb7f3813a33f754eceed13766a3c236,https://www.dropbox.com/s/kqvn0iifhmmcjve/tel_aviv.osm.zip?dl=0
data/input/tel_aviv/service_roads.bin,a392a61e1cc51e38e6d7e53e2593e545,https://www.dropbox.com/s/69jq3nxzfd9c12r/service_roads.bin.zip?dl=0
data/input/tel_aviv/tel_aviv_separate_cycleways.bin,1b00f4d55ce732360c0a217d466c6be9,https://www.dropbox.com/s/p62d1gum2e04rp9/tel_aviv_separate_cycleways.bin.zip?dl=0
data/input/tel_aviv/service_roads.bin,216407d6f112683e81973fbb11af6403,https://www.dropbox.com/s/7rscshpat7dyzxv/service_roads.bin.zip?dl=0
data/input/tel_aviv/tel_aviv_separate_cycleways.bin,1202ee9ecf9b3151277579251a15fc06,https://www.dropbox.com/s/p62d1gum2e04rp9/tel_aviv_separate_cycleways.bin.zip?dl=0
data/input/tel_aviv/tel_aviv_snapped_cycleways.bin,f9101f6ff1662c4c0bd69246599a27c3,https://www.dropbox.com/s/wq2oco1u22gzwou/tel_aviv_snapped_cycleways.bin.zip?dl=0
data/input/xian/footways.bin,425becbab867631415fe49edcf8f9694,https://www.dropbox.com/s/6hf4t4ovk1m1wi3/footways.bin.zip?dl=0
data/input/xian/osm/china-latest.osm.pbf,0108807f1dc321d5de5579622ac3f4cf,https://www.dropbox.com/s/qewwxtioocbv3ld/china-latest.osm.pbf.zip?dl=0
data/input/xian/osm/xian.osm,4084c665ad947bb40173a43cb33fdec8,https://www.dropbox.com/s/j5qwt33bs077sd2/xian.osm.zip?dl=0
data/input/xian/service_roads.bin,2130675f49282a5e9fe3db870b089e98,https://www.dropbox.com/s/5djufzeqgdp43ek/service_roads.bin.zip?dl=0
data/input/xian/service_roads.bin,c9a1a296817cfbd6c64dbe0d3389c40a,https://www.dropbox.com/s/wm4ga2kay4v4ija/service_roads.bin.zip?dl=0
data/system/cities/seattle.bin,104e558649d9b4fb1021ba9d7c6d35db,https://www.dropbox.com/s/we87vhlkvzowhis/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,3abf4b55403b08614fc13b9206b848c9,https://www.dropbox.com/s/87tkfll4pn7aoxp/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,977b734630a2c60f10dc964382799117,https://www.dropbox.com/s/7p3oxxk4fs6wam5/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,5230880de093d86dd4112a8fca116d23,https://www.dropbox.com/s/15sz9xfmhsdu7po/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,95050037d6beec4f6f50edd8c4a3da1d,https://www.dropbox.com/s/4c5x4yfr6bm1fg3/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,634e69eaa5156b9ee47cefe51c97b58a,https://www.dropbox.com/s/nm2x4ywetve2i57/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,96570c57bec0cfd4b8219e4d4a749131,https://www.dropbox.com/s/8e8zekvpuf9b3xl/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,411d1c589111609e8dc77e5a4a1c69a1,https://www.dropbox.com/s/cybc10r4p7m9bax/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,4ac7ae2c922e8d0e5adf6bcf60f1851e,https://www.dropbox.com/s/dt73qv3y8xpjs6z/south_seattle.bin.zip?dl=0
data/system/maps/southbank.bin,930ed10b0e95fbb1d423794e7bf5390c,https://www.dropbox.com/s/t9wmq8wysgw66hl/southbank.bin.zip?dl=0
data/system/maps/tel_aviv.bin,bd67dcb9bcfd6a8ed0c6481ac687a7fb,https://www.dropbox.com/s/rwe23b9l3yntt16/tel_aviv.bin.zip?dl=0
data/system/maps/udistrict.bin,4a8b8112ed7d935af63291da177bedd6,https://www.dropbox.com/s/uzh61en0mk2yo7q/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,daf51962f2b45a597a0b7bc53bce1cba,https://www.dropbox.com/s/lkz10fiuptrs6qw/west_seattle.bin.zip?dl=0
data/system/maps/xian.bin,eaf35f4f8ee2d31fcc115a941c7f3510,https://www.dropbox.com/s/7i34sxqnytb1kfp/xian.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,d04def99cb29f354938e476ff8bb8bcc,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,caf8b008386cb8dc0c1f948179c179a8,https://www.dropbox.com/s/t9llyq0xgcye2od/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,f9638cd289efd7d3515273e484a511ac,https://www.dropbox.com/s/9zt99acdrjhz0up/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,909d8c8854eb2a07dbec2106c10c1ca7,https://www.dropbox.com/s/9po1k5lw8ljbuur/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,6cc7592100865dd296b24067521ee888,https://www.dropbox.com/s/yxtuxa66g1hn8o8/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,3034fb6c7b83798b58545f088e9326d2,https://www.dropbox.com/s/8ih6vsmmyzikvbm/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,00e41b92e2e6a970d644a1d1ec2a37d1,https://www.dropbox.com/s/c9r7cefuk14c593/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,c59a4fcf67950316e3ca8123d0544893,https://www.dropbox.com/s/c2gp7kt4bisjg42/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,dce496d7ae5560da61bd68a3c9c5b684,https://www.dropbox.com/s/byibc8wek9ptpen/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,038551a6b7255630bdb60aaae96c3655,https://www.dropbox.com/s/bjkibbon8tblqpw/weekday.bin.zip?dl=0
data/system/maps/ballard.bin,0aea1ec0df2d485522bb0b1503a77172,https://www.dropbox.com/s/awomqyos6nrh3ns/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,8812649b0ec44c6e61637eb5e6b343e5,https://www.dropbox.com/s/t75aawvsyiefq29/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,2fb1f1a86ff6b2c7c74d894f51b1dbe2,https://www.dropbox.com/s/ot59a8bycrqot1o/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,72423b707eed0fe1f35728081f28159b,https://www.dropbox.com/s/fj742yz5mdqqedg/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,21787a57c7bc3ef3d4ed6d1a60e6c517,https://www.dropbox.com/s/jt2ktdlz50pxh94/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,9479d9dfc07d8740a77213bf501aae06,https://www.dropbox.com/s/u69wp2m9c9o4eol/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,5c134997358c74bc644eb0163b36102b,https://www.dropbox.com/s/24xupe5p02n3k9q/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,d915b79fe92b34cc7df70f562c9eada9,https://www.dropbox.com/s/su9165xf1939q3p/south_seattle.bin.zip?dl=0
data/system/maps/southbank.bin,4f5dba97373d83168bd94ce552f99b70,https://www.dropbox.com/s/z06c7ddb0yh4zm9/southbank.bin.zip?dl=0
data/system/maps/tel_aviv.bin,38168e6152d12e5c9a6b9fe1b350ebac,https://www.dropbox.com/s/wefvd4glqoydgdk/tel_aviv.bin.zip?dl=0
data/system/maps/udistrict.bin,45316f2a874f8b4b96cad91835900634,https://www.dropbox.com/s/x80tfgwa1z3943h/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,bbf6b0bb4653de8f1a5c4e29e1367e81,https://www.dropbox.com/s/ozinx4ck20t8jnv/west_seattle.bin.zip?dl=0
data/system/maps/xian.bin,0a5a2354c1033599d53821ab8a431379,https://www.dropbox.com/s/sr0138dya91d6w4/xian.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,4be92c76d13cc688eb2c88e583926943,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,01bbb2b126a19ceb6a59b93681cdeadd,https://www.dropbox.com/s/ic30cpe76so9mu0/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,154baf444087ab4b1457e77aa15e0319,https://www.dropbox.com/s/73y673dyc7aapk7/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,1b19490831983167a5d13713fcba945a,https://www.dropbox.com/s/xy6ykf9ayc4pvo1/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,f4e4f50d0a6b97320324abd60da71f57,https://www.dropbox.com/s/qx465vf9xe56cuf/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,9f7acfed3cf4edc00864057a355d9082,https://www.dropbox.com/s/q1gohkmhaiaiaw5/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,6e7f80a14157359d300b4ddd28cdd53c,https://www.dropbox.com/s/2ibi22dibm5bx6x/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,c9ffd52c60b9bb5a9ed5d0804522ab34,https://www.dropbox.com/s/8qoeuwz9nszr1g9/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,419fc0359cf73f6f6bbc935dc571c883,https://www.dropbox.com/s/rqlx4mhs05yrcpk/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,278a152fd8c1e1bf55d281a45e3a6a91,https://www.dropbox.com/s/4ls3xcclfpcr894/weekday.bin.zip?dl=0

24
data/route_goldenfiles/downtown.txt
View File

@ -1,12 +1,12 @@
https://www.openstreetmap.org/relation/8624462 from Lane #6371 to None
3rd Ave & Madison St: Position(Lane #13852, 64.6052m) driving, Position(Lane #13851, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9797, 86.6295m) driving, Position(Lane #9798, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624463 from Lane #6371 to None
3rd Ave & Madison St: Position(Lane #13852, 64.6052m) driving, Position(Lane #13851, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9797, 86.6295m) driving, Position(Lane #9798, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9338838 from Lane #6371 to None
3rd Ave & Madison St: Position(Lane #13852, 64.6052m) driving, Position(Lane #13851, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9797, 86.6295m) driving, Position(Lane #9798, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9341184 from Lane #6371 to None
3rd Ave & Madison St: Position(Lane #13852, 64.6052m) driving, Position(Lane #13851, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9797, 86.6295m) driving, Position(Lane #9798, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624462 from Lane #8145 to None
3rd Ave & Madison St: Position(Lane #17276, 64.6298m) driving, Position(Lane #17275, 64.6692m) sidewalk
3rd Ave & Union St: Position(Lane #12765, 86.6295m) driving, Position(Lane #12766, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624463 from Lane #8145 to None
3rd Ave & Madison St: Position(Lane #17276, 64.6298m) driving, Position(Lane #17275, 64.6692m) sidewalk
3rd Ave & Union St: Position(Lane #12765, 86.6295m) driving, Position(Lane #12766, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9338838 from Lane #8145 to None
3rd Ave & Madison St: Position(Lane #17276, 64.6298m) driving, Position(Lane #17275, 64.6692m) sidewalk
3rd Ave & Union St: Position(Lane #12765, 86.6295m) driving, Position(Lane #12766, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9341184 from Lane #8145 to None
3rd Ave & Madison St: Position(Lane #17276, 64.6298m) driving, Position(Lane #17275, 64.6692m) sidewalk
3rd Ave & Union St: Position(Lane #12765, 86.6295m) driving, Position(Lane #12766, 86.6407m) sidewalk

6
data/route_goldenfiles/krakow_center.txt
View File

@ -1,3 +1,3 @@
https://www.openstreetmap.org/relation/2053781 from Lane #4306 to Some(LaneID(8421))
Politechnika: Position(Lane #4306, 68.497m) driving, Position(Lane #7936, 15.9997m) sidewalk
Nowy Kleparz: Position(Lane #6266, 20.3364m) driving, Position(Lane #6267, 30.8147m) sidewalk
https://www.openstreetmap.org/relation/2053781 from Lane #4310 to Some(LaneID(8433))
Politechnika: Position(Lane #4310, 68.497m) driving, Position(Lane #7948, 15.9997m) sidewalk
Nowy Kleparz: Position(Lane #6274, 21.4007m) driving, Position(Lane #6275, 31.7056m) sidewalk

2775
data/system/proposals/stay healthy lake wash blvd.json
View File

File diff suppressed because it is too large Load Diff

8
game/src/edit/mod.rs
View File

@ -674,10 +674,12 @@ pub fn apply_map_edits(ctx: &mut EventCtx, app: &mut App, edits: MapEdits) {
}
pub fn can_edit_lane(mode: &GameplayMode, l: LaneID, app: &App) -> bool {
let l = app.primary.map.get_l(l);
mode.can_edit_lanes()
&& !app.primary.map.get_l(l).is_walkable()
&& app.primary.map.get_l(l).lane_type != LaneType::SharedLeftTurn
&& !app.primary.map.get_l(l).is_light_rail()
&& !l.is_walkable()
&& l.lane_type != LaneType::SharedLeftTurn
&& !l.is_light_rail()
&& !app.primary.map.get_parent(l.id).is_service()
}
pub fn speed_limit_choices() -> Vec<Choice<Speed>> {

4
game/src/helpers.rs
View File

@ -290,8 +290,10 @@ pub fn open_browser(url: String) {
pub fn loading_tips() -> Text {
Text::from_multiline(vec![
Line("Recent changes (September 20)"),
Line("Recent changes (September 27)"),
Line(""),
Line("- Alleyways are now included in the map"),
Line("- Check out the trip tables and summary changes (press 'q')"),
Line("- Try out the new traffic signal editor!"),
Line("- The \"traffic signal demand\" layer shows all intersections through the whole day"),
Line("- New 3D buildings and textured color schemes in settings"),

1
map_model/src/lib.rs
View File

@ -45,6 +45,7 @@ use std::collections::BTreeMap;
// TODO Minimize uses of these!
pub const NORMAL_LANE_THICKNESS: Distance = Distance::const_meters(2.5);
pub(crate) const SERVICE_ROAD_LANE_THICKNESS: Distance = Distance::const_meters(1.5);
pub const SIDEWALK_THICKNESS: Distance = Distance::const_meters(1.5);
pub(crate) const SHOULDER_THICKNESS: Distance = Distance::const_meters(0.5);

12
map_model/src/make/initial/lane_specs.rs
View File

@ -1,6 +1,6 @@
use crate::{
osm, Direction, DrivingSide, LaneType, NORMAL_LANE_THICKNESS, SHOULDER_THICKNESS,
SIDEWALK_THICKNESS,
osm, Direction, DrivingSide, LaneType, NORMAL_LANE_THICKNESS, SERVICE_ROAD_LANE_THICKNESS,
SHOULDER_THICKNESS, SIDEWALK_THICKNESS,
};
use abstutil::Tags;
use geom::Distance;
@ -238,6 +238,14 @@ pub fn get_lane_specs_ltr(tags: &Tags, driving_side: DrivingSide) -> Vec<LaneSpe
}
}
if tags.is(osm::HIGHWAY, "service") {
for spec in fwd_side.iter_mut().chain(back_side.iter_mut()) {
if spec.lt == LaneType::Driving {
spec.width = SERVICE_ROAD_LANE_THICKNESS;
}
}
}
let mut need_fwd_shoulder = fwd_side
.last()
.map(|spec| spec.lt != LaneType::Sidewalk)

7
map_model/src/objects/road.rs
View File

@ -173,6 +173,9 @@ impl Road {
// about 12mph
return Speed::km_per_hour(20.0);
}
if self.is_service() {
return Speed::miles_per_hour(10.0);
}
Speed::miles_per_hour(20.0)
}
@ -326,6 +329,10 @@ impl Road {
self.lanes_ltr().len() == 1 && self.lanes_ltr()[0].2 == LaneType::Sidewalk
}
pub fn is_service(&self) -> bool {
self.osm_tags.is(osm::HIGHWAY, "service")
}
pub fn common_endpt(&self, other: &Road) -> IntersectionID {
if self.src_i == other.src_i || self.src_i == other.dst_i {
self.src_i

4
map_model/src/raw.rs
View File

@ -297,6 +297,10 @@ impl RawRoad {
pub fn is_footway(&self) -> bool {
self.osm_tags.is(osm::HIGHWAY, "pedestrian")
}
pub fn is_service(&self) -> bool {
self.osm_tags.is(osm::HIGHWAY, "service")
}
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]