a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-24 15:02:59 +03:00
Code Issues Projects Releases Wiki Activity

No right on red (#806)

Browse Source 
* 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>
This commit is contained in:
Marcel Dejean 2021-11-17 02:06:11 -05:00 committed by GitHub
parent 7d6b720099
commit 641c908051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
89 changed files with 1052 additions and 954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1564
data/MANIFEST.json
View File

File diff suppressed because it is too large Load Diff

5
importer/config/at/salzburg/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/br/sao_paulo/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/ca/montreal/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/ch/geneva/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/ch/zurich/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/cz/frydek_mistek/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/de/berlin/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/de/bonn/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/de/rostock/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/fr/charleville_mezieres/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/fr/lyon/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/fr/paris/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/allerton_bywater/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/allerton_bywater/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/ashton_park/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/ashton_park/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/aylesbury/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/aylesbury/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/aylesham/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/aylesham/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/bailrigg/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/bailrigg/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/bath_riverside/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/bath_riverside/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/bicester/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/bicester/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/cambridge/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/castlemead/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/castlemead/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/chapelford/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/chapelford/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/chapeltown_cohousing/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/chapeltown_cohousing/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/chorlton/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/clackers_brook/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/clackers_brook/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/cricklewood/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/cricklewood/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/culm/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/culm/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/dickens_heath/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/didcot/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/didcot/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/dunton_hills/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/dunton_hills/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/ebbsfleet/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/ebbsfleet/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/exeter_red_cow_village/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/exeter_red_cow_village/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/great_kneighton/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/halsnead/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/halsnead/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/hampton/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/hampton/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/handforth/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/handforth/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/kergilliack/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/kergilliack/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/kidbrooke_village/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/kidbrooke_village/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/lcid/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/leeds/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/lockleaze/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/lockleaze/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/london/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/long_marston/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/marsh_barton/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/marsh_barton/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/micklefield/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/micklefield/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/newborough_road/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/newborough_road/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/newcastle_great_park/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/newcastle_great_park/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/northwick_park/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/northwick_park/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/poundbury/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/poundbury/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/priors_hall/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/priors_hall/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/st_albans/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/taunton_firepool/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/taunton_garden/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/tresham/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/tresham/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/trumpington_meadows/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/gb/tyersal_lane/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/tyersal_lane/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/upton/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/upton/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/water_lane/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/water_lane/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/wichelstowe/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/wichelstowe/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/wixams/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/wixams/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/gb/wynyard/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/gb/wynyard/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/il/tel_aviv/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/ir/tehran/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": "data/input/ir/tehran/procgen_houses.json",
"filter_crosswalks": false
}
}

5
importer/config/jp/hiroshima/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/ly/tripoli/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/nz/auckland/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/pl/krakow/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/pl/warsaw/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/sg/jurong/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/tw/taipei/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/anchorage/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/bellevue/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/beltsville/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/detroit/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/milwaukee/cfg.json
View File

@ -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": {
@ -18,4 +19,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

3
importer/config/us/mt_vernon/cfg.json
View File

@ -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",

5
importer/config/us/nyc/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/phoenix/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": false,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/providence/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/san_francisco/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": true,
"extra_buildings": null,
"filter_crosswalks": false
}
}

5
importer/config/us/tucson/cfg.json
View File

@ -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",
@ -14,4 +15,4 @@
"include_railroads": false,
"extra_buildings": null,
"filter_crosswalks": false
}
}

1
importer/src/lib.rs
View File

@ -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,

1
importer/src/seattle.rs
View File

@ -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(

4
map_model/src/make/traffic_signals/lagging_green.rs
View File

@ -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![

28
map_model/src/make/traffic_signals/mod.rs
View File

@ -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

3
map_model/src/map.rs
View File

@ -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,

1
map_model/src/raw.rs
View File

@ -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,
},
}
}

1
tests/src/main.rs
View File

@ -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,