From 0ad14d17acde9b943a5993d5bb590519ac8a6bae Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Wed, 15 Jul 2020 11:37:37 -0700 Subject: [PATCH] settle on american spelling of center --- data/MANIFEST.txt | 7 +++---- .../polygons/{berlin_centre.poly => berlin_center.poly} | 2 +- game/src/helpers.rs | 2 +- updater/src/main.rs | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename data/input/berlin/polygons/{berlin_centre.poly => berlin_center.poly} (94%) diff --git a/data/MANIFEST.txt b/data/MANIFEST.txt index 5ffa0ce7b8..6b4a13c6ce 100644 --- a/data/MANIFEST.txt +++ b/data/MANIFEST.txt @@ -1,9 +1,9 @@ data/input/berlin/osm/berlin-latest.osm.pbf,52bbd0527d89827ddeb84eaff742ac5b,https://www.dropbox.com/s/8masykl5oi34wmj/berlin-latest.osm.pbf.zip?dl=0 -data/input/berlin/osm/berlin_centre.osm,5b777f293e8639af583eb5a6b4ce9e8f,https://www.dropbox.com/s/fez31d657hf0n63/berlin_centre.osm.zip?dl=0 +data/input/berlin/osm/berlin_center.osm,5b777f293e8639af583eb5a6b4ce9e8f,https://www.dropbox.com/s/uo6qwure2ntll9h/berlin_center.osm.zip?dl=0 data/input/krakow/osm/huge_krakow.osm,03bae13bcf9461236b81dd1f0a74696d,https://www.dropbox.com/s/ooqaw4z5yfwucql/huge_krakow.osm.zip?dl=0 data/input/krakow/osm/malopolskie-latest.osm.pbf,36071de68f68c516fe81300c2d1940a9,https://www.dropbox.com/s/4718vobelcz32id/malopolskie-latest.osm.pbf.zip?dl=0 data/input/raw_maps/ballard.bin,c69ccb1549963e2afd6e79f171fca891,https://www.dropbox.com/s/cmcgvc3pu4kfbxg/ballard.bin.zip?dl=0 -data/input/raw_maps/berlin_centre.bin,493fe8c5540ccce3e37842501e8007c1,https://www.dropbox.com/s/gogyjakbskbyw2z/berlin_centre.bin.zip?dl=0 +data/input/raw_maps/berlin_center.bin,50c746f880f11b51ed94d6fac7dce7d5,https://www.dropbox.com/s/2vilnherg3f8c5q/berlin_center.bin.zip?dl=0 data/input/raw_maps/downtown.bin,795f4c07462efdedb7ca6a7618543944,https://www.dropbox.com/s/t6k6x1et3hj4q1z/downtown.bin.zip?dl=0 data/input/raw_maps/huge_krakow.bin,b5d27e2d8cd92b35edb6ab8ecefbc01a,https://www.dropbox.com/s/8rxwlqb9r901757/huge_krakow.bin.zip?dl=0 data/input/raw_maps/huge_seattle.bin,c547d7cb0785c11c2561e95750b062d7,https://www.dropbox.com/s/29oz9q847fpsxsj/huge_seattle.bin.zip?dl=0 @@ -12,7 +12,6 @@ data/input/raw_maps/montlake.bin,cc10e8a4a31552ed41cf73e9213723a3,https://www.dr data/input/raw_maps/south_seattle.bin,2c712abcfafd96e24b3563ebe205cb1a,https://www.dropbox.com/s/20rrw79lr4z7qwe/south_seattle.bin.zip?dl=0 data/input/raw_maps/udistrict.bin,ca2ce64fca0baadd2f76ccba37d28bf3,https://www.dropbox.com/s/67ng8s8wkx0d0l7/udistrict.bin.zip?dl=0 data/input/raw_maps/west_seattle.bin,da443ee0c319aa84a32135b714ec5f74,https://www.dropbox.com/s/d58f6td01i1p00f/west_seattle.bin.zip?dl=0 -data/input/screenshots/berlin_centre.zip,6f1a3e6a55d5c2057de90e4a663ba3e6,https://www.dropbox.com/s/6gnezo91vpf3skr/berlin_centre.zip.zip?dl=0 data/input/screenshots/downtown.zip,a7aae6ad193aed9e324225b2e7f76751,https://www.dropbox.com/s/qawd35wz62m2acl/downtown.zip.zip?dl=0 data/input/screenshots/huge_krakow.zip,6f91dcc1643d213bd035297f15c15891,https://www.dropbox.com/s/dbzon7k5ukndtza/huge_krakow.zip.zip?dl=0 data/input/screenshots/lakeslice.zip,308e6094fbc85de79fdb08686b088289,https://www.dropbox.com/s/z0z96lsn7bunqfy/lakeslice.zip.zip?dl=0 @@ -38,7 +37,7 @@ data/input/seattle/popdat.bin,1aa2569c7e5a5a4773d7ca706d60432d,https://www.dropb data/input/seattle/trips_2014.csv,d4a8e733045b28c0385fb81359d6df03,https://www.dropbox.com/s/5ppravwmk6bf20d/trips_2014.csv.zip?dl=0 data/system/cities/seattle.bin,7019f93dac8ba704566049f6d253e533,https://www.dropbox.com/s/1k23g2q1nrmbh1m/seattle.bin.zip?dl=0 data/system/maps/ballard.bin,a7b719add97a69333d0ce30f4d80bf9a,https://www.dropbox.com/s/yp28kp7ii8h81cc/ballard.bin.zip?dl=0 -data/system/maps/berlin_centre.bin,ee7778bcded11df98f176dace587c158,https://www.dropbox.com/s/rxrt2c8duhzzpe9/berlin_centre.bin.zip?dl=0 +data/system/maps/berlin_center.bin,5cec10a797f2c0f0e28505c1d01d4685,https://www.dropbox.com/s/votx78uvbf27osp/berlin_center.bin.zip?dl=0 data/system/maps/downtown.bin,5fef439055a779159f3e962ecf870a71,https://www.dropbox.com/s/5sffvtpixjqqxnv/downtown.bin.zip?dl=0 data/system/maps/huge_krakow.bin,87a379937a006fcf3432ad394076722f,https://www.dropbox.com/s/cc1zgofng1ccxzu/huge_krakow.bin.zip?dl=0 data/system/maps/huge_seattle.bin,afc70b168efbcda561b1206a662c8e1d,https://www.dropbox.com/s/fzguwv1mplkg8xb/huge_seattle.bin.zip?dl=0 diff --git a/data/input/berlin/polygons/berlin_centre.poly b/data/input/berlin/polygons/berlin_center.poly similarity index 94% rename from data/input/berlin/polygons/berlin_centre.poly rename to data/input/berlin/polygons/berlin_center.poly index ea278e45f8..4b48e87379 100644 --- a/data/input/berlin/polygons/berlin_centre.poly +++ b/data/input/berlin/polygons/berlin_center.poly @@ -1,4 +1,4 @@ -berlin_centre +berlin_center 1 13.361434936523436 52.49532344352079 13.432674407958984 52.49532344352079 diff --git a/game/src/helpers.rs b/game/src/helpers.rs index cfba1ec0d1..b6126a6e49 100644 --- a/game/src/helpers.rs +++ b/game/src/helpers.rs @@ -96,7 +96,7 @@ pub fn nice_map_name(name: &str) -> &str { "west_seattle" => "West Seattle", // Outside Seattle "huge_krakow" => "Kraków (city center)", - "berlin_centre" => "Berlin (city centre)", + "berlin_center" => "Berlin (city center)", _ => name, } } diff --git a/updater/src/main.rs b/updater/src/main.rs index 5c180df1f5..448ea480f4 100644 --- a/updater/src/main.rs +++ b/updater/src/main.rs @@ -265,7 +265,7 @@ impl Manifest { } "huge_seattle" => map == "huge_seattle", "krakow" => map == "huge_krakow", - "berlin" => map == "berlin_centre", + "berlin" => map == "berlin_center", _ => panic!("Unknown city {}. Check your data/config", city), } }