From ae6c099bd51df77bb1140eff36e70113293b6c67 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Sat, 27 Jun 2020 16:19:48 -0700 Subject: [PATCH] start bringing in private broadmoor roads. omit from the CH, so trips will just fail without a path for now. --- convert_osm/src/osm_reader.rs | 4 - data/MANIFEST.txt | 280 ++++++++++++++-------------- ezgui/src/shaders/fragment_140.glsl | 2 + ezgui/src/shaders/fragment_300.glsl | 4 - game/src/colors.rs | 2 + game/src/info/lane.rs | 4 + game/src/render/intersection.rs | 4 + game/src/render/lane.rs | 3 + game/src/render/map.rs | 13 +- game/src/render/road.rs | 22 ++- map_model/src/intersection.rs | 8 + map_model/src/pathfind/driving.rs | 2 +- map_model/src/pathfind/walking.rs | 2 +- map_model/src/road.rs | 4 + 14 files changed, 199 insertions(+), 155 deletions(-) diff --git a/convert_osm/src/osm_reader.rs b/convert_osm/src/osm_reader.rs index 90112423de..d4b51aa747 100644 --- a/convert_osm/src/osm_reader.rs +++ b/convert_osm/src/osm_reader.rs @@ -432,10 +432,6 @@ fn is_road(tags: &BTreeMap) -> bool { if !tags.contains_key(osm::HIGHWAY) { return false; } - // TODO Need to figure out how to ban cutting through in the contraction hierarchy. - if tags.get("access") == Some(&"private".to_string()) { - return false; - } if tags.get("access") == Some(&"no".to_string()) && tags.get("bus") != Some(&"yes".to_string()) && tags.get("highway") != Some(&"construction".to_string()) diff --git a/data/MANIFEST.txt b/data/MANIFEST.txt index 7bca6d3970..60375aed6c 100644 --- a/data/MANIFEST.txt +++ b/data/MANIFEST.txt @@ -1,16 +1,16 @@ data/input/austin/osm/Austin.osm,7c8d72cf97072af34cee665006b1e9e6,https://www.dropbox.com/s/8bedio4fpt6yvhg/Austin.osm.zip?dl=0 data/input/austin/osm/downtown_atx.osm,a30b0f460a481598e494f16a9d07a822,https://www.dropbox.com/s/tbadw3f0ex2zzx7/downtown_atx.osm.zip?dl=0 data/input/austin/osm/huge_austin.osm,fb166029fc8006bd20dc959fbbbde3b6,https://www.dropbox.com/s/4x421o9o8px0m6o/huge_austin.osm.zip?dl=0 -data/input/raw_maps/ballard.bin,5077acf87dac9cbf03dc5a831b09c494,https://www.dropbox.com/s/cni0pi80vsi6jpo/ballard.bin.zip?dl=0 -data/input/raw_maps/downtown.bin,00ac774561dfeaa76da0136c47cd3108,https://www.dropbox.com/s/cgvxjra4prycyaw/downtown.bin.zip?dl=0 +data/input/raw_maps/ballard.bin,8c3352b1d6a2952bf403b161fdb9c2ab,https://www.dropbox.com/s/rgt6klepk3xfs1x/ballard.bin.zip?dl=0 +data/input/raw_maps/downtown.bin,ccecda571647ad17bd31d7c5d5b9e58b,https://www.dropbox.com/s/wtutrifj8vctbw0/downtown.bin.zip?dl=0 data/input/raw_maps/downtown_atx.bin,0cd7ecaf548124710936a173ef617e0a,https://www.dropbox.com/s/0qiji6lmwmkpt6y/downtown_atx.bin.zip?dl=0 data/input/raw_maps/huge_austin.bin,5d0fdca0eb9bae5cd5e0955442972bd4,https://www.dropbox.com/s/zs6te7tq7vgjicc/huge_austin.bin.zip?dl=0 -data/input/raw_maps/huge_seattle.bin,e5477b0df3c2c678bdc6a00dfc742b4c,https://www.dropbox.com/s/phs694ygovx0wu4/huge_seattle.bin.zip?dl=0 -data/input/raw_maps/lakeslice.bin,02d9f53cff62ffc34be755c73d0e89c7,https://www.dropbox.com/s/rsy99usiwvfrbpg/lakeslice.bin.zip?dl=0 -data/input/raw_maps/montlake.bin,63254aaf2d839619129576547e16b9df,https://www.dropbox.com/s/15icwhf2kp3wbva/montlake.bin.zip?dl=0 -data/input/raw_maps/south_seattle.bin,c9e863cfb5c197fa2d06124105ef7277,https://www.dropbox.com/s/m9ycx3ewoug1o0p/south_seattle.bin.zip?dl=0 -data/input/raw_maps/udistrict.bin,f9d476b06d584464932c04bdad6f29c2,https://www.dropbox.com/s/3w1pa5d2jinl6hn/udistrict.bin.zip?dl=0 -data/input/raw_maps/west_seattle.bin,c45424a4493161bbff4d182448b6a777,https://www.dropbox.com/s/sqkyxgmvbi80ios/west_seattle.bin.zip?dl=0 +data/input/raw_maps/huge_seattle.bin,944fa2ab4aae181ae668b231ab028dde,https://www.dropbox.com/s/xc6sdim85381oas/huge_seattle.bin.zip?dl=0 +data/input/raw_maps/lakeslice.bin,18ec459138017761b880b8fae33fdc2c,https://www.dropbox.com/s/kdyprwckb56p3ql/lakeslice.bin.zip?dl=0 +data/input/raw_maps/montlake.bin,d3a5caa1997eabbfdc303d8eed03f282,https://www.dropbox.com/s/pdzvcngcp2b6tyz/montlake.bin.zip?dl=0 +data/input/raw_maps/south_seattle.bin,a6ac306e66c21f49a1872890587c0b89,https://www.dropbox.com/s/vbfj4byv80st7aa/south_seattle.bin.zip?dl=0 +data/input/raw_maps/udistrict.bin,cf9b6f8c2d9f2201b986966e1499deaf,https://www.dropbox.com/s/cz2cstcsab3swtr/udistrict.bin.zip?dl=0 +data/input/raw_maps/west_seattle.bin,44adf0c06d8ef8848b229c285cd4e663,https://www.dropbox.com/s/yayu6rzl4w9xb54/west_seattle.bin.zip?dl=0 data/input/screenshots/downtown/01x01.gif,873df007edd02e5967f3917cbe8f342f,https://www.dropbox.com/s/4209gvxkypinlqs/01x01.gif.zip?dl=0 data/input/screenshots/downtown/01x02.gif,ec8b579d6cb498a2a85bc2af8b51f390,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 @@ -65,7 +65,7 @@ data/input/screenshots/downtown/05x03_i2008.gif,b760a66fe6fdcfb9d8d3b5f0e87d5133 data/input/screenshots/downtown/05x04_i2058.gif,df5ff57e7958692b9fcf59ac1079db8d,https://www.dropbox.com/s/trpf4ycs0nup4fu/05x04_i2058.gif.zip?dl=0 data/input/screenshots/downtown/05x05_i53.gif,5dff9cf8a03709d88095bfa75a65ea8a,https://www.dropbox.com/s/6pn7udikopq47pa/05x05_i53.gif.zip?dl=0 data/input/screenshots/downtown/05x06_i143.gif,071b82649c8372e8bcbdfde13552dec2,https://www.dropbox.com/s/91bg983h517meci/05x06_i143.gif.zip?dl=0 -data/input/screenshots/downtown/05x07_i76.gif,26d8586b0a86e9a232831035cd5dbdb9,https://www.dropbox.com/s/xubktehz1tpymrg/05x07_i76.gif.zip?dl=0 +data/input/screenshots/downtown/05x07_i76.gif,2311c18875f962bc55323f790422a080,https://www.dropbox.com/s/kwkf996zyhknekt/05x07_i76.gif.zip?dl=0 data/input/screenshots/downtown/05x08_i1333.gif,5bedba5ff7f47e8c5ac0a3495e59706c,https://www.dropbox.com/s/o1q3dlbr3bduju8/05x08_i1333.gif.zip?dl=0 data/input/screenshots/downtown/05x09_i449.gif,56a5fcd591d16698c09a78b0b2e49001,https://www.dropbox.com/s/uspx3un9qk0bfml/05x09_i449.gif.zip?dl=0 data/input/screenshots/downtown/05x10_i1290.gif,bdd2f2fe491282df150943fe6a1c3431,https://www.dropbox.com/s/ymxj08395fce40p/05x10_i1290.gif.zip?dl=0 @@ -77,10 +77,10 @@ data/input/screenshots/downtown/06x03_i173.gif,e5580742da03747d4106c2df11d9ad6f, data/input/screenshots/downtown/06x04_i172.gif,e273d024c03ca6671935f9967101913c,https://www.dropbox.com/s/12g8qw138nac1ai/06x04_i172.gif.zip?dl=0 data/input/screenshots/downtown/06x05_i156.gif,6bc421036c5e69eed6bb33f79d5716ee,https://www.dropbox.com/s/3hmfwna9rdaakjq/06x05_i156.gif.zip?dl=0 data/input/screenshots/downtown/06x06_i1660.gif,5c1d05f2757ffb57112fbbaefd81365e,https://www.dropbox.com/s/jj274lw79cml1ug/06x06_i1660.gif.zip?dl=0 -data/input/screenshots/downtown/06x07_i83.gif,e735555375fdf491020f79efbcc2724d,https://www.dropbox.com/s/axulkj801d21cys/06x07_i83.gif.zip?dl=0 -data/input/screenshots/downtown/06x08_i16.gif,9b0159d66bce99f5c30dfe475edf97a0,https://www.dropbox.com/s/vjb480gf7go3vvj/06x08_i16.gif.zip?dl=0 -data/input/screenshots/downtown/06x09_i31.gif,a14188b372edd2fb0906e0743042314d,https://www.dropbox.com/s/bgxq2wlrmmkns1n/06x09_i31.gif.zip?dl=0 -data/input/screenshots/downtown/06x10_i82.gif,37fe70e21f7ae546451da1fc03c02c59,https://www.dropbox.com/s/jqrko5ls76b6m65/06x10_i82.gif.zip?dl=0 +data/input/screenshots/downtown/06x07_i83.gif,58830f958cbd6d0f862e889a84ea8086,https://www.dropbox.com/s/r8qqtdpxakq6xip/06x07_i83.gif.zip?dl=0 +data/input/screenshots/downtown/06x08_i16.gif,a7c96d34f68fff898227453dfab37ec3,https://www.dropbox.com/s/eqrf664rdlc54fv/06x08_i16.gif.zip?dl=0 +data/input/screenshots/downtown/06x09_i31.gif,473145593f90f8684086abafeb8878e0,https://www.dropbox.com/s/msbeyaiazbkklnx/06x09_i31.gif.zip?dl=0 +data/input/screenshots/downtown/06x10_i82.gif,672ebce099bbe20f90ca66d7f431cd5f,https://www.dropbox.com/s/g5n2dhs5yvhcgdp/06x10_i82.gif.zip?dl=0 data/input/screenshots/downtown/06x11_i293.gif,9a58f2d827c605a22cf6c26a1158754a,https://www.dropbox.com/s/7x9j93rej5hh0la/06x11_i293.gif.zip?dl=0 data/input/screenshots/downtown/06x12_i2054.gif,31e1ff2257ee6a5798867eb55d829ed1,https://www.dropbox.com/s/x3y4lpvfmmcfp41/06x12_i2054.gif.zip?dl=0 data/input/screenshots/downtown/07x01_i0.gif,d3bcb890f697c13ef6d886fbe43865cd,https://www.dropbox.com/s/n6unj0fw6vhx0d4/07x01_i0.gif.zip?dl=0 @@ -88,19 +88,19 @@ data/input/screenshots/downtown/07x02_i25.gif,f21d58b67a7a22bb865cc9212d8e4aab,h data/input/screenshots/downtown/07x03_i70.gif,5a6e9211c13cf604b6d54d43dd36e7fe,https://www.dropbox.com/s/ze84uo5l4i68ks6/07x03_i70.gif.zip?dl=0 data/input/screenshots/downtown/07x04_i17.gif,51afdb1a8bb5743987c06a3b9beb5dda,https://www.dropbox.com/s/7sg3eost9w8uyfu/07x04_i17.gif.zip?dl=0 data/input/screenshots/downtown/07x05_i19.gif,49535e34eff8528354c24325236cd76b,https://www.dropbox.com/s/m0nzhutd9v7hd9g/07x05_i19.gif.zip?dl=0 -data/input/screenshots/downtown/07x06_i19.gif,b86e88b375e0f53773f61b1853f67f79,https://www.dropbox.com/s/mrz05ks3p0ehxgv/07x06_i19.gif.zip?dl=0 +data/input/screenshots/downtown/07x06_i19.gif,2aa7b4ac35b37fdd7d8d763fad8ad8f9,https://www.dropbox.com/s/35aptzyckb8sldz/07x06_i19.gif.zip?dl=0 data/input/screenshots/downtown/07x07_i1364.gif,e0ee7338cd783d612600b9acca755955,https://www.dropbox.com/s/mwgsqqraglujbw8/07x07_i1364.gif.zip?dl=0 data/input/screenshots/downtown/07x08_i15.gif,fa7b97a154cb2524c7873a5363148eed,https://www.dropbox.com/s/9nhz9mdj95buunl/07x08_i15.gif.zip?dl=0 data/input/screenshots/downtown/07x09_i31.gif,e261e79006a4c201b8ef1a1852dcfd03,https://www.dropbox.com/s/zm6qloxcdk0lltg/07x09_i31.gif.zip?dl=0 data/input/screenshots/downtown/07x10_i32.gif,8f55fec528b91ee071ebbe4db77b9a13,https://www.dropbox.com/s/cpefugyq4rayjzo/07x10_i32.gif.zip?dl=0 -data/input/screenshots/downtown/07x11_i33.gif,3233818f45785c0ee5019abfef0b241c,https://www.dropbox.com/s/vclpflw4orpz4kq/07x11_i33.gif.zip?dl=0 +data/input/screenshots/downtown/07x11_i33.gif,69bb78634c42382d287fe07bfda62fb6,https://www.dropbox.com/s/5uwgsobq3z1fr3n/07x11_i33.gif.zip?dl=0 data/input/screenshots/downtown/07x12_i785.gif,cd3b11113a160f0db28d21fb0a2ce600,https://www.dropbox.com/s/pu9t6uic7kdebmq/07x12_i785.gif.zip?dl=0 data/input/screenshots/downtown/08x01_i1.gif,81550571986dd6906f563c36f9b5d3c9,https://www.dropbox.com/s/dfevhj1itlc14kk/08x01_i1.gif.zip?dl=0 -data/input/screenshots/downtown/08x02_i1549.gif,45d9fa7210d48fab178940764868db9f,https://www.dropbox.com/s/ko8e8s7vess5r56/08x02_i1549.gif.zip?dl=0 -data/input/screenshots/downtown/08x03_i218.gif,2f8448fda96ef13e87c8030770c7f01f,https://www.dropbox.com/s/3wnih4esly6qedb/08x03_i218.gif.zip?dl=0 -data/input/screenshots/downtown/08x04_i209.gif,136b1abd41fa0ffa10874735c84ffe7c,https://www.dropbox.com/s/weyjgpixirdulvb/08x04_i209.gif.zip?dl=0 +data/input/screenshots/downtown/08x02_i1549.gif,efc9578b2d1c84603fb901899d1b59fa,https://www.dropbox.com/s/o98vywhqxhdfkmx/08x02_i1549.gif.zip?dl=0 +data/input/screenshots/downtown/08x03_i218.gif,2cd8bfac4a79772073253d64916acc2f,https://www.dropbox.com/s/ujwh110pfycngri/08x03_i218.gif.zip?dl=0 +data/input/screenshots/downtown/08x04_i209.gif,65188834c6b854830d036578d1dc883d,https://www.dropbox.com/s/bv3ceuflyn802w3/08x04_i209.gif.zip?dl=0 data/input/screenshots/downtown/08x05_i125.gif,322da6a58704c185aa6b104df666dece,https://www.dropbox.com/s/6nw3d5zweusdwkc/08x05_i125.gif.zip?dl=0 -data/input/screenshots/downtown/08x06_i122.gif,44cf52ac50f972341f626f0844cce395,https://www.dropbox.com/s/i1sr35a4jcnbf0f/08x06_i122.gif.zip?dl=0 +data/input/screenshots/downtown/08x06_i122.gif,0ca46469c9301615b385c833340c63b4,https://www.dropbox.com/s/uhw4jo7cclekpq2/08x06_i122.gif.zip?dl=0 data/input/screenshots/downtown/08x07_i113.gif,d074a53fba42fb6ac1ab17f5534418e1,https://www.dropbox.com/s/yd4lvd4wygt2zvw/08x07_i113.gif.zip?dl=0 data/input/screenshots/downtown/08x08_i99.gif,0edbffc09087f6fb001f63c821ea8d4d,https://www.dropbox.com/s/yll2vscq4zmscr6/08x08_i99.gif.zip?dl=0 data/input/screenshots/downtown/08x09_i118.gif,dff83d001ae81e0a82e4cec7f1930a27,https://www.dropbox.com/s/6e7sc5cqynowhez/08x09_i118.gif.zip?dl=0 @@ -132,102 +132,102 @@ data/input/screenshots/downtown/10x10_i480.gif,614f257e2098908589b5dbab808b4a36, data/input/screenshots/downtown/10x11_i310.gif,3f5ab6d315b1c58c2a3481e8512219c3,https://www.dropbox.com/s/8n8hsjl6rih2jx5/10x11_i310.gif.zip?dl=0 data/input/screenshots/downtown/10x12_i925.gif,611498fe40b157c0488a907be030769b,https://www.dropbox.com/s/vf6oighedzml7o5/10x12_i925.gif.zip?dl=0 data/input/screenshots/downtown/combine.sh,db60d5e5a221311e073343e52012802a,https://www.dropbox.com/s/214dtjy7scdcp2l/combine.sh.zip?dl=0 -data/input/screenshots/lakeslice/01x01_i1357.gif,b4c6251a3ca7ccccf93622ad607cff0f,https://www.dropbox.com/s/xgyyio5l4zfc6x4/01x01_i1357.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x02_i163.gif,f945efe4a093801b972e59b9ddc7b02d,https://www.dropbox.com/s/ir8payetpzt168b/01x02_i163.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x03_i1.gif,9ca902d6ef2c81b0fe1f083b81926bc2,https://www.dropbox.com/s/dwool88jsttp6c1/01x03_i1.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x04_i1423.gif,c3f1622224cb61d6a08501288f55e8fc,https://www.dropbox.com/s/tpyqefqmtky5ig1/01x04_i1423.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x05_i36.gif,5bbfde156a268307267fb201c78654e6,https://www.dropbox.com/s/pgj7jpiwq43cjwp/01x05_i36.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x01_i1380.gif,b4c6251a3ca7ccccf93622ad607cff0f,https://www.dropbox.com/s/yr65nlqbgm00ms5/01x01_i1380.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x02_i165.gif,9c8cc74e3e9f3959947fdcdd264cdcc2,https://www.dropbox.com/s/zwoln1kv9se85rd/01x02_i165.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x03_i1.gif,2bb1b99de850143838c65f194991fe39,https://www.dropbox.com/s/sgdqeh4p9fgsfsk/01x03_i1.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x04_i1447.gif,1ff0d3848c07011db3a2f2851a8df400,https://www.dropbox.com/s/9r3hxr4uo2tb9ab/01x04_i1447.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x05_i36.gif,d2a136264d2bba1c90e4dda453d877ee,https://www.dropbox.com/s/6uvv43kp9s1vg7q/01x05_i36.gif.zip?dl=0 data/input/screenshots/lakeslice/01x06_i37.gif,b261b9df0216506c2a1a433222304581,https://www.dropbox.com/s/2e7zdi1ym4iwfh8/01x06_i37.gif.zip?dl=0 data/input/screenshots/lakeslice/01x07_i27.gif,8f6cc6acf4bc5b21972f15e9f8edec29,https://www.dropbox.com/s/j58l09hua562ejj/01x07_i27.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x08_i420.gif,0d9a342fa6525a04e9ce568f1917b935,https://www.dropbox.com/s/zktwjx57ylu5azn/01x08_i420.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x09_i349.gif,d08478461685b70d91c79af6651cc05d,https://www.dropbox.com/s/vtb5anvldevna0z/01x09_i349.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x10_i76.gif,57b8bdd989589dc8a3afc72912c9b8e9,https://www.dropbox.com/s/lr4lkh7khzqmkxv/01x10_i76.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x11_i147.gif,619a4eeeb4e9332e9c0e8c537f58e1c7,https://www.dropbox.com/s/u665i8v9yu8qudg/01x11_i147.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x08_i423.gif,0d9a342fa6525a04e9ce568f1917b935,https://www.dropbox.com/s/d8u4bzxppmz59x0/01x08_i423.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x09_i351.gif,d08478461685b70d91c79af6651cc05d,https://www.dropbox.com/s/8s9aubvib30wp6z/01x09_i351.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x10_i78.gif,57b8bdd989589dc8a3afc72912c9b8e9,https://www.dropbox.com/s/wce6tv7m64ma7ge/01x10_i78.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x11_i149.gif,619a4eeeb4e9332e9c0e8c537f58e1c7,https://www.dropbox.com/s/gjod370y1towgkb/01x11_i149.gif.zip?dl=0 data/input/screenshots/lakeslice/01x12_i3.gif,38c51b3a596a5bafef66faa0a2a2245e,https://www.dropbox.com/s/si2ohev472hs918/01x12_i3.gif.zip?dl=0 data/input/screenshots/lakeslice/01x13_i38.gif,7e821daa867b570870d57d84834b22ea,https://www.dropbox.com/s/4saxlmuv5m064aj/01x13_i38.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x14_i348.gif,74820411209897b6e706254bba7c355a,https://www.dropbox.com/s/ahunkt3xt51jkfp/01x14_i348.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x15_i347.gif,b4c61f22237bcf2e47c61c1641be8dd3,https://www.dropbox.com/s/7qqied0nqcan0hb/01x15_i347.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x16_i215.gif,65dc56c10d5c3fd6c7cce17e4155ea53,https://www.dropbox.com/s/i9pklvvln4hp9qy/01x16_i215.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x17_i214.gif,634be0334458c1cf12bb4a37a027e5ad,https://www.dropbox.com/s/wjh6vzhvz4uryri/01x17_i214.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x14_i350.gif,74820411209897b6e706254bba7c355a,https://www.dropbox.com/s/l3ygwlqi8wbmz98/01x14_i350.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x15_i349.gif,b4c61f22237bcf2e47c61c1641be8dd3,https://www.dropbox.com/s/dixyehmt9643oxl/01x15_i349.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x16_i217.gif,65dc56c10d5c3fd6c7cce17e4155ea53,https://www.dropbox.com/s/p8dmbkk5p9sqxfy/01x16_i217.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x17_i216.gif,634be0334458c1cf12bb4a37a027e5ad,https://www.dropbox.com/s/4j6cayhem0o2uzz/01x17_i216.gif.zip?dl=0 data/input/screenshots/lakeslice/01x18_i2.gif,066f532397b5a3d0b8e9a8370ef051a7,https://www.dropbox.com/s/vovux9ubpbbspim/01x18_i2.gif.zip?dl=0 data/input/screenshots/lakeslice/01x19_i5.gif,5f61552eb2e24340ec61dd2f9e1065ab,https://www.dropbox.com/s/rgvsylaezc79chi/01x19_i5.gif.zip?dl=0 data/input/screenshots/lakeslice/01x20_i21.gif,269b055ef40f7e6844d19325e7fcc559,https://www.dropbox.com/s/nlqy0c3wmw0hsr3/01x20_i21.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x21_i447.gif,bef26d24b06a5bc720cacfa59b1265b0,https://www.dropbox.com/s/qvf7on1d7kaudhx/01x21_i447.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x22_i450.gif,a17d3b918623fad35294cdcc81b0a722,https://www.dropbox.com/s/t9jnyt0vuo5c5wc/01x22_i450.gif.zip?dl=0 -data/input/screenshots/lakeslice/01x23_i1184.gif,b2fd052c80952ab888b47715bc74ab81,https://www.dropbox.com/s/yffikpxlx9mncm8/01x23_i1184.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x01_i328.gif,6d636e7fe2bc4b997433bcdd49b921dd,https://www.dropbox.com/s/m6pcxp0oihu79qd/02x01_i328.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x02_i166.gif,be031b75d61584d32498b9798bb2178e,https://www.dropbox.com/s/1lfc413k4ojtq26/02x02_i166.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x03_i300.gif,3947c530f673710068f009ae3b006cff,https://www.dropbox.com/s/ymoda4p8236o4hr/02x03_i300.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x04_i1237.gif,1fb015af3e5d9225d135068ef4471d6d,https://www.dropbox.com/s/q7mntfqldaxjjgy/02x04_i1237.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x05_i909.gif,3ce48a08638a140c84600efc6b33912f,https://www.dropbox.com/s/q4ds4of9o3ule1z/02x05_i909.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x06_i704.gif,2406bfef3597d837173daae8a57c8e78,https://www.dropbox.com/s/qdp6zfu6t4dum7d/02x06_i704.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x07_i123.gif,9ec5dded434289bf42a844e05eed870f,https://www.dropbox.com/s/jolmmqajirptk4w/02x07_i123.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x08_i201.gif,0779910a2db4f030da9fc6b9ff875108,https://www.dropbox.com/s/tlhrtxvp4satdja/02x08_i201.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x09_i209.gif,377669e789d2ff5af097ac6e90842431,https://www.dropbox.com/s/5660h3wauptx00x/02x09_i209.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x10_i79.gif,25be2a09fd24e24c1e66d957039774b8,https://www.dropbox.com/s/2zp2amb17vw3tnb/02x10_i79.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x11_i315.gif,4951fc64630dd04af61cfdce18fca490,https://www.dropbox.com/s/tnmlj9z3b8x5dfa/02x11_i315.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x12_i313.gif,331ac1a4677c8f8f82209efccf6e38e6,https://www.dropbox.com/s/zhvu51zx0eosoc6/02x12_i313.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x21_i450.gif,bef26d24b06a5bc720cacfa59b1265b0,https://www.dropbox.com/s/nh6bipykdy3ehp8/01x21_i450.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x22_i453.gif,a17d3b918623fad35294cdcc81b0a722,https://www.dropbox.com/s/deeybpq0t1pabj3/01x22_i453.gif.zip?dl=0 +data/input/screenshots/lakeslice/01x23_i1200.gif,b2fd052c80952ab888b47715bc74ab81,https://www.dropbox.com/s/iwwjksf1mdyt757/01x23_i1200.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x01_i330.gif,6d636e7fe2bc4b997433bcdd49b921dd,https://www.dropbox.com/s/pahpiqljygqhw6g/02x01_i330.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x02_i168.gif,be031b75d61584d32498b9798bb2178e,https://www.dropbox.com/s/zom2kflif3e16kf/02x02_i168.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x03_i302.gif,895aedd8934b6d9949b664b390fd6b79,https://www.dropbox.com/s/gnmdufhv0gp479k/02x03_i302.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x04_i1254.gif,ec62c8788ef902749f663d0da26242cb,https://www.dropbox.com/s/f2alpj2cs75oc3e/02x04_i1254.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x05_i925.gif,8bb85d9d47122bec13bcd9f7d6e8a717,https://www.dropbox.com/s/z0js73u3frywr4t/02x05_i925.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x06_i719.gif,2406bfef3597d837173daae8a57c8e78,https://www.dropbox.com/s/7lrndp8c7hn6ew9/02x06_i719.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x07_i125.gif,9ec5dded434289bf42a844e05eed870f,https://www.dropbox.com/s/li1dionwxwc4ocg/02x07_i125.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x08_i203.gif,0779910a2db4f030da9fc6b9ff875108,https://www.dropbox.com/s/qvct1p3srqr08fk/02x08_i203.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x09_i211.gif,377669e789d2ff5af097ac6e90842431,https://www.dropbox.com/s/lk9i2dirdo0sygx/02x09_i211.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x10_i81.gif,25be2a09fd24e24c1e66d957039774b8,https://www.dropbox.com/s/blsa9ilrg2km3ai/02x10_i81.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x11_i317.gif,4951fc64630dd04af61cfdce18fca490,https://www.dropbox.com/s/t3the1r4nk61yht/02x11_i317.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x12_i315.gif,331ac1a4677c8f8f82209efccf6e38e6,https://www.dropbox.com/s/tgn743v55v7t847/02x12_i315.gif.zip?dl=0 data/input/screenshots/lakeslice/02x13_i45.gif,c36ff290d76bce4627537c93a47807ee,https://www.dropbox.com/s/gwrzihxnuso37je/02x13_i45.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x14_i312.gif,c9c5221d80269c4243d07f0150368345,https://www.dropbox.com/s/tzeiss7tlyzol2c/02x14_i312.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x15_i239.gif,cb443c69b2f4bedd249ccee058ff678c,https://www.dropbox.com/s/3mas7u9eaeg4e91/02x15_i239.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x16_i221.gif,128389493179f30cdebb53bc7343edd5,https://www.dropbox.com/s/6990etqcaitmc0m/02x16_i221.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x17_i235.gif,9fd02a975b054e6e73e339403bfdf996,https://www.dropbox.com/s/s9a4ly7msu14ide/02x17_i235.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x18_i236.gif,cbb51760209bb6e2b096bc22c3249eff,https://www.dropbox.com/s/hlrwg5su4c1nkh4/02x18_i236.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x14_i314.gif,c9c5221d80269c4243d07f0150368345,https://www.dropbox.com/s/j3r2lbv9bjtbeg2/02x14_i314.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x15_i241.gif,cb443c69b2f4bedd249ccee058ff678c,https://www.dropbox.com/s/zc6708bowx5yx4t/02x15_i241.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x16_i223.gif,128389493179f30cdebb53bc7343edd5,https://www.dropbox.com/s/skcxhyeqhi1njhg/02x16_i223.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x17_i237.gif,9fd02a975b054e6e73e339403bfdf996,https://www.dropbox.com/s/l4yazac7a6fxbok/02x17_i237.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x18_i238.gif,cbb51760209bb6e2b096bc22c3249eff,https://www.dropbox.com/s/7tjlld70863ilx7/02x18_i238.gif.zip?dl=0 data/input/screenshots/lakeslice/02x19_i12.gif,5c764b767a0fb3e8f486a7f5d75b9628,https://www.dropbox.com/s/107qh50152prbol/02x19_i12.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x20_i190.gif,17f6a5c8cecd6a6a35504563f49fad3c,https://www.dropbox.com/s/lk88l5vbs75r2av/02x20_i190.gif.zip?dl=0 -data/input/screenshots/lakeslice/02x21_i229.gif,970751fd0225bb59bcbe44acfc913caa,https://www.dropbox.com/s/lbq4arlhmhk8wz8/02x21_i229.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x20_i192.gif,17f6a5c8cecd6a6a35504563f49fad3c,https://www.dropbox.com/s/6veyos0h9bmdqeo/02x20_i192.gif.zip?dl=0 +data/input/screenshots/lakeslice/02x21_i231.gif,970751fd0225bb59bcbe44acfc913caa,https://www.dropbox.com/s/iqgqqc2dmiqc0hq/02x21_i231.gif.zip?dl=0 data/input/screenshots/lakeslice/02x22_i32.gif,2c778d2abd23a9a274ab99cea873613d,https://www.dropbox.com/s/b2ddr0kjtwuadm5/02x22_i32.gif.zip?dl=0 data/input/screenshots/lakeslice/02x23_i33.gif,689357050dd43d164c19d59e0876a45c,https://www.dropbox.com/s/6i392lkqdijjyex/02x23_i33.gif.zip?dl=0 data/input/screenshots/lakeslice/03x01.gif,da70eeb59d35438f548685c42ce1f2d0,https://www.dropbox.com/s/5ijnumye9627six/03x01.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x02_i590.gif,98b7fae5c5333b63ea1a4143dd72ecad,https://www.dropbox.com/s/jyz35d3a3v6qivo/03x02_i590.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x03.gif,91e10d87663f54d0d6123422a4eb83a6,https://www.dropbox.com/s/y3s3juhevw8gctm/03x03.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x04.gif,10941e6b1bda8b61555f830f58322b37,https://www.dropbox.com/s/e46x5875g3z50ta/03x04.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x05_i1244.gif,93205bde0984c43b60e2d7b5baf25c5b,https://www.dropbox.com/s/nvfk4x0hqn2a1tc/03x05_i1244.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x06_i366.gif,2cb51203c77581e10aee058426648c70,https://www.dropbox.com/s/ltkbl0r0s0imsqg/03x06_i366.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x07_i120.gif,461b1de0d077889a8a51a63804997069,https://www.dropbox.com/s/1ukjemqvj5x86k5/03x07_i120.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x02_i76.gif,1fba2aa6ffd465cc6c1a9a9e8dba5c63,https://www.dropbox.com/s/pr56p02jejld6qb/03x02_i76.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x03_i357.gif,90cd4dee14f94211d4a0757c3a236580,https://www.dropbox.com/s/v2gb9y7eikhn8ps/03x03_i357.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x04_i633.gif,ffca0d69ae1a30c3716e3aa8ef71b51c,https://www.dropbox.com/s/d9zf5vjqxvq5fho/03x04_i633.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x05_i572.gif,c6fa2acc8aa385709812a1b6478256a7,https://www.dropbox.com/s/6u86mscw6w0du4v/03x05_i572.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x06_i369.gif,3dc8c3b979f40e39882aeb1e8df1b7e1,https://www.dropbox.com/s/0f2yfkqtre7ei9d/03x06_i369.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x07_i122.gif,461b1de0d077889a8a51a63804997069,https://www.dropbox.com/s/7elq5wvse840p6q/03x07_i122.gif.zip?dl=0 data/input/screenshots/lakeslice/03x08_i67.gif,e5daaa1231ceb83a721941f4dfdc2dcd,https://www.dropbox.com/s/rbepa1xao9xi24h/03x08_i67.gif.zip?dl=0 data/input/screenshots/lakeslice/03x09_i68.gif,7d40b1866cfe9c1f1241f102465cd596,https://www.dropbox.com/s/nopeca2iaubwx6j/03x09_i68.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x10_i86.gif,8a02c38ff85e689a1f2942c6f4aabd4b,https://www.dropbox.com/s/8vbh9qmoj0mrxdo/03x10_i86.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x11_i154.gif,37a1bbb2bc9e1a48ed076afadf4580c9,https://www.dropbox.com/s/ded3pb31e8wj2w5/03x11_i154.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x12_i152.gif,5278471890a200c91b8cec0f7c8ebf0a,https://www.dropbox.com/s/yrowb22j6rc2kpj/03x12_i152.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x10_i88.gif,8a02c38ff85e689a1f2942c6f4aabd4b,https://www.dropbox.com/s/k0clfr0ht3tcvm1/03x10_i88.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x11_i156.gif,37a1bbb2bc9e1a48ed076afadf4580c9,https://www.dropbox.com/s/ihcaz4pdsv6giv5/03x11_i156.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x12_i154.gif,5278471890a200c91b8cec0f7c8ebf0a,https://www.dropbox.com/s/79qdlmpea42jnz7/03x12_i154.gif.zip?dl=0 data/input/screenshots/lakeslice/03x13_i31.gif,9a8711ff2cb95c30a72e55d2169a2294,https://www.dropbox.com/s/hp3osky3hakf13n/03x13_i31.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x14_i149.gif,03d2c41a8bd32a8daae6e325b333166e,https://www.dropbox.com/s/i5l01eow19k4vte/03x14_i149.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x15_i170.gif,af4b553210729d0a5577c051fabc129d,https://www.dropbox.com/s/folq9f6bmd3ofra/03x15_i170.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x14_i151.gif,03d2c41a8bd32a8daae6e325b333166e,https://www.dropbox.com/s/zaae4m9vdrc4zbo/03x14_i151.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x15_i172.gif,af4b553210729d0a5577c051fabc129d,https://www.dropbox.com/s/emzgrljliwzmv07/03x15_i172.gif.zip?dl=0 data/input/screenshots/lakeslice/03x16_i28.gif,7c80597a35f9106744908e6b91dbec53,https://www.dropbox.com/s/r0nbqg39dj6q6le/03x16_i28.gif.zip?dl=0 data/input/screenshots/lakeslice/03x17_i28.gif,7f7f4fe8672d85b49c90ce7ba3e4627c,https://www.dropbox.com/s/utv6m9vb3aaboic/03x17_i28.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x18_i279.gif,d3c956c5478b93b02772dc139825a779,https://www.dropbox.com/s/yqs0w3p0i47ehhq/03x18_i279.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x18_i281.gif,d3c956c5478b93b02772dc139825a779,https://www.dropbox.com/s/sx0tzhgelxyz29n/03x18_i281.gif.zip?dl=0 data/input/screenshots/lakeslice/03x19_i13.gif,15a6457d45632a0b738136f124ff96a3,https://www.dropbox.com/s/71bqluoqb68awz2/03x19_i13.gif.zip?dl=0 data/input/screenshots/lakeslice/03x20_i71.gif,700e2e08eddf6ed9c2b9168896eaa4ea,https://www.dropbox.com/s/gcmjm4atrzicphb/03x20_i71.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x21_i269.gif,b0b037489733d2f38666916ecee71c74,https://www.dropbox.com/s/ohqr6mdl4e0cbf6/03x21_i269.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x22_i274.gif,e46511f44cb99cddbe0fb9c14130bf1e,https://www.dropbox.com/s/tiyegp61nrblm5o/03x22_i274.gif.zip?dl=0 -data/input/screenshots/lakeslice/03x23_i276.gif,e1f0093b9d74e30cd825259c9d335b08,https://www.dropbox.com/s/vxca24ldnk7br5z/03x23_i276.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x01_i117.gif,7b6b1836babba3ca42a6b9c5924f522e,https://www.dropbox.com/s/9icftm4f1dp9ehn/04x01_i117.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x02_i115.gif,2d8e905574175d3106e6f2e99e1c7810,https://www.dropbox.com/s/1kayafnocmrzyhh/04x02_i115.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x03_i112.gif,2cabdbdcfc21e3f66c2faea3bebe62e6,https://www.dropbox.com/s/b64ehp0p1g9hwde/04x03_i112.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x04_i111.gif,ba75998ee7e991d6f2db48f9ddb14e9c,https://www.dropbox.com/s/21r8bwvgt1y9s3z/04x04_i111.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x05_i108.gif,bd19f047712785fe416323ced5ce9ccc,https://www.dropbox.com/s/w09nkj1y4q7w4mj/04x05_i108.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x21_i271.gif,b0b037489733d2f38666916ecee71c74,https://www.dropbox.com/s/ijip1x51vprudrb/03x21_i271.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x22_i276.gif,e46511f44cb99cddbe0fb9c14130bf1e,https://www.dropbox.com/s/1g6hfxjvidedljn/03x22_i276.gif.zip?dl=0 +data/input/screenshots/lakeslice/03x23_i278.gif,e1f0093b9d74e30cd825259c9d335b08,https://www.dropbox.com/s/2zo3m653ip7rocy/03x23_i278.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x01_i119.gif,7b6b1836babba3ca42a6b9c5924f522e,https://www.dropbox.com/s/lhoj11tlznjnhzc/04x01_i119.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x02_i117.gif,977f4428999c829fdfc6d562888e68f1,https://www.dropbox.com/s/cnwbfnrcfmxrpft/04x02_i117.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x03_i114.gif,54c8674c3a08299e95aa68304b895a11,https://www.dropbox.com/s/7jc2qjm8pls6n0c/04x03_i114.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x04_i113.gif,cb129b35c0aac8bbd638376a4414802a,https://www.dropbox.com/s/p9mpugvupx66mum/04x04_i113.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x05_i110.gif,852e65cc610165af7cd05255f313fea5,https://www.dropbox.com/s/o6cpknw422wx8s3/04x05_i110.gif.zip?dl=0 data/input/screenshots/lakeslice/04x06_i30.gif,f9226b3b1f1dc64d49962f9822429b9a,https://www.dropbox.com/s/xfmafq1tytw8tow/04x06_i30.gif.zip?dl=0 data/input/screenshots/lakeslice/04x07_i24.gif,4291c38b39f3a0faf6d4169c174f48f2,https://www.dropbox.com/s/mwmohhgezax4r15/04x07_i24.gif.zip?dl=0 data/input/screenshots/lakeslice/04x08_i26.gif,92e6ea05df4fc7f37b7f8ecbc4d9db54,https://www.dropbox.com/s/gpktce18nzsluvb/04x08_i26.gif.zip?dl=0 data/input/screenshots/lakeslice/04x09_i64.gif,69e74185fc48117201dba2c14f5b53ce,https://www.dropbox.com/s/9unlorlmpl7jki2/04x09_i64.gif.zip?dl=0 data/input/screenshots/lakeslice/04x10_i63.gif,9ce1f1c5e8be4c3d225aba473f5c3814,https://www.dropbox.com/s/fh0l5h5u9ras8lb/04x10_i63.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x11_i118.gif,670649a3c1f2aa08be6a2c88401a3789,https://www.dropbox.com/s/9vko1xl9onmn9kx/04x11_i118.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x12_i458.gif,d983e268ce3d3512c2d30d243b9be8e9,https://www.dropbox.com/s/4qz1eyvsqjvwidx/04x12_i458.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x13_i128.gif,e9ac7578e29d34a78589f2852747d3cb,https://www.dropbox.com/s/w85x3h4rzk6uqr2/04x13_i128.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x14_i173.gif,687e19540b8da97e3cd98a7e14dee891,https://www.dropbox.com/s/mtcu8twfi4ra5um/04x14_i173.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x15_i172.gif,a5147305ad6acf69ea04459d8006f6de,https://www.dropbox.com/s/vgcuaklgp3pdog0/04x15_i172.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x16_i1295.gif,ff3d00a01f7f9e4561f9ba900f5d603e,https://www.dropbox.com/s/0mi5wtys1xckbke/04x16_i1295.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x11_i120.gif,670649a3c1f2aa08be6a2c88401a3789,https://www.dropbox.com/s/4mwmae7cjygs1hm/04x11_i120.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x12_i461.gif,d983e268ce3d3512c2d30d243b9be8e9,https://www.dropbox.com/s/0s3nivk3dq09b8j/04x12_i461.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x13_i130.gif,e9ac7578e29d34a78589f2852747d3cb,https://www.dropbox.com/s/w1zm2ti77loiyrg/04x13_i130.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x14_i175.gif,687e19540b8da97e3cd98a7e14dee891,https://www.dropbox.com/s/yb1i83a673luke3/04x14_i175.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x15_i174.gif,a5147305ad6acf69ea04459d8006f6de,https://www.dropbox.com/s/87mgyb1eprcddds/04x15_i174.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x16_i1316.gif,ff3d00a01f7f9e4561f9ba900f5d603e,https://www.dropbox.com/s/l31r1ooe6h7ypb3/04x16_i1316.gif.zip?dl=0 data/input/screenshots/lakeslice/04x17.gif,cd9e12b8507f86e6572ae19fb6b4dea9,https://www.dropbox.com/s/tnxoukvvijytzel/04x17.gif.zip?dl=0 data/input/screenshots/lakeslice/04x18.gif,710c2ac084e1cfcc7b76d649607f320c,https://www.dropbox.com/s/yh63ydv2tzxo9is/04x18.gif.zip?dl=0 data/input/screenshots/lakeslice/04x19_i14.gif,b46228ced53ba0d79ee2c471e6551bbb,https://www.dropbox.com/s/0bexsapt2k0ugkw/04x19_i14.gif.zip?dl=0 -data/input/screenshots/lakeslice/04x20_i1049.gif,034a0e7429a3af7005c5e8fa4d4c140f,https://www.dropbox.com/s/5trx45kj8mcsh8s/04x20_i1049.gif.zip?dl=0 +data/input/screenshots/lakeslice/04x20_i1065.gif,034a0e7429a3af7005c5e8fa4d4c140f,https://www.dropbox.com/s/052gh5s90cqoh67/04x20_i1065.gif.zip?dl=0 data/input/screenshots/lakeslice/04x21.gif,d6fbe7e7c0968f42e8ba1edfddaba6c2,https://www.dropbox.com/s/neynw9s07o4q1m2/04x21.gif.zip?dl=0 data/input/screenshots/lakeslice/04x22.gif,9d306b892f20b92a0812a67a9289f334,https://www.dropbox.com/s/6j3q52n5tzrs7nk/04x22.gif.zip?dl=0 data/input/screenshots/lakeslice/04x23_i0.gif,a992f2dc8dd80fbe323bed2f803ef829,https://www.dropbox.com/s/36hepxjecc8w79t/04x23_i0.gif.zip?dl=0 data/input/screenshots/lakeslice/05x01.gif,5b6403c119128b6108a7bc7d21996e92,https://www.dropbox.com/s/pj58sr18r0ut2fn/05x01.gif.zip?dl=0 -data/input/screenshots/lakeslice/05x02_i162.gif,38c2cc99a04d840d90a4ef88d41d7dd8,https://www.dropbox.com/s/yv6ci5muhrk9dvf/05x02_i162.gif.zip?dl=0 -data/input/screenshots/lakeslice/05x03_i868.gif,b088d70b28523ce9ae420a7f6653381c,https://www.dropbox.com/s/91wl1ncej0i8pnm/05x03_i868.gif.zip?dl=0 -data/input/screenshots/lakeslice/05x04_i640.gif,0d673e364c723de34c1b903fb029b3fa,https://www.dropbox.com/s/he1u5bnoywnd30r/05x04_i640.gif.zip?dl=0 +data/input/screenshots/lakeslice/05x02_i164.gif,38c2cc99a04d840d90a4ef88d41d7dd8,https://www.dropbox.com/s/pfkc0x0ljphc0cd/05x02_i164.gif.zip?dl=0 +data/input/screenshots/lakeslice/05x03_i884.gif,b088d70b28523ce9ae420a7f6653381c,https://www.dropbox.com/s/qb89rvo481xx9wj/05x03_i884.gif.zip?dl=0 +data/input/screenshots/lakeslice/05x04_i653.gif,0d673e364c723de34c1b903fb029b3fa,https://www.dropbox.com/s/mj06y52y6kei927/05x04_i653.gif.zip?dl=0 data/input/screenshots/lakeslice/05x05.gif,af1a2e1fbd4088abf7f48903ab905ab1,https://www.dropbox.com/s/hewvrh2k42b21hs/05x05.gif.zip?dl=0 data/input/screenshots/lakeslice/05x06.gif,39fcc3d533707143f51c07013c80ed44,https://www.dropbox.com/s/bh0e7g75e7xyyc4/05x06.gif.zip?dl=0 data/input/screenshots/lakeslice/05x07.gif,f7e7e64a400229a8bad72d0ae76b2eea,https://www.dropbox.com/s/nslakajwmjpfdba/05x07.gif.zip?dl=0 @@ -247,7 +247,7 @@ data/input/screenshots/lakeslice/05x20.gif,8eb32ff700be3a4ded979bb464a47a44,http data/input/screenshots/lakeslice/05x21.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/qaj31so7m67niy7/05x21.gif.zip?dl=0 data/input/screenshots/lakeslice/05x22.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/8dpa1hz7a9na31p/05x22.gif.zip?dl=0 data/input/screenshots/lakeslice/05x23.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/1cu70j4e5xv1vif/05x23.gif.zip?dl=0 -data/input/screenshots/lakeslice/combine.sh,efae2cc47ef5f968ec56d4c2e3e32f68,https://www.dropbox.com/s/7b186yyyz1nkxhv/combine.sh.zip?dl=0 +data/input/screenshots/lakeslice/combine.sh,0919b63fd6a71ec9df5363b4a89ea4ee,https://www.dropbox.com/s/7b186yyyz1nkxhv/combine.sh.zip?dl=0 data/input/screenshots/montlake/01x01_i17.gif,e518fb6834ddd05222d8be14eb05d935,https://www.dropbox.com/s/5flz8teh9c78hd0/01x01_i17.gif.zip?dl=0 data/input/screenshots/montlake/01x02_i2.gif,eadc32a670592561ab71b5b5011dedf3,https://www.dropbox.com/s/96xf91bgcjgyf59/01x02_i2.gif.zip?dl=0 data/input/screenshots/montlake/01x03_i1.gif,a3d1cc3ed0389b254a17ad8e702f30e6,https://www.dropbox.com/s/jcf2g93tjw3z17o/01x03_i1.gif.zip?dl=0 @@ -256,81 +256,81 @@ data/input/screenshots/montlake/01x05_i41.gif,464a20b7a029722f273ff491a7fef956,h data/input/screenshots/montlake/01x06_i25.gif,f58058dc29f62def6805f57e69f52510,https://www.dropbox.com/s/2hcl30t5gwxtyy7/01x06_i25.gif.zip?dl=0 data/input/screenshots/montlake/02x01_i13.gif,68adc783f7b9ee78769b814649d8da7b,https://www.dropbox.com/s/ft32tu18eudkk9d/02x01_i13.gif.zip?dl=0 data/input/screenshots/montlake/02x02_i4.gif,bd0e493168d795409cfca410cc6a6127,https://www.dropbox.com/s/pl0t65otzq7eosj/02x02_i4.gif.zip?dl=0 -data/input/screenshots/montlake/02x03_i57.gif,62c2d51d4587b7a49497a9ef8a8cb5f2,https://www.dropbox.com/s/g2ga1vjjj92n7uw/02x03_i57.gif.zip?dl=0 -data/input/screenshots/montlake/02x04_i24.gif,863e132d5fcc7d65254bd4787847c92a,https://www.dropbox.com/s/fjhh99fdd37ibh9/02x04_i24.gif.zip?dl=0 -data/input/screenshots/montlake/02x05_i132.gif,e6012d0504bf1d70fefd1b7a11f9e3b0,https://www.dropbox.com/s/8js07j3qv5zzyu7/02x05_i132.gif.zip?dl=0 -data/input/screenshots/montlake/02x06_i316.gif,b92945068cfbf6b4b0cd1300f38adc63,https://www.dropbox.com/s/igtmy3imf88bl96/02x06_i316.gif.zip?dl=0 +data/input/screenshots/montlake/02x03_i57.gif,cf9f02dad45afbd5574f82816567d549,https://www.dropbox.com/s/ouwo4kwnll5q9e0/02x03_i57.gif.zip?dl=0 +data/input/screenshots/montlake/02x04_i24.gif,05d00ce53965d3d97301b2d012f28d96,https://www.dropbox.com/s/ijposcp4zs780fm/02x04_i24.gif.zip?dl=0 +data/input/screenshots/montlake/02x05_i132.gif,7401325edaddc98ad77cf57b62955052,https://www.dropbox.com/s/v532whk41yguxcb/02x05_i132.gif.zip?dl=0 +data/input/screenshots/montlake/02x06_i316.gif,685afc8d9b6d92f2fc8998d8f2a37737,https://www.dropbox.com/s/2p6t6cx6e5vsoin/02x06_i316.gif.zip?dl=0 data/input/screenshots/montlake/03x01_i287.gif,bd8f434426ab4e418c6590cb4bc6042f,https://www.dropbox.com/s/n3fx5wjvc8ya8of/03x01_i287.gif.zip?dl=0 data/input/screenshots/montlake/03x02_i3.gif,13a4405cdfeb3b1085f3c2e6b8b14fc7,https://www.dropbox.com/s/urob44rlvxqzj75/03x02_i3.gif.zip?dl=0 data/input/screenshots/montlake/03x03_i61.gif,61c4e2cbce94f65f6b14f2848895de77,https://www.dropbox.com/s/w5b37nrsy31222v/03x03_i61.gif.zip?dl=0 -data/input/screenshots/montlake/03x04_i69.gif,afe6cd63bac5f81a22d71bae60ad76b0,https://www.dropbox.com/s/91nwbixt2z64lwd/03x04_i69.gif.zip?dl=0 +data/input/screenshots/montlake/03x04_i69.gif,bfab1349087072a50a8f090e8ab14663,https://www.dropbox.com/s/z4ck2a3epm41apm/03x04_i69.gif.zip?dl=0 data/input/screenshots/montlake/03x05_i263.gif,0de63817562633d333ef98ba57960813,https://www.dropbox.com/s/u7hgygw12jy0hyk/03x05_i263.gif.zip?dl=0 data/input/screenshots/montlake/03x06_i199.gif,9a6c1ef5b986d5794d5e3c899dd0b717,https://www.dropbox.com/s/dcw891hntvfenvd/03x06_i199.gif.zip?dl=0 data/input/screenshots/montlake/combine.sh,cfb1c2faef4e2117fe00ff03a71ad1b3,https://www.dropbox.com/s/odbawy1k6nfll1r/combine.sh.zip?dl=0 -data/input/screenshots/udistrict/01x01_i155.gif,dcb4021792e5c45ca02ea5ca88a17d34,https://www.dropbox.com/s/llpkvd4x9yho626/01x01_i155.gif.zip?dl=0 -data/input/screenshots/udistrict/01x02_i183.gif,98e0f47bbfacaa1f3837a233fe8b45b7,https://www.dropbox.com/s/gk7peo2rnewsxg7/01x02_i183.gif.zip?dl=0 -data/input/screenshots/udistrict/01x03_i148.gif,9cd4b69a6c3f12fe11cb5d8c588c3bd3,https://www.dropbox.com/s/uu1m0lfixc0eokt/01x03_i148.gif.zip?dl=0 -data/input/screenshots/udistrict/01x04_i175.gif,0c46a83831b7ea1e84a262a5d4bdb9ba,https://www.dropbox.com/s/ft4wnjwqkfyh9s0/01x04_i175.gif.zip?dl=0 -data/input/screenshots/udistrict/01x05_i275.gif,6e280cecb344595f966726c5f0166cb1,https://www.dropbox.com/s/rjy3scc827hxjri/01x05_i275.gif.zip?dl=0 +data/input/screenshots/udistrict/01x01_i156.gif,dcb4021792e5c45ca02ea5ca88a17d34,https://www.dropbox.com/s/6ij40rj4chuuzav/01x01_i156.gif.zip?dl=0 +data/input/screenshots/udistrict/01x02_i184.gif,98e0f47bbfacaa1f3837a233fe8b45b7,https://www.dropbox.com/s/2xarkyq1nbykj6b/01x02_i184.gif.zip?dl=0 +data/input/screenshots/udistrict/01x03_i149.gif,9cd4b69a6c3f12fe11cb5d8c588c3bd3,https://www.dropbox.com/s/v5q1799733ts3l6/01x03_i149.gif.zip?dl=0 +data/input/screenshots/udistrict/01x04_i176.gif,0c46a83831b7ea1e84a262a5d4bdb9ba,https://www.dropbox.com/s/xz9maa9wobotu2q/01x04_i176.gif.zip?dl=0 +data/input/screenshots/udistrict/01x05_i276.gif,6e280cecb344595f966726c5f0166cb1,https://www.dropbox.com/s/lh0n9vovi24spqi/01x05_i276.gif.zip?dl=0 data/input/screenshots/udistrict/01x06_i2.gif,abcc23a8e157b2eb72e21a3fb60ec821,https://www.dropbox.com/s/6t0ozjspupeiyz3/01x06_i2.gif.zip?dl=0 -data/input/screenshots/udistrict/01x07_i187.gif,0fb5757cdf6c659c4983c010e2080f61,https://www.dropbox.com/s/h8a3fj5apoc0dw4/01x07_i187.gif.zip?dl=0 +data/input/screenshots/udistrict/01x07_i188.gif,0fb5757cdf6c659c4983c010e2080f61,https://www.dropbox.com/s/jp6irvm7f8n5lse/01x07_i188.gif.zip?dl=0 data/input/screenshots/udistrict/01x08_i66.gif,2b5f9e20dd9f29d2768c46a12498ba89,https://www.dropbox.com/s/snjsx8q36l1z50r/01x08_i66.gif.zip?dl=0 data/input/screenshots/udistrict/01x09.gif,68a69600430ada459cd1a55b564e7a21,https://www.dropbox.com/s/olindya5idcylnm/01x09.gif.zip?dl=0 data/input/screenshots/udistrict/02x01_i0.gif,0ef3539f95bb934fe6c0d7350154be2e,https://www.dropbox.com/s/k66kylbnl9yb423/02x01_i0.gif.zip?dl=0 -data/input/screenshots/udistrict/02x02_i195.gif,78eea1394245978f34ee73dc819ba7b8,https://www.dropbox.com/s/8gc6ili6is28074/02x02_i195.gif.zip?dl=0 -data/input/screenshots/udistrict/02x03_i149.gif,be910049675e50fa4316a1f7ceddbd7b,https://www.dropbox.com/s/q8au7malxrkh4ul/02x03_i149.gif.zip?dl=0 -data/input/screenshots/udistrict/02x04_i178.gif,c79d46632d1be0c1e9930c8d461734ad,https://www.dropbox.com/s/ba5iw5v6pyxyy5v/02x04_i178.gif.zip?dl=0 +data/input/screenshots/udistrict/02x02_i196.gif,78eea1394245978f34ee73dc819ba7b8,https://www.dropbox.com/s/r8x2zszm5oaa7i2/02x02_i196.gif.zip?dl=0 +data/input/screenshots/udistrict/02x03_i150.gif,be910049675e50fa4316a1f7ceddbd7b,https://www.dropbox.com/s/qdh5umqrp0oodt1/02x03_i150.gif.zip?dl=0 +data/input/screenshots/udistrict/02x04_i179.gif,c79d46632d1be0c1e9930c8d461734ad,https://www.dropbox.com/s/nr68kd3p9vqljem/02x04_i179.gif.zip?dl=0 data/input/screenshots/udistrict/02x05_i60.gif,625658381ebbae50dfd3b2f2c62c2316,https://www.dropbox.com/s/bkzsuhoqi1b972l/02x05_i60.gif.zip?dl=0 data/input/screenshots/udistrict/02x06_i59.gif,aecb55b1728c1c542b0c9b7a44622b6a,https://www.dropbox.com/s/1524wak5lokqmob/02x06_i59.gif.zip?dl=0 -data/input/screenshots/udistrict/02x07_i187.gif,21e979fcc8e0fbe75a45b821de0d2fd4,https://www.dropbox.com/s/deq2tos7znyodxu/02x07_i187.gif.zip?dl=0 -data/input/screenshots/udistrict/02x08_i424.gif,b4d3cb0050f5bc6cbb9a22b16942a945,https://www.dropbox.com/s/sn34b26s1yxehyh/02x08_i424.gif.zip?dl=0 +data/input/screenshots/udistrict/02x07_i188.gif,21e979fcc8e0fbe75a45b821de0d2fd4,https://www.dropbox.com/s/n0ajjr1kjhffwwy/02x07_i188.gif.zip?dl=0 +data/input/screenshots/udistrict/02x08_i425.gif,b4d3cb0050f5bc6cbb9a22b16942a945,https://www.dropbox.com/s/k5aedqirin7shbp/02x08_i425.gif.zip?dl=0 data/input/screenshots/udistrict/02x09.gif,56c28c1f06652fc67fd99d334c8b282e,https://www.dropbox.com/s/te4q4tzpcnu8aiw/02x09.gif.zip?dl=0 data/input/screenshots/udistrict/03x01_i4.gif,4cf069191ccc63a6600ddd4eae8bc81d,https://www.dropbox.com/s/rqyuk0zoed2iwrj/03x01_i4.gif.zip?dl=0 data/input/screenshots/udistrict/03x02_i21.gif,5e1612e2923197f7e7f6a54bef017d3f,https://www.dropbox.com/s/hc5i704bai5087a/03x02_i21.gif.zip?dl=0 data/input/screenshots/udistrict/03x03_i25.gif,452050a1d939cc3a52bb6e7e868370c6,https://www.dropbox.com/s/wfxplnw6hrsp2sw/03x03_i25.gif.zip?dl=0 data/input/screenshots/udistrict/03x04_i14.gif,0df97882d9efc68609bb427d6bd3431b,https://www.dropbox.com/s/f89omk8q117ryz7/03x04_i14.gif.zip?dl=0 data/input/screenshots/udistrict/03x05_i62.gif,b09ef6c2e35a3c18bd2f353c25d96a52,https://www.dropbox.com/s/97jsnwbsrqz36xb/03x05_i62.gif.zip?dl=0 -data/input/screenshots/udistrict/03x06_i436.gif,59562eb933f55ee12bac83c8e0d1aab1,https://www.dropbox.com/s/196kxqvt2mayh3q/03x06_i436.gif.zip?dl=0 -data/input/screenshots/udistrict/03x07_i236.gif,d025cdf056674c1d01af0433ecce4442,https://www.dropbox.com/s/zqx4ybvolj6wa3j/03x07_i236.gif.zip?dl=0 -data/input/screenshots/udistrict/03x08_i145.gif,a5a76414f98af82162dda80f8b4b205f,https://www.dropbox.com/s/aiur19thxbe6e4s/03x08_i145.gif.zip?dl=0 +data/input/screenshots/udistrict/03x06_i437.gif,59562eb933f55ee12bac83c8e0d1aab1,https://www.dropbox.com/s/2osw0msa92vvneu/03x06_i437.gif.zip?dl=0 +data/input/screenshots/udistrict/03x07_i237.gif,d025cdf056674c1d01af0433ecce4442,https://www.dropbox.com/s/sz4fgw3dt9kmxci/03x07_i237.gif.zip?dl=0 +data/input/screenshots/udistrict/03x08_i146.gif,a5a76414f98af82162dda80f8b4b205f,https://www.dropbox.com/s/7790nadi9eco5nx/03x08_i146.gif.zip?dl=0 data/input/screenshots/udistrict/03x09.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/jycyqycbmav6pr8/03x09.gif.zip?dl=0 data/input/screenshots/udistrict/04x01_i68.gif,6fb774191d65d49dc6357756ec0ab81a,https://www.dropbox.com/s/9u9uhrefil2vh52/04x01_i68.gif.zip?dl=0 -data/input/screenshots/udistrict/04x02_i268.gif,0bb72ccf4222ead4c604c04b4f8bbf46,https://www.dropbox.com/s/k1tw558opdygkti/04x02_i268.gif.zip?dl=0 +data/input/screenshots/udistrict/04x02_i269.gif,0bb72ccf4222ead4c604c04b4f8bbf46,https://www.dropbox.com/s/tfw5widwkr52mxw/04x02_i269.gif.zip?dl=0 data/input/screenshots/udistrict/04x03_i36.gif,ad80979c2de3fbfdcefccbede19c5edb,https://www.dropbox.com/s/lt82suu9f2lhgbi/04x03_i36.gif.zip?dl=0 data/input/screenshots/udistrict/04x04_i69.gif,08edbedb15d8c54ef48aa34ee5e9c043,https://www.dropbox.com/s/eiodf6imiij4ok8/04x04_i69.gif.zip?dl=0 data/input/screenshots/udistrict/04x05_i41.gif,5ef75226a9fd8721bb33d266e4053a59,https://www.dropbox.com/s/ax96hi6exaezusl/04x05_i41.gif.zip?dl=0 -data/input/screenshots/udistrict/04x06_i57.gif,b1a37e9e120571503f13485335a63fce,https://www.dropbox.com/s/2zoaesyfequza54/04x06_i57.gif.zip?dl=0 -data/input/screenshots/udistrict/04x07_i596.gif,d8fbaf76dd6b851baadc8f3d58efb1aa,https://www.dropbox.com/s/n5tclew8o2lzh1d/04x07_i596.gif.zip?dl=0 +data/input/screenshots/udistrict/04x06_i57.gif,ee722834fc4374ac9493b3e2a41ccf04,https://www.dropbox.com/s/ft3mpm6ky2tk8kn/04x06_i57.gif.zip?dl=0 +data/input/screenshots/udistrict/04x07_i122.gif,600764d29fd60719b321e7efe586cde5,https://www.dropbox.com/s/h5qm11wo7pkccgn/04x07_i122.gif.zip?dl=0 data/input/screenshots/udistrict/04x08.gif,83b9d64be3a002d82d6f37bdcf5f8a28,https://www.dropbox.com/s/2eqhafqpjjs4whz/04x08.gif.zip?dl=0 data/input/screenshots/udistrict/04x09.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/sbc7vun4od21kmj/04x09.gif.zip?dl=0 -data/input/screenshots/udistrict/05x01_i198.gif,a96616b48018eeb9083706ad979ae1b0,https://www.dropbox.com/s/l7phojd3gaw5buv/05x01_i198.gif.zip?dl=0 -data/input/screenshots/udistrict/05x02_i144.gif,7baf3b64c8bb263b80919a72a530a052,https://www.dropbox.com/s/xt0m1pdjjy57f2s/05x02_i144.gif.zip?dl=0 -data/input/screenshots/udistrict/05x03_i562.gif,20aa9727384c694b5d7ff0668b8122b1,https://www.dropbox.com/s/d0mnt672c5u72m1/05x03_i562.gif.zip?dl=0 +data/input/screenshots/udistrict/05x01_i199.gif,a96616b48018eeb9083706ad979ae1b0,https://www.dropbox.com/s/76jmurjvund3s35/05x01_i199.gif.zip?dl=0 +data/input/screenshots/udistrict/05x02_i145.gif,7baf3b64c8bb263b80919a72a530a052,https://www.dropbox.com/s/r01gra47tqd7sjx/05x02_i145.gif.zip?dl=0 +data/input/screenshots/udistrict/05x03_i563.gif,20aa9727384c694b5d7ff0668b8122b1,https://www.dropbox.com/s/3kpyqxt4gay6ols/05x03_i563.gif.zip?dl=0 data/input/screenshots/udistrict/05x04_i6.gif,4cb87b0f149bbb2ca87034919935125b,https://www.dropbox.com/s/dpt6p8xpyuwivz5/05x04_i6.gif.zip?dl=0 data/input/screenshots/udistrict/05x05_i7.gif,9af9ef8590ff2911cbb714087ac40363,https://www.dropbox.com/s/j082dwq4qajjgmn/05x05_i7.gif.zip?dl=0 -data/input/screenshots/udistrict/05x06_i697.gif,642e64c8c31ff2ec6c5f69fed00fce96,https://www.dropbox.com/s/mexhrk72fuyy9y6/05x06_i697.gif.zip?dl=0 -data/input/screenshots/udistrict/05x07_i802.gif,ab216267a6391f1e4719b0c07c2a8a2f,https://www.dropbox.com/s/se2jygkayr8h5i2/05x07_i802.gif.zip?dl=0 -data/input/screenshots/udistrict/05x08_i772.gif,f9b3dcc25712c295a872a961d70953ab,https://www.dropbox.com/s/dpojy5cyohyz0ww/05x08_i772.gif.zip?dl=0 +data/input/screenshots/udistrict/05x06_i699.gif,642e64c8c31ff2ec6c5f69fed00fce96,https://www.dropbox.com/s/ofyzsgdv71djfe8/05x06_i699.gif.zip?dl=0 +data/input/screenshots/udistrict/05x07_i804.gif,ab216267a6391f1e4719b0c07c2a8a2f,https://www.dropbox.com/s/vqr7oc26txgt9vs/05x07_i804.gif.zip?dl=0 +data/input/screenshots/udistrict/05x08_i774.gif,f9b3dcc25712c295a872a961d70953ab,https://www.dropbox.com/s/72klgfvubi16kyo/05x08_i774.gif.zip?dl=0 data/input/screenshots/udistrict/05x09.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/m1z9a6ytjdt5l8p/05x09.gif.zip?dl=0 -data/input/screenshots/udistrict/06x01_i218.gif,cdb154f95a9170af4c7c6524dba67f28,https://www.dropbox.com/s/1x9bdw02fsetr38/06x01_i218.gif.zip?dl=0 -data/input/screenshots/udistrict/06x02_i146.gif,5198e0a326c56621463a9625e1df501e,https://www.dropbox.com/s/q9cm80nhzd1p56p/06x02_i146.gif.zip?dl=0 +data/input/screenshots/udistrict/06x01_i219.gif,cdb154f95a9170af4c7c6524dba67f28,https://www.dropbox.com/s/ghe6w5yk0n4gikm/06x01_i219.gif.zip?dl=0 +data/input/screenshots/udistrict/06x02_i147.gif,5198e0a326c56621463a9625e1df501e,https://www.dropbox.com/s/5v32en7byhc9l24/06x02_i147.gif.zip?dl=0 data/input/screenshots/udistrict/06x03_i47.gif,9ff96987e2d6ac6776e172b94b97b04a,https://www.dropbox.com/s/3b2w4pirutatwjd/06x03_i47.gif.zip?dl=0 -data/input/screenshots/udistrict/06x04_i135.gif,72006c79284dfe27810988e1c1a39cf9,https://www.dropbox.com/s/s02zgrxw07tt32i/06x04_i135.gif.zip?dl=0 -data/input/screenshots/udistrict/06x05_i569.gif,2b2543d0c6f91e900618b6c9954f95b7,https://www.dropbox.com/s/le5czpzdjymdecv/06x05_i569.gif.zip?dl=0 +data/input/screenshots/udistrict/06x04_i136.gif,72006c79284dfe27810988e1c1a39cf9,https://www.dropbox.com/s/3hhjk1r8nx7ijy5/06x04_i136.gif.zip?dl=0 +data/input/screenshots/udistrict/06x05_i570.gif,2b2543d0c6f91e900618b6c9954f95b7,https://www.dropbox.com/s/wogmxmzy7jv7uxp/06x05_i570.gif.zip?dl=0 data/input/screenshots/udistrict/06x06.gif,ae86609d7ca233af1ea7d090ed246635,https://www.dropbox.com/s/lzvhekkaofzpefh/06x06.gif.zip?dl=0 data/input/screenshots/udistrict/06x07.gif,649fa67582cc8d983d7d63a519c7c825,https://www.dropbox.com/s/ylh4y2c2n929ybb/06x07.gif.zip?dl=0 data/input/screenshots/udistrict/06x08.gif,4cddcd69d367a8dd6b91ec8e6c0b9495,https://www.dropbox.com/s/bk8o5lzjyjfq59w/06x08.gif.zip?dl=0 data/input/screenshots/udistrict/06x09.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/wxi34p9kuz8ocwd/06x09.gif.zip?dl=0 data/input/screenshots/udistrict/07x01_i1.gif,9dc6f5b947d824ff9f95d514fc666e68,https://www.dropbox.com/s/dgidytlygm8a07h/07x01_i1.gif.zip?dl=0 -data/input/screenshots/udistrict/07x02_i153.gif,1dc0246fae86911bfbfb2cf0a90d263e,https://www.dropbox.com/s/dc4ae1s7eltaeq6/07x02_i153.gif.zip?dl=0 +data/input/screenshots/udistrict/07x02_i154.gif,1dc0246fae86911bfbfb2cf0a90d263e,https://www.dropbox.com/s/efj8cabw3uvnurm/07x02_i154.gif.zip?dl=0 data/input/screenshots/udistrict/07x03_i93.gif,482a03aa0aa22351282f3c8e43ace594,https://www.dropbox.com/s/vgt4ckdxa5glbov/07x03_i93.gif.zip?dl=0 -data/input/screenshots/udistrict/07x04_i250.gif,7036b1875829de48e29031a2434ef2bd,https://www.dropbox.com/s/06fdval7jpoyjtm/07x04_i250.gif.zip?dl=0 +data/input/screenshots/udistrict/07x04_i251.gif,7036b1875829de48e29031a2434ef2bd,https://www.dropbox.com/s/dxa8eg6sjphao79/07x04_i251.gif.zip?dl=0 data/input/screenshots/udistrict/07x05.gif,5274abc4196eeff3be32120bf5155f53,https://www.dropbox.com/s/1eilzv2xpdpj2vq/07x05.gif.zip?dl=0 data/input/screenshots/udistrict/07x06.gif,5ec11ca3817cecc6d51bf93b7f0da87e,https://www.dropbox.com/s/s3pwr699tf92win/07x06.gif.zip?dl=0 data/input/screenshots/udistrict/07x07.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/9aigocj6mcx9tof/07x07.gif.zip?dl=0 data/input/screenshots/udistrict/07x08.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/6spsyydnprx3xl8/07x08.gif.zip?dl=0 data/input/screenshots/udistrict/07x09.gif,8eb32ff700be3a4ded979bb464a47a44,https://www.dropbox.com/s/kgshfypmb6d2tqw/07x09.gif.zip?dl=0 -data/input/screenshots/udistrict/combine.sh,e5e73b9e9f67396422fb236a5d1a68c3,https://www.dropbox.com/s/ghvm39u5xntcd3i/combine.sh.zip?dl=0 +data/input/screenshots/udistrict/combine.sh,ca086c089e56ebd7f32fe0bf5e3323c5,https://www.dropbox.com/s/ghvm39u5xntcd3i/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 @@ -364,25 +364,25 @@ 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/trips_2014.csv,d4a8e733045b28c0385fb81359d6df03,https://www.dropbox.com/s/5ppravwmk6bf20d/trips_2014.csv.zip?dl=0 data/system/cities/seattle.bin,24be9fb4dd63e74fa22cfde30f694fad,https://www.dropbox.com/s/mfa297h0or0r1b8/seattle.bin.zip?dl=0 -data/system/maps/ballard.bin,b5c162c60564290d8a6f767cb3d5e546,https://www.dropbox.com/s/xc9f80kblw5clmt/ballard.bin.zip?dl=0 -data/system/maps/downtown.bin,25ef830e6dd1d901c9f643064a116115,https://www.dropbox.com/s/fdu6xgmg4tvz1z6/downtown.bin.zip?dl=0 +data/system/maps/ballard.bin,ccf03dcbb0d4e46911d7d2147b244f46,https://www.dropbox.com/s/v8ihzb7xv6vs6qx/ballard.bin.zip?dl=0 +data/system/maps/downtown.bin,31b1edad90c12c73646112007597bbeb,https://www.dropbox.com/s/jsa53seqj55nb8n/downtown.bin.zip?dl=0 data/system/maps/downtown_atx.bin,87f500eaaa8edc62bd736310543e1529,https://www.dropbox.com/s/lfra9r1cgxnfb4t/downtown_atx.bin.zip?dl=0 data/system/maps/huge_austin.bin,c112ada2699d6a6a7eaebb2775a9de85,https://www.dropbox.com/s/2dv7vwn176cnhtk/huge_austin.bin.zip?dl=0 -data/system/maps/huge_seattle.bin,7fb67f3de73d3cf8e466c121a3a75fd8,https://www.dropbox.com/s/6had4woeom611t0/huge_seattle.bin.zip?dl=0 -data/system/maps/lakeslice.bin,48ed521d9987adc4e37656ef8e1efe16,https://www.dropbox.com/s/muozc01vnl6w8x6/lakeslice.bin.zip?dl=0 -data/system/maps/montlake.bin,f4becd378c2311f0f8af7e0b54a60a0f,https://www.dropbox.com/s/eidkt8ektrtf84k/montlake.bin.zip?dl=0 -data/system/maps/south_seattle.bin,1cae6e54a7bd3a96c2f047465fd86c20,https://www.dropbox.com/s/5q56oh4id0ja64y/south_seattle.bin.zip?dl=0 -data/system/maps/udistrict.bin,8690bac3de1cb3d3bcc3dad2f2452a9a,https://www.dropbox.com/s/n0mhxtuiq9t4kwi/udistrict.bin.zip?dl=0 -data/system/maps/west_seattle.bin,fce67b02d3a6987e368d343c493b9db9,https://www.dropbox.com/s/0l4x6ppkd0vzow4/west_seattle.bin.zip?dl=0 -data/system/prebaked_results/lakeslice/weekday.bin,de0e6e287e58adbd17f0d56e15bc0f19,https://www.dropbox.com/s/5tegsh3wyqoe4hj/weekday.bin.zip?dl=0 -data/system/prebaked_results/montlake/car vs bike contention.bin,6dc3c9d1a39f335a87fd2ba525ea322a,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0 -data/system/prebaked_results/montlake/weekday.bin,2da479c8cbe57a2679af46662511de9b,https://www.dropbox.com/s/fw91svqc68k72bc/weekday.bin.zip?dl=0 -data/system/scenarios/ballard/weekday.bin,03f195b1016c58b3a91d2e32501addda,https://www.dropbox.com/s/po1pijtt8jdg780/weekday.bin.zip?dl=0 -data/system/scenarios/downtown/weekday.bin,6b4cfc7e41441567aaf7f8ad2dc2ae96,https://www.dropbox.com/s/3else8nyuyy3d79/weekday.bin.zip?dl=0 -data/system/scenarios/huge_seattle/weekday.bin,764a2041748e30e0c38aa4f1c75a0eb4,https://www.dropbox.com/s/e7ru1refjvqcedy/weekday.bin.zip?dl=0 -data/system/scenarios/lakeslice/weekday.bin,037280fcf4e349eba985147698a0e548,https://www.dropbox.com/s/14mlmb9tmah5jn5/weekday.bin.zip?dl=0 -data/system/scenarios/montlake/everyone_weekday.bin,00857198000a1f4bdc86c857bbcc75bb,https://www.dropbox.com/s/pqi3d7huf2fdjhd/everyone_weekday.bin.zip?dl=0 -data/system/scenarios/montlake/weekday.bin,0611c3f862f07d4b5ef7d059b848e210,https://www.dropbox.com/s/bspg8qn0tqvk5fp/weekday.bin.zip?dl=0 -data/system/scenarios/south_seattle/weekday.bin,cc4b00b46ac22f600f3f2e8e02a9b935,https://www.dropbox.com/s/xiuu0tq087kynys/weekday.bin.zip?dl=0 -data/system/scenarios/udistrict/weekday.bin,131a9c2daac3bacc7bb253bb52092200,https://www.dropbox.com/s/ggchmew53puc6te/weekday.bin.zip?dl=0 -data/system/scenarios/west_seattle/weekday.bin,fea9feba76888be07eab0d8442fbc6b6,https://www.dropbox.com/s/k1tc4dxog1n9ooa/weekday.bin.zip?dl=0 +data/system/maps/huge_seattle.bin,68dbb213623cdba2c0639781b77b17ff,https://www.dropbox.com/s/4xau1w29udgkmbt/huge_seattle.bin.zip?dl=0 +data/system/maps/lakeslice.bin,3a7befc484d398e7ef34909acc468786,https://www.dropbox.com/s/v3ao5z5okktfdjf/lakeslice.bin.zip?dl=0 +data/system/maps/montlake.bin,947704e9a56dbffc2a0a06652c5e2a8d,https://www.dropbox.com/s/pn0e2gj7zrzjo9e/montlake.bin.zip?dl=0 +data/system/maps/south_seattle.bin,716f50c0418c701c0756de092007a330,https://www.dropbox.com/s/av2kf0v2sli9gm7/south_seattle.bin.zip?dl=0 +data/system/maps/udistrict.bin,0c33b4969b5aed1036dff3cf9ef59010,https://www.dropbox.com/s/mq62h91yhjq6mp8/udistrict.bin.zip?dl=0 +data/system/maps/west_seattle.bin,d99edad550826417fd15f4565b394a05,https://www.dropbox.com/s/0ydm9p0qdemslo3/west_seattle.bin.zip?dl=0 +data/system/prebaked_results/lakeslice/weekday.bin,0f6aaab4b9abd46128d0d59efe8175a8,https://www.dropbox.com/s/hgrowurmb2p63v8/weekday.bin.zip?dl=0 +data/system/prebaked_results/montlake/car vs bike contention.bin,66fe0dfe06b682da455c78a01c7a5972,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0 +data/system/prebaked_results/montlake/weekday.bin,683a148a83ecc8728380d9550f65b226,https://www.dropbox.com/s/njkf30w4v5o2pp6/weekday.bin.zip?dl=0 +data/system/scenarios/ballard/weekday.bin,7d0ad4cfb607515f69ec3c62956a59c2,https://www.dropbox.com/s/l6uiw3rsw2mf4q7/weekday.bin.zip?dl=0 +data/system/scenarios/downtown/weekday.bin,0b6b73e7036725a2cd6304c7e1c40407,https://www.dropbox.com/s/h08obxl733c60uj/weekday.bin.zip?dl=0 +data/system/scenarios/huge_seattle/weekday.bin,16496450344c9250905dc952043a7622,https://www.dropbox.com/s/9atwvwb1ik46lip/weekday.bin.zip?dl=0 +data/system/scenarios/lakeslice/weekday.bin,e93d78424e3a1b421b2fa035748e0b12,https://www.dropbox.com/s/42viy5s2t8hn1c1/weekday.bin.zip?dl=0 +data/system/scenarios/montlake/everyone_weekday.bin,2917d803030cc79ba8f613c2a640adf9,https://www.dropbox.com/s/vdl5ypbxbqr5toc/everyone_weekday.bin.zip?dl=0 +data/system/scenarios/montlake/weekday.bin,5497e8ed089e0b074bb54f62a0463eba,https://www.dropbox.com/s/46qkrhgkj5gpqof/weekday.bin.zip?dl=0 +data/system/scenarios/south_seattle/weekday.bin,e1c2eb6a6235cceb8c31dbf6e068e67b,https://www.dropbox.com/s/5h8dpsxq6x9iyc6/weekday.bin.zip?dl=0 +data/system/scenarios/udistrict/weekday.bin,a4d13e7a82760be83202a2ea160b4603,https://www.dropbox.com/s/09j9q1ghsf5kytn/weekday.bin.zip?dl=0 +data/system/scenarios/west_seattle/weekday.bin,bba2bb11dc5a4d4cdb087c80acc65cb3,https://www.dropbox.com/s/xh2hfw8c2zwnh0u/weekday.bin.zip?dl=0 diff --git a/ezgui/src/shaders/fragment_140.glsl b/ezgui/src/shaders/fragment_140.glsl index 3bb9215cbe..b3dcc0e392 100644 --- a/ezgui/src/shaders/fragment_140.glsl +++ b/ezgui/src/shaders/fragment_140.glsl @@ -13,5 +13,7 @@ void main() { //float gray = dot(pass_style.rgb, vec3(0.299, 0.587, 0.114)); //f_color = vec4(vec3(gray), pass_style.a); + //f_color = vec4(1.0 - pass_style.r, 1.0 - pass_style.g, 1.0 - pass_style.b, pass_style.a); + f_color = pass_style; } diff --git a/ezgui/src/shaders/fragment_300.glsl b/ezgui/src/shaders/fragment_300.glsl index f4e1273507..4b81559b22 100644 --- a/ezgui/src/shaders/fragment_300.glsl +++ b/ezgui/src/shaders/fragment_300.glsl @@ -12,9 +12,5 @@ in vec4 pass_style; out vec4 f_color; void main() { - // https://en.wikipedia.org/wiki/Grayscale#Luma_coding_in_video_systems - //float gray = dot(pass_style.rgb, vec3(0.299, 0.587, 0.114)); - //f_color = vec4(vec3(gray), pass_style.a); - f_color = pass_style; } diff --git a/game/src/colors.rs b/game/src/colors.rs index ee29126045..2f92f3fabc 100644 --- a/game/src/colors.rs +++ b/game/src/colors.rs @@ -63,6 +63,7 @@ pub struct ColorScheme { pub general_road_marking: Color, pub road_center_line: Color, pub light_rail_track: Color, + pub private_road: Color, pub unzoomed_highway: Color, pub unzoomed_arterial: Color, pub unzoomed_residential: Color, @@ -161,6 +162,7 @@ impl ColorScheme { general_road_marking: Color::WHITE, road_center_line: Color::YELLOW, light_rail_track: Color::hex("#844204"), + private_road: Color::hex("#F0B0C0"), unzoomed_highway: Color::rgb(232, 146, 162), unzoomed_arterial: Color::rgb(255, 199, 62), unzoomed_residential: Color::WHITE, diff --git a/game/src/info/lane.rs b/game/src/info/lane.rs index a1e52156e3..9669dbcd2c 100644 --- a/game/src/info/lane.rs +++ b/game/src/info/lane.rs @@ -16,6 +16,10 @@ pub fn info(ctx: &EventCtx, app: &App, details: &mut Details, id: LaneID) -> Vec if !l.is_sidewalk() { kv.push(("Type", l.lane_type.describe().to_string())); } + if r.is_private() { + // TODO Ideally the area name, and be more specific about access restrictions + kv.push(("Access", "Private".to_string())); + } if l.is_parking() { kv.push(( diff --git a/game/src/render/intersection.rs b/game/src/render/intersection.rs index be3306ee5a..088c543948 100644 --- a/game/src/render/intersection.rs +++ b/game/src/render/intersection.rs @@ -45,6 +45,10 @@ impl DrawIntersection { } } + if i.is_private(map) { + default_geom.push(cs.private_road.alpha(0.5), i.polygon.clone()); + } + match i.intersection_type { IntersectionType::Border => { let r = map.get_r(*i.roads.iter().next().unwrap()); diff --git a/game/src/render/lane.rs b/game/src/render/lane.rs index bd865e5d7f..d1a895fb4a 100644 --- a/game/src/render/lane.rs +++ b/game/src/render/lane.rs @@ -184,6 +184,9 @@ impl DrawLane { } }; } + if road.is_private() { + draw.push(cs.private_road.alpha(0.5), polygon.clone()); + } AlmostDrawLane { id: lane.id, diff --git a/game/src/render/map.rs b/game/src/render/map.rs index 2b64d76c14..f42159e17a 100644 --- a/game/src/render/map.rs +++ b/game/src/render/map.rs @@ -68,6 +68,8 @@ impl DrawMap { all_roads.push( if r.is_light_rail() { cs.light_rail_track + } else if r.is_private() { + cs.private_road } else { osm_rank_to_color(cs, r.get_rank()) }, @@ -118,7 +120,16 @@ impl DrawMap { // TODO Would be neat to show closed intersections here, but then edits need to // regenerate this if i.is_stop_sign() { - all_intersections.push(osm_rank_to_color(cs, i.get_rank(map)), i.polygon.clone()); + all_intersections.push( + if i.is_light_rail(map) { + cs.light_rail_track + } else if i.is_private(map) { + cs.private_road + } else { + osm_rank_to_color(cs, i.get_rank(map)) + }, + i.polygon.clone(), + ); /*if false { all_intersections.push( color, diff --git a/game/src/render/road.rs b/game/src/render/road.rs index 08e1af8a69..ddabca57c7 100644 --- a/game/src/render/road.rs +++ b/game/src/render/road.rs @@ -20,6 +20,11 @@ impl DrawRoad { let mut draw = GeomBatch::new(); let center = r.get_current_center(map); let width = Distance::meters(0.25); + let color = if r.is_private() { + cs.road_center_line.lerp(cs.private_road, 0.5) + } else { + cs.road_center_line + }; // If the road is a one-way (only parking and sidewalk on the off-side), draw a solid line // No center line at all if there's a shared left turn lane or it's light rail if !r.is_light_rail() @@ -27,12 +32,12 @@ impl DrawRoad { .iter() .all(|(_, lt)| *lt == LaneType::Parking || *lt == LaneType::Sidewalk) { - draw.push(cs.road_center_line, center.make_polygons(width)); + draw.push(color, center.make_polygons(width)); } else if r.children_forwards.is_empty() || (r.children_forwards[0].1 != LaneType::SharedLeftTurn && !r.is_light_rail()) { draw.extend( - cs.road_center_line, + color, center.dashed_lines(width, Distance::meters(2.0), Distance::meters(1.0)), ); } @@ -65,8 +70,17 @@ impl Renderable for DrawRoad { if r.center_pts.length() >= Distance::meters(30.0) && name != "???" { // TODO If it's definitely straddling bus/bike lanes, change the color? Or // even easier, just skip the center lines? - let txt = Text::from(Line(name).fg(app.cs.road_center_line)) - .bg(app.cs.driving_lane); + let fg = if r.is_private() { + app.cs.road_center_line.lerp(app.cs.private_road, 0.5) + } else { + app.cs.road_center_line + }; + let bg = if r.is_private() { + app.cs.driving_lane.lerp(app.cs.private_road, 0.5) + } else { + app.cs.driving_lane + }; + let txt = Text::from(Line(name).fg(fg)).bg(bg); let (pt, angle) = r.center_pts.dist_along(r.center_pts.length() / 2.0); batch.append( txt.render_to_batch(g.prerender) diff --git a/map_model/src/intersection.rs b/map_model/src/intersection.rs index 573ec2f42c..d6ef8324c7 100644 --- a/map_model/src/intersection.rs +++ b/map_model/src/intersection.rs @@ -60,6 +60,14 @@ impl Intersection { self.intersection_type == IntersectionType::TrafficSignal } + pub fn is_light_rail(&self, map: &Map) -> bool { + self.roads.iter().all(|r| map.get_r(*r).is_light_rail()) + } + + pub fn is_private(&self, map: &Map) -> bool { + self.roads.iter().all(|r| map.get_r(*r).is_private()) + } + pub fn get_incoming_lanes(&self, map: &Map, constraints: PathConstraints) -> Vec { self.incoming_lanes .iter() diff --git a/map_model/src/pathfind/driving.rs b/map_model/src/pathfind/driving.rs index b31a76f7a1..0e5c670a82 100644 --- a/map_model/src/pathfind/driving.rs +++ b/map_model/src/pathfind/driving.rs @@ -161,7 +161,7 @@ fn make_input_graph( for l in map.all_lanes() { let from = nodes.get(Node::Lane(l.id)); let mut any = false; - if constraints.can_use(l, map) { + if constraints.can_use(l, map) && !map.get_r(l.parent).is_private() { let indices = uber_turn_entrances.get(l.id); if indices.is_empty() { for turn in map.get_turns_for(l.id, constraints) { diff --git a/map_model/src/pathfind/walking.rs b/map_model/src/pathfind/walking.rs index 75487e9376..5028241df9 100644 --- a/map_model/src/pathfind/walking.rs +++ b/map_model/src/pathfind/walking.rs @@ -205,7 +205,7 @@ fn make_input_graph( let mut input_graph = InputGraph::new(); for l in map.all_lanes() { - if l.is_sidewalk() { + if l.is_sidewalk() && !map.get_r(l.parent).is_private() { let cost = to_s(l.length()); let n1 = nodes.get(Node::SidewalkEndpoint(l.id, true)); let n2 = nodes.get(Node::SidewalkEndpoint(l.id, false)); diff --git a/map_model/src/road.rs b/map_model/src/road.rs index d79e3cd0ab..6a503a203f 100644 --- a/map_model/src/road.rs +++ b/map_model/src/road.rs @@ -453,4 +453,8 @@ impl Road { pub fn is_light_rail(&self) -> bool { !self.children_forwards.is_empty() && self.children_forwards[0].1 == LaneType::LightRail } + + pub fn is_private(&self) -> bool { + self.osm_tags.get("access") == Some(&"private".to_string()) + } }