From d257535a7ce806df5fca038f667da9ec40ce3fde Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Sat, 16 May 2020 17:32:01 -0700 Subject: [PATCH] grab new OSM, try to get mt baker running. rainier is just a mess. --- Cargo.lock | 2 +- data/MANIFEST.txt | 95 ++++++++++++++++++------------- sim/src/mechanics/intersection.rs | 13 ++++- 3 files changed, 69 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c63c268db1..e95596812f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2903,7 +2903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "seattle_traffic_signals" version = "0.1.0" -source = "git+https://github.com/dabreegster/seattle_traffic_signals#668a39ab29835df44fe029fcae2a83683db0bfd3" +source = "git+https://github.com/dabreegster/seattle_traffic_signals#f3d21a9799ae62e6fc672ce41b979a837ffc0132" dependencies = [ "include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/data/MANIFEST.txt b/data/MANIFEST.txt index d42c267e96..b1902cd372 100644 --- a/data/MANIFEST.txt +++ b/data/MANIFEST.txt @@ -2,18 +2,18 @@ data/input/austin/osm/Austin.osm,7c8d72cf97072af34cee665006b1e9e6,https://www.dr 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/raw_maps/23rd.bin,4321f7a0985a4cc6a52fc066768f2ff1,https://www.dropbox.com/s/9g5589k9swdln9y/23rd.bin.zip?dl=0 -data/input/raw_maps/ballard.bin,bb706b56726f3e516b1f80d0e0a7247b,https://www.dropbox.com/s/wus0ufcnjyvcsuy/ballard.bin.zip?dl=0 +data/input/raw_maps/ballard.bin,872360c9b230e0fba293d5623e79ef86,https://www.dropbox.com/s/wus0ufcnjyvcsuy/ballard.bin.zip?dl=0 data/input/raw_maps/caphill.bin,e6ba4ce4f9b6122ccaef930e69ff4d09,https://www.dropbox.com/s/vybo4owf8pzuita/caphill.bin.zip?dl=0 -data/input/raw_maps/downtown.bin,73d825429fde732bcaa127b1a7fcb74f,https://www.dropbox.com/s/ntqzttf25037fty/downtown.bin.zip?dl=0 +data/input/raw_maps/downtown.bin,aa4a1132293ef073baaf7965191c6696,https://www.dropbox.com/s/ntqzttf25037fty/downtown.bin.zip?dl=0 data/input/raw_maps/downtown_atx.bin,b8bf1101d55440ccdaf6b4755a5d5701,https://www.dropbox.com/s/0cs55y1jcmm2alk/downtown_atx.bin.zip?dl=0 data/input/raw_maps/huge_austin.bin,5dbd9efb15a39432b28dc6fe9003cea4,https://www.dropbox.com/s/we0765ym7dlcsl1/huge_austin.bin.zip?dl=0 -data/input/raw_maps/huge_seattle.bin,d876954d01acdf472af089521973f2a4,https://www.dropbox.com/s/jcssts861uaovva/huge_seattle.bin.zip?dl=0 -data/input/raw_maps/intl_district.bin,d532e660c0ddcc4e7ddda1d4291f5d8a,https://www.dropbox.com/s/yopzq58r9t4y93v/intl_district.bin.zip?dl=0 +data/input/raw_maps/huge_seattle.bin,9c72832372dec4871dfe5e5f6d5065dd,https://www.dropbox.com/s/jcssts861uaovva/huge_seattle.bin.zip?dl=0 +data/input/raw_maps/intl_district.bin,d4572a910b78fb5af00cb769c8aefba0,https://www.dropbox.com/s/yopzq58r9t4y93v/intl_district.bin.zip?dl=0 data/input/raw_maps/lakeslice.bin,9b052e89143df54ea4319332e244ac3f,https://www.dropbox.com/s/4nmdtw0mgqe7tyg/lakeslice.bin.zip?dl=0 data/input/raw_maps/montlake.bin,d768f077113f1c129910bd1c4c316591,https://www.dropbox.com/s/qk8rhwr6vdm79vz/montlake.bin.zip?dl=0 -data/input/raw_maps/mt_baker.bin,81911afb8f161dbd60c9fabe0bf56444,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0 +data/input/raw_maps/mt_baker.bin,958f2d612aa248d804bd99a3dea7f82a,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0 data/input/raw_maps/udistrict.bin,6fdc857e3e4962fe4155ae8a46b10f0d,https://www.dropbox.com/s/o1gtavxtw8n3bhy/udistrict.bin.zip?dl=0 -data/input/raw_maps/west_seattle.bin,39ac2f33cba02a254aabf8923955bd7f,https://www.dropbox.com/s/112ym2cwg643c9n/west_seattle.bin.zip?dl=0 +data/input/raw_maps/west_seattle.bin,57099c3cb958aadea518b0a314035e06,https://www.dropbox.com/s/112ym2cwg643c9n/west_seattle.bin.zip?dl=0 data/input/screenshots/lakeslice/01x01_i325.gif,40b1e76bb29e46823fa52186c891578b,https://www.dropbox.com/s/uiodmxawv8sheb1/01x01_i325.gif.zip?dl=0 data/input/screenshots/lakeslice/01x02_i163.gif,41555319ee4b156d8105b665c6b0c8c5,https://www.dropbox.com/s/6zebcdhbeirab49/01x02_i163.gif.zip?dl=0 data/input/screenshots/lakeslice/01x03_i1.gif,206a663a9dc054ed504daa4c8215b3a1,https://www.dropbox.com/s/qn65mm834k8w1jr/01x03_i1.gif.zip?dl=0 @@ -149,6 +149,25 @@ data/input/screenshots/montlake/03x04_i69.gif,de8be1ad8c9b3a36c538aa7272f62a9f,h data/input/screenshots/montlake/03x05_i65.gif,0843a8c57bfd087c50da38ba6e30ed87,https://www.dropbox.com/s/1904om4kbatqre0/03x05_i65.gif.zip?dl=0 data/input/screenshots/montlake/03x06_i27.gif,99070af118cad46c723cdeb3d36299f2,https://www.dropbox.com/s/3ydodh4ogbntpbl/03x06_i27.gif.zip?dl=0 data/input/screenshots/montlake/combine.sh,e166ec3d291c2c6a9aa8a65053b46faf,https://www.dropbox.com/s/odbawy1k6nfll1r/combine.sh.zip?dl=0 +data/input/screenshots/pending_montlake/01x01_i17.gif,351482f0be7e8affc17fe252719bfef4,https://www.dropbox.com/s/j5x1nhni8l5ypfm/01x01_i17.gif.zip?dl=0 +data/input/screenshots/pending_montlake/01x02_i18.gif,fe21899c9a7e715f6c39fba181eb614e,https://www.dropbox.com/s/gzk3l9qih8t1sri/01x02_i18.gif.zip?dl=0 +data/input/screenshots/pending_montlake/01x03_i0.gif,db7e3395017d17c36d80b3822094f63b,https://www.dropbox.com/s/trgy0dcymj4s4nf/01x03_i0.gif.zip?dl=0 +data/input/screenshots/pending_montlake/01x04_i31.gif,bd024de0d467b8e72e2708b5235e8244,https://www.dropbox.com/s/cosrmtbufp0n6il/01x04_i31.gif.zip?dl=0 +data/input/screenshots/pending_montlake/01x05_i41.gif,2788adcada8766d72f9b70eb4a414ba0,https://www.dropbox.com/s/2g0l69malz438co/01x05_i41.gif.zip?dl=0 +data/input/screenshots/pending_montlake/01x06_i25.gif,1c85ab80a85e7c0374aeb39cd4a975f2,https://www.dropbox.com/s/t063unn8fyynp3i/01x06_i25.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x01_i13.gif,789517904486a866750f2b2b982e0c66,https://www.dropbox.com/s/z2re8vvxr6suzyy/02x01_i13.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x02_i328.gif,039b087e14473541b69d8187ff9e2e8f,https://www.dropbox.com/s/6zdiftuoywzld8t/02x02_i328.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x03_i57.gif,1eb75eb1011687466a63a65bb366ceb7,https://www.dropbox.com/s/5y7cwkw3o9euiqg/02x03_i57.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x04_i24.gif,453c759d634733685aa0e67560e9a99f,https://www.dropbox.com/s/awrlfeh2r31h850/02x04_i24.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x05_i132.gif,203ba8fd01fed532ca45251183326216,https://www.dropbox.com/s/sufmh0vbrrwo7s3/02x05_i132.gif.zip?dl=0 +data/input/screenshots/pending_montlake/02x06_i90.gif,b3ab4d5de279448714f559a12f55795e,https://www.dropbox.com/s/owb7yqockb6woxh/02x06_i90.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x01_i13.gif,ca345d564fc2e6aea5980ebab0d5637f,https://www.dropbox.com/s/tx89fjl8ucyib1i/03x01_i13.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x02_i3.gif,ce6d72b512e5ef8b8fcc0b4067c7bcf5,https://www.dropbox.com/s/3sqoflhvtajmuom/03x02_i3.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x03_i61.gif,de99ae6bdedadbafac36de68a6019f06,https://www.dropbox.com/s/gy6300qsi3erw51/03x03_i61.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x04_i69.gif,de8be1ad8c9b3a36c538aa7272f62a9f,https://www.dropbox.com/s/33s725l3ae9q6oh/03x04_i69.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x05_i65.gif,0843a8c57bfd087c50da38ba6e30ed87,https://www.dropbox.com/s/xd17xrjm1oc7hi0/03x05_i65.gif.zip?dl=0 +data/input/screenshots/pending_montlake/03x06_i27.gif,99070af118cad46c723cdeb3d36299f2,https://www.dropbox.com/s/2ij9rfsr3odes1y/03x06_i27.gif.zip?dl=0 +data/input/screenshots/pending_montlake/combine.sh,e166ec3d291c2c6a9aa8a65053b46faf,https://www.dropbox.com/s/q4ol2t3tzyqb37y/combine.sh.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 @@ -166,49 +185,49 @@ data/input/seattle/google_transit/stops.txt,8610cdc491d036eee88c9b7ae24d692d,htt data/input/seattle/google_transit/trips.txt,8a4fbb3846249777afae319d64e6241e,https://www.dropbox.com/s/vpphfu9s5owan61/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/23rd.osm,11f394b191e191dd0d5378128eb51cca,https://www.dropbox.com/s/ytavrx6ovporxbx/23rd.osm.zip?dl=0 -data/input/seattle/osm/ballard.osm,32f9dfc56c68ac51b38ce017f166a022,https://www.dropbox.com/s/7981y9qbxuztc5b/ballard.osm.zip?dl=0 -data/input/seattle/osm/caphill.osm,a6524b0f56783ad7e3d860e8c2bcc450,https://www.dropbox.com/s/rvwjr3735tc4gio/caphill.osm.zip?dl=0 -data/input/seattle/osm/downtown.osm,e53bed741b423ed4861eaead399d978b,https://www.dropbox.com/s/kpn8hfhoskj9pxz/downtown.osm.zip?dl=0 -data/input/seattle/osm/huge_seattle.osm,67ff8eee61bb84200416a25a199e3f6a,https://www.dropbox.com/s/xhe35pj632ow6fl/huge_seattle.osm.zip?dl=0 -data/input/seattle/osm/intl_district.osm,8518bcd8a5d0feb7243a92d2e4f8d523,https://www.dropbox.com/s/fny0hr1fyiic9ih/intl_district.osm.zip?dl=0 -data/input/seattle/osm/lakeslice.osm,e4a038bd92736ab8539813a8b11a37d8,https://www.dropbox.com/s/vv90x69xvxx7o3s/lakeslice.osm.zip?dl=0 -data/input/seattle/osm/montlake.osm,2c7b7ace56bbccf8a1e500157ac51c65,https://www.dropbox.com/s/qh1jiav783m60g1/montlake.osm.zip?dl=0 -data/input/seattle/osm/mt_baker.osm,2cd7ba808d94318975bd73e9ced01c51,https://www.dropbox.com/s/2tibw8w3q99u0f4/mt_baker.osm.zip?dl=0 -data/input/seattle/osm/udistrict.osm,e5b0d978d1c74ae5c555a4ebd3ad9d70,https://www.dropbox.com/s/h66cidmzcq15pbo/udistrict.osm.zip?dl=0 -data/input/seattle/osm/washington-latest.osm.pbf,363e061c2bf9aa49b48fa12ec56d0ed1,https://www.dropbox.com/s/xha9cx696czbzlf/washington-latest.osm.pbf.zip?dl=0 -data/input/seattle/osm/west_seattle.osm,8f893f5a3302b3cf5a614b1d52e49b5f,https://www.dropbox.com/s/8m0vmvwg5zz3uod/west_seattle.osm.zip?dl=0 -data/input/seattle/parcels.bin,a622decab6c9f7f38d5113212a2f8b64,https://www.dropbox.com/s/39bymqayph3easc/parcels.bin.zip?dl=0 +data/input/seattle/osm/23rd.osm,fdb795f859bc814cf4ed57c95fdb96dd,https://www.dropbox.com/s/ytavrx6ovporxbx/23rd.osm.zip?dl=0 +data/input/seattle/osm/ballard.osm,303350ea2d914ffbe7fa485b932fd99d,https://www.dropbox.com/s/7981y9qbxuztc5b/ballard.osm.zip?dl=0 +data/input/seattle/osm/caphill.osm,aa91a4ee5b372ab67c9d1b7a58016392,https://www.dropbox.com/s/rvwjr3735tc4gio/caphill.osm.zip?dl=0 +data/input/seattle/osm/downtown.osm,9931de697685d215a127aa80e60d6d6b,https://www.dropbox.com/s/kpn8hfhoskj9pxz/downtown.osm.zip?dl=0 +data/input/seattle/osm/huge_seattle.osm,b5334a4fc712b9e00f9e08e8e1633c2d,https://www.dropbox.com/s/xhe35pj632ow6fl/huge_seattle.osm.zip?dl=0 +data/input/seattle/osm/intl_district.osm,8327d23095b8e2e53c65add05a29aab7,https://www.dropbox.com/s/fny0hr1fyiic9ih/intl_district.osm.zip?dl=0 +data/input/seattle/osm/lakeslice.osm,b2beee297d13cabe791e83eb56e890c3,https://www.dropbox.com/s/vv90x69xvxx7o3s/lakeslice.osm.zip?dl=0 +data/input/seattle/osm/montlake.osm,b7464fc4523304ee3932f2330e1609b2,https://www.dropbox.com/s/qh1jiav783m60g1/montlake.osm.zip?dl=0 +data/input/seattle/osm/mt_baker.osm,5cdf2be2c03804b8541632152fec6ae5,https://www.dropbox.com/s/2tibw8w3q99u0f4/mt_baker.osm.zip?dl=0 +data/input/seattle/osm/udistrict.osm,6cd123fb43ca9be76702996b37216496,https://www.dropbox.com/s/h66cidmzcq15pbo/udistrict.osm.zip?dl=0 +data/input/seattle/osm/washington-latest.osm.pbf,b8724b86c85c9a36cb4ada1068d28e35,https://www.dropbox.com/s/xha9cx696czbzlf/washington-latest.osm.pbf.zip?dl=0 +data/input/seattle/osm/west_seattle.osm,8a7318cfead8625078d2e3a09d8cf2e0,https://www.dropbox.com/s/8m0vmvwg5zz3uod/west_seattle.osm.zip?dl=0 +data/input/seattle/parcels.bin,2e11a261b787d34f7535198e0775a924,https://www.dropbox.com/s/39bymqayph3easc/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,8b88fa7f2036277d2f26ad393f6509b9,https://www.dropbox.com/s/wrpji7e14rdwszs/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/maps/23rd.bin,261b438a96f6fd102ccfa191a0fa736f,https://www.dropbox.com/s/wjl45codk6rqfg4/23rd.bin.zip?dl=0 -data/system/maps/ballard.bin,d5b82ef79d0e65d0f28635114e20f943,https://www.dropbox.com/s/u4rvz50she3yrk0/ballard.bin.zip?dl=0 +data/system/maps/ballard.bin,17102a34e17ef941a8d4c461b043cbf5,https://www.dropbox.com/s/u4rvz50she3yrk0/ballard.bin.zip?dl=0 data/system/maps/caphill.bin,e90dbfc74ece01e680a4936a347324c0,https://www.dropbox.com/s/bh20pn3wxygetw8/caphill.bin.zip?dl=0 -data/system/maps/downtown.bin,a01f1ed32ebbcdefc8a9650158e9d4f6,https://www.dropbox.com/s/4do5cg4vc17lafo/downtown.bin.zip?dl=0 +data/system/maps/downtown.bin,2c8d9ef378a7261781ed1221dd09c20e,https://www.dropbox.com/s/4do5cg4vc17lafo/downtown.bin.zip?dl=0 data/system/maps/downtown_atx.bin,b2d634b8aa1244261d3a5e3a6e8b8ab7,https://www.dropbox.com/s/5avnbkd4oxby2hs/downtown_atx.bin.zip?dl=0 data/system/maps/huge_austin.bin,1993956d19e43b1d27d8417435820f23,https://www.dropbox.com/s/khy0m6v9yt0gjnt/huge_austin.bin.zip?dl=0 -data/system/maps/huge_seattle.bin,e28b8164df54661add72cc304287cc0b,https://www.dropbox.com/s/btvr3qajshnivhb/huge_seattle.bin.zip?dl=0 -data/system/maps/intl_district.bin,fd2a8c0beb87670b02148265a826746f,https://www.dropbox.com/s/fohppni52ekc5l3/intl_district.bin.zip?dl=0 +data/system/maps/huge_seattle.bin,56798a8913a3c9374af2c035203d5a52,https://www.dropbox.com/s/btvr3qajshnivhb/huge_seattle.bin.zip?dl=0 +data/system/maps/intl_district.bin,c9b44b3d2fdadf4dbeba76c259791831,https://www.dropbox.com/s/fohppni52ekc5l3/intl_district.bin.zip?dl=0 data/system/maps/lakeslice.bin,26d33cfbd07f5c71178f8bf4435c9abc,https://www.dropbox.com/s/99zi0gcbyvqrkud/lakeslice.bin.zip?dl=0 data/system/maps/montlake.bin,79f3ac864a6cdf0935a8ece7d965c0cc,https://www.dropbox.com/s/zvhm2j5lavixxcr/montlake.bin.zip?dl=0 -data/system/maps/mt_baker.bin,085cd5d41c3f0fababbeac0dd5cec1cc,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0 +data/system/maps/mt_baker.bin,e0d309e341b923742009d56ffb70af65,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0 data/system/maps/udistrict.bin,8050fb96058a0c707e1cd7574bae5158,https://www.dropbox.com/s/zqt2je8fadssz5j/udistrict.bin.zip?dl=0 -data/system/maps/west_seattle.bin,9285420be1a6af679ed5022db369be4c,https://www.dropbox.com/s/5pp1ik9l40yj3wh/west_seattle.bin.zip?dl=0 -data/system/prebaked_results/lakeslice/weekday.bin,56a3b4128362a002b9e0048fc7a4ccaf,https://www.dropbox.com/s/1c1sohvy50263wg/weekday.bin.zip?dl=0 +data/system/maps/west_seattle.bin,980cd951a689e38a4b48b055c71e0145,https://www.dropbox.com/s/5pp1ik9l40yj3wh/west_seattle.bin.zip?dl=0 +data/system/prebaked_results/lakeslice/weekday.bin,8a82c0cfdb63e08b6a332c38419e14e9,https://www.dropbox.com/s/1c1sohvy50263wg/weekday.bin.zip?dl=0 data/system/prebaked_results/montlake/car vs bike contention.bin,6585d89d8bf8086150e1dc3545459e0e,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0 -data/system/prebaked_results/montlake/weekday.bin,eebd82a6a82339840d552475854d3e95,https://www.dropbox.com/s/1aq7n9ow8tfqb5d/weekday.bin.zip?dl=0 -data/system/scenarios/23rd/weekday.bin,9dddee85882d9ed3e0e3ee67048921e7,https://www.dropbox.com/s/tgo7gztfodbljyi/weekday.bin.zip?dl=0 -data/system/scenarios/ballard/weekday.bin,d13bcb0870506ee60fd841f4fb906061,https://www.dropbox.com/s/67hys1v7m7oe979/weekday.bin.zip?dl=0 -data/system/scenarios/caphill/weekday.bin,76217ad3e2689f2edf2aa6024d96c2eb,https://www.dropbox.com/s/9ifg7ogd6p5f1qg/weekday.bin.zip?dl=0 -data/system/scenarios/downtown/weekday.bin,7cbb3ac1aa29d738e77006a40e38dd71,https://www.dropbox.com/s/pstvu4p7xj3gaoi/weekday.bin.zip?dl=0 -data/system/scenarios/huge_seattle/weekday.bin,d87f9544efe453ea17c50dc2704b80c5,https://www.dropbox.com/s/u3pmsshwnf13g83/weekday.bin.zip?dl=0 -data/system/scenarios/intl_district/weekday.bin,fcf14fcf65da9eb6a844aab14200ff36,https://www.dropbox.com/s/sgag53d9tul9rcl/weekday.bin.zip?dl=0 -data/system/scenarios/lakeslice/weekday.bin,c3abbe2e579d0409e8182760d99e52fa,https://www.dropbox.com/s/858wxml3z0qlhxd/weekday.bin.zip?dl=0 +data/system/prebaked_results/montlake/weekday.bin,48010f711617ed21a67105423b0543ea,https://www.dropbox.com/s/1aq7n9ow8tfqb5d/weekday.bin.zip?dl=0 +data/system/scenarios/23rd/weekday.bin,245740d8f044e3cada839c587eb1ff6b,https://www.dropbox.com/s/tgo7gztfodbljyi/weekday.bin.zip?dl=0 +data/system/scenarios/ballard/weekday.bin,2f328abfafd263813bdbe5371d54ac45,https://www.dropbox.com/s/67hys1v7m7oe979/weekday.bin.zip?dl=0 +data/system/scenarios/caphill/weekday.bin,9f09b4f562b969b2228acca137e2d65f,https://www.dropbox.com/s/9ifg7ogd6p5f1qg/weekday.bin.zip?dl=0 +data/system/scenarios/downtown/weekday.bin,6b0e4ddaba2d64b7f550d6a24f161a43,https://www.dropbox.com/s/pstvu4p7xj3gaoi/weekday.bin.zip?dl=0 +data/system/scenarios/huge_seattle/weekday.bin,8fcd9aef14999a0de9b5ae7a41d6ccfb,https://www.dropbox.com/s/u3pmsshwnf13g83/weekday.bin.zip?dl=0 +data/system/scenarios/intl_district/weekday.bin,aa8253dab8346923759a94c3995b5a41,https://www.dropbox.com/s/sgag53d9tul9rcl/weekday.bin.zip?dl=0 +data/system/scenarios/lakeslice/weekday.bin,4c2e9bbc8c3761c6b924eab9ff16faae,https://www.dropbox.com/s/858wxml3z0qlhxd/weekday.bin.zip?dl=0 data/system/scenarios/montlake/everyone_weekday.bin,25e9839b4f76a9b6f1928b647356c9ea,https://www.dropbox.com/s/44s818fimpu53v1/everyone_weekday.bin.zip?dl=0 -data/system/scenarios/montlake/weekday.bin,d723b86ac41e175e90b18cdbe2478a14,https://www.dropbox.com/s/yntrxxgv3yx75gd/weekday.bin.zip?dl=0 -data/system/scenarios/mt_baker/weekday.bin,9fb314cab893cdbcccd1e922d137669d,https://www.dropbox.com/s/5e36iyuha2ltyo8/weekday.bin.zip?dl=0 -data/system/scenarios/udistrict/weekday.bin,1c4b0736ec8a7742ce6dcf54707cfe87,https://www.dropbox.com/s/gz5h3pgckjn9bbj/weekday.bin.zip?dl=0 -data/system/scenarios/west_seattle/weekday.bin,41609e93ac92a2bf116132df3736361e,https://www.dropbox.com/s/n8ertmxn05yn0kj/weekday.bin.zip?dl=0 +data/system/scenarios/montlake/weekday.bin,c6259b16975b3d275e2767bbb37efba9,https://www.dropbox.com/s/yntrxxgv3yx75gd/weekday.bin.zip?dl=0 +data/system/scenarios/mt_baker/weekday.bin,295a2f8ff14d849403c4999231e6fef4,https://www.dropbox.com/s/5e36iyuha2ltyo8/weekday.bin.zip?dl=0 +data/system/scenarios/udistrict/weekday.bin,fc7a56e9865e9f805687dab6b87b373c,https://www.dropbox.com/s/gz5h3pgckjn9bbj/weekday.bin.zip?dl=0 +data/system/scenarios/west_seattle/weekday.bin,daca5f895bb7379f096e8bc7156cadf3,https://www.dropbox.com/s/n8ertmxn05yn0kj/weekday.bin.zip?dl=0 diff --git a/sim/src/mechanics/intersection.rs b/sim/src/mechanics/intersection.rs index 376b531c87..bedbb66944 100644 --- a/sim/src/mechanics/intersection.rs +++ b/sim/src/mechanics/intersection.rs @@ -632,7 +632,14 @@ fn allow_block_the_box(osm_node_id: i64) -> bool { // 45th and Union Bay osm_node_id == 31192107 || osm_node_id == 4272330879 || osm_node_id == 53120147 || // 45th and Montlake - osm_node_id == 31430639 || osm_node_id == 29977895 || osm_node_id == 3391705317 || osm_node_id == 29977897 + osm_node_id == 31430639 || osm_node_id == 29977895 || osm_node_id == 3391705317 || + osm_node_id == 29977897 || + // Rainier and Brandon + osm_node_id == 53089293 || + // Rainier and Letitia + osm_node_id == 1729797719 || osm_node_id == 4272388873 || osm_node_id == 53194882 || + // Rainier and MLK + osm_node_id == 53131428 } // TODO Various problems (bad geometry, multi-intersection turn restrictions) cause @@ -645,7 +652,9 @@ fn allow_conflicting_turns(osm_node_id: i64) -> bool { // Boyer and Lynn 3978753095, // WA 509 and WA 99 - 31253092 + 31253092, + // 52nd and Holly + 4263867891, 4263867898, 4263867908, 4263867899 ] .contains(&osm_node_id) }