From e4a95b604e36d3c24394c1c8afd726202e924374 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Wed, 26 May 2021 15:02:20 -0700 Subject: [PATCH] Fix Rainier Valley gridlock, fallout from #664. https://www.openstreetmap.org/changeset/105381427 mapping a turn lane is the fix, preventing crazy U-turns using the service road. Not sure how I missed that lane when looking here before. I made the edit to .osm locally instead of grabbing fresh data for all of Seattle. --- data/MANIFEST.json | 23 ++++++++++++++--------- game/src/challenges/prebake.rs | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/data/MANIFEST.json b/data/MANIFEST.json index c19a49ca2b..73dd6b1985 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -1931,9 +1931,9 @@ "compressed_size_bytes": 490829 }, "data/input/us/seattle/osm/rainier_valley.osm": { - "checksum": "db76a33cf17640790ad17c3d6859744d", - "uncompressed_size_bytes": 7735384, - "compressed_size_bytes": 648524 + "checksum": "29c739eaf0ba8a422c6473c73add1775", + "uncompressed_size_bytes": 7735427, + "compressed_size_bytes": 648540 }, "data/input/us/seattle/osm/slu.osm": { "checksum": "9a2107a5a1f4cf9d4b662fdca2f2157c", @@ -2031,9 +2031,9 @@ "compressed_size_bytes": 390073 }, "data/input/us/seattle/raw_maps/rainier_valley.bin": { - "checksum": "c29399cf1e7080f424d8239933659286", - "uncompressed_size_bytes": 2346994, - "compressed_size_bytes": 533594 + "checksum": "dba2e667ab6512d7e1a598894a8a62d6", + "uncompressed_size_bytes": 2347114, + "compressed_size_bytes": 533595 }, "data/input/us/seattle/raw_maps/slu.bin": { "checksum": "c8d8ab9fd0c0d8fa0350e35533c672ce", @@ -3786,9 +3786,9 @@ "compressed_size_bytes": 1251477 }, "data/system/us/seattle/maps/rainier_valley.bin": { - "checksum": "006be485f7381bd977a0aa630bd5ece7", - "uncompressed_size_bytes": 5762462, - "compressed_size_bytes": 1951138 + "checksum": "d40372b77556a159befce7d2c64542c7", + "uncompressed_size_bytes": 5757236, + "compressed_size_bytes": 1949493 }, "data/system/us/seattle/maps/slu.bin": { "checksum": "dc99001042bff369950bd8689cddf5de", @@ -3850,6 +3850,11 @@ "uncompressed_size_bytes": 11103592, "compressed_size_bytes": 3903778 }, + "data/system/us/seattle/prebaked_results/rainier_valley/weekday.bin": { + "checksum": "9c9074d8e20f0ca1a6aecd8bc3296cfa", + "uncompressed_size_bytes": 20215945, + "compressed_size_bytes": 7196590 + }, "data/system/us/seattle/prebaked_results/wallingford/weekday.bin": { "checksum": "20e091e2a41e11fee43db96de8149b72", "uncompressed_size_bytes": 38238950, diff --git a/game/src/challenges/prebake.rs b/game/src/challenges/prebake.rs index e8ddfddffc..333af2e59d 100644 --- a/game/src/challenges/prebake.rs +++ b/game/src/challenges/prebake.rs @@ -30,7 +30,7 @@ pub fn prebake_all() { MapName::seattle("lakeslice"), MapName::seattle("phinney"), MapName::seattle("qa"), - //MapName::seattle("rainier_valley"), + MapName::seattle("rainier_valley"), MapName::seattle("wallingford"), ] { let map = map_model::Map::load_synchronously(name.path(), &mut timer);