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

fix zordering of harbor island, broken in the osm reader refactor a few weeks back

Browse Source 
fresh osm. breaks lakeslice, but I'll fix tomorrow. progress in
south/west seattle.
This commit is contained in:
Dustin Carlino 2020-08-06 18:11:09 -07:00
parent 5998afaea4
commit 128e649236
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
convert_osm/src/extract.rs
View File

@ -121,7 +121,7 @@ pub fn extract_osm(map: &mut RawMap, opts: &Options, timer: &mut Timer) -> OsmEx
points: map.gps_bounds.convert_back(&way.pts),
attributes: way.tags.inner().clone(),
});
} else if way.tags.is("natural", "coastline") {
} else if way.tags.is("natural", "coastline") && !way.tags.is("place", "island") {
coastline_groups.push((id, way.pts.clone()));
continue;
}

84
data/MANIFEST.txt
View File

@ -9,25 +9,25 @@ data/input/krakow/footways.bin,017e85fd6da69b67a1a7a790506f52ff,https://www.drop
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/raw_maps/ballard.bin,47fb631292bfb447b8d42e5680548ff5,https://www.dropbox.com/s/z3035x2se5d2fg5/ballard.bin.zip?dl=0
data/input/raw_maps/ballard.bin,422675e5ae0054651a3dc1f307c8bfbb,https://www.dropbox.com/s/bhekalw3smrs88p/ballard.bin.zip?dl=0
data/input/raw_maps/berlin_center.bin,55f7855f1be26430a46c8bbed74a6789,https://www.dropbox.com/s/g09clxwc5o8bqfk/berlin_center.bin.zip?dl=0
data/input/raw_maps/downtown.bin,a3bd6494ca7691a60b072025c8289d1a,https://www.dropbox.com/s/oo89d0qtodmyitc/downtown.bin.zip?dl=0
data/input/raw_maps/huge_seattle.bin,c1d03aba9ab6b55c5dc9e3495cf3b6fd,https://www.dropbox.com/s/fp6ybxik5gmulf8/huge_seattle.bin.zip?dl=0
data/input/raw_maps/downtown.bin,2c84ccaa228df16ddef50e5c67d22c82,https://www.dropbox.com/s/jya9xkj38cshwj9/downtown.bin.zip?dl=0
data/input/raw_maps/huge_seattle.bin,e0b63d95fae06b9c6c9a9afc587270a6,https://www.dropbox.com/s/r7l2y22iyvla5b8/huge_seattle.bin.zip?dl=0
data/input/raw_maps/krakow_center.bin,a6c557888cf3211fce8f025150c49734,https://www.dropbox.com/s/y7hwvd547soiwan/krakow_center.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,276b35edb7c177afef2154767698a268,https://www.dropbox.com/s/u61o93yq1gdgwg4/lakeslice.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,b71cf35251603a6a787a065b8a37f6f3,https://www.dropbox.com/s/3ko1beo4uv2j49p/lakeslice.bin.zip?dl=0
data/input/raw_maps/montlake.bin,11e3f20b67fb76359dc69737a039e8d1,https://www.dropbox.com/s/h9mymsai9ia9yde/montlake.bin.zip?dl=0
data/input/raw_maps/south_seattle.bin,12b7dddeac86abcb738a13cda8252be5,https://www.dropbox.com/s/vciigy9gbcrclsq/south_seattle.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,a84071c4832e64a0d756290175a19423,https://www.dropbox.com/s/qsh2ktay3sf4oi1/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,f10e59d67ed701edbaa36cf0a55d93a7,https://www.dropbox.com/s/q042wvb54xzbtgl/west_seattle.bin.zip?dl=0
data/input/screenshots/downtown.zip,9a44c845024179d6876217f0b0f43338,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/raw_maps/south_seattle.bin,c1a531ccb0874a3fafaa48952ec58d29,https://www.dropbox.com/s/y7d3mcnqp4u50b6/south_seattle.bin.zip?dl=0
data/input/raw_maps/udistrict.bin,5f1c93a1d7939af3995359c074b11bbc,https://www.dropbox.com/s/7doajjusb5if43q/udistrict.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,b6c92b97d266d644368c9f6e5f9ce812,https://www.dropbox.com/s/oa5gpkut51mc6vj/west_seattle.bin.zip?dl=0
data/input/screenshots/downtown.zip,8759a23f7729e51f0a27ca781a1b5cbb,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0
data/input/screenshots/krakow_center.zip,44b8e8301931e97fb87f928676723a6d,https://www.dropbox.com/s/azea6v6mnxbe0vc/krakow_center.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,3a1e28ad0a6a7833ee76853f908075e9,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,2b7b40e003ed4bdfad43405ce6f28e7b,https://www.dropbox.com/s/eblgq5zj3gflhwx/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,5b4014eb2749eac4b9aecfb02fd0efcf,https://www.dropbox.com/s/ecnt1tyza48y9o2/udistrict.zip.zip?dl=0
data/input/screenshots/lakeslice.zip,b36f19b5c44b51def26c2056f03bc5a1,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0
data/input/screenshots/montlake.zip,1e685a3ca7680136347961b4c0170a54,https://www.dropbox.com/s/eblgq5zj3gflhwx/montlake.zip.zip?dl=0
data/input/screenshots/udistrict.zip,4b993c8dfe3e3ac912e10511fb915fdc,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
data/input/seattle/footways.bin,9a8eee924ebda79f2aead8c1dd7e1a5c,https://www.dropbox.com/s/jm6kqb44mifjrts/footways.bin.zip?dl=0
data/input/seattle/footways.bin,27973beaf53521a6ed0e6992fb3e8cbe,https://www.dropbox.com/s/wtjkiohjdjg9ykp/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
data/input/seattle/google_transit/block_trip.txt,8d3626586ddbb1a384931215580de078,https://www.dropbox.com/s/kuztkmujnt9pr1v/block_trip.txt.zip?dl=0
@ -42,39 +42,39 @@ data/input/seattle/google_transit/stops.txt,da1ff7000efdf2166d861479a69d80a4,htt
data/input/seattle/google_transit/trips.txt,e8efe1d2e130e248942188284d88ab09,https://www.dropbox.com/s/lw0hhnqttns2h8z/trips.txt.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
data/input/seattle/osm/ballard.osm,0da3c8c31f7090fa262fd3f047d43aa3,https://www.dropbox.com/s/bv2rzd8pewh78x6/ballard.osm.zip?dl=0
data/input/seattle/osm/downtown.osm,4589fb4a95c283c1991ae49ad14035c2,https://www.dropbox.com/s/ojlvrbl01d174eb/downtown.osm.zip?dl=0
data/input/seattle/osm/huge_seattle.osm,7108e0da99b243a65f4982d9727404ba,https://www.dropbox.com/s/r00d8x4fckhi6mn/huge_seattle.osm.zip?dl=0
data/input/seattle/osm/lakeslice.osm,d1264361ffba5f0c5bb7ee8e0af526bd,https://www.dropbox.com/s/ddnx92h4apdfadm/lakeslice.osm.zip?dl=0
data/input/seattle/osm/montlake.osm,cf0817334e5d05f873859c3879c19922,https://www.dropbox.com/s/fuw15q6h7cnpng4/montlake.osm.zip?dl=0
data/input/seattle/osm/south_seattle.osm,73879499bb315eabfb26b9be4a0b6522,https://www.dropbox.com/s/n9gf2umksvt1h4m/south_seattle.osm.zip?dl=0
data/input/seattle/osm/udistrict.osm,b6381cfa842c686aec9f1cfac0e632d4,https://www.dropbox.com/s/he95edewuhwb7xs/udistrict.osm.zip?dl=0
data/input/seattle/osm/washington-latest.osm.pbf,a22251748ead8d8124017d488f681629,https://www.dropbox.com/s/2qwllw41agpvmsk/washington-latest.osm.pbf.zip?dl=0
data/input/seattle/osm/west_seattle.osm,ae4f93815abc6e70db04dfbca9f25312,https://www.dropbox.com/s/v7k9691p27vu50o/west_seattle.osm.zip?dl=0
data/input/seattle/parcels.bin,18bbd11b4424b30c5ba751295fa3b5e2,https://www.dropbox.com/s/5u6icqchhfhjdr9/parcels.bin.zip?dl=0
data/input/seattle/osm/ballard.osm,cab1a91bf03fa7abbc617277b99771eb,https://www.dropbox.com/s/p3katjz2p4avm3q/ballard.osm.zip?dl=0
data/input/seattle/osm/downtown.osm,c3cca101bea810f8d41095e4e2364e7b,https://www.dropbox.com/s/c78dhji0smno535/downtown.osm.zip?dl=0
data/input/seattle/osm/huge_seattle.osm,7a2ae3c9d446a17d978fbbd7fad249b0,https://www.dropbox.com/s/cl2d8u1wdr8lg3l/huge_seattle.osm.zip?dl=0
data/input/seattle/osm/lakeslice.osm,7e2e5043dcbbef2a4579a5b4cdff4cf8,https://www.dropbox.com/s/wswmpwq364v27xd/lakeslice.osm.zip?dl=0
data/input/seattle/osm/montlake.osm,c47e0350876bac1edad848df2e554e44,https://www.dropbox.com/s/csse1o53413lovg/montlake.osm.zip?dl=0
data/input/seattle/osm/south_seattle.osm,f1243c78fe237bb55cc7b8c38904df0e,https://www.dropbox.com/s/kns97vli1ijrimk/south_seattle.osm.zip?dl=0
data/input/seattle/osm/udistrict.osm,05d718bca1305fbcedffb0c9d3c808d8,https://www.dropbox.com/s/yy1j6b6b8bj7wn1/udistrict.osm.zip?dl=0
data/input/seattle/osm/washington-latest.osm.pbf,676dbdf08ebd8303f85eda7cb7de5833,https://www.dropbox.com/s/2ogkqpqnq8zjr1t/washington-latest.osm.pbf.zip?dl=0
data/input/seattle/osm/west_seattle.osm,abee01cc1d034a9b12a984d219393dcc,https://www.dropbox.com/s/wwt9h4kqvx4vg4y/west_seattle.osm.zip?dl=0
data/input/seattle/parcels.bin,32d515292c9298358eda739e715f609f,https://www.dropbox.com/s/3fz3eb9xlxu3xbm/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,b7e57a345ca118f305fc5a942264e65e,https://www.dropbox.com/s/9k8wwzghoi0o8z4/popdat.bin.zip?dl=0
data/input/seattle/service_roads.bin,0d82356f76e87c2ec31528ded8265d7c,https://www.dropbox.com/s/ghpf2ngndddn7c7/service_roads.bin.zip?dl=0
data/input/seattle/popdat.bin,ba74425bdd7e0435d16714342ddc1f7f,https://www.dropbox.com/s/o731ipwxu91ef0b/popdat.bin.zip?dl=0
data/input/seattle/service_roads.bin,771cffc34dfbca9f941a90adf553be5d,https://www.dropbox.com/s/61o9prqoa7f52q7/service_roads.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,ed96e1b845a551d2335dabece281bc90,https://www.dropbox.com/s/b9c5v7jcxe3pu5t/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,9f7cc88172c3fbe1af5f23d764a3be4b,https://www.dropbox.com/s/9ria0hl1bdahiwp/ballard.bin.zip?dl=0
data/system/cities/seattle.bin,4c23d8a7fbf0981a65c7e9499a1c7185,https://www.dropbox.com/s/1vg3138khp81kyi/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,79ee86eee63666b74c1a616e7f58db45,https://www.dropbox.com/s/98wdkhwohiv982c/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,065b4979987b228e19fe63adb5ee3856,https://www.dropbox.com/s/kivu0qhpdl2dfo6/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,10040ca42f209cd3cbfdc21e18fe5d85,https://www.dropbox.com/s/4fipln0wkb9rrke/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,1453a6a8303c941cfed4ac443dc88d2b,https://www.dropbox.com/s/rek64eokl98wi1e/huge_seattle.bin.zip?dl=0
data/system/maps/downtown.bin,b502ad91c4aa90368ed6b40545aa0118,https://www.dropbox.com/s/okqy9d2lvpclbzt/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,37a3d1587ab66bececb95ad1002e28cf,https://www.dropbox.com/s/8u0mw81isncs2t8/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,ae135fdfc30743833c71d9c2b6ecf3e3,https://www.dropbox.com/s/5o2u3bt4d58qdi7/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,43d8306e6334f206311d363fb0c9d3c9,https://www.dropbox.com/s/fpvbusqntoaz4qm/lakeslice.bin.zip?dl=0
data/system/maps/lakeslice.bin,6476b23467e7433ffb46e93ba61331a9,https://www.dropbox.com/s/f3nlxvinuo03gzt/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,75d2fa79912db2d287b7bb3e68904f1e,https://www.dropbox.com/s/sfrnr6gajffvaxa/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,90305faa011ccb2210eb9127ea7b7546,https://www.dropbox.com/s/nn5b4vvm45bvih2/south_seattle.bin.zip?dl=0
data/system/maps/udistrict.bin,0e723897052015d5b96d0d198544062a,https://www.dropbox.com/s/yuikz2qaev72cwk/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,56bb5ab6154f9dff692c44e11f49cc7c,https://www.dropbox.com/s/4jorjserrwtj5w2/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,9077472f746b87a51200490dde46bd74,https://www.dropbox.com/s/8jqn37tvo2rcute/weekday.bin.zip?dl=0
data/system/maps/south_seattle.bin,da9e3dc5019108e21f77eb40509ec155,https://www.dropbox.com/s/srlxi4hme132aec/south_seattle.bin.zip?dl=0
data/system/maps/udistrict.bin,10e8534ddca4a422d929a0cbb0b97368,https://www.dropbox.com/s/tefrx95x051eoir/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,8413879e624c19d52a8437439f4aa444,https://www.dropbox.com/s/aqul2662x8xzdnm/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,0e60d59420a34f648f17799895c4aa78,https://www.dropbox.com/s/eeeo9pl8aq38aw5/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,faa041af70a41bb8fcacd3dfd7a7d467,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,3f177553c4e31d364f8b5713bff2c251,https://www.dropbox.com/s/j1zy9bdadzis62o/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,3a244dd17be96ea961b75f0f97d7954d,https://www.dropbox.com/s/2nv0p6lqbqqfsuo/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,97ee4cbe65a6334d582a7cc6efe19c8b,https://www.dropbox.com/s/t67pdiea3perzzb/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,116e1fb01835ec449a8226727dedde46,https://www.dropbox.com/s/1zsliubcgba433g/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,d82f24639b8d85b94e8af85fe909cad5,https://www.dropbox.com/s/ql01vfg1i4uvesp/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,834dee7fb416aa27ce57f4789af2ccb6,https://www.dropbox.com/s/qa67b1dq3sdlqa5/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,515c708b3d42cee89cd70d5baf405808,https://www.dropbox.com/s/j9j2c7f6seyx9b9/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,166be61208e936e0b29f6286827fc80a,https://www.dropbox.com/s/f1ew96ay71tsb11/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,2bebf5bec15d5618ba6660dcb82cf285,https://www.dropbox.com/s/01c40kube985uq0/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,06746b72ec456e69c4500edf0b06d82f,https://www.dropbox.com/s/bcuc4gnmq3sxefo/weekday.bin.zip?dl=0
data/system/scenarios/ballard/weekday.bin,8a2165ab31b5a9c3912362f08e0dc2b9,https://www.dropbox.com/s/w9g4tanopzyaza4/weekday.bin.zip?dl=0
data/system/scenarios/downtown/weekday.bin,b38bb955b90a6356a3033ba1e0cec942,https://www.dropbox.com/s/8cmr13ll9bcekmd/weekday.bin.zip?dl=0
data/system/scenarios/huge_seattle/weekday.bin,64f059dc127da745673a72c6b3b9583a,https://www.dropbox.com/s/3xzp1wxq6shgabg/weekday.bin.zip?dl=0
data/system/scenarios/lakeslice/weekday.bin,d6e6e790b477655b6edd82524d679064,https://www.dropbox.com/s/7653v8k8bzm49bp/weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,888c0f0009cf6867939c410b798563e1,https://www.dropbox.com/s/7qgfn453ad149cz/weekday.bin.zip?dl=0
data/system/scenarios/south_seattle/weekday.bin,de52bd964f6e3f48ff86ebf2a664d195,https://www.dropbox.com/s/covz7zncujqmmzh/weekday.bin.zip?dl=0
data/system/scenarios/udistrict/weekday.bin,1c5c80e1abe4b16db4be497915921820,https://www.dropbox.com/s/4zshiz2lqinw2df/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,fad7c87544e370120758a391a55f9ac6,https://www.dropbox.com/s/fpf9kml3uanyejl/weekday.bin.zip?dl=0