From 58ee3175ace96003c41d603698971d2ee90fb8a6 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 19 Mar 2021 17:24:11 -0700 Subject: [PATCH] Add a new Seattle map focused on the Arboretum, for #574, along with prebaked data for the baseline (because it doesn't gridlock, without any interventions needed!) and a proposal for opening up Broadmoor. --- data/MANIFEST.json | 35 +- data/system/proposals/broadmoor access.json | 2135 +++++++++++++++++++ game/src/challenges/prebake.rs | 1 + importer/config/us/seattle/arboretum.poly | 12 + map_gui/src/tools/mod.rs | 1 + 5 files changed, 2179 insertions(+), 5 deletions(-) create mode 100644 data/system/proposals/broadmoor access.json create mode 100644 importer/config/us/seattle/arboretum.poly diff --git a/data/MANIFEST.json b/data/MANIFEST.json index f472b08311..2f6fa356d3 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -1295,6 +1295,11 @@ "uncompressed_size_bytes": 585949, "compressed_size_bytes": 40712 }, + "data/input/us/seattle/osm/arboretum.osm": { + "checksum": "62ee8bfb66fd36a06670b71d97b6b5da", + "uncompressed_size_bytes": 14026273, + "compressed_size_bytes": 1208587 + }, "data/input/us/seattle/osm/ballard.osm": { "checksum": "62147bec9872f921a3a9d72bc668333e", "uncompressed_size_bytes": 80740931, @@ -1390,6 +1395,11 @@ "uncompressed_size_bytes": 445837278, "compressed_size_bytes": 205027231 }, + "data/input/us/seattle/raw_maps/arboretum.bin": { + "checksum": "56f458bf47a50a5474adf7e3dfffe725", + "uncompressed_size_bytes": 3454856, + "compressed_size_bytes": 845474 + }, "data/input/us/seattle/raw_maps/ballard.bin": { "checksum": "1d114504d04532875cf8a81ac8a7d969", "uncompressed_size_bytes": 22500308, @@ -2641,9 +2651,14 @@ "compressed_size_bytes": 7663872 }, "data/system/us/seattle/city.bin": { - "checksum": "1b162b734d95c957a1886db56eb3de19", - "uncompressed_size_bytes": 1767992, - "compressed_size_bytes": 918968 + "checksum": "4758ed07f16d699f86e5df12b33ab578", + "uncompressed_size_bytes": 1768209, + "compressed_size_bytes": 919082 + }, + "data/system/us/seattle/maps/arboretum.bin": { + "checksum": "dfda992da0a752baadedace67e689c65", + "uncompressed_size_bytes": 8333784, + "compressed_size_bytes": 2918992 }, "data/system/us/seattle/maps/ballard.bin": { "checksum": "fa9e33249b8411fe999ace869f43b66e", @@ -2656,9 +2671,9 @@ "compressed_size_bytes": 11325493 }, "data/system/us/seattle/maps/huge_seattle.bin": { - "checksum": "e11f140dedc04ced9333da697c22abb8", + "checksum": "f0680969a223fc3f2a7ed09394bd7ce5", "uncompressed_size_bytes": 378566327, - "compressed_size_bytes": 134890519 + "compressed_size_bytes": 134841577 }, "data/system/us/seattle/maps/lakeslice.bin": { "checksum": "1a99670f9b62c848e99708f46d62a1ca", @@ -2720,6 +2735,11 @@ "uncompressed_size_bytes": 77312641, "compressed_size_bytes": 26933516 }, + "data/system/us/seattle/prebaked_results/arboretum/weekday.bin": { + "checksum": "24fe3a9df3610d1db557a4425e3bd3db", + "uncompressed_size_bytes": 18358337, + "compressed_size_bytes": 6593871 + }, "data/system/us/seattle/prebaked_results/lakeslice/weekday.bin": { "checksum": "95848187af817d99412a5d9857cb818b", "uncompressed_size_bytes": 64544192, @@ -2755,6 +2775,11 @@ "uncompressed_size_bytes": 29197710, "compressed_size_bytes": 10420631 }, + "data/system/us/seattle/scenarios/arboretum/weekday.bin": { + "checksum": "95d864ba8109678d2518f0fa5455cf27", + "uncompressed_size_bytes": 2659846, + "compressed_size_bytes": 555198 + }, "data/system/us/seattle/scenarios/ballard/weekday.bin": { "checksum": "b16bbbbf83db6062f1f7c48a45ad891b", "uncompressed_size_bytes": 21679683, diff --git a/data/system/proposals/broadmoor access.json b/data/system/proposals/broadmoor access.json new file mode 100644 index 0000000000..9a3fa3da8d --- /dev/null +++ b/data/system/proposals/broadmoor access.json @@ -0,0 +1,2135 @@ +{ + "map_name": { + "city": { + "country": "us", + "city": "seattle" + }, + "map": "arboretum" + }, + "edits_name": "broadmoor access", + "version": 8, + "commands": [ + { + "ChangeRoad": { + "r": { + "osm_way_id": 6390190, + "i1": 53137182, + "i2": 53137184 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6417790, + "i1": 53171446, + "i2": 53157476 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6418660, + "i1": 53157479, + "i2": 53152097 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6418660, + "i1": 53172736, + "i2": 53157479 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6495683, + "i1": 53157477, + "i2": 53152096 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6522874, + "i1": 53157474, + "i2": 53171446 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6522874, + "i1": 53171446, + "i2": 53205225 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 6522874, + "i1": 3649356771, + "i2": 53157474 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 157026976, + "i1": 53152100, + "i2": 3653500956 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 157026976, + "i1": 3653500956, + "i2": 1692533944 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 157026977, + "i1": 1692533944, + "i2": 3810541480 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 157026977, + "i1": 3810541480, + "i2": 60796475 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425978, + "i1": 53068705, + "i2": 53152100 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425978, + "i1": 53109462, + "i2": 2328871413 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425978, + "i1": 2328871413, + "i2": 53068705 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425984, + "i1": 1724731101, + "i2": 1724731117 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425989, + "i1": 53068705, + "i2": 53068706 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160425989, + "i1": 53068706, + "i2": 1724731554 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426010, + "i1": 53137182, + "i2": 53152096 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426010, + "i1": 53152096, + "i2": 53152097 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426010, + "i1": 53152097, + "i2": 53152098 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426010, + "i1": 53152098, + "i2": 53152100 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426010, + "i1": 1724731051, + "i2": 53137182 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426016, + "i1": 53137184, + "i2": 53157476 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426016, + "i1": 53157474, + "i2": 53137184 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426016, + "i1": 53157476, + "i2": 53157477 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426016, + "i1": 53157477, + "i2": 53157479 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426016, + "i1": 53157479, + "i2": 53152098 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426022, + "i1": 53109462, + "i2": 2328871433 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 160426022, + "i1": 2328871433, + "i2": 53068706 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 224046592, + "i1": 2328871413, + "i2": 2328871433 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 427121696, + "i1": 1724731117, + "i2": 4263573432 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 8.9408, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 8.9408, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 427121697, + "i1": 1724731117, + "i2": 1724731122 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 739575042, + "i1": 53172736, + "i2": 53109462 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 739575042, + "i1": 53205225, + "i2": 53172736 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + }, + { + "ChangeRoad": { + "r": { + "osm_way_id": 739575043, + "i1": 1724731122, + "i2": 53205225 + }, + "new": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 21, + "cap_vehicles_per_hour": null + } + }, + "old": { + "lanes_ltr": [ + [ + "Sidewalk", + "Back" + ], + [ + "Driving", + "Back" + ], + [ + "Driving", + "Fwd" + ], + [ + "Sidewalk", + "Fwd" + ] + ], + "speed_limit": 11.176, + "access_restrictions": { + "allow_through_traffic": 0, + "cap_vehicles_per_hour": null + } + } + } + } + ], + "merge_zones": true, + "proposal_description": [ + "Allow bike and foot traffic through Broadmoor", + "Create a new connection between Montlake and Madison Park by allowing cyclists and pedestrians to use Broadmoor Drive East, which is currently a gated neighborhood." + ], + "proposal_link": null +} diff --git a/game/src/challenges/prebake.rs b/game/src/challenges/prebake.rs index 4751321f35..bc74a39013 100644 --- a/game/src/challenges/prebake.rs +++ b/game/src/challenges/prebake.rs @@ -25,6 +25,7 @@ pub fn prebake_all() { } for name in vec![ + MapName::seattle("arboretum"), MapName::seattle("montlake"), MapName::seattle("lakeslice"), MapName::seattle("phinney"), diff --git a/importer/config/us/seattle/arboretum.poly b/importer/config/us/seattle/arboretum.poly new file mode 100644 index 0000000000..5482ec49f1 --- /dev/null +++ b/importer/config/us/seattle/arboretum.poly @@ -0,0 +1,12 @@ +boundary +1 + -122.31288492478997 47.64756327832363 + -122.31175262138632 47.641731067093374 + -122.30304991072732 47.64132336234134 + -122.30405593601937 47.61747418073105 + -122.27274185322928 47.61739078304126 + -122.27186546599566 47.64595691276929 + -122.2915764548665 47.64720580158261 + -122.31288492478997 47.64756327832363 +END +END diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index 0a9d1c880b..4fc4811fb6 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -155,6 +155,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("nyc", "midtown_manhattan") => "Midtown Manhattan", ("phoenix", "tempe") => "Tempe", ("providence", "downtown") => "Providence", + ("seattle", "arboretum") => "Arboretum", ("seattle", "ballard") => "Ballard", ("seattle", "downtown") => "Downtown Seattle", ("seattle", "huge_seattle") => "Seattle (entire area)",