No right on red (#806)

* add turn_on_red config option which is false for nyc

* when making stages, don't add movements that don't share a stage with a protected movement

* Fix a renamed DirectedRoadID field from
cb3693bd7a and the new turn_on_red field
in the test crate

* Update all map config files with the new option

for x in importer/config/*/*/cfg.json; do
	cat $x | jq '.map_config += {turn_on_red: true}' > tmp
	mv -f tmp $x
done

(And then undoing NYC)

* turn on red banned on all non-us maps

* regenerate all maps

Co-authored-by: Marcel Dejean <marcel@dejean.nyc>
Co-authored-by: Dustin Carlino <dabreegster@gmail.com>

importer/config/at/salzburg/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/br/sao_paulo/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/ca/montreal/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 65000
+    "street_parking_spot_length": 65000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/ch/geneva/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/ch/zurich/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/cz/frydek_mistek/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/de/berlin/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/de/bonn/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/de/rostock/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/fr/charleville_mezieres/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/fr/lyon/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/fr/paris/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/allerton_bywater/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/ashton_park/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/aylesbury/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/aylesham/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/bailrigg/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/bath_riverside/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/bicester/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/cambridge/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/castlemead/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/chapelford/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/chapeltown_cohousing/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/chorlton/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/clackers_brook/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/cricklewood/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/culm/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/dickens_heath/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/didcot/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/dunton_hills/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/ebbsfleet/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/exeter_red_cow_village/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/great_kneighton/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/halsnead/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/hampton/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/handforth/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/kergilliack/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/kidbrooke_village/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/lcid/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/leeds/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/lockleaze/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/london/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/long_marston/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/marsh_barton/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/micklefield/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/newborough_road/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/newcastle_great_park/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/northwick_park/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/poundbury/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/priors_hall/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/st_albans/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/taunton_firepool/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/taunton_garden/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/tresham/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/trumpington_meadows/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/tyersal_lane/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/upton/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/water_lane/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/wichelstowe/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/wixams/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/gb/wynyard/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/il/tel_aviv/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/ir/tehran/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/jp/hiroshima/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 65000
+    "street_parking_spot_length": 65000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/ly/tripoli/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/nz/auckland/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 65000
+    "street_parking_spot_length": 65000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/pl/krakow/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": false,
     "inferred_sidewalks": false,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/pl/warsaw/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": false,
     "inferred_sidewalks": false,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/sg/jurong/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Left",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 65000
+    "street_parking_spot_length": 65000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/tw/taipei/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 65000
+    "street_parking_spot_length": 65000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/anchorage/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/bellevue/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/beltsville/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/detroit/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/milwaukee/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": {
     "SomeAdditionalWhereNoData": {

importer/config/us/mt_vernon/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/nyc/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": false
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/phoenix/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/providence/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/san_francisco/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/config/us/tucson/cfg.json

@@ -4,7 +4,8 @@
     "driving_side": "Right",
     "bikes_can_use_bus_lanes": true,
     "inferred_sidewalks": true,
-    "street_parking_spot_length": 80000
+    "street_parking_spot_length": 80000,
+    "turn_on_red": true
   },
   "onstreet_parking": "JustOSM",
   "public_offstreet_parking": "None",

importer/src/lib.rs

@@ -111,6 +111,7 @@ pub fn oneshot(
                 bikes_can_use_bus_lanes: true,
                 inferred_sidewalks: true,
                 street_parking_spot_length: Distance::meters(8.0),
+                turn_on_red: true,
             },
 
             onstreet_parking: convert_osm::OnstreetParking::JustOSM,

importer/src/seattle.rs

@@ -133,6 +133,7 @@ pub async fn osm_to_raw(name: &str, timer: &mut Timer<'_>, config: &ImporterConf
                 bikes_can_use_bus_lanes: true,
                 inferred_sidewalks: true,
                 street_parking_spot_length: Distance::meters(8.0),
+                turn_on_red: true,
             },
 
             onstreet_parking: convert_osm::OnstreetParking::Blockface(

map_model/src/make/traffic_signals/lagging_green.rs

@@ -282,7 +282,7 @@ fn three_way_three_stage(i: &Intersection, map: &Map) -> Option<ControlTrafficSi
     // Three-stage with protected lefts, right turn on red
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![
             vec![
@@ -320,7 +320,7 @@ fn four_way_four_stage(i: &Intersection, map: &Map) -> Option<ControlTrafficSign
     let mut ts = new(i.id);
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![
             vec![

map_model/src/make/traffic_signals/mod.rs

@@ -9,7 +9,7 @@ use std::collections::{BTreeSet, HashSet};
 
 use crate::{
     ControlTrafficSignal, DrivingSide, Intersection, IntersectionCluster, IntersectionID, Map,
-    MovementID, RoadID, Stage, StageType, TurnPriority, TurnType,
+    MovementID, RoadID, Stage, StageType, TurnPriority, TurnType, MapConfig
 };
 use geom::Duration;
 
@@ -152,7 +152,7 @@ fn degenerate(map: &Map, i: &Intersection) -> Option<ControlTrafficSignal> {
     let mut ts = new(i.id);
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![vec![(vec![r1, r2], TurnType::Straight, PROTECTED)]],
     );
@@ -202,7 +202,7 @@ fn three_way(map: &Map, i: &Intersection) -> Option<ControlTrafficSignal> {
     // Two-stage with no protected lefts, right turn on red, turning cars yield to peds
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![
             vec![
@@ -242,7 +242,7 @@ fn four_way_four_stage(map: &Map, i: &Intersection) -> Option<ControlTrafficSign
     let mut ts = new(i.id);
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![
             vec![
@@ -275,7 +275,7 @@ fn four_way_two_stage(map: &Map, i: &Intersection) -> Option<ControlTrafficSigna
     let mut ts = new(i.id);
     make_stages(
         &mut ts,
-        map.config.driving_side,
+        &map.config,
         i,
         vec![
             vec![
@@ -356,17 +356,17 @@ const YIELD: bool = false;
 
 fn make_stages(
     ts: &mut ControlTrafficSignal,
-    driving_side: DrivingSide,
+    map_config: &MapConfig,
     i: &Intersection,
     stage_specs: Vec<Vec<(Vec<RoadID>, TurnType, bool)>>,
 ) {
     for specs in stage_specs {
         let mut stage = Stage::new();
         let mut explicit_crosswalks = false;
-        for (roads, mut turn_type, protected) in specs.into_iter() {
+        for (roads, mut turn_type, protected) in specs.iter() {
             // The heuristics are written assuming right turns are easy and lefts are hard, so
             // invert in the UK.
-            if driving_side == DrivingSide::Left {
+            if map_config.driving_side == DrivingSide::Left {
                 if turn_type == TurnType::Right {
                     turn_type = TurnType::Left;
                 } else if turn_type == TurnType::Left {
@@ -382,9 +382,19 @@ fn make_stages(
                     continue;
                 }
 
+                // If turn on red is banned, ignore movements when the stage has
+                // no protected (green) movement from that road
+                if !map_config.turn_on_red
+                    && !specs.iter().any(|(other_roads, _, other_protected)|
+                        *other_protected
+                        && other_roads.contains(&movement.id.from.road))
+                {
+                    continue;
+                }
+
                 stage.edit_movement(
                     movement,
-                    if protected {
+                    if *protected {
                         TurnPriority::Protected
                     } else {
                         TurnPriority::Yield

map_model/src/map.rs

@@ -34,6 +34,8 @@ pub struct MapConfig {
     /// value can be smaller than the hardcoded maximum car length; cars may render on top of each
     /// other, but otherwise the simulation doesn't care.
     pub street_parking_spot_length: Distance,
+    /// If true, turns on red which do not conflict crossing traffic ('right on red') are allowed 
+    pub turn_on_red: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq)]
@@ -173,6 +175,7 @@ impl Map {
                 bikes_can_use_bus_lanes: true,
                 inferred_sidewalks: true,
                 street_parking_spot_length: Distance::meters(8.0),
+                turn_on_red: true,
             },
             pathfinder: Pathfinder::empty(),
             pathfinder_dirty: false,

map_model/src/raw.rs

@@ -124,6 +124,7 @@ impl RawMap {
                 bikes_can_use_bus_lanes: true,
                 inferred_sidewalks: true,
                 street_parking_spot_length: Distance::meters(8.0),
+                turn_on_red: true,
             },
         }
     }

tests/src/main.rs

@@ -57,6 +57,7 @@ fn import_map(path: String) -> Map {
                 bikes_can_use_bus_lanes: true,
                 inferred_sidewalks: true,
                 street_parking_spot_length: Distance::meters(8.0),
+                turn_on_red: false,
             },
             onstreet_parking: convert_osm::OnstreetParking::JustOSM,
             public_offstreet_parking: convert_osm::PublicOffstreetParking::None,