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

stop grabbing parking lot capacity

Browse Source
This commit is contained in:
Dustin Carlino 2020-06-06 14:37:09 -07:00
parent b15664727d
commit 8de9ba0536
5 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
convert_osm/src/osm_reader.rs
View File

@ -218,7 +218,6 @@ pub fn extract_osm(
// TODO Verify parking = surface or handle other cases? // TODO Verify parking = surface or handle other cases?
map.parking_lots.push(RawParkingLot { map.parking_lots.push(RawParkingLot {
polygon: Polygon::new(&pts), polygon: Polygon::new(&pts),
capacity: tags.get("capacity").and_then(|x| x.parse::<usize>().ok()),
osm_id: way.id, osm_id: way.id,
}); });
} else if tags.get("highway") == Some(&"service".to_string()) { } else if tags.get("highway") == Some(&"service".to_string()) {

40
data/MANIFEST.txt
View File

@ -1,16 +1,16 @@
data/input/austin/osm/Austin.osm,7c8d72cf97072af34cee665006b1e9e6,https://www.dropbox.com/s/4f3lu8ii5d2lf4c/Austin.osm.zip?dl=0 data/input/austin/osm/Austin.osm,7c8d72cf97072af34cee665006b1e9e6,https://www.dropbox.com/s/4f3lu8ii5d2lf4c/Austin.osm.zip?dl=0
data/input/austin/osm/downtown_atx.osm,a30b0f460a481598e494f16a9d07a822,https://www.dropbox.com/s/8qodpqdn1pedzva/downtown_atx.osm.zip?dl=0 data/input/austin/osm/downtown_atx.osm,a30b0f460a481598e494f16a9d07a822,https://www.dropbox.com/s/8qodpqdn1pedzva/downtown_atx.osm.zip?dl=0
data/input/austin/osm/huge_austin.osm,fb166029fc8006bd20dc959fbbbde3b6,https://www.dropbox.com/s/4bbsfpsg48dctje/huge_austin.osm.zip?dl=0 data/input/austin/osm/huge_austin.osm,fb166029fc8006bd20dc959fbbbde3b6,https://www.dropbox.com/s/4bbsfpsg48dctje/huge_austin.osm.zip?dl=0
data/input/raw_maps/ballard.bin,085fed58e8bb146eef9dc43a65c59f82,https://www.dropbox.com/s/wus0ufcnjyvcsuy/ballard.bin.zip?dl=0 data/input/raw_maps/ballard.bin,2012f0e3dff883809999dbe18895f80d,https://www.dropbox.com/s/wus0ufcnjyvcsuy/ballard.bin.zip?dl=0
data/input/raw_maps/downtown.bin,9693a91878be7a141664d28d2cb134c3,https://www.dropbox.com/s/ntqzttf25037fty/downtown.bin.zip?dl=0 data/input/raw_maps/downtown.bin,831f3de5b4152b45a071d805ccf429b7,https://www.dropbox.com/s/ntqzttf25037fty/downtown.bin.zip?dl=0
data/input/raw_maps/downtown_atx.bin,aaa00df13e00a6b63dd4fc618527dc45,https://www.dropbox.com/s/0cs55y1jcmm2alk/downtown_atx.bin.zip?dl=0 data/input/raw_maps/downtown_atx.bin,7f0df797155555b2bb0a907ce2441501,https://www.dropbox.com/s/0cs55y1jcmm2alk/downtown_atx.bin.zip?dl=0
data/input/raw_maps/huge_austin.bin,435f6c0218c4f2f5de500d594e913b21,https://www.dropbox.com/s/we0765ym7dlcsl1/huge_austin.bin.zip?dl=0 data/input/raw_maps/huge_austin.bin,021d2e85519b7be1a007e09e61fdcf16,https://www.dropbox.com/s/we0765ym7dlcsl1/huge_austin.bin.zip?dl=0
data/input/raw_maps/huge_seattle.bin,2cbd03989e76e63cb3f0603fe9a3d382,https://www.dropbox.com/s/jcssts861uaovva/huge_seattle.bin.zip?dl=0 data/input/raw_maps/huge_seattle.bin,1a2af1b3baa8c5e06a91616575d612be,https://www.dropbox.com/s/jcssts861uaovva/huge_seattle.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,13f21d57edd8bfc067f612dfab4ebac4,https://www.dropbox.com/s/4nmdtw0mgqe7tyg/lakeslice.bin.zip?dl=0 data/input/raw_maps/lakeslice.bin,3cf164517ad4b2d1048ca6a5b3a4da4b,https://www.dropbox.com/s/4nmdtw0mgqe7tyg/lakeslice.bin.zip?dl=0
data/input/raw_maps/montlake.bin,7f4b46974756c036a3417e42ce991867,https://www.dropbox.com/s/qk8rhwr6vdm79vz/montlake.bin.zip?dl=0 data/input/raw_maps/montlake.bin,147f1ab54b31b00071223ab8fda90c07,https://www.dropbox.com/s/qk8rhwr6vdm79vz/montlake.bin.zip?dl=0
data/input/raw_maps/mt_baker.bin,3175df1a8218faafa3b4d2c179925499,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0 data/input/raw_maps/mt_baker.bin,17f3dcd469c7f73ba9b79ef3e6e75ba6,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,572f14cbb49146efc83d799c02448212,https://www.dropbox.com/s/o1gtavxtw8n3bhy/udistrict.bin.zip?dl=0 data/input/raw_maps/udistrict.bin,e4d9aae4a54fc5cf31c9d1ced05cf435,https://www.dropbox.com/s/o1gtavxtw8n3bhy/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,0488b6607e04f5a919434ac2f6f9a26d,https://www.dropbox.com/s/112ym2cwg643c9n/west_seattle.bin.zip?dl=0 data/input/raw_maps/west_seattle.bin,fb61f9801e185bc9c111d894268bde2d,https://www.dropbox.com/s/112ym2cwg643c9n/west_seattle.bin.zip?dl=0
data/input/screenshots/downtown/01x01.gif,728b7726e06d7960e661c05c26108bae,https://www.dropbox.com/s/4209gvxkypinlqs/01x01.gif.zip?dl=0 data/input/screenshots/downtown/01x01.gif,728b7726e06d7960e661c05c26108bae,https://www.dropbox.com/s/4209gvxkypinlqs/01x01.gif.zip?dl=0
data/input/screenshots/downtown/01x02.gif,65f23e22339d8f6ea4b39151f3e44782,https://www.dropbox.com/s/9x5qtp86h3uemzm/01x02.gif.zip?dl=0 data/input/screenshots/downtown/01x02.gif,65f23e22339d8f6ea4b39151f3e44782,https://www.dropbox.com/s/9x5qtp86h3uemzm/01x02.gif.zip?dl=0
data/input/screenshots/downtown/01x03.gif,c126afdf55a94993e6c9a909eb685f8c,https://www.dropbox.com/s/4ev4pepyvrl6bs4/01x03.gif.zip?dl=0 data/input/screenshots/downtown/01x03.gif,c126afdf55a94993e6c9a909eb685f8c,https://www.dropbox.com/s/4ev4pepyvrl6bs4/01x03.gif.zip?dl=0
@ -364,16 +364,16 @@ data/input/seattle/sidewalks.bin,034dd47ab77902dbc81c0107f13d8965,https://www.dr
data/input/seattle/sidewalks.kml,94d385ba03ef1b57a5ba10965913ec6c,https://www.dropbox.com/s/vn8amar9xi6vbvh/sidewalks.kml.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/input/seattle/trips_2014.csv,d4a8e733045b28c0385fb81359d6df03,https://www.dropbox.com/s/5ppravwmk6bf20d/trips_2014.csv.zip?dl=0
data/system/cities/seattle.bin,018968486daedf1b69a1b3be5a3749bf,https://www.dropbox.com/s/eupzog6iw7wtaas/seattle.bin.zip?dl=0 data/system/cities/seattle.bin,018968486daedf1b69a1b3be5a3749bf,https://www.dropbox.com/s/eupzog6iw7wtaas/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,78198be4e5a03a59c63cdd61846efc60,https://www.dropbox.com/s/u4rvz50she3yrk0/ballard.bin.zip?dl=0 data/system/maps/ballard.bin,84075fe9b2920cf45a20318a71cc67f7,https://www.dropbox.com/s/u4rvz50she3yrk0/ballard.bin.zip?dl=0
data/system/maps/downtown.bin,3555b5dea0a14c15e313026dc28f00ea,https://www.dropbox.com/s/4do5cg4vc17lafo/downtown.bin.zip?dl=0 data/system/maps/downtown.bin,9c1239583f93edeebd9db1ef677cb787,https://www.dropbox.com/s/4do5cg4vc17lafo/downtown.bin.zip?dl=0
data/system/maps/downtown_atx.bin,dbcb84727ee433d1df94cad9b49c512c,https://www.dropbox.com/s/5avnbkd4oxby2hs/downtown_atx.bin.zip?dl=0 data/system/maps/downtown_atx.bin,d46819d53a47b7628fbfb947f17bd790,https://www.dropbox.com/s/5avnbkd4oxby2hs/downtown_atx.bin.zip?dl=0
data/system/maps/huge_austin.bin,91335d6d27c8df103d4963eefeae20bc,https://www.dropbox.com/s/khy0m6v9yt0gjnt/huge_austin.bin.zip?dl=0 data/system/maps/huge_austin.bin,884294efce5154c483a976c390089d15,https://www.dropbox.com/s/khy0m6v9yt0gjnt/huge_austin.bin.zip?dl=0
data/system/maps/huge_seattle.bin,80e2d8068ada8624b9d8129c8728e74a,https://www.dropbox.com/s/btvr3qajshnivhb/huge_seattle.bin.zip?dl=0 data/system/maps/huge_seattle.bin,ad8b5a5ea710b0524741a800e5703060,https://www.dropbox.com/s/btvr3qajshnivhb/huge_seattle.bin.zip?dl=0
data/system/maps/lakeslice.bin,061a9c3e377bac0ae5db460c67c3eea9,https://www.dropbox.com/s/99zi0gcbyvqrkud/lakeslice.bin.zip?dl=0 data/system/maps/lakeslice.bin,6ecaad694d8c73996d3b45879a4af142,https://www.dropbox.com/s/99zi0gcbyvqrkud/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,d58d14b9fbae8cfdf6c547fe140ff3fe,https://www.dropbox.com/s/zvhm2j5lavixxcr/montlake.bin.zip?dl=0 data/system/maps/montlake.bin,79c11be1af5833a04c6cbb4746e04401,https://www.dropbox.com/s/zvhm2j5lavixxcr/montlake.bin.zip?dl=0
data/system/maps/mt_baker.bin,09dd0d4220e1ebbed4fc730ed2081933,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0 data/system/maps/mt_baker.bin,312bff6b9609305be22cce8c02190315,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0
data/system/maps/udistrict.bin,4de690facca9297f148396f3f09c3a6a,https://www.dropbox.com/s/zqt2je8fadssz5j/udistrict.bin.zip?dl=0 data/system/maps/udistrict.bin,870d0e3b89a56a294a5ad6e559fe22b8,https://www.dropbox.com/s/zqt2je8fadssz5j/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,867b16afdf12c484d680bfbc73cbd919,https://www.dropbox.com/s/5pp1ik9l40yj3wh/west_seattle.bin.zip?dl=0 data/system/maps/west_seattle.bin,804ff03d1a8b2975a26340d4cf9dbc52,https://www.dropbox.com/s/5pp1ik9l40yj3wh/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,fb9e4d239bde525413665e52054ca67d,https://www.dropbox.com/s/1c1sohvy50263wg/weekday.bin.zip?dl=0 data/system/prebaked_results/lakeslice/weekday.bin,fb9e4d239bde525413665e52054ca67d,https://www.dropbox.com/s/1c1sohvy50263wg/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,0dc6575e7855a6bd8d4ead24bc9a8b1e,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0 data/system/prebaked_results/montlake/car vs bike contention.bin,0dc6575e7855a6bd8d4ead24bc9a8b1e,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,f0479fef3a3470133abdb7b057fc41ee,https://www.dropbox.com/s/1aq7n9ow8tfqb5d/weekday.bin.zip?dl=0 data/system/prebaked_results/montlake/weekday.bin,f0479fef3a3470133abdb7b057fc41ee,https://www.dropbox.com/s/1aq7n9ow8tfqb5d/weekday.bin.zip?dl=0

7
map_model/src/make/buildings.rs
View File

@ -180,8 +180,6 @@ pub fn make_all_parking_lots(
id, id,
polygon: orig.polygon.clone(), polygon: orig.polygon.clone(),
aisles: Vec::new(), aisles: Vec::new(),
// TODO Rethink this approach. 250 square feet is around 23 square meters
capacity: orig.capacity,
osm_id: orig.osm_id, osm_id: orig.osm_id,
spots: Vec::new(), spots: Vec::new(),
@ -192,9 +190,8 @@ pub fn make_all_parking_lots(
}); });
} else { } else {
timer.warn(format!( timer.warn(format!(
"Parking lot from OSM way {} can't have a driveway. Forfeiting {:?} parking \ "Parking lot from OSM way {} can't have a driveway.",
spots", orig.osm_id
orig.osm_id, orig.capacity
)); ));
} }
} }

2
map_model/src/parking_lot.rs
View File

@ -26,8 +26,6 @@ pub struct ParkingLot {
pub id: ParkingLotID, pub id: ParkingLotID,
pub polygon: Polygon, pub polygon: Polygon,
pub aisles: Vec<Vec<Pt2D>>, pub aisles: Vec<Vec<Pt2D>>,
// TODO Rename this
pub capacity: Option<usize>,
pub osm_id: i64, pub osm_id: i64,
// The middle of the "T", pointing towards the parking aisle // The middle of the "T", pointing towards the parking aisle
pub spots: Vec<(Pt2D, Angle)>, pub spots: Vec<(Pt2D, Angle)>,

1
map_model/src/raw.rs
View File

@ -336,7 +336,6 @@ pub struct RawArea {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct RawParkingLot { pub struct RawParkingLot {
pub polygon: Polygon, pub polygon: Polygon,
pub capacity: Option<usize>,
pub osm_id: i64, pub osm_id: i64,
} }