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

Fix bike lane importing on Bell St. To prevent this from gridlocking

Browse Source 
lakeslice (which is still quite sensitive to tiny changes in demand
data), manually retime a signal.
This commit is contained in:
Dustin Carlino 2020-08-27 20:51:49 -07:00
parent 696c6c6d9e
commit d8d2877c14
5 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2748,7 +2748,7 @@ dependencies = [
[[package]]
name = "seattle_traffic_signals"
version = "0.1.0"
source = "git+https://github.com/dabreegster/seattle_traffic_signals#a01733241976911c0a1b02404002938fd30d1f9d"
source = "git+https://github.com/dabreegster/seattle_traffic_signals#c2b33cc7fc4b922c8d25d88a8b07fb824d235b9d"
dependencies = [
"include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",

42
data/MANIFEST.txt
View File

@ -21,9 +21,9 @@ data/input/raw_maps/tel_aviv.bin,8dd2fa0428728c4e3a503ca143c7d0d2,https://www.dr
data/input/raw_maps/udistrict.bin,4441415d1f8b6fc32293fde688ecc40d,https://www.dropbox.com/s/p4oscm85fj1mxgb/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,121ae8600b101dea7fafcc8786a3a5e0,https://www.dropbox.com/s/45c2slhwmmn3jkn/west_seattle.bin.zip?dl=0
data/input/raw_maps/xian.bin,45d3dff4d99821f387e550950fb5669d,https://www.dropbox.com/s/kjeu0q8ey93l11h/xian.bin.zip?dl=0
data/input/screenshots/downtown.zip,884f74e5545710010fee2b0f36703026,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/krakow_center.zip,313168cab728591a474f786def32d37a,https://www.dropbox.com/s/azea6v6mnxbe0vc/krakow_center.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,0e054f56d5dd252274d343bf725e7d99,https://www.dropbox.com/s/06mwgdt6orow3rk/lakeslice.zip.zip?dl=0
data/input/screenshots/downtown.zip,21838ff62b31b2d6d4860a7f3d08f921,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/krakow_center.zip,1274855e993e09015c3b00127bf0da97,https://www.dropbox.com/s/azea6v6mnxbe0vc/krakow_center.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,adedabf6ee4e30f8e386762f860176d8,https://www.dropbox.com/s/06mwgdt6orow3rk/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,158ec5f3913f62519fbbeb5a6f47f9cd,https://www.dropbox.com/s/eblgq5zj3gflhwx/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,8a98fae6bc9d995f9e1ab4c91d0d7a23,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
@ -67,26 +67,26 @@ data/input/xian/osm/china-latest.osm.pbf,0108807f1dc321d5de5579622ac3f4cf,https:
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/system/cities/seattle.bin,91f8ed0b5da81b5f757448a2a2e7da89,https://www.dropbox.com/s/8fnapw0rcxo54kk/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,72fd71140ced183e0da844dfc6f1b8fe,https://www.dropbox.com/s/sihq0wnno6txl2b/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,44b1a3b5e234a8be66ed6c0d4970d67e,https://www.dropbox.com/s/rvq2x685rq4t93p/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,7862b97b00d6bae7eb842f15979dad77,https://www.dropbox.com/s/azus8tqnq2jc42n/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,410e4ae5fd3b4bf9b759e0c062a83d36,https://www.dropbox.com/s/js04yd17y2kofkh/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,356df3ac5650ccd607792cbec8809200,https://www.dropbox.com/s/d5ucfrsn6pfrm23/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,5311c3728a76fd78916faeae8fddd572,https://www.dropbox.com/s/ipcdlm1m2rumwyo/lakeslice.bin.zip?dl=0
data/system/maps/ballard.bin,a30729616ad7bd1fe00b624c5a0aeeaf,https://www.dropbox.com/s/zg4ujpiwzrwb3w2/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,eb7398f8c4933cc927ef653a0e47a1e7,https://www.dropbox.com/s/ccf5z56plcrm1nc/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,20efae9377afec32812b31827a887083,https://www.dropbox.com/s/cqiyk2cekbwds01/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,b6b5c99b27d9d768bc0fb6aef98c776f,https://www.dropbox.com/s/t2ssq6xdtchxyv5/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,7e423da356c1671ea09d2527575fce5c,https://www.dropbox.com/s/fwkktv545su6no0/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,c117a20d21a7c68ceae775c6c1daf318,https://www.dropbox.com/s/sss05ts43u8ghb8/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,6ca284783ce83e915282476cf99e04cc,https://www.dropbox.com/s/wyybiw5y7z3gdoc/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,47096a54d508341170e909b09f814dd7,https://www.dropbox.com/s/92a2s0iyt95u2b2/south_seattle.bin.zip?dl=0
data/system/maps/tel_aviv.bin,cd6b5be033b413472fab59f16d9994e5,https://www.dropbox.com/s/8yjv0f9xzqnmwhb/tel_aviv.bin.zip?dl=0
data/system/maps/south_seattle.bin,286ce475d0d4a93501d7f9af6fff6418,https://www.dropbox.com/s/y505pnkwxyyrw0f/south_seattle.bin.zip?dl=0
data/system/maps/tel_aviv.bin,b273e64c3e2ded4134f46bce6d9992cf,https://www.dropbox.com/s/7hndvhud5x8xao5/tel_aviv.bin.zip?dl=0
data/system/maps/udistrict.bin,d2773d20a171843b7b6c805f350d4cf5,https://www.dropbox.com/s/y03l06emjmtjp32/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,df580b7566bb9d57a2605cf4affa741d,https://www.dropbox.com/s/a9ws18sar0l5tns/west_seattle.bin.zip?dl=0
data/system/maps/xian.bin,fe0b3775cc141c735870104b70339db0,https://www.dropbox.com/s/w7g13kgn8a1girv/xian.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,fce6ca79a0db0e18ddee6eed278dd3e8,https://www.dropbox.com/s/z6kdmrak7v474vr/weekday.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,3e640d22ff8d32889789e0373085543c,https://www.dropbox.com/s/cw9igcxi0ljhz3z/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,5928aa529033e398fe6d256afe21c2ab,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,8aa6120acd559486058feb6de8b8b376,https://www.dropbox.com/s/xk8lpp9vbmmgnv0/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,d1b13d9c12c8e76d045f02adf78a5c0b,https://www.dropbox.com/s/c2ouuxx0w354jna/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,08d0e8b0772a317f071f23325d132944,https://www.dropbox.com/s/6myqpydj4ded8db/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,7e67ecb766f7da43aad3c6c70bb9fe48,https://www.dropbox.com/s/7nsyz2mp0zdc4en/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,cc1a06a4885b313a9a4812e27314c0ea,https://www.dropbox.com/s/icpl9paebveedj7/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,9c7b530af4c326464aa0b6794a9a5d53,https://www.dropbox.com/s/r7vo9injkzdkdoq/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,4157bb7649bdf4bb2fae76547a89fca4,https://www.dropbox.com/s/3p1s1lpm9oxf2xb/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,c737fc396889dd2802eb19f2d4f12e32,https://www.dropbox.com/s/s2ruerzrblm748m/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,78c849b41a47a244fa5337f9908dc815,https://www.dropbox.com/s/d4xorlgwldyvmjj/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,bcd77a7b5187ee4839833d932cf52a41,https://www.dropbox.com/s/4g21l6rbynvs3tu/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,ba320112557d5b86aef2007d1d4a1d0e,https://www.dropbox.com/s/5ovezzvn3yodmrd/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,fa38c6aa7ca000418670cc1d47fae81c,https://www.dropbox.com/s/txnffoq2ixtie2h/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,765fb67c2fa190fc7d5fc08b7e4509a6,https://www.dropbox.com/s/l4srf95werxzevb/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,2c94d6f8af14e1d9bf2002f3f72ec832,https://www.dropbox.com/s/zylrq4jdb505g47/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,bf805f70c0879377ca778bc4057726aa,https://www.dropbox.com/s/zuhnr2365wagwks/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,32be050e96fa4890a3a44f3659eec588,https://www.dropbox.com/s/1a9g7e0xg08t6yu/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,088b6042a4f12ac98ec80294da0bc014,https://www.dropbox.com/s/klx9hep2o9tltlj/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,17dc867d73248a7fa46ae1518e04e905,https://www.dropbox.com/s/7phfemgsuyr7c01/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 #6378 to None
3rd Ave & Madison St: Position(Lane #13875, 64.6052m) driving, Position(Lane #13874, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9811, 86.6295m) driving, Position(Lane #9812, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624463 from Lane #6378 to None
3rd Ave & Madison St: Position(Lane #13875, 64.6052m) driving, Position(Lane #13874, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9811, 86.6295m) driving, Position(Lane #9812, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9338838 from Lane #6378 to None
3rd Ave & Madison St: Position(Lane #13875, 64.6052m) driving, Position(Lane #13874, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9811, 86.6295m) driving, Position(Lane #9812, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9341184 from Lane #6378 to None
3rd Ave & Madison St: Position(Lane #13875, 64.6052m) driving, Position(Lane #13874, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9811, 86.6295m) driving, Position(Lane #9812, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624462 from Lane #6377 to None
3rd Ave & Madison St: Position(Lane #13871, 64.6052m) driving, Position(Lane #13870, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9809, 86.6295m) driving, Position(Lane #9810, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/8624463 from Lane #6377 to None
3rd Ave & Madison St: Position(Lane #13871, 64.6052m) driving, Position(Lane #13870, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9809, 86.6295m) driving, Position(Lane #9810, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9338838 from Lane #6377 to None
3rd Ave & Madison St: Position(Lane #13871, 64.6052m) driving, Position(Lane #13870, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9809, 86.6295m) driving, Position(Lane #9810, 86.6407m) sidewalk
https://www.openstreetmap.org/relation/9341184 from Lane #6377 to None
3rd Ave & Madison St: Position(Lane #13871, 64.6052m) driving, Position(Lane #13870, 64.6446m) sidewalk
3rd Ave & Union St: Position(Lane #9809, 86.6295m) driving, Position(Lane #9810, 86.6407m) sidewalk

6
data/route_goldenfiles/krakow_center.txt
View File

@ -1,3 +1,3 @@
https://www.openstreetmap.org/relation/2053781 from Lane #4490 to Some(LaneID(8705))
Politechnika: Position(Lane #4490, 68.497m) driving, Position(Lane #8206, 15.9997m) sidewalk
Nowy Kleparz: Position(Lane #6496, 20.3364m) driving, Position(Lane #6497, 30.8147m) sidewalk
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

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

@ -194,15 +194,13 @@ pub fn get_lane_specs_ltr(tags: &Tags) -> Vec<LaneSpec> {
if tags.is_any("cycleway:left", vec!["lane", "opposite_track", "track"]) {
if oneway {
fwd_side.insert(0, fwd(LaneType::Biking));
if tags.is("oneway:bicycle", "no") {
back_side.push(back(LaneType::Biking));
}
} else {
back_side.push(back(LaneType::Biking));
}
}
// Cycleway isn't explicitly specified, but this is a reasonable assumption anyway.
if back_side.is_empty() && tags.is("oneway:bicycle", "no") {
back_side.push(back(LaneType::Biking));
}
}
if driving_lane == LaneType::Driving {
@ -363,9 +361,7 @@ mod tests {
"sbbdps",
"vv^^^^",
),
/* TODO I have a fix for this, but somehow the fallout gridlocked lakeslice, so
* holding off... */
/*(
(
"https://www.openstreetmap.org/way/534549104",
vec![
"lanes=2",
@ -377,7 +373,7 @@ mod tests {
],
"sddbbs",
"v^^v^^",
),*/
),
] {
let actual = get_lane_specs_ltr(&tags(input.clone()));
let actual_lt = actual