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

handle cycleway:both, for #168

Browse Source
This commit is contained in:
Dustin Carlino 2020-07-08 17:59:30 -07:00
parent d94c993b9b
commit 438bc39b86
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
data/MANIFEST.txt
View File

@ -11,10 +11,10 @@ data/input/raw_maps/montlake.bin,749507726d6acc94fbde892bf78bd137,https://www.dr
data/input/raw_maps/south_seattle.bin,4dba5a22610c3ce88fc45b705a682e19,https://www.dropbox.com/s/xa6bmlxa7a25l2k/south_seattle.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,d0dee6bcc4d48865679e940259068b6a,https://www.dropbox.com/s/pordmxw0adnujec/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,1a7f2dc27fe28a5af452daf16086351c,https://www.dropbox.com/s/cunj31v1z0ju4k8/west_seattle.bin.zip?dl=0
data/input/screenshots/downtown.zip,7514d440d028b17ba56a57b777282344,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,62fa56e686868bdb266cb1b91fa995bc,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,d55a629bc3fd128ccc38bc5f950a7814,https://www.dropbox.com/s/r9vkgwesqklfuq2/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,27e860a863b04274e766077c59d2911e,https://www.dropbox.com/s/ecnt1tyza48y9o2/udistrict.zip.zip?dl=0
data/input/screenshots/downtown.zip,e835ef91deec6a71a17c7b88c2d9d5f7,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,2810415bf055b337d418b63fed730b5f,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,d4a1f87cc6510ebedaa05601b4510eb2,https://www.dropbox.com/s/r9vkgwesqklfuq2/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,0a548e80ba5e453f208bd96505f72f26,https://www.dropbox.com/s/ecnt1tyza48y9o2/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/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
@ -29,31 +29,31 @@ data/input/seattle/osm/south_seattle.osm,a415c8d714d0f4934c2f8c79ca6d5a2d,https:
data/input/seattle/osm/udistrict.osm,dd3b931047f54b1a14f2efdb6f9420e0,https://www.dropbox.com/s/0e4ig7ln7y0vodw/udistrict.osm.zip?dl=0
data/input/seattle/osm/washington-latest.osm.pbf,ef33a41125145695082088e34f57ae7d,https://www.dropbox.com/s/ty2ursd4szd67uu/washington-latest.osm.pbf.zip?dl=0
data/input/seattle/osm/west_seattle.osm,a28b390b3a8612fb993799c57917fba3,https://www.dropbox.com/s/8l2q3e28narajfw/west_seattle.osm.zip?dl=0
data/input/seattle/parcels.bin,ab30bc4f86740e2293ae1a4029dc2e00,https://www.dropbox.com/s/a1we6pvraeia4ih/parcels.bin.zip?dl=0
data/input/seattle/parcels.bin,dff366a1150e01cc058bc85fe13786df,https://www.dropbox.com/s/gno2o3r4emtwmrk/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,7b49f07a1e9c34c68fa390d03f1cff2f,https://www.dropbox.com/s/r1riqn6kqsh7p5q/popdat.bin.zip?dl=0
data/input/seattle/sidewalks.bin,034dd47ab77902dbc81c0107f13d8965,https://www.dropbox.com/s/ma9bmisijc7v7xa/sidewalks.bin.zip?dl=0
data/input/seattle/sidewalks.kml,94d385ba03ef1b57a5ba10965913ec6c,https://www.dropbox.com/s/vn8amar9xi6vbvh/sidewalks.kml.zip?dl=0
data/input/seattle/trips_2014.csv,d4a8e733045b28c0385fb81359d6df03,https://www.dropbox.com/s/5ppravwmk6bf20d/trips_2014.csv.zip?dl=0
data/system/cities/seattle.bin,65ed19fe6b0a41d57ccb481a5c76652a,https://www.dropbox.com/s/kwei76ih7g12n1r/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,bd1823ac3de40c5e6e5691ce089d75d2,https://www.dropbox.com/s/cejfzehk7h85tzr/ballard.bin.zip?dl=0
data/system/maps/ballard.bin,4e1338644614f04dc51348426466f8f1,https://www.dropbox.com/s/29gsioxwo4a94sj/ballard.bin.zip?dl=0
data/system/maps/downtown.bin,e5f0533502468834a82b85546458c023,https://www.dropbox.com/s/hbv4c8d19hjhnza/downtown.bin.zip?dl=0
data/system/maps/downtown_atx.bin,270eb1508a071fffdd7c6edb78b4beb6,https://www.dropbox.com/s/4q1idnl4oqv3sjr/downtown_atx.bin.zip?dl=0
data/system/maps/huge_austin.bin,aa2e4610a7b9abfeb242f94219dcf1b4,https://www.dropbox.com/s/jun8xldjrv3y6fo/huge_austin.bin.zip?dl=0
data/system/maps/huge_seattle.bin,845546b313745dba5d344ba044b1efd5,https://www.dropbox.com/s/9mwq0ytxjoyos4k/huge_seattle.bin.zip?dl=0
data/system/maps/huge_seattle.bin,fd203e2bb9bb56a6a54ab13fe150f863,https://www.dropbox.com/s/v9f85dccgv52n04/huge_seattle.bin.zip?dl=0
data/system/maps/lakeslice.bin,5d6d2a9f761a50727b895e656edf696c,https://www.dropbox.com/s/r8zzfky3e26gdm4/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,b6893420323290dc57c377129ea9ee09,https://www.dropbox.com/s/1s6j9leeykkm3r8/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,3a2f4e128474fb3984079d0c28af6967,https://www.dropbox.com/s/pb9mngr5ck75vvg/south_seattle.bin.zip?dl=0
data/system/maps/south_seattle.bin,7632b11750a0bead49199338aaa9913f,https://www.dropbox.com/s/ag7p7b4rdg6scrt/south_seattle.bin.zip?dl=0
data/system/maps/udistrict.bin,87dd6f903215866a30c5075f81beace4,https://www.dropbox.com/s/hwzlac2naqtb81t/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,22d1a9e5235cb248d2f017f4c833fdb3,https://www.dropbox.com/s/8450pwzu2m1jj8v/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,833a88293226e90e3d178dcce939c9b3,https://www.dropbox.com/s/kzdk69hyos4wt91/weekday.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,27d5e5d62b1f5447aec2c5a1572ff423,https://www.dropbox.com/s/bojl8fu4uvjmwg4/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,75f4d00c72ffe575d65bcfbe21315b2e,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,e44b51cca896482099e73913baca6272,https://www.dropbox.com/s/uza6ccyf6n4bvup/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,e8288131e7fde68e8156329a199104a6,https://www.dropbox.com/s/bg2ueu8wpi8fm0z/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,902a4f0112809ef9026ee2cde9f6c88d,https://www.dropbox.com/s/utqa09hhx1vd557/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,ec6cc91c92214f8e0e79d2f6ab3c4d38,https://www.dropbox.com/s/iihqranchy47ac3/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,ef9dd7bbcd967c0f1971a3a047eccdfc,https://www.dropbox.com/s/ioa9hhr8govhpv6/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,0368d821883a0cd0ac3521891ef33ed1,https://www.dropbox.com/s/fyvxgpnj1r556p9/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,cb38ab9563d167087d6a6fb6f4149031,https://www.dropbox.com/s/lnp6b4uj9wfgrlt/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,32f854b5fae07c55a7c9dbe1594e458d,https://www.dropbox.com/s/ivm3rr3bplymkws/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,72374457909ff96b1f2f269932cdbe10,https://www.dropbox.com/s/3vum1tki8zx3ayi/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,a44bdca0f2fbda2f9c803ca2e78c07af,https://www.dropbox.com/s/77v3vmomfyjv7r0/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,c3cf546edcc27d4c85e4e97471419359,https://www.dropbox.com/s/pqpkymbdm1g3xuk/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,726f5894c993fda25d37559e9157c263,https://www.dropbox.com/s/txvpd99vhin98tj/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,710d8459d8d4158af18408e2e1493c24,https://www.dropbox.com/s/ob2glhk181hmgkn/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,f1423504c301cfff366cd9b08e529403,https://www.dropbox.com/s/mx1ku2g817kuzoh/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,de756310c6c3420d710c1f7d65b8c4b0,https://www.dropbox.com/s/oa1zlhrs5y3vvs5/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,25f0690aa2bf798f3d1e6cc38b74ff7d,https://www.dropbox.com/s/mctc7mhs7ve3v17/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,f94c8a85416acf4204e24615ae2cb650,https://www.dropbox.com/s/nvhqjh1cyuv6rw4/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,e633910c9a781265dba0ac0a96d93025,https://www.dropbox.com/s/6tvhsdg61uje5t3/weekday.bin.zip?dl=0

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

@ -112,6 +112,9 @@ pub fn get_lane_types(osm_tags: &BTreeMap<String, String>) -> (Vec<LaneType>, Ve
if !back_side.is_empty() {
back_side.push(LaneType::Biking);
}
} else if tags.is("cycleway:both", "lane") {
fwd_side.push(LaneType::Biking);
back_side.push(LaneType::Biking);
} else {
if tags.is("cycleway:right", "lane") {
fwd_side.push(LaneType::Biking);