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

when sidewalks=separate, don't put sidewalks on both sides of a one-way.

Browse Source 
this is a complete guess, but seemingly a better one for some sample
cases in seattle and krakow. helps with #178.

also opt krakow into screenshot diff testing; it has enough different
things happening that it's worth watching more carefully how importing
changes affect it.
This commit is contained in:
Dustin Carlino 2020-07-09 18:53:15 -07:00
parent 3ecf05e1bb
commit 585ba4f137
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
data/MANIFEST.txt
View File

@ -14,10 +14,11 @@ data/input/raw_maps/montlake.bin,749507726d6acc94fbde892bf78bd137,https://www.dr
data/input/raw_maps/south_seattle.bin,0ebdda0feb14d520741e7907e9fa4286,https://www.dropbox.com/s/1lsmaiz97gqh02j/south_seattle.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,cbbded9a3045cf4e6a0b10768bc99cde,https://www.dropbox.com/s/4deintbkbocl3v9/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,8472bc3288ea510cad0278b035e5a744,https://www.dropbox.com/s/1p4ui7pbdpq9la0/west_seattle.bin.zip?dl=0
data/input/screenshots/downtown.zip,3e6d333e96cfd7e3cdb90442cdf125ca,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,bf5ee0dc54f01aaf8688b3728e706c82,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,b0e6a179354bfe8182acbc449b606fe8,https://www.dropbox.com/s/r9vkgwesqklfuq2/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,f173a85434221477ee4731d3b5a258b1,https://www.dropbox.com/s/ecnt1tyza48y9o2/udistrict.zip.zip?dl=0
data/input/screenshots/downtown.zip,6204c186ac3c7da8912d861f4203511b,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/huge_krakow.zip,8beda904f2135e9b265b1c860e560ee8,https://www.dropbox.com/s/dbzon7k5ukndtza/huge_krakow.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,5292f745bef04068fde19a6459f8bc5f,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,4ed956799ee78e9fe90a3ba0480a69b3,https://www.dropbox.com/s/r9vkgwesqklfuq2/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,c3f049573cd93449ee5454f593d5ac15,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
@ -32,30 +33,30 @@ data/input/seattle/osm/south_seattle.osm,fbda605b8a4f580e426790fbb6e6dd15,https:
data/input/seattle/osm/udistrict.osm,7510484ec8abddbe64a2dc761a94fb67,https://www.dropbox.com/s/wraohtnpydpfe1p/udistrict.osm.zip?dl=0
data/input/seattle/osm/washington-latest.osm.pbf,e06cc7eec144eac6a495d93db6d85766,https://www.dropbox.com/s/fhgqauc5obh05cd/washington-latest.osm.pbf.zip?dl=0
data/input/seattle/osm/west_seattle.osm,ce708f4701cd9118c2e9de0573e69457,https://www.dropbox.com/s/1bsbebu9va987qx/west_seattle.osm.zip?dl=0
data/input/seattle/parcels.bin,5fd9e42c47827328a067a43b83686a1a,https://www.dropbox.com/s/4lql4s0fo3n5smf/parcels.bin.zip?dl=0
data/input/seattle/parcels.bin,14fc11da8f66ffa940db229238c61b62,https://www.dropbox.com/s/0fen55e9u3hau0a/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,b607f9990528d0ca2fbeec9f02a5755e,https://www.dropbox.com/s/hcf80kvl66a4yai/popdat.bin.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,d8e88217584d6ece7abaf1ec4222c7e6,https://www.dropbox.com/s/s1i208j6oy5pd5o/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,3ee77b40b60ce5f95e80251956ca823a,https://www.dropbox.com/s/6f3nlghhqhrf8e4/ballard.bin.zip?dl=0
data/system/maps/downtown.bin,e2e739e380416cae1b733704be5b2dc2,https://www.dropbox.com/s/b8vso3pfevmdm5f/downtown.bin.zip?dl=0
data/system/maps/downtown.bin,f3b4a5ba352f60467ddadd573652ecf4,https://www.dropbox.com/s/n52radnrjiw0067/downtown.bin.zip?dl=0
data/system/maps/downtown_atx.bin,a76df031940aa3f5d9f680fa82846f26,https://www.dropbox.com/s/umfhjtr0mw058l2/downtown_atx.bin.zip?dl=0
data/system/maps/huge_austin.bin,87be99eeaa1b1c6d9d074a23df872240,https://www.dropbox.com/s/g25smuci2uta2h2/huge_austin.bin.zip?dl=0
data/system/maps/huge_krakow.bin,1f7d1f91ec180499edcd629148975332,https://www.dropbox.com/s/h78wsd9071bkz73/huge_krakow.bin.zip?dl=0
data/system/maps/huge_seattle.bin,767b051c74b6c3a07aba02e0d540afbe,https://www.dropbox.com/s/rod1ohltfkkfh9f/huge_seattle.bin.zip?dl=0
data/system/maps/huge_austin.bin,b23d8dcc98e019048de996e7aab92432,https://www.dropbox.com/s/m6080pdtcro574x/huge_austin.bin.zip?dl=0
data/system/maps/huge_krakow.bin,3853ec839405fa326122db45f07b0144,https://www.dropbox.com/s/7xn9kv5mrghh2gi/huge_krakow.bin.zip?dl=0
data/system/maps/huge_seattle.bin,1bfa92964e1374fe0274d8025630b5ad,https://www.dropbox.com/s/eyk5ia4a2xdrkzx/huge_seattle.bin.zip?dl=0
data/system/maps/lakeslice.bin,c89ec7b553f609e6ededfd3a60571126,https://www.dropbox.com/s/bpjsehxrzh82at9/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,50c92ff0b5bca1f86432cdfbd220c035,https://www.dropbox.com/s/4xd14op12txfi8h/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,61ce25cee6f19ca0428267dbc71792ec,https://www.dropbox.com/s/nlj0ksoywbnos4b/south_seattle.bin.zip?dl=0
data/system/maps/udistrict.bin,fa69034e20276f3ec43cf94a316f32c6,https://www.dropbox.com/s/ncq4eiv7ebahzna/udistrict.bin.zip?dl=0
data/system/maps/south_seattle.bin,d8eb25cd0efbb724d9592726832d182a,https://www.dropbox.com/s/yk91jo6n3219dub/south_seattle.bin.zip?dl=0
data/system/maps/udistrict.bin,c4ac1ea31166085e5e14c83c921497fe,https://www.dropbox.com/s/48h6qzzsipp2hj0/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,0bbeb4f70dbcbd89cd479d92bd33abc3,https://www.dropbox.com/s/z9g60t5w1x9cz41/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,e124afde363d59143a07e35cac5f50aa,https://www.dropbox.com/s/66vumkmd67oc7pd/weekday.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,0a63345ec313aa625d982d81da63b444,https://www.dropbox.com/s/84aisa040edy6bp/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,d3e42a758ba4e10e6143c8f8370a638f,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,2792b98144cb6039170220dfd5f47a5b,https://www.dropbox.com/s/e0waikptje7t242/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,c403d83884a2ba835ba5965553b18930,https://www.dropbox.com/s/xobdb97jzbk0q9g/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,1c7bd52c4c095664f9a1520c4015ebd7,https://www.dropbox.com/s/pgariaxsj6al97q/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,cdeeb0903e9ba2c0c292d1391555079b,https://www.dropbox.com/s/cm7btf1rm981lb5/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,6273608f8dec48215f857ae1f4eb0c9f,https://www.dropbox.com/s/273as5xs1hygejf/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,45e0a0647f50189c599ce0c8f3fac548,https://www.dropbox.com/s/xd09e2hqotqjuhd/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,affa8a966d2df6c239429649177c3c07,https://www.dropbox.com/s/8843kzs8gcvy26l/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,58dfd9a454380dd0dd13a38b5ba890c6,https://www.dropbox.com/s/gzbtdro75t5u00f/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,2c7a088241bab5ecc6a706e05e45c2f0,https://www.dropbox.com/s/hedo93xlxcbslls/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,a78f8b1d9c59251346fa8a9f276ccc47,https://www.dropbox.com/s/yhrc5dpivdoblym/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,a44c5d115f0ac372f1690050bba7aa11,https://www.dropbox.com/s/29xfnb2sqdiyg80/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,85228b8aebb083d58d18594dd3e6889e,https://www.dropbox.com/s/6z7iqx5zz51uixd/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,427035d4337fdf41ddbdf3bac74a5a05,https://www.dropbox.com/s/vjkkdpx4t8g01mc/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,642274c94288656656f117812e0322ae,https://www.dropbox.com/s/c2nht2az09jlybg/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,93175fa0560f968e7724a05563074464,https://www.dropbox.com/s/09uqbgqg2h2otw4/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,532ab567481702198755bd622369a957,https://www.dropbox.com/s/6dvdxust5p85412/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,919d64919bb2769364da773b7fdc6160,https://www.dropbox.com/s/u4bp0ceaqujyy1i/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,8bc49d5e4a130dc87553bdb40ad1c95c,https://www.dropbox.com/s/dvrgzh3l3smni2o/weekday.bin.zip?dl=0

1
game/src/info/person.rs
View File

@ -240,6 +240,7 @@ pub fn bio(
// - Rides a fixie
// - Has 17 pinky toe piercings (surprising, considering they're the state champ at
// barefoot marathons)
// TODO Favorite color: colors.lol
if let Some(p) = app.primary.sim.get_pandemic_model() {
// TODO add hospitalization/quarantine probably

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

@ -150,10 +150,15 @@ pub fn get_lane_types(osm_tags: &BTreeMap<String, String>) -> (Vec<LaneType>, Ve
}
}
// TODO Need to snap separate sidewalks to ways. Until then, just do this.
if tags.is(osm::SIDEWALK, "both") || tags.is(osm::SIDEWALK, "separate") {
if tags.is(osm::SIDEWALK, "both") {
fwd_side.push(LaneType::Sidewalk);
back_side.push(LaneType::Sidewalk);
} else if tags.is(osm::SIDEWALK, "separate") {
// TODO Need to snap separate sidewalks to ways. Until then, just do this.
fwd_side.push(LaneType::Sidewalk);
if !back_side.is_empty() {
back_side.push(LaneType::Sidewalk);
}
} else if tags.is(osm::SIDEWALK, "right") {
fwd_side.push(LaneType::Sidewalk);
} else if tags.is(osm::SIDEWALK, "left") {