diff --git a/.gitignore b/.gitignore index 6fb11e02c8..af694271e6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ data/system/leeds data/system/london data/system/nyc data/system/paris +data/system/providence data/system/salzburg data/system/seattle data/system/tel_aviv diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 193e4040fa..64dabcc21b 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -275,6 +275,21 @@ "uncompressed_size_bytes": 24392306, "compressed_size_bytes": 6861518 }, + "data/input/providence/osm/downtown.osm": { + "checksum": "463b986adc83ae4d1174496a4ce744d1", + "uncompressed_size_bytes": 28835517, + "compressed_size_bytes": 2722837 + }, + "data/input/providence/osm/rhode-island-latest.osm.pbf": { + "checksum": "125f6f64b3d211b0a7759ed21abb3b79", + "uncompressed_size_bytes": 41818936, + "compressed_size_bytes": 41774574 + }, + "data/input/providence/raw_maps/downtown.bin": { + "checksum": "c54db43fa183110ef7cafe6b8d77cc9a", + "uncompressed_size_bytes": 5520075, + "compressed_size_bytes": 1669798 + }, "data/input/salzburg/osm/austria-latest.osm.pbf": { "checksum": "53a70dc6134b6370502218b9f2f5ecf2", "uncompressed_size_bytes": 631097048, @@ -785,6 +800,11 @@ "uncompressed_size_bytes": 49575210, "compressed_size_bytes": 16935174 }, + "data/system/providence/maps/downtown.bin": { + "checksum": "e627ea0c650a54faf5b970a9219a389a", + "uncompressed_size_bytes": 17093516, + "compressed_size_bytes": 6220693 + }, "data/system/salzburg/city.bin": { "checksum": "79aa21f2df73501818c02821ba915bb8", "uncompressed_size_bytes": 1084423, @@ -821,9 +841,9 @@ "compressed_size_bytes": 18228660 }, "data/system/seattle/maps/downtown.bin": { - "checksum": "661a133625f2e997e11e790b53beb0da", - "uncompressed_size_bytes": 29297095, - "compressed_size_bytes": 10109042 + "checksum": "3587f8705569ee8955a4b5c32160a0c6", + "uncompressed_size_bytes": 29308389, + "compressed_size_bytes": 10095928 }, "data/system/seattle/maps/huge_seattle.bin": { "checksum": "65362090429b5fcd5ad736dd7b66aee8", diff --git a/importer/config/providence/cfg.json b/importer/config/providence/cfg.json new file mode 100644 index 0000000000..0818a3cbbf --- /dev/null +++ b/importer/config/providence/cfg.json @@ -0,0 +1,17 @@ +{ + "osm_url": "http://download.geofabrik.de/north-america/us/rhode-island-latest.osm.pbf", + "map_config": { + "driving_side": "Right", + "bikes_can_use_bus_lanes": true, + "inferred_sidewalks": true, + "separate_cycleways": false, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 10 + }, + "elevation": null, + "include_railroads": true +} diff --git a/importer/config/providence/downtown.poly b/importer/config/providence/downtown.poly new file mode 100644 index 0000000000..8c06776f0e --- /dev/null +++ b/importer/config/providence/downtown.poly @@ -0,0 +1,10 @@ +boundary +1 + -71.43799781799316 41.84168771910253 + -71.42838478088379 41.81789647342126 + -71.39533996582031 41.80631742775632 + -71.3785171508789 41.82090284460583 + -71.37551307678223 41.84155983282107 + -71.43799781799316 41.84168771910253 +END +END diff --git a/importer/src/main.rs b/importer/src/main.rs index 2de75f4dc6..5016c4ad73 100644 --- a/importer/src/main.rs +++ b/importer/src/main.rs @@ -102,6 +102,7 @@ fn regenerate_everything(config: ImporterConfiguration) { "london", "nyc", "paris", + "providence", "salzburg", "tel_aviv", "warsaw", diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index 06400d699c..4862dacd87 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -88,6 +88,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("paris", "south") => "Paris (south)", ("paris", "east") => "Paris (east)", ("paris", "west") => "Paris (west)", + ("providence", "downtown") => "Providence", ("salzburg", "north") => "Salzburg (north)", ("salzburg", "south") => "Salzburg (south)", ("salzburg", "east") => "Salzburg (east)", diff --git a/updater/src/main.rs b/updater/src/main.rs index 7b712424ea..ed0b3f513a 100644 --- a/updater/src/main.rs +++ b/updater/src/main.rs @@ -180,7 +180,10 @@ fn generate_manifest() -> Manifest { } let orig_path = entry.path().display().to_string(); let path = orig_path.replace("\\", "/"); - if path.contains("system/assets/") || path.contains("system/proposals") { + if path.contains("system/assets/") + || path.contains("system/proposals") + || path.contains("system/study_areas") + { continue; } paths.push((orig_path, path));