diff --git a/.gitignore b/.gitignore index 587557715b..ccc23db973 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ data/system/berlin data/system/krakow data/system/leeds data/system/london +data/system/nyc data/system/paris data/system/seattle data/system/tel_aviv diff --git a/book/src/howto/new_city.md b/book/src/howto/new_city.md index b570e07350..696e5dfbc1 100644 --- a/book/src/howto/new_city.md +++ b/book/src/howto/new_city.md @@ -77,7 +77,7 @@ use it as well. 6. Run it: `./import.sh --city=your_city --raw --map` -7. Update `.gitignore`, following `tel_aviv` as an example. +7. Update `.gitignore` and `data/regen.sh`, following `tel_aviv` as an example. Send a PR with your changes! I'll generate everything and make it work with `updater`, so most people don't have to build everything from scratch. diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 683b320eb8..f2198361ae 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -116,6 +116,34 @@ "checksum": "4f651a450d9d6b73618db015c34a03ad", "size_bytes": 99666 }, + "data/input/nyc/footways.bin": { + "checksum": "58a6a3fcc2f3c7d9a85335ec8c5bfaac", + "size_bytes": 436756 + }, + "data/input/nyc/osm/lower_manhattan.osm": { + "checksum": "09bf8cdb40474741b58e74f4c486a69e", + "size_bytes": 34156510 + }, + "data/input/nyc/osm/midtown_manhattan.osm": { + "checksum": "d90c3be90e26add046724e76b7b3503b", + "size_bytes": 44314663 + }, + "data/input/nyc/osm/new-york-latest.osm.pbf": { + "checksum": "facc38237e51d386617203060c812a5c", + "size_bytes": 277455662 + }, + "data/input/nyc/raw_maps/lower_manhattan.bin": { + "checksum": "bba778a44cbf7b1fc7aaaae4ad03e0f1", + "size_bytes": 8694261 + }, + "data/input/nyc/raw_maps/midtown_manhattan.bin": { + "checksum": "1374a11f6e2751bfbd7181644b8c0341", + "size_bytes": 8823093 + }, + "data/input/nyc/service_roads.bin": { + "checksum": "41b6584f2c0af6324047e84995785132", + "size_bytes": 83733 + }, "data/input/paris/footways.bin": { "checksum": "8197a29367a323022a7d57338fc5fe5b", "size_bytes": 834703 @@ -456,6 +484,18 @@ "checksum": "e1c97b9cfc9bb60d42aa51697eef698f", "size_bytes": 8499386 }, + "data/system/nyc/city.bin": { + "checksum": "aae1b9807f852aa74b9d7d6e66db1810", + "size_bytes": 440489 + }, + "data/system/nyc/maps/lower_manhattan.bin": { + "checksum": "8566f19c9cf42a5b758ff019822c2ab7", + "size_bytes": 18433412 + }, + "data/system/nyc/maps/midtown_manhattan.bin": { + "checksum": "9c108eacd0bccde93bb3ee638ec8b0df", + "size_bytes": 17282440 + }, "data/system/paris/city.bin": { "checksum": "0fd1914ef16ad3797ccfaf14c36c3a17", "size_bytes": 2279409 diff --git a/data/other_polygons/manhattan.poly b/data/other_polygons/manhattan.poly deleted file mode 100644 index 223a9e71e3..0000000000 --- a/data/other_polygons/manhattan.poly +++ /dev/null @@ -1,15 +0,0 @@ -boundary -1 - -74.02373313903809 40.69625781921317 - -74.01025772094727 40.699218658976555 - -73.99995803833008 40.703122861875606 - -73.9739513397217 40.7105727473657 - -73.96159172058105 40.7519385984599 - -73.9400053024292 40.77612179824107 - -73.94030570983887 40.78057392807732 - -73.93798828125 40.78483079505022 - -73.96742820739748 40.822383381646446 - -74.01686668395996 40.75219867966512 - -74.02373313903809 40.69625781921317 -END -END diff --git a/data/regen.sh b/data/regen.sh index 36d0d92b17..d14c1b2c6b 100755 --- a/data/regen.sh +++ b/data/regen.sh @@ -9,6 +9,7 @@ rm -fv data/system/seattle/maps/huge_seattle.bin data/input/raw_maps/huge_seattl ./import.sh --raw --map --city=krakow ./import.sh --raw --map --city=leeds ./import.sh --raw --map --city=london +./import.sh --raw --map --city_overview --city=nyc ./import.sh --raw --map --city_overview --city=paris ./import.sh --raw --map --city=tel_aviv ./import.sh --raw --map --city=xian diff --git a/importer/config/nyc/cfg.json b/importer/config/nyc/cfg.json new file mode 100644 index 0000000000..d9facdf634 --- /dev/null +++ b/importer/config/nyc/cfg.json @@ -0,0 +1,15 @@ +{ + "osm_url": "https://download.geofabrik.de/north-america/us/new-york-latest.osm.pbf", + "map_config": { + "driving_side": "Right", + "bikes_can_use_bus_lanes": true, + "inferred_sidewalks": true + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 10 + }, + "elevation": null, + "include_railroads": true +} diff --git a/importer/config/nyc/lower_manhattan.poly b/importer/config/nyc/lower_manhattan.poly new file mode 100644 index 0000000000..55740e7fe6 --- /dev/null +++ b/importer/config/nyc/lower_manhattan.poly @@ -0,0 +1,11 @@ +boundary +1 + -73.9706039428711 40.727096155848784 + -74.01317596435547 40.743355347975395 + -74.02356147766113 40.69892583453415 + -74.00733947753906 40.69697363868991 + -73.9940357208252 40.706864174918 + -73.97601127624512 40.70998719702583 + -73.9706039428711 40.727096155848784 +END +END diff --git a/importer/config/nyc/midtown_manhattan.poly b/importer/config/nyc/midtown_manhattan.poly new file mode 100644 index 0000000000..69c17c9d30 --- /dev/null +++ b/importer/config/nyc/midtown_manhattan.poly @@ -0,0 +1,11 @@ +boundary +1 + -73.9706039428711 40.726169262197246 + -73.96957397460938 40.74094923806963 + -73.95772933959961 40.75694498295937 + -73.99789810180664 40.77469185382073 + -74.0125322341919 40.757595135105426 + -74.01296138763428 40.74250996792694 + -73.9706039428711 40.726169262197246 +END +END diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index c56e96c946..dd6e52fa9f 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -69,6 +69,8 @@ pub fn nice_map_name(name: &MapName) -> &str { ("krakow", "center") => "Kraków (city center)", ("leeds", "center") => "Leeds (city center)", ("london", "southbank") => "London (Southbank)", + ("nyc", "lower_manhattan") => "Lower Manhattan", + ("nyc", "midtown_manhattan") => "Midtown Manhattan", ("paris", "center") => "Paris (city center)", ("paris", "north") => "Paris (north)", ("paris", "south") => "Paris (south)",