From 82cc802c5ef8e458cb2f1dcfff8f781a0f2dfaeb Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 13:10:32 +0100 Subject: [PATCH 01/20] small corrections --- res/country_metadata/hasDailyAlternateSideParkingSign.yml | 1 + res/country_metadata/hasNoStandingSign.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/country_metadata/hasDailyAlternateSideParkingSign.yml b/res/country_metadata/hasDailyAlternateSideParkingSign.yml index 2237f2c89d..2915468a06 100644 --- a/res/country_metadata/hasDailyAlternateSideParkingSign.yml +++ b/res/country_metadata/hasDailyAlternateSideParkingSign.yml @@ -21,6 +21,7 @@ FI: true # https://en.wikipedia.org/wiki/Road_signs_in_Finland GE: true # https://en.wikipedia.org/wiki/Road_signs_in_Georgia_(country) GR: true # https://en.wikipedia.org/wiki/Road_signs_in_Greece HR: true # http://www.adcidl.com/pdf/Croatian-Road-Traffic-Signs.pdf +IT: false # https://commons.wikimedia.org/wiki/Old_road_signs_of_Italy not used anymore KH: true # https://en.wikipedia.org/wiki/Road_signs_in_Cambodia LA: true # https://en.wikipedia.org/wiki/Road_signs_in_Laos LT: true # https://en.wikipedia.org/wiki/Road_signs_in_Lithuania diff --git a/res/country_metadata/hasNoStandingSign.yml b/res/country_metadata/hasNoStandingSign.yml index 4c74b05516..43760b8acb 100644 --- a/res/country_metadata/hasNoStandingSign.yml +++ b/res/country_metadata/hasNoStandingSign.yml @@ -2,7 +2,7 @@ # "no standing" is usually like "no parking" but loading/unloading goods is also forbidden # default: false -AU: true # https://commons.wikimedia.org/wiki/Road_signs_of_Australia -CA: true # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Ontario +AU: false # https://commons.wikimedia.org/wiki/Road_signs_of_Australia but https://www.smh.com.au/national/no-standing-parking-rule-to-end-in-nsw-20081112-5mob.html +CA-ON: true # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Ontario PH: true # https://en.wikipedia.org/wiki/Road_signs_in_the_Philippines#Parking_signs US: true From 58bcc022dbc3cbeafce0a089485e89065878732e Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 13:11:10 +0100 Subject: [PATCH 02/20] remove information on these extremely rare signs again Even if some countries still have those de-jure, de-facto they are not really used (anymore) --- .../hasBiWeeklyAlternateSideCombinationParkingSign.yml | 5 ----- .../hasDailyAlternateSideCombinationParkingSign.yml | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 res/country_metadata/hasBiWeeklyAlternateSideCombinationParkingSign.yml delete mode 100644 res/country_metadata/hasDailyAlternateSideCombinationParkingSign.yml diff --git a/res/country_metadata/hasBiWeeklyAlternateSideCombinationParkingSign.yml b/res/country_metadata/hasBiWeeklyAlternateSideCombinationParkingSign.yml deleted file mode 100644 index 20e5d35a8d..0000000000 --- a/res/country_metadata/hasBiWeeklyAlternateSideCombinationParkingSign.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Whether a combination sign for alternate-side-parking (bi-weekly - first and last half of month) exists, -# i.e. a sign that directs when parking is forbidden on the left side and when on the right side at the same time -# -default: false -BE: true # https://nl.wikipedia.org/wiki/Beurtelings_parkeren diff --git a/res/country_metadata/hasDailyAlternateSideCombinationParkingSign.yml b/res/country_metadata/hasDailyAlternateSideCombinationParkingSign.yml deleted file mode 100644 index d5d2ad8588..0000000000 --- a/res/country_metadata/hasDailyAlternateSideCombinationParkingSign.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Whether a combination sign for alternate-side-parking (even and odd days) exists, -# i.e. a sign that directs when parking is forbidden on the left side and when on the right side at the same time -# -default: false -SV: true # https://sv.wikipedia.org/wiki/Datumparkering From d457a6d737020bbd8ded4e994895fe98633e8944 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 18:21:56 +0100 Subject: [PATCH 03/20] update hasLivingStreet and add livingStreetSignStyle --- res/country_metadata/hasLivingStreet.yml | 17 +++-- .../livingStreetSignStyle.yml | 74 +++++++++++++++++++ ...ing_street_australia.svg => australia.svg} | 0 .../living street graphics/mexico.svg | 24 ++++++ ...living_street_russian.svg => portrait.svg} | 0 .../{living_street_sadc.svg => sadc.svg} | 0 .../{living_street_france.svg => square.svg} | 0 .../{living_street.svg => wide.svg} | 0 8 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 res/country_metadata/livingStreetSignStyle.yml rename res/graphics/living street graphics/{living_street_australia.svg => australia.svg} (100%) create mode 100644 res/graphics/living street graphics/mexico.svg rename res/graphics/living street graphics/{living_street_russian.svg => portrait.svg} (100%) rename res/graphics/living street graphics/{living_street_sadc.svg => sadc.svg} (100%) rename res/graphics/living street graphics/{living_street_france.svg => square.svg} (100%) rename res/graphics/living street graphics/{living_street.svg => wide.svg} (100%) diff --git a/res/country_metadata/hasLivingStreet.yml b/res/country_metadata/hasLivingStreet.yml index 06d6fc062e..1a0fcc0d62 100644 --- a/res/country_metadata/hasLivingStreet.yml +++ b/res/country_metadata/hasLivingStreet.yml @@ -9,7 +9,7 @@ default: false AL: true AZ: true AO: true -AM: true + AM: true AU: true AT: true BY: true @@ -23,23 +23,27 @@ DK: true EE: true FI: true FR: true -GE: true +GB: true + GE: true DE: true GR: true HU: true -IL: true +IL: false # OSM wiki: "No special legal category corresponding to Living Streets exists in Ireland. Tag as residential with maxspeed of either 50 or 30 as indicated by signs" IS: true -IT: true +IT: false # OSM wiki: "Living streets do not exist in Italy. The 'sign Italian traffic signs - zona residenziale.svg' is defined as 'Zona residenziale', but no special rules corresponding to Living Streets exists. Tag as residential with maxspeed of either 50 or 30 as indicated by signs." KZ: true KG: true LV: true LS: true LT: true LU: true +ME: true # because all surrounding ones have it MG: true -MW: true +MK: true # because all surrounding ones have it MU: true +MW: true # because all surrounding ones have it MN: true +MX: true MZ: true NA: true NL: true @@ -60,6 +64,7 @@ CH: true TZ: true TR: true UA: true -GB: true +XK: true # because all surrounding ones have it +ZA: true ZM: true ZW: true diff --git a/res/country_metadata/livingStreetSignStyle.yml b/res/country_metadata/livingStreetSignStyle.yml new file mode 100644 index 0000000000..e96a2f3db2 --- /dev/null +++ b/res/country_metadata/livingStreetSignStyle.yml @@ -0,0 +1,74 @@ +# style of living street (aka home zone) sign +# +# most signs show the same motive: A dad and son playing ball in the foreground, +# a detached house and a car in the background. All in white on blue. +# +# sources: +# - same as hasLivingStreet +# +# styles: +# - wide - white on blue, white border, wide/landscape +# - portrait - white on blue, white border, narrow/portrait +# - square - white on blue, white border, square +# - sadc - white on blue, red border, narrow/portrait +# - australia - black "Shared zone" with speed limit sign on white rectangular narrow/portrait with black border +# - mexico - black on yellow, black border, wide/landscape +AL: wide +AM: portrait +AO: sadc +AT: wide +AU: australia # https://en.wikipedia.org/wiki/Shared_Zone +BA: wide +BE: wide +BG: wide +BW: wide +BY: portrait +CH: wide # https://de.wikipedia.org/wiki/Begegnungszone +CZ: wide +DE: wide +DK: square # https://www.retsinformation.dk/eli/lta/2012/802 +EE: wide +ES: wide +FI: wide +FR: square # https://fr.wikipedia.org/wiki/Zone_de_rencontre +GB: square # https://en.wikipedia.org/wiki/Home_zone +GE: portrait +GR: wide +HR: wide +HU: wide +IS: wide +KZ: portrait +KG: portrait +LS: sadc +LT: wide +LV: wide +LU: wide +MD: wide +ME: wide +MG: sadc +MK: wide +MN: portrait +MU: sadc +MW: sadc +MX: mexico # https://wiki.openstreetmap.org/wiki/File:SP-E17a_Calle_residencial.png +MZ: sadc +NL: wide +NA: sadc +'NO': square # https://no.wikipedia.org/wiki/Gatetun +NZ: australia +PL: wide +RO: square +RU: portrait # https://ru.wikipedia.org/wiki/Жилая_зона +RS: wide +SC: sadc +SK: wide +SI: wide +SE: wide +SZ: sadc +TR: wide +TZ: sadc +UA: portrait +XK: wide +ZA: sadc +ZM: sadc +ZW: sadc \ No newline at end of file diff --git a/res/graphics/living street graphics/living_street_australia.svg b/res/graphics/living street graphics/australia.svg similarity index 100% rename from res/graphics/living street graphics/living_street_australia.svg rename to res/graphics/living street graphics/australia.svg diff --git a/res/graphics/living street graphics/mexico.svg b/res/graphics/living street graphics/mexico.svg new file mode 100644 index 0000000000..1dd99fec94 --- /dev/null +++ b/res/graphics/living street graphics/mexico.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/graphics/living street graphics/living_street_russian.svg b/res/graphics/living street graphics/portrait.svg similarity index 100% rename from res/graphics/living street graphics/living_street_russian.svg rename to res/graphics/living street graphics/portrait.svg diff --git a/res/graphics/living street graphics/living_street_sadc.svg b/res/graphics/living street graphics/sadc.svg similarity index 100% rename from res/graphics/living street graphics/living_street_sadc.svg rename to res/graphics/living street graphics/sadc.svg diff --git a/res/graphics/living street graphics/living_street_france.svg b/res/graphics/living street graphics/square.svg similarity index 100% rename from res/graphics/living street graphics/living_street_france.svg rename to res/graphics/living street graphics/square.svg diff --git a/res/graphics/living street graphics/living_street.svg b/res/graphics/living street graphics/wide.svg similarity index 100% rename from res/graphics/living street graphics/living_street.svg rename to res/graphics/living street graphics/wide.svg From 03d583ce8e544dd6c9b324e7427eb660e5d0d4ce Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 18:22:15 +0100 Subject: [PATCH 04/20] update hasLivingStreet and add livingStreetSignStyle --- .../westnordost/streetcomplete/data/meta/CountryInfo.java | 6 ++---- res/country_metadata/hasLivingStreet.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java index ba5cfc51d7..286b48c481 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java @@ -23,10 +23,8 @@ public class CountryInfo implements Serializable, Cloneable List clothesContainerOperators; String firstDayOfWorkweek; Boolean hasAdvisorySpeedLimitSign; - Boolean hasBiWeeklyAlternateSideCombinationParkingSign; Boolean hasBiWeeklyAlternateSideParkingSign; Boolean hasCenterLeftTurnLane; - Boolean hasDailyAlternateSideCombinationParkingSign; Boolean hasDailyAlternateSideParkingSign; Boolean hasLivingStreet; Boolean hasNoStandingSign; @@ -34,6 +32,7 @@ public class CountryInfo implements Serializable, Cloneable Boolean isLeftHandTraffic; Boolean isUsuallyAnyGlassRecycleableInContainers; List lengthUnits; + String livingStreetSignStyle; Integer mobileCountryCode; String noParkingSignStyle; String noStoppingSignStyle; @@ -65,6 +64,7 @@ public List getAdditionalStreetsignLanguages() public String getCountryCode() { return countryCode; } public String getFirstDayOfWorkweek() { return firstDayOfWorkweek; } public List getLengthUnits() { return lengthUnits; } + public String getLivingStreetSignStyle() { return livingStreetSignStyle; } public Locale getLocale() { List languages = getOfficialLanguages(); @@ -105,10 +105,8 @@ public List getPopularSports() public List getWeightLimitUnits() { return weightLimitUnits; } public Integer getWorkweekDays() { return workweekDays; } public boolean hasAdvisorySpeedLimitSign() { return hasAdvisorySpeedLimitSign; } - public Boolean hasBiWeeklyAlternateSideCombinationParkingSign() { return hasBiWeeklyAlternateSideCombinationParkingSign; } public Boolean hasBiWeeklyAlternateSideParkingSign() { return hasBiWeeklyAlternateSideParkingSign; } public Boolean hasCenterLeftTurnLane() { return hasCenterLeftTurnLane; } - public Boolean hasDailyAlternateSideCombinationParkingSign() { return hasDailyAlternateSideCombinationParkingSign; } public Boolean hasDailyAlternateSideParkingSign() { return hasDailyAlternateSideParkingSign; } public boolean hasLivingStreet() { return hasLivingStreet; } public Boolean hasNoStandingSign() { return hasNoStandingSign; } diff --git a/res/country_metadata/hasLivingStreet.yml b/res/country_metadata/hasLivingStreet.yml index 1a0fcc0d62..9f2fbc40a8 100644 --- a/res/country_metadata/hasLivingStreet.yml +++ b/res/country_metadata/hasLivingStreet.yml @@ -9,7 +9,7 @@ default: false AL: true AZ: true AO: true - AM: true +AM: true AU: true AT: true BY: true @@ -24,7 +24,7 @@ EE: true FI: true FR: true GB: true - GE: true +GE: true DE: true GR: true HU: true From 6eebd32af16f7290b1177a31cef0e09851cfaf95 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:35:35 +0100 Subject: [PATCH 05/20] fix typo --- .../de/westnordost/streetcomplete/data/meta/CountryInfo.java | 4 ++-- .../recycling_material/AddRecyclingContainerMaterialsForm.kt | 2 +- ...ainers.yml => isUsuallyAnyGlassRecyclableInContainers.yml} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename res/country_metadata/{isUsuallyAnyGlassRecycleableInContainers.yml => isUsuallyAnyGlassRecyclableInContainers.yml} (100%) diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java index 286b48c481..85fc518941 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java @@ -30,7 +30,7 @@ public class CountryInfo implements Serializable, Cloneable Boolean hasNoStandingSign; Boolean hasSlowZone; Boolean isLeftHandTraffic; - Boolean isUsuallyAnyGlassRecycleableInContainers; + Boolean isUsuallyAnyGlassRecyclableInContainers; List lengthUnits; String livingStreetSignStyle; Integer mobileCountryCode; @@ -113,5 +113,5 @@ public List getPopularSports() public boolean hasSlowZone() { return hasSlowZone; } public boolean isLeftHandTraffic() { return isLeftHandTraffic; } public Boolean isRoofsAreUsuallyFlat() { return roofsAreUsuallyFlat; } - public Boolean isUsuallyAnyGlassRecycleableInContainers() { return isUsuallyAnyGlassRecycleableInContainers; } + public Boolean isUsuallyAnyGlassRecyclableInContainers() { return isUsuallyAnyGlassRecyclableInContainers; } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterialsForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterialsForm.kt index 35245656c1..151898f06f 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterialsForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterialsForm.kt @@ -49,7 +49,7 @@ class AddRecyclingContainerMaterialsForm override val maxSelectableItems = -1 - private val isAnyGlassRecycleable get() = countryInfo.isUsuallyAnyGlassRecycleableInContainers + private val isAnyGlassRecycleable get() = countryInfo.isUsuallyAnyGlassRecyclableInContainers override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/res/country_metadata/isUsuallyAnyGlassRecycleableInContainers.yml b/res/country_metadata/isUsuallyAnyGlassRecyclableInContainers.yml similarity index 100% rename from res/country_metadata/isUsuallyAnyGlassRecycleableInContainers.yml rename to res/country_metadata/isUsuallyAnyGlassRecyclableInContainers.yml From 9b639a6dbe5fc53e3b015f6a7ea63a1f7e0d6b58 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:36:27 +0100 Subject: [PATCH 06/20] rename living street graphics --- .../res/drawable-mcc208/ic_living_street.xml | 2 +- .../res/drawable-mcc250/ic_living_street.xml | 2 +- .../res/drawable-mcc255/ic_living_street.xml | 2 +- .../res/drawable-mcc257/ic_living_street.xml | 2 +- .../res/drawable-mcc268/ic_living_street.xml | 2 +- .../res/drawable-mcc283/ic_living_street.xml | 2 +- .../res/drawable-mcc400/ic_living_street.xml | 2 +- .../res/drawable-mcc401/ic_living_street.xml | 2 +- .../res/drawable-mcc428/ic_living_street.xml | 2 +- .../res/drawable-mcc437/ic_living_street.xml | 2 +- .../res/drawable/ic_living_street_mexico.xml | 77 +++++++++++++++++++ ...sian.xml => ic_living_street_portrait.xml} | 0 ...france.xml => ic_living_street_square.xml} | 0 13 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable/ic_living_street_mexico.xml rename app/src/main/res/drawable/{ic_living_street_russian.xml => ic_living_street_portrait.xml} (100%) rename app/src/main/res/drawable/{ic_living_street_france.xml => ic_living_street_square.xml} (100%) diff --git a/app/src/main/res/drawable-mcc208/ic_living_street.xml b/app/src/main/res/drawable-mcc208/ic_living_street.xml index 48cc8e2b3c..84741e1c5e 100644 --- a/app/src/main/res/drawable-mcc208/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc208/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc250/ic_living_street.xml b/app/src/main/res/drawable-mcc250/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc250/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc250/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc255/ic_living_street.xml b/app/src/main/res/drawable-mcc255/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc255/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc255/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc257/ic_living_street.xml b/app/src/main/res/drawable-mcc257/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc257/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc257/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc268/ic_living_street.xml b/app/src/main/res/drawable-mcc268/ic_living_street.xml index 48cc8e2b3c..84741e1c5e 100644 --- a/app/src/main/res/drawable-mcc268/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc268/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc283/ic_living_street.xml b/app/src/main/res/drawable-mcc283/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc283/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc283/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc400/ic_living_street.xml b/app/src/main/res/drawable-mcc400/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc400/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc400/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc401/ic_living_street.xml b/app/src/main/res/drawable-mcc401/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc401/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc401/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc428/ic_living_street.xml b/app/src/main/res/drawable-mcc428/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc428/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc428/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable-mcc437/ic_living_street.xml b/app/src/main/res/drawable-mcc437/ic_living_street.xml index 60a65bbcab..ae4be15cd4 100644 --- a/app/src/main/res/drawable-mcc437/ic_living_street.xml +++ b/app/src/main/res/drawable-mcc437/ic_living_street.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/ic_living_street_mexico.xml b/app/src/main/res/drawable/ic_living_street_mexico.xml new file mode 100644 index 0000000000..4308bfac8c --- /dev/null +++ b/app/src/main/res/drawable/ic_living_street_mexico.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_living_street_russian.xml b/app/src/main/res/drawable/ic_living_street_portrait.xml similarity index 100% rename from app/src/main/res/drawable/ic_living_street_russian.xml rename to app/src/main/res/drawable/ic_living_street_portrait.xml diff --git a/app/src/main/res/drawable/ic_living_street_france.xml b/app/src/main/res/drawable/ic_living_street_square.xml similarity index 100% rename from app/src/main/res/drawable/ic_living_street_france.xml rename to app/src/main/res/drawable/ic_living_street_square.xml From 993e7af63e70ee706d2e6740e2a08ae35a193799 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:42:14 +0100 Subject: [PATCH 07/20] import parking and stopping sign graphics --- app/src/main/res/drawable/ic_no_parking.xml | 15 +++++++++++ .../res/drawable/ic_no_parking_australia.xml | 21 +++++++++++++++ .../main/res/drawable/ic_no_parking_mutcd.xml | 21 +++++++++++++++ .../ic_no_parking_mutcd_latin_america.xml | 21 +++++++++++++++ .../res/drawable/ic_no_parking_mutcd_text.xml | 19 ++++++++++++++ .../ic_no_parking_mutcd_text_spanish.xml | 19 ++++++++++++++ .../main/res/drawable/ic_no_parking_sadc.xml | 21 +++++++++++++++ .../res/drawable/ic_no_parking_taiwan.xml | 22 ++++++++++++++++ .../res/drawable/ic_no_parking_vienna.xml | 21 +++++++++++++++ .../drawable/ic_no_standing_mutcd_text.xml | 19 ++++++++++++++ app/src/main/res/drawable/ic_no_stopping.xml | 14 ++++++++++ .../res/drawable/ic_no_stopping_australia.xml | 21 +++++++++++++++ .../res/drawable/ic_no_stopping_canada.xml | 20 ++++++++++++++ .../res/drawable/ic_no_stopping_colombia.xml | 26 +++++++++++++++++++ .../res/drawable/ic_no_stopping_mutcd.xml | 21 +++++++++++++++ .../ic_no_stopping_mutcd_latin_america.xml | 25 ++++++++++++++++++ .../drawable/ic_no_stopping_mutcd_text.xml | 19 ++++++++++++++ .../main/res/drawable/ic_no_stopping_sadc.xml | 21 +++++++++++++++ .../res/drawable/ic_no_waiting_mutcd_text.xml | 19 ++++++++++++++ 19 files changed, 385 insertions(+) create mode 100644 app/src/main/res/drawable/ic_no_parking.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_australia.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_mutcd.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_mutcd_latin_america.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_mutcd_text.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_mutcd_text_spanish.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_sadc.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_taiwan.xml create mode 100644 app/src/main/res/drawable/ic_no_parking_vienna.xml create mode 100644 app/src/main/res/drawable/ic_no_standing_mutcd_text.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_australia.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_canada.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_colombia.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_mutcd.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_mutcd_latin_america.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_mutcd_text.xml create mode 100644 app/src/main/res/drawable/ic_no_stopping_sadc.xml create mode 100644 app/src/main/res/drawable/ic_no_waiting_mutcd_text.xml diff --git a/app/src/main/res/drawable/ic_no_parking.xml b/app/src/main/res/drawable/ic_no_parking.xml new file mode 100644 index 0000000000..9235416f87 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking.xml @@ -0,0 +1,15 @@ + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_australia.xml b/app/src/main/res/drawable/ic_no_parking_australia.xml new file mode 100644 index 0000000000..698bdbe8b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_australia.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_mutcd.xml b/app/src/main/res/drawable/ic_no_parking_mutcd.xml new file mode 100644 index 0000000000..d3230d5736 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_mutcd.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_mutcd_latin_america.xml b/app/src/main/res/drawable/ic_no_parking_mutcd_latin_america.xml new file mode 100644 index 0000000000..72aab21182 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_mutcd_latin_america.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_mutcd_text.xml b/app/src/main/res/drawable/ic_no_parking_mutcd_text.xml new file mode 100644 index 0000000000..433eafdcdb --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_mutcd_text.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_mutcd_text_spanish.xml b/app/src/main/res/drawable/ic_no_parking_mutcd_text_spanish.xml new file mode 100644 index 0000000000..1b97799e09 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_mutcd_text_spanish.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_sadc.xml b/app/src/main/res/drawable/ic_no_parking_sadc.xml new file mode 100644 index 0000000000..93dbec6658 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_sadc.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_taiwan.xml b/app/src/main/res/drawable/ic_no_parking_taiwan.xml new file mode 100644 index 0000000000..b97e7bff32 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_taiwan.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_parking_vienna.xml b/app/src/main/res/drawable/ic_no_parking_vienna.xml new file mode 100644 index 0000000000..d3230d5736 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_parking_vienna.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_standing_mutcd_text.xml b/app/src/main/res/drawable/ic_no_standing_mutcd_text.xml new file mode 100644 index 0000000000..7c55ac8415 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_standing_mutcd_text.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping.xml b/app/src/main/res/drawable/ic_no_stopping.xml new file mode 100644 index 0000000000..6242c60443 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_australia.xml b/app/src/main/res/drawable/ic_no_stopping_australia.xml new file mode 100644 index 0000000000..49795c3bf0 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_australia.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_canada.xml b/app/src/main/res/drawable/ic_no_stopping_canada.xml new file mode 100644 index 0000000000..9d2d77bd38 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_canada.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_colombia.xml b/app/src/main/res/drawable/ic_no_stopping_colombia.xml new file mode 100644 index 0000000000..aec81c4bb7 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_colombia.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_mutcd.xml b/app/src/main/res/drawable/ic_no_stopping_mutcd.xml new file mode 100644 index 0000000000..a469529273 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_mutcd.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_mutcd_latin_america.xml b/app/src/main/res/drawable/ic_no_stopping_mutcd_latin_america.xml new file mode 100644 index 0000000000..e0f79bc09d --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_mutcd_latin_america.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_mutcd_text.xml b/app/src/main/res/drawable/ic_no_stopping_mutcd_text.xml new file mode 100644 index 0000000000..ca719ba46b --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_mutcd_text.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_stopping_sadc.xml b/app/src/main/res/drawable/ic_no_stopping_sadc.xml new file mode 100644 index 0000000000..20a0414d1b --- /dev/null +++ b/app/src/main/res/drawable/ic_no_stopping_sadc.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_no_waiting_mutcd_text.xml b/app/src/main/res/drawable/ic_no_waiting_mutcd_text.xml new file mode 100644 index 0000000000..bd88148439 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_waiting_mutcd_text.xml @@ -0,0 +1,19 @@ + + + + + + From 4579fc197b633c4a4a7f15223b70997733d0abf4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:42:44 +0100 Subject: [PATCH 08/20] add advisorySpeedLimitSignStyle --- .../streetcomplete/data/meta/CountryInfo.java | 2 ++ .../advisorySpeedLimitSignStyle.yml | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 res/country_metadata/advisorySpeedLimitSignStyle.yml diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java index 85fc518941..09dfb41b30 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java @@ -17,6 +17,7 @@ public class CountryInfo implements Serializable, Cloneable List additionalStreetsignLanguages; String additionalValidHousenumberRegex; + String advisorySpeedLimitSignStyle; List atmOperators; String centerLineStyle; List chargingStationOperators; @@ -57,6 +58,7 @@ public List getAdditionalStreetsignLanguages() return Collections.unmodifiableList(additionalStreetsignLanguages); } public String getAdditionalValidHousenumberRegex() { return additionalValidHousenumberRegex; } + public String getAdvisorySpeedLimitSignStyle() { return advisorySpeedLimitSignStyle; } public List getAtmOperators() { return atmOperators; } public String getCenterLineStyle() { return centerLineStyle; } public List getChargingStationOperators() { return chargingStationOperators; } diff --git a/res/country_metadata/advisorySpeedLimitSignStyle.yml b/res/country_metadata/advisorySpeedLimitSignStyle.yml new file mode 100644 index 0000000000..e9a42a5fe3 --- /dev/null +++ b/res/country_metadata/advisorySpeedLimitSignStyle.yml @@ -0,0 +1,20 @@ +# style of advisory speed limit sign. +# +# All known signs are rectangular, so categorizing them only very roughly by color +# +# sources: +# - https://en.wikipedia.org/wiki/Advisory_speed_limit +# - https://commons.wikimedia.org/wiki/Category:Diagrams_of_advisory_speed_road_signs +default: blue +AU: yellow +CA: yellow +CN: yellow +GB: white +JP: white +KR: white +'NO': white +NZ: yellow +PH: yellow +QA: white +TH: yellow # https://commons.wikimedia.org/wiki/File:Thailand_road_sign_%E0%B8%95%E0%B8%AA-16-60.svg +US: yellow From d1e452aa31af6072314979be5d461f1125c5fa5d Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:42:58 +0100 Subject: [PATCH 09/20] add noStandingSignStyle --- .../de/westnordost/streetcomplete/data/meta/CountryInfo.java | 2 ++ res/country_metadata/noStandingSignStyle.yml | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 res/country_metadata/noStandingSignStyle.yml diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java index 09dfb41b30..6049d800b3 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java @@ -36,6 +36,7 @@ public class CountryInfo implements Serializable, Cloneable String livingStreetSignStyle; Integer mobileCountryCode; String noParkingSignStyle; + String noStandingSignStyle; String noStoppingSignStyle; List officialLanguages; List orchardProduces; @@ -78,6 +79,7 @@ public Locale getLocale() } public Integer getMobileCountryCode() { return mobileCountryCode; } public String getNoParkingSignStyle() { return noParkingSignStyle; } + public String getNoStandingSignStyle() { return noStandingSignStyle; } public String getNoStoppingSignStyle() { return noStoppingSignStyle; } public List getOfficialLanguages() { diff --git a/res/country_metadata/noStandingSignStyle.yml b/res/country_metadata/noStandingSignStyle.yml new file mode 100644 index 0000000000..3373ee3d65 --- /dev/null +++ b/res/country_metadata/noStandingSignStyle.yml @@ -0,0 +1,4 @@ +# style of no-standing sign +CA-ON: mutcd text standing # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Ontario +PH: mutcd text waiting # https://en.wikipedia.org/wiki/Road_signs_in_the_Philippines#Parking_signs +US: mutcd text standing From 0e75dfaae06c5921bb435369b974287440818ba6 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 19:46:44 +0100 Subject: [PATCH 10/20] add dict from "sign style" to actual Android resources --- .../streetcomplete/ktx/CountryInfo.kt | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt diff --git a/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt b/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt new file mode 100644 index 0000000000..89f12b47f9 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt @@ -0,0 +1,52 @@ +package de.westnordost.streetcomplete.ktx + +import de.westnordost.streetcomplete.R +import de.westnordost.streetcomplete.data.meta.CountryInfo + +val CountryInfo.advisorySpeedLimitSignLayoutResId: Int? get() = when(advisorySpeedLimitSignStyle) { + "blue" -> R.layout.quest_maxspeed_advisory_blue + "yellow" -> R.layout.quest_maxspeed_advisory_yellow + "white" -> R.layout.quest_maxspeed_advisory_white + else -> null +} + +val CountryInfo.livingStreetSignDrawableResId: Int? get() = when(livingStreetSignStyle) { + "wide" -> R.drawable.ic_living_street + "portrait" -> R.drawable.ic_living_street_portrait + "square" -> R.drawable.ic_living_street_square + "sadc" -> R.drawable.ic_living_street_sadc + "australia" -> R.drawable.ic_living_street_australia + "mexico" -> R.drawable.ic_living_street_mexico + else -> null +} + +val CountryInfo.noStandingSignDrawableResId: Int? get() = when(noStandingSignStyle) { + "mutcd text standing" -> R.drawable.ic_no_standing_mutcd_text + "mutcd text waiting" -> R.drawable.ic_no_waiting_mutcd_text + else -> null +} + +val CountryInfo.noParkingSignDrawableResId: Int? get() = when(noParkingSignStyle) { + "vienna" -> R.drawable.ic_no_parking + "vienna variant" -> R.drawable.ic_no_parking_vienna + "mutcd" -> R.drawable.ic_no_parking_mutcd + "mutcd text" -> R.drawable.ic_no_parking_mutcd_text + "mutcd latin" -> R.drawable.ic_no_parking_mutcd_latin_america + "mutcd text spanish" -> R.drawable.ic_no_parking_mutcd_text_spanish + "sadc" -> R.drawable.ic_no_parking_sadc + "australia" -> R.drawable.ic_no_parking_australia + "taiwan" -> R.drawable.ic_no_parking_taiwan + else -> null +} + +val CountryInfo.noStoppingSignDrawableResId: Int? get() = when(noStoppingSignStyle) { + "vienna" -> R.drawable.ic_no_stopping + "mutcd" -> R.drawable.ic_no_stopping_mutcd + "mutcd latin" -> R.drawable.ic_no_stopping_mutcd_latin_america + "mutcd text" -> R.drawable.ic_no_stopping_mutcd_text + "sadc" -> R.drawable.ic_no_stopping_sadc + "australia" -> R.drawable.ic_no_stopping_australia + "colombia" -> R.drawable.ic_no_stopping_colombia + "canada" -> R.drawable.ic_no_stopping_canada + else -> null +} From b5920e5cb782ffd6d1e735d13407ccb8d45d5a22 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 20:18:18 +0100 Subject: [PATCH 11/20] update country metadata --- app/src/main/assets/country_metadata/AD.yml | 2 +- app/src/main/assets/country_metadata/AE.yml | 4 ++-- app/src/main/assets/country_metadata/AF.yml | 3 ++- app/src/main/assets/country_metadata/AG.yml | 2 ++ app/src/main/assets/country_metadata/AL.yml | 4 +++- app/src/main/assets/country_metadata/AM.yml | 6 ++++-- app/src/main/assets/country_metadata/AO.yml | 9 ++++++--- app/src/main/assets/country_metadata/AR.yml | 4 +++- app/src/main/assets/country_metadata/AT.yml | 8 +++++--- .../main/assets/country_metadata/AU-ACT.yml | 2 +- .../main/assets/country_metadata/AU-NSW.yml | 2 +- app/src/main/assets/country_metadata/AU.yml | 13 ++++++++---- app/src/main/assets/country_metadata/AW.yml | 2 +- app/src/main/assets/country_metadata/AZ.yml | 3 ++- app/src/main/assets/country_metadata/BA.yml | 6 ++++-- app/src/main/assets/country_metadata/BB.yml | 2 ++ app/src/main/assets/country_metadata/BE.yml | 8 +++++--- app/src/main/assets/country_metadata/BF.yml | 2 ++ app/src/main/assets/country_metadata/BG.yml | 6 ++++-- app/src/main/assets/country_metadata/BH.yml | 5 ++++- app/src/main/assets/country_metadata/BJ.yml | 2 ++ app/src/main/assets/country_metadata/BN.yml | 2 +- app/src/main/assets/country_metadata/BO.yml | 5 ++++- app/src/main/assets/country_metadata/BR.yml | 4 +++- app/src/main/assets/country_metadata/BS.yml | 2 +- app/src/main/assets/country_metadata/BT.yml | 2 ++ app/src/main/assets/country_metadata/BW.yml | 9 ++++++--- app/src/main/assets/country_metadata/BY.yml | 8 +++++--- app/src/main/assets/country_metadata/BZ.yml | 4 +++- .../main/assets/country_metadata/CA-ON.yml | 2 ++ app/src/main/assets/country_metadata/CA.yml | 11 ++++++---- app/src/main/assets/country_metadata/CD.yml | 6 ++++-- app/src/main/assets/country_metadata/CH.yml | 7 ++++--- app/src/main/assets/country_metadata/CI.yml | 2 ++ app/src/main/assets/country_metadata/CL.yml | 4 +++- app/src/main/assets/country_metadata/CM.yml | 6 ++++-- app/src/main/assets/country_metadata/CN.yml | 7 ++++--- app/src/main/assets/country_metadata/CO.yml | 4 +++- app/src/main/assets/country_metadata/CR.yml | 4 +++- app/src/main/assets/country_metadata/CU.yml | 4 +++- app/src/main/assets/country_metadata/CW.yml | 2 +- app/src/main/assets/country_metadata/CY.yml | 1 + app/src/main/assets/country_metadata/CZ.yml | 9 +++++---- app/src/main/assets/country_metadata/DE.yml | 7 ++++--- app/src/main/assets/country_metadata/DK.yml | 7 ++++--- app/src/main/assets/country_metadata/DO.yml | 4 +++- app/src/main/assets/country_metadata/DZ.yml | 2 ++ app/src/main/assets/country_metadata/EC.yml | 4 +++- app/src/main/assets/country_metadata/EE.yml | 8 +++++--- app/src/main/assets/country_metadata/EG.yml | 2 ++ app/src/main/assets/country_metadata/ES.yml | 9 ++++++--- app/src/main/assets/country_metadata/ET.yml | 1 + app/src/main/assets/country_metadata/FI.yml | 8 +++++--- app/src/main/assets/country_metadata/FR.yml | 8 +++++--- app/src/main/assets/country_metadata/GB.yml | 8 +++++--- app/src/main/assets/country_metadata/GD.yml | 2 ++ app/src/main/assets/country_metadata/GE.yml | 4 +++- app/src/main/assets/country_metadata/GF.yml | 4 ++-- app/src/main/assets/country_metadata/GH.yml | 2 ++ app/src/main/assets/country_metadata/GN.yml | 2 ++ app/src/main/assets/country_metadata/GR.yml | 8 +++++--- app/src/main/assets/country_metadata/GT.yml | 4 +++- app/src/main/assets/country_metadata/HK.yml | 4 ++-- app/src/main/assets/country_metadata/HN.yml | 4 +++- app/src/main/assets/country_metadata/HR.yml | 8 ++++++-- app/src/main/assets/country_metadata/HT.yml | 2 ++ app/src/main/assets/country_metadata/HU.yml | 7 ++++--- app/src/main/assets/country_metadata/ID.yml | 4 +++- app/src/main/assets/country_metadata/IE.yml | 8 +++++--- app/src/main/assets/country_metadata/IL.yml | 4 ++-- app/src/main/assets/country_metadata/IN.yml | 2 ++ app/src/main/assets/country_metadata/IQ.yml | 2 ++ app/src/main/assets/country_metadata/IR.yml | 1 + app/src/main/assets/country_metadata/IS.yml | 7 ++++--- app/src/main/assets/country_metadata/IT.yml | 7 ++++--- app/src/main/assets/country_metadata/JA.yml | 2 +- app/src/main/assets/country_metadata/JM.yml | 2 ++ app/src/main/assets/country_metadata/JO.yml | 4 +++- app/src/main/assets/country_metadata/JP.yml | 7 ++++--- app/src/main/assets/country_metadata/KE.yml | 4 +++- app/src/main/assets/country_metadata/KG.yml | 4 +++- app/src/main/assets/country_metadata/KH.yml | 4 +++- app/src/main/assets/country_metadata/KM.yml | 2 ++ app/src/main/assets/country_metadata/KP.yml | 3 ++- app/src/main/assets/country_metadata/KR.yml | 5 +++-- app/src/main/assets/country_metadata/KW.yml | 2 ++ app/src/main/assets/country_metadata/KZ.yml | 4 +++- app/src/main/assets/country_metadata/LA.yml | 3 ++- app/src/main/assets/country_metadata/LB.yml | 4 +++- app/src/main/assets/country_metadata/LC.yml | 2 ++ app/src/main/assets/country_metadata/LI.yml | 2 +- app/src/main/assets/country_metadata/LR.yml | 4 +++- app/src/main/assets/country_metadata/LS.yml | 9 ++++++--- app/src/main/assets/country_metadata/LT.yml | 6 ++++-- app/src/main/assets/country_metadata/LU.yml | 8 +++++--- app/src/main/assets/country_metadata/LV.yml | 6 ++++-- app/src/main/assets/country_metadata/MA.yml | 2 ++ app/src/main/assets/country_metadata/MC.yml | 2 +- app/src/main/assets/country_metadata/MD.yml | 4 +++- app/src/main/assets/country_metadata/ME.yml | 5 ++++- app/src/main/assets/country_metadata/MG.yml | 5 ++++- app/src/main/assets/country_metadata/MK.yml | 5 ++++- app/src/main/assets/country_metadata/ML.yml | 2 ++ app/src/main/assets/country_metadata/MN.yml | 3 ++- app/src/main/assets/country_metadata/MO.yml | 6 +++--- app/src/main/assets/country_metadata/MR.yml | 2 ++ app/src/main/assets/country_metadata/MT.yml | 2 +- app/src/main/assets/country_metadata/MU.yml | 11 ++++++---- app/src/main/assets/country_metadata/MW.yml | 9 ++++++--- app/src/main/assets/country_metadata/MX.yml | 8 ++++++-- app/src/main/assets/country_metadata/MY.yml | 4 +++- app/src/main/assets/country_metadata/MZ.yml | 9 ++++++--- app/src/main/assets/country_metadata/NA.yml | 9 ++++++--- app/src/main/assets/country_metadata/NE.yml | 2 ++ app/src/main/assets/country_metadata/NG.yml | 2 ++ app/src/main/assets/country_metadata/NI.yml | 4 +++- app/src/main/assets/country_metadata/NL.yml | 5 +++-- app/src/main/assets/country_metadata/NO.yml | 10 ++++++---- app/src/main/assets/country_metadata/NP.yml | 2 ++ app/src/main/assets/country_metadata/NZ.yml | 12 +++++++---- app/src/main/assets/country_metadata/OM.yml | 6 ++++-- app/src/main/assets/country_metadata/PA.yml | 4 +++- app/src/main/assets/country_metadata/PE.yml | 6 ++++-- app/src/main/assets/country_metadata/PG.yml | 4 +++- app/src/main/assets/country_metadata/PH.yml | 10 ++++++++-- app/src/main/assets/country_metadata/PK.yml | 2 ++ app/src/main/assets/country_metadata/PL.yml | 8 +++++--- app/src/main/assets/country_metadata/PR.yml | 4 +++- app/src/main/assets/country_metadata/PS.yml | 2 +- app/src/main/assets/country_metadata/PT.yml | 4 ++-- app/src/main/assets/country_metadata/PY.yml | 4 +++- app/src/main/assets/country_metadata/QA.yml | 5 ++++- app/src/main/assets/country_metadata/RO.yml | 8 +++++--- app/src/main/assets/country_metadata/RS.yml | 6 ++++-- app/src/main/assets/country_metadata/RU.yml | 8 +++++--- app/src/main/assets/country_metadata/RW.yml | 4 +++- app/src/main/assets/country_metadata/SA.yml | 2 +- app/src/main/assets/country_metadata/SC.yml | 5 ++++- app/src/main/assets/country_metadata/SD.yml | 2 ++ app/src/main/assets/country_metadata/SE.yml | 7 ++++--- app/src/main/assets/country_metadata/SG.yml | 2 +- app/src/main/assets/country_metadata/SI.yml | 8 +++++--- app/src/main/assets/country_metadata/SK.yml | 8 +++++--- app/src/main/assets/country_metadata/SL.yml | 2 ++ app/src/main/assets/country_metadata/SM.yml | 2 +- app/src/main/assets/country_metadata/SO.yml | 2 +- app/src/main/assets/country_metadata/SR.yml | 2 ++ app/src/main/assets/country_metadata/ST.yml | 2 ++ app/src/main/assets/country_metadata/SV.yml | 5 ++++- app/src/main/assets/country_metadata/SX.yml | 2 ++ app/src/main/assets/country_metadata/SZ.yml | 7 ++++--- app/src/main/assets/country_metadata/TG.yml | 2 ++ app/src/main/assets/country_metadata/TH.yml | 3 ++- app/src/main/assets/country_metadata/TJ.yml | 2 ++ app/src/main/assets/country_metadata/TM.yml | 2 ++ app/src/main/assets/country_metadata/TN.yml | 2 ++ app/src/main/assets/country_metadata/TR.yml | 3 ++- app/src/main/assets/country_metadata/TT.yml | 2 ++ app/src/main/assets/country_metadata/TW.yml | 4 +++- app/src/main/assets/country_metadata/TZ.yml | 9 ++++++--- app/src/main/assets/country_metadata/UA.yml | 8 +++++--- app/src/main/assets/country_metadata/UG.yml | 2 +- app/src/main/assets/country_metadata/US.yml | 13 ++++++++---- app/src/main/assets/country_metadata/UY.yml | 4 +++- app/src/main/assets/country_metadata/UZ.yml | 1 + app/src/main/assets/country_metadata/VE.yml | 4 +++- app/src/main/assets/country_metadata/VN.yml | 3 ++- app/src/main/assets/country_metadata/XK.yml | 3 +++ app/src/main/assets/country_metadata/ZA.yml | 9 ++++++--- app/src/main/assets/country_metadata/ZM.yml | 9 ++++++--- app/src/main/assets/country_metadata/ZW.yml | 5 ++++- .../main/assets/country_metadata/default.yml | 20 ++++++++++++------- .../hasBiWeeklyAlternateSideParkingSign.yml | 6 +++--- 173 files changed, 570 insertions(+), 255 deletions(-) diff --git a/app/src/main/assets/country_metadata/AD.yml b/app/src/main/assets/country_metadata/AD.yml index 150adf1886..cde30ba74c 100644 --- a/app/src/main/assets/country_metadata/AD.yml +++ b/app/src/main/assets/country_metadata/AD.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Crèdit Andorrà] -isSlowZoneKnown: true +hasSlowZone: true mobileCountryCode: 213 officialLanguages: [ca] diff --git a/app/src/main/assets/country_metadata/AE.yml b/app/src/main/assets/country_metadata/AE.yml index b93fb6c71e..d61c738772 100644 --- a/app/src/main/assets/country_metadata/AE.yml +++ b/app/src/main/assets/country_metadata/AE.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [ADIB, ADCB, Emirates NBD, Dubai Islamic Bank, FAB, Al Hilal, NBAD, Union National Bank, HSBC, mashreq, UNION NATIONAL BANK, RAKBANK, RAK Bank, RAK BANK, Sharjah Islamic Bank, al hilal bank, Commercial Bank of Dubai, Mashreq Bank, Mashreq, Rak Bank, National Bank of Abu Dhabi, EMIRATES ISLAMIC, CBI, Al Hilal Bank, City Bank, FGB, Bank of Sharjah, Abu Dhabi Distribution Co., union national bank, Dubai Islamic bank, Emirates Islamic Bank, nbf, Emirates Islamic, Standard Chartered, Al Masraf] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su mobileCountryCode: 424 officialLanguages: [ar] @@ -9,4 +9,4 @@ orchardProduces: [date, tomato, guava, mango, mangosteen, lemon, lime, chilli_pe popularReligions: [muslim] popularSports: [tennis, golf] roofsAreUsuallyFlat: true -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/AF.yml b/app/src/main/assets/country_metadata/AF.yml index f6ad04af0e..f69956a635 100644 --- a/app/src/main/assets/country_metadata/AF.yml +++ b/app/src/main/assets/country_metadata/AF.yml @@ -2,8 +2,9 @@ atmOperators: [Azizi Bank, AIB BANK] firstDayOfWorkweek: Sa mobileCountryCode: 412 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fa, ps] orchardProduces: [grape, apple, apricot, peach, almond, plum, olive, pear, walnut, fig, orange, pistachio] popularReligions: [muslim] roofsAreUsuallyFlat: true -workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/AG.yml b/app/src/main/assets/country_metadata/AG.yml index 994b55f629..2d1b451ba6 100644 --- a/app/src/main/assets/country_metadata/AG.yml +++ b/app/src/main/assets/country_metadata/AG.yml @@ -2,6 +2,8 @@ isLeftHandTraffic: true lengthUnits: [foot and inch, meter] mobileCountryCode: 344 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [guava, mango, mangosteen, tomato, pineapple, lemon, lime, banana, chilli_pepper, sweet_pepper] speedUnits: [miles per hour, kilometers per hour] diff --git a/app/src/main/assets/country_metadata/AL.yml b/app/src/main/assets/country_metadata/AL.yml index 87497a2f54..9bce39ef5e 100644 --- a/app/src/main/assets/country_metadata/AL.yml +++ b/app/src/main/assets/country_metadata/AL.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BKT, Fibank, Tirana Bank, Raiffeisen Bank, Raiffeisen BANK, Credins Bank, Raiffeisenbank, Raiffeisen, Alpha Bank, Credins, Bank Gjirokastra, donaldi, Banka Kombetare Tregtare, Raffeisen, Bkt, ALPHA BANK] -isLivingStreetKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +livingStreetSignStyle: wide mobileCountryCode: 276 officialLanguages: [sq] orchardProduces: [tomato, grape, olive, apple, chilli_pepper, sweet_pepper, plum, fig, orange, peach, cherry, date, pear, chestnut, apricot, lemon, lime] diff --git a/app/src/main/assets/country_metadata/AM.yml b/app/src/main/assets/country_metadata/AM.yml index 6f6c9b2299..611b7d1ea9 100644 --- a/app/src/main/assets/country_metadata/AM.yml +++ b/app/src/main/assets/country_metadata/AM.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [Ameriabank, Unibank, VTB, ACBA, ABB, HSBC, Ararat Bank, Ardshinbank, Armbusinessbank, ArmEconomBank, Areximbank, ArmBusinessBank, AEB, ВТБ, Araratbank, Ameria Bank, Հայբիզնեսբանկ, ASHIB, UniBank, Ակբա, AcbaCreditAgricole, VTB Bank, Converse Bank, VTB Armenia] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: portrait mobileCountryCode: 283 officialLanguages: [hy] orchardProduces: [tomato, grape, apple, apricot, peach, plum, pear, cherry, walnut, fig, hazelnut] diff --git a/app/src/main/assets/country_metadata/AO.yml b/app/src/main/assets/country_metadata/AO.yml index a8b9dcb5bb..c2512a9117 100644 --- a/app/src/main/assets/country_metadata/AO.yml +++ b/app/src/main/assets/country_metadata/AO.yml @@ -1,8 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco de Poupança e Credito (BPC), Banco de Fomento Angola (BFA), Banco BIC Angola, Banco Keve] -centerLine: white -isLivingStreetKnown: true +centerLineStyle: white +hasLivingStreet: true +livingStreetSignStyle: sadc mobileCountryCode: 631 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [pt] orchardProduces: [banana, pineapple, tomato, coffee, cashew_nut, sisal, cacao] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/AR.yml b/app/src/main/assets/country_metadata/AR.yml index 95f7546590..8a712bad02 100644 --- a/app/src/main/assets/country_metadata/AR.yml +++ b/app/src/main/assets/country_metadata/AR.yml @@ -1,9 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Macro, Banco Nación, Banco de la Nación Argentina, Macro, Banco Provincia, Banco Santa Fe, BPN Cajero, Banco Patagonia, Galicia, Banco de Córdoba, Santander Río, Banco San Juan, Banco Ciudad, Banco Galicia, Santander, HSBC, NUEVO BANCO DE SANTA FE S.A., Banco de Corrientes, Credicoop, Nuevo Banco del Chaco, Banco Credicoop, Banco Formosa, Supervielle, BTF Cajero, Red Link, Banco de Santiago del Estero, ICBC, Nuevo Banco de Entre Ríos S.A., Banco de Formosa, Patagonia Cajero, BLP Cajero, BBVA, Banco Provincia de Buenos Aires, Banco del Chubut, Patagonia, CABAL COOP. LTDA., Banco Hipotecario, Banco Santiago del Estero, Banco Supervielle, BBVA Francés, Cajero Express, Nación, BANCO MACRO, Banco de la Nacion Argentina, Banco Itaú, Citibank, Banelco, Banco Santa Cruz, Banco Provincia de La Pampa S.A., Provincia Cajero, Banco Nacion Argentina, Banco Corrientes, Banco HSBC, Banco de la Provincia de Buenos Aires, Banco Nación de la República Argentina, Banco Municipal, Athena Bitcoin Argentina, Athena Bitcoin Inc., Banco de Entre Ríos, Red Link - Punto efectivo, Galicia Cajero, UBM La Pampa, Santa Cruz Cajero, BBVA Banco Francés, Banco Provincia de La Rioja, Banco Comafi, Link, Banco Francés, Superville, Banco Nacion, Banco Hipotecario S.A., Banco Superville, Cajero Banco Macro, Chubut, BERSA, Banco Piano, Cajero Macro, Banco Santander, Bancor, bancor link, Hipotecario, Nuevo Banco del Chaco SA, Banco de la Nation, link, Banco de Santa Fe, Banco de La Pampa, Planta Baldissera, Link Banco Provincia, Banco Nación Argentina, Banco Rioja, Express, Comafi, Banco de la Provincia del Neuquén S.A., Itaú] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Empresa Provincial de la Energía Santa Fe] clothesContainerOperators: [Municipalidad de Posadas] mobileCountryCode: 722 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es] orchardProduces: [grape, lemon, lime, orange, apple, pear, tomato, mate, olive, banana, peach, chilli_pepper, sweet_pepper, grapefruit, plum, tea, apricot] popularSports: [soccer, tennis, basketball, paddle_tennis, field_hockey, rugby] diff --git a/app/src/main/assets/country_metadata/AT.yml b/app/src/main/assets/country_metadata/AT.yml index 6d6865e5de..28feb4c153 100644 --- a/app/src/main/assets/country_metadata/AT.yml +++ b/app/src/main/assets/country_metadata/AT.yml @@ -2,9 +2,11 @@ atmOperators: [Raiffeisenbank, Raiffeisen, Volksbank, Euronet, Sparkasse, Erste Bank, BAWAG PSK, BAWAG P.S.K., Oberbank, Bank Austria, Bawag PSK, BAWAG, First Data, Spar, bank99, Kremser Bank und Sparkassen AG, Steiermärkische Sparkasse, Sparkasse Oberösterreich, DenizBank, Bank Burgenland, Raiffeisen Bank, Tiroler Sparkasse, Hypo Salzburg, BTV, Salzburger Sparkasse, Hypo, Steiermärkische Bank, bank 99, Bankomat, PSK, Maestro, Raika, Raiffeisenbank Sillian, Sparda Bank, Hypo Tirol, Sparkasse Imst AG, Cointed GmbH, PSA, Bankhaus Schelhammer & Schattera, RLB, BKS Bank, Spänglerbank, Sparkasse Niederösterreich, Raiffeisenbank Stockerau eGen, Sparkasse Kufstein, Billa Plus, Volksbank Kufstein, SPAR, Raiffeisenbank Mittelburgenland Ost, Austrian Anadi Bank, Posojilnica Bank eGen, Raiffeisenkasse, Raiffeisenbank Ybbstal, Raiffeisenbank Amstetten-Ybbs, ICCash] chargingStationOperators: [Wien Energie GmbH, SMATRICS, Energie AG, EVN, Energie Steiermark, VLOTTE, Tesla Motors Inc., Smatrics, Wels Strom E-Mobil, Salzburg AG, Kelag, Linz AG, Vorarlberger Kraftwerke, Lebensland Kärnten, TIWAG, SMATRICS GmbH & Co KG, Energie Burgenland, KELAG, ElectroDrive Salzburg GmbH, max.center, Wien Energie, Lidl, ella, Telekom Austria, Ella, ElectroDrive Salzburg, AT*GOE, kelag, be.ENERGISED, Stadtwerke Kitzbühel, Lidl Österreich, Electrodrive Salzburg, AAE Naturstrom, bike-energy, Vorarlberger Kraftwerke AG, VKW illwerke, VKW Mobilität, Lidl Österreich GmbH, IONITY, Hotel Der Stubaierhof, HGL, Envesta, EVN AG, E-Werke Bad Radkersburg, ÖBB-Infrastruktur, ÖAMTC, smatrics, VLOTTE P&C, VKW Vlotte, Stadtwerke Trofaiach 22 kW, Stadtgemeinde Zell am See, Keba, Ionity, IAM – Institut für Technologie und alternative Mobilität, IAM, Gigasport, Gemeinde Podersdorf, EnergieAG, Energie Graz GmbH & Co KG, Energie Burgenland AG, ÖBB, vlotte, vkw vlotte, tim, huma eleven, everynear, elektrodrive-tirol.at, da emobil GmbH, Weiss GmbH Kompetent bei Holz, Vlotte-VKW, Turmöl, Turmstrom, Tiwag- Tiroler Wasserkraftwerke AG, Tiwag, Tesla, TU Wien - Enio, TIWAG-Tiroler Wasserkraft AG, Swarovski, Stadtwerke Mürzzuschlag, Stadtwerke Judenburg, Stadtwerke Hartberg, Stadtgemeinde Mank, Stadtgemeinde Friedberg, Stadtgemeinde Ebreichsdorf, Spar, Linz Strom AG, Linz AG Strom, Gemeinde Kreuzstetten, Gemeinde Kirchdorf in Tirol, Gemeinde Eben, Energie Steiermark AG, ElectroDrive, ELLA, Direkt Holidays GmbH, DEZ, BH Melk, A1] clothesContainerOperators: [Humana, Holding Graz, Kolping, Rotes Kreuz, MA 48, Caritas, Linz AG Abfall, MA48, Graz Holding, humana, WAMS, Stadtbetriebe Steyr, Stadt Graz, HUMANA, GVA Baden] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 232 officialLanguages: [de] orchardProduces: [grape, apple, tomato, pear, chilli_pepper, sweet_pepper, strawberry, plum, apricot, cherry, walnut, peach, raspberry, hop] diff --git a/app/src/main/assets/country_metadata/AU-ACT.yml b/app/src/main/assets/country_metadata/AU-ACT.yml index 809c4ef1ee..6446019501 100644 --- a/app/src/main/assets/country_metadata/AU-ACT.yml +++ b/app/src/main/assets/country_metadata/AU-ACT.yml @@ -1,2 +1,2 @@ # Do not edit. Source files are in /res/country_metadata -isSlowZoneKnown: false +hasSlowZone: false diff --git a/app/src/main/assets/country_metadata/AU-NSW.yml b/app/src/main/assets/country_metadata/AU-NSW.yml index 7f09c7feff..120c1ae8b1 100644 --- a/app/src/main/assets/country_metadata/AU-NSW.yml +++ b/app/src/main/assets/country_metadata/AU-NSW.yml @@ -1,3 +1,3 @@ # Do not edit. Source files are in /res/country_metadata chargingStationOperators: [NRMA, Chargefox, National Roads and Motorists' Association Limited, Tesla Motors, Evie Networks, Chargepoint] -isSlowZoneKnown: false +hasSlowZone: false diff --git a/app/src/main/assets/country_metadata/AU.yml b/app/src/main/assets/country_metadata/AU.yml index b6b9359414..d385a6049f 100644 --- a/app/src/main/assets/country_metadata/AU.yml +++ b/app/src/main/assets/country_metadata/AU.yml @@ -1,11 +1,16 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [Commonwealth Bank, ANZ, Westpac, NAB, Bendigo Bank, RediATM, Bankwest, St George, National Australia Bank, Suncorp, Commonwealth, Commonwealth Bank of Australia, rediATM, BankWest, nab, BOM, BOQ, Bank of Queensland, CBA, firstpoint, Bank of Melbourne, Bank West, BankSA, St. George, HSBC, Redi ATM, Cashcard, redi, IMB, Next, Westpac Bank, westpac, anz, Newcastle Permanent, Greater Bank, bankwest, BitRocket, Bank SA, iCash, St.George, st.george, DC payments, Westpac Banking Corporation, Heritage Bank, Suncorp Bank, Warwick Credit Union, cashcard, Redi, St George Bank, DC ATM, Anz, Travelex, Bendigo] -centerLine: white -isAdvisorySpeedLimitKnown: true +centerLineStyle: white +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasNoStandingSign: false +hasSlowZone: true isLeftHandTraffic: true -isLivingStreetKnown: true -isSlowZoneKnown: true +livingStreetSignStyle: australia mobileCountryCode: 505 +noParkingSignStyle: australia +noStoppingSignStyle: australia officialLanguages: [en] orchardProduces: [grape, tomato, banana, apple, orange, pear, olive, peach, pineapple, almond, avocado, strawberry, lemon, lime, guava, mango, mangosteen, chilli_pepper, sweet_pepper] popularReligions: [christian, muslim, buddhist] diff --git a/app/src/main/assets/country_metadata/AW.yml b/app/src/main/assets/country_metadata/AW.yml index e0910e9580..0bbb97ef47 100644 --- a/app/src/main/assets/country_metadata/AW.yml +++ b/app/src/main/assets/country_metadata/AW.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white chargingStationOperators: [Elmar] officialLanguages: [nl, pap] popularSports: [baseball] diff --git a/app/src/main/assets/country_metadata/AZ.yml b/app/src/main/assets/country_metadata/AZ.yml index ff9f081f40..61ba4c2080 100644 --- a/app/src/main/assets/country_metadata/AZ.yml +++ b/app/src/main/assets/country_metadata/AZ.yml @@ -1,6 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Azərbaycan Beynəlxalq Bankı, Kapital Bank, YuniBank, Bank Standart, Texnikabank, Xalq Bank, Bank Respublika, Bankomat, Ata Bank, Unibank, Azəriqazbank, Bank of Baku, MuğanBank, RabitəBank, Nikoyl Bank, AFB Bank, Beynəlxalq Bank, International Bank of Azerbaijan, Royal Bank, Azərbaycan Sənaye Bankı, Access Bank, KapitalBank, Kredo Bank, Kapital bank, Bank of Azerbaijan, Bank Avrasiya, Atrabank, Parabank, Turan Bank, Yunayted Kredit Bank, Kapital Bank ATM, Azerbaijan International Bank, Pasha Bank, Express Bank, Əmrahbank, Zaminbank, Artsakhbank, The International Bank of Azerbaijan, MilliÖn, NBC Bank, AtaBank, ZaminBank, Melli İran Bank, Paşa Bank, Bank Silk Vey, Yapı Kredi Bank Azərbaycan, Expressbank, AzərTürkBank, Azerbaijan İnternational Bank, Bank Standard, expressbank, ASB, SW Bank, Beynalxalq bank, Kapitalbank ATM, Капитал банк, Beynelxalq Bank ATM, SILK WAY, SilkWay Bank, Nikoil, «Kapital Bank» ASC, Nikoil Bank] -isLivingStreetKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true mobileCountryCode: 400 officialLanguages: [az] orchardProduces: [tomato, apple, persimmon, grape, chilli_pepper, sweet_pepper, pear, hazelnut, plum, apricot, peach, cherry, raspberry, walnut, fig, lemon, lime] diff --git a/app/src/main/assets/country_metadata/BA.yml b/app/src/main/assets/country_metadata/BA.yml index 89d17bbcf5..b81b1264d0 100644 --- a/app/src/main/assets/country_metadata/BA.yml +++ b/app/src/main/assets/country_metadata/BA.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [UniCredit Bank, Raiffeisen Bank, Raiffeisen, Nova Banka, NLB Banka, Sberbank, Unicredit, Unicredit bank, Raifefisen Bank dd BIH, NLB, Raiffeisen bank, Unicredit Bank, Raiffeisenbank, Sparkasse, Addiko Bank, Komercijalna Banka, Raiffeisen banka, Unicredit banka, UniCredit, Ziraat Bank, Sparkasse Bank, Raiffeisen Bank BiH, Raiffeisen Bank dd BIH, Bosna Bank International, BBI, Komercijalna banka, NLB banka, Intesa San Paolo] chargingStationOperators: [City] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 218 officialLanguages: [bs, hr, sr] orchardProduces: [plum, apple, tomato, grape, chilli_pepper, sweet_pepper, raspberry, pear, strawberry, peach, cherry, walnut, chestnut, apricot, avocado, fig] diff --git a/app/src/main/assets/country_metadata/BB.yml b/app/src/main/assets/country_metadata/BB.yml index a6ba2185ad..a6bb04527f 100644 --- a/app/src/main/assets/country_metadata/BB.yml +++ b/app/src/main/assets/country_metadata/BB.yml @@ -2,6 +2,8 @@ atmOperators: [CIBC FirstCaribbean International Bank, Scotiabank] isLeftHandTraffic: true mobileCountryCode: 342 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [coconut, banana, avocado, chilli_pepper, sweet_pepper, tomato] popularSports: [cricket] diff --git a/app/src/main/assets/country_metadata/BE.yml b/app/src/main/assets/country_metadata/BE.yml index a40434365f..7090491eaf 100644 --- a/app/src/main/assets/country_metadata/BE.yml +++ b/app/src/main/assets/country_metadata/BE.yml @@ -2,9 +2,11 @@ atmOperators: [BNP Paribas Fortis, KBC, Argenta, Belfius, BeoBank, BNP Paribas, ING, bpost, Bpost, Crelan, AXA, bpost bank, Beobank, BNP Parisbas Fortis, Dexia, Fortis, BNP-Paribas Fortis, Europabank, AXA Bank, Record, De Post, Record Bank] chargingStationOperators: [Allego, Blue Corner, Ionity, allego, Smoov Allego, Luminus, PitPoint, The Plugin Company, Tesla, Smoov, Colruyt, Bluecorner, smoov allego, Lidl, BlueCorner, smoov, charge.brussels, bluecorner, allegro / smoov, Pitpoint Brussels, Partago, ORES, Eoly, EV-Box, De Lijn, BlueConnect, Audi, Allegro] clothesContainerOperators: [Vlaams Inzamel Centrum Textiel, Wereld Missie Hulp, Les Petits Riens - Spullenhulp, Terre, Vlaams Internationaal Centrum, IDELUX-Environnement, Oxfam, Curitas n.v., V.H.S. Europ, Curitas, De Kringwinkel, Terre ASBL, Wereldmissiehulp, Caritas n.v., ivio, IVAREM, WMH, Vlaams Inzamelcentrum Textiel, Curitas NV, Rode Kruis, Les Petits Riens, IVIO, Wereldmissiehulp en O.L.V. van zeven Weeën vzw, Wereld-Missiehulp, Terre asbl, TEXTIEL, Salvatorlaanse Hulpactie & Ontwikkelingshulp, Salvatoriaanse Hulpactie & Ontwikkelingshulp, Les Petits Riens-Spullenhulp, Kringwinkel, De Bremberg, Curitas N.V.] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasBiWeeklyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 206 officialLanguages: [nl, fr, de] orchardProduces: [pear, tomato, apple, strawberry, chilli_pepper, sweet_pepper, cherry, raspberry, grape, walnut, hop, plum] diff --git a/app/src/main/assets/country_metadata/BF.yml b/app/src/main/assets/country_metadata/BF.yml index b91046ed3b..1600b55023 100644 --- a/app/src/main/assets/country_metadata/BF.yml +++ b/app/src/main/assets/country_metadata/BF.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Bank of Africa, UBA, Ecobank] mobileCountryCode: 613 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, mos, dyu, ff] orchardProduces: [cashew_nut, guava, mango, mangosteen, tomato, chilli_pepper, sweet_pepper, almond, orange, lemon, lime, grapefruit] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/BG.yml b/app/src/main/assets/country_metadata/BG.yml index 6cbf8bc728..3593064ba9 100644 --- a/app/src/main/assets/country_metadata/BG.yml +++ b/app/src/main/assets/country_metadata/BG.yml @@ -3,8 +3,10 @@ additionalStreetsignLanguages: [international] atmOperators: [Банка ДСК, ОББ, Fibank, ДСК, УниКредит Булбанк, FIBank, Пощенска банка, Първа инвестиционна банка, Postbank, Raiffeisenbank, Unicredit Bulbank, Обединена Българска Банка, Централна кооперативна Банка, Райфайзен Банк, Райфайзенбанк, UniCredit, UniCredit Bulbank, Unicredit, DSK, ЦКБ, Райфайзен, DSK Bank, Фибанк, Централна кооперативна банка, FiBank, Уникредит Булбанк, Raiffeisen, ПИБ, OBB, Piraeus Bank, Първа Инвестиционна Банка, CCB, Central Cooperative Bank, Raiffeisen Bank, Общинска Банка, Обединена българска банка, Allianz, Общинска банка, First Investment Bank, Unicredit bulbank, Банк ДСК] chargingStationOperators: [ОП „Общински паркинги и синя зона“ - Варна] clothesContainerOperators: [БЧК, texcycle] -isLivingStreetKnown: true -isSlowZoneKnown: false +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: false +livingStreetSignStyle: wide mobileCountryCode: 284 officialLanguages: [bg] orchardProduces: [grape, tomato, pepper, plum, apple, peach, apricot, raspberry, strawberry, walnut, cherry, pear, chilli_pepper, sweet_pepper, almond, chestnut] diff --git a/app/src/main/assets/country_metadata/BH.yml b/app/src/main/assets/country_metadata/BH.yml index 88d1583394..857d5cb9b2 100644 --- a/app/src/main/assets/country_metadata/BH.yml +++ b/app/src/main/assets/country_metadata/BH.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [HSBC, BISB, BBK, BBK Online, NBB, Ithmaar Bank, Kuwait Finance House] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su +hasDailyAlternateSideParkingSign: true mobileCountryCode: 426 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [date, tomato, lemon, lime, banana, grape, chilli_pepper, sweet_pepper] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/BJ.yml b/app/src/main/assets/country_metadata/BJ.yml index 0de76be2f2..128fef5039 100644 --- a/app/src/main/assets/country_metadata/BJ.yml +++ b/app/src/main/assets/country_metadata/BJ.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Ecobank, BOA, private, Bank of Africa] mobileCountryCode: 616 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, fon] orchardProduces: [tomato, pineapple, cashew_nut, chilli_pepper, sweet_pepper, coconut, banana, guava, mango, mangosteen, orange, date, kola_nut, pepper, coffee] diff --git a/app/src/main/assets/country_metadata/BN.yml b/app/src/main/assets/country_metadata/BN.yml index 825a6403be..f5c6b95359 100644 --- a/app/src/main/assets/country_metadata/BN.yml +++ b/app/src/main/assets/country_metadata/BN.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BIBD, Baiduri Bank, Standard Chartered, TAIB, Maybank] -centerLine: white +centerLineStyle: white isLeftHandTraffic: true mobileCountryCode: 528 officialLanguages: [ms, en] diff --git a/app/src/main/assets/country_metadata/BO.yml b/app/src/main/assets/country_metadata/BO.yml index 58fd9efcf2..b3ffbb50fa 100644 --- a/app/src/main/assets/country_metadata/BO.yml +++ b/app/src/main/assets/country_metadata/BO.yml @@ -1,6 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Mercantil Santa Cruz, Banco Unión, Banco Nacional de Bolivia, Banco Bisa, Banco Union, BCP, Banco BISA, BNB, Banco BCP, Banco Fie, BancoSol, Banco Ganadero, Banco Sol, Banco Económico, Mercantil Santa Cruz, Banco Fassil, Banco FIE, Banco de Crédito BCP, BNB24, Banco de Crédito de Bolivia, Banco Prodem, Banco Economico, BISA, Banco Union S.A., Banco Mercantil Santa Cruz S.A., Bisa, Banco Nacional de Bolivia BNB, Banco Mercantil Santa Cruz (BMSC), BMSC, Banco Nacional de Bolivia (BNB), Banco Fassil S.A., Banco Los Andes ProCredit, Banco BISA S.A., mercantil santa cruz, Cooperativa Jesús Nazareno, Banco Ecofuturo, BANCO UNION, MERCANTIL SANTA CRUZ, Banco Mercantil, Banco Los Andes, Banco de Crédito (BCP), La Primera E.F.V., Banco Mercantíl Santa Cruz, La Primera, Banco de Crédito, Mutual La Primera, Cajero BNB] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 736 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es, qu, ay] orchardProduces: [banana, orange, pineapple, chestnut, tomato, peach, lemon, lime, brazil_nut, grape, coffee, papaya, guava, mango, mangosteen, rubber, avocado, chilli_pepper, sweet_pepper] +workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/BR.yml b/app/src/main/assets/country_metadata/BR.yml index 1244669b3f..4c50585434 100644 --- a/app/src/main/assets/country_metadata/BR.yml +++ b/app/src/main/assets/country_metadata/BR.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco do Brasil, Banco 24 Horas, Banco24Horas, Bradesco, Caixa Econômica Federal, Itaú, Caixa, Banco 24 horas, Santander, Banco 24H, Banrisul, Tecnologia Bancária S.A., Banco24horas, 24 Horas, Banrisul S.A., Saque e Pague, Banco 24Horas, Banco 24h, Banco do Brasil S.A., HSBC, Multibanco, banco24horas, Itaú Unibanco, 24 horas, BRB, Banco Bradesco, TecBan, Banco24H, Caixa 24h, Caixa 24 Horas, Banco24, Banese, Caixa Economica Federal, Caixa Econômica, BDN BRADESCO, Banco24h, Banco 24h., Banco 24Hrs, 24Horas, Tecban, caixa 24h, Banco Santander, Dinho, Caixas eletrônicos da Caixa Econômica Federal, banco 24h, Banco 24 horas.] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Ipiranga, Sat, Petrobras, BR, ipiranga, Taurus, Shell, Petrobrás, EDP] mobileCountryCode: 724 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [pt] orchardProduces: [orange, banana, tomato, coffee, coconut, pineapple, guava, mango, mangosteen, grape, cashew_nut, lemon, lime, papaya, apple, mate, cacao, peach] diff --git a/app/src/main/assets/country_metadata/BS.yml b/app/src/main/assets/country_metadata/BS.yml index cccb0d206e..0be4b5900a 100644 --- a/app/src/main/assets/country_metadata/BS.yml +++ b/app/src/main/assets/country_metadata/BS.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white isLeftHandTraffic: true lengthUnits: [foot and inch, meter] mobileCountryCode: 364 diff --git a/app/src/main/assets/country_metadata/BT.yml b/app/src/main/assets/country_metadata/BT.yml index 83c2996d03..2927eae3f8 100644 --- a/app/src/main/assets/country_metadata/BT.yml +++ b/app/src/main/assets/country_metadata/BT.yml @@ -2,6 +2,8 @@ atmOperators: [Bank of Bhutan, BOB, Bhutan National Bank, Druk PNB, Bank Of Bhutan, BNB, Tashi Bank, BOBL, BDBL] isLeftHandTraffic: true mobileCountryCode: 402 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [dz] orchardProduces: [orange, chilli_pepper, sweet_pepper, areca_nut, apple, banana, nutmeg, guava, mango, mangosteen, pear, peach, plum, tomato, walnut] popularReligions: [buddhist, hindu] diff --git a/app/src/main/assets/country_metadata/BW.yml b/app/src/main/assets/country_metadata/BW.yml index 73daeb69a2..6ba2d5f932 100644 --- a/app/src/main/assets/country_metadata/BW.yml +++ b/app/src/main/assets/country_metadata/BW.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [FNB, First National Bank, Barclays, Standard Chartered Bank, Barclay's, Stanbic Bank, Fnb, FNB ATM] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: wide mobileCountryCode: 652 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, tn] orchardProduces: [tomato, orange] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/BY.yml b/app/src/main/assets/country_metadata/BY.yml index 39c387e693..09bf02b50c 100644 --- a/app/src/main/assets/country_metadata/BY.yml +++ b/app/src/main/assets/country_metadata/BY.yml @@ -1,9 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Беларусбанк, Банк БелВЭБ, Белинвестбанк, Белагропромбанк, Приорбанк, БПС-Сбербанк, МТБанк, Белгазпромбанк, Банк Дабрабыт, Альфа-Банк, БНБ-Банк, ОАО «Белагропромбанк», ОАО «Белгазпромбанк», ЗАО РРБ-Банк, Паритетбанк, ЗАО "РРБ-Банк", ВТБ, ОАО "АСБ Беларусбанк", Технобанк, Белвнешэкономбанк, ОАО «АСБ Беларусбанк», БелВЭБ, Беларусьбанк, БПС-Банк, Альфа-банк, Belarusbank, ОАО «Белинвестбанк», ОАО "БПС-СБЕРБАНК", ЗАО "Альфа-Банк", АСБ "Беларусбанк", АСБ Беларусбанк, Франсабанк, БеларусБанк, ОАО «БПС-Сбербанк», БСБ Банк, БПС, Belinvestbank, ОАО "Белагропромбанк", беларусбанк, ЗАО «БСБ Банк», Банк ВТБ, Priorbank, ОАО «Банк Дабрабыт», БТА Банк, БПС-банк, Альфабанк, BSB Bank, БПС-сбербанк, Бпс-сбербанк, ОАО «Приорбанк», Трастбанк, BelSwissBank, АльфаБанк, БелСвиссБанк, Банк ВТБ Беларусь, Банк Решение, БелАгроПромБанк, БПС Сбербанк, Belagroprombank, Идея Банк, БСБ банк, Белорусбанк, БелИнвестБанк, РРБ-Банк, Paritetbank, БТА банк, Банкомат, белгазпромбанк, Банк Москва-Минск, БСБ-Банк, БПС Банк, ОАО БПС-Сбербанк, Францбанк, ОАО «АСБ «Беларусбанк», белагропромбанк, ОАО Беларусбанк, ВТБ-Банк, БНБ-банк, Белaрусбанк, ПриорБанк, БПС-СБЕРБАНК, ОАО БЕЛАГРОПРОМБАНК, Бпс банк, Белсвиссбанк, БТА, ОАО АСБ Беларусбанк] chargingStationOperators: ['"РУП ""Белоруснефть-Минскавтозаправка"""', ПО «Белоруснефть», Белоруснефть, '"РУП ""Белоруснефть-Гомельоблнефтепродукт"""', '"РУП ""Белоруснефть-Могилевоблнефтепродукт"""', '"РУП ""Белоруснефть-Гроднооблнефтепродукт"""', '"РУП ""Белоруснефть-Минскоблнефтепродукт"""', Евроопт, Беларуснафта, Eleven] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: portrait mobileCountryCode: 257 officialLanguages: [be, ru] orchardProduces: [apple, tomato, strawberry, pear, cherry, grape, walnut, plum, hazelnut, cranberry] diff --git a/app/src/main/assets/country_metadata/BZ.yml b/app/src/main/assets/country_metadata/BZ.yml index 98c17f825d..e892c6100b 100644 --- a/app/src/main/assets/country_metadata/BZ.yml +++ b/app/src/main/assets/country_metadata/BZ.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Belize Bank, Heritage Bank] -centerLine: yellow +centerLineStyle: yellow lengthUnits: [foot and inch, meter] mobileCountryCode: 702 +noParkingSignStyle: mutcd +noStoppingSignStyle: mutcd officialLanguages: [en, bzj] orchardProduces: [orange, banana, grapefruit, tomato, chilli_pepper, sweet_pepper, pineapple, papaya, coconut, cacao, coffee, guava, mango, mangosteen] speedUnits: [miles per hour, kilometers per hour] diff --git a/app/src/main/assets/country_metadata/CA-ON.yml b/app/src/main/assets/country_metadata/CA-ON.yml index 2090b8d11c..a35f6aa1fc 100644 --- a/app/src/main/assets/country_metadata/CA-ON.yml +++ b/app/src/main/assets/country_metadata/CA-ON.yml @@ -1,4 +1,6 @@ # Do not edit. Source files are in /res/country_metadata chargingStationOperators: [Flo, Tesla, Expressway Ford, Tim Hortons, Fairway Plaza, City of Kitchener, University of Waterloo, Tesla Motors Inc., Tesla Motors, Sun Country, FLO, Electric Circuit, City of Waterloo, City of Stratford, Chargepoint, Cadillac Fairview, Bingemans, Bank of Nova Scotia] clothesContainerOperators: [Canadian Diabetes] +hasNoStandingSign: true +noStandingSignStyle: mutcd text standing officialLanguages: [en] diff --git a/app/src/main/assets/country_metadata/CA.yml b/app/src/main/assets/country_metadata/CA.yml index 5892ead80a..d3afdf057d 100644 --- a/app/src/main/assets/country_metadata/CA.yml +++ b/app/src/main/assets/country_metadata/CA.yml @@ -1,10 +1,13 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [RBC, CIBC, TD Canada Trust, Desjardins, BMO, Scotiabank, Instacoin, Banque Laurentienne, TD, RBC Royal Bank, Royal Bank, generic, Caisse Desjardins, Vancity, Banque Nationale, Bank of Montreal, BMO Bank of Montreal, DC Bank, Alterna, Banque Manuvie, Royal Bank of Canada, PC Financial, Banque Scotia, Envision Financial, Banque Royale, ATB Financial, Steinbach Credit Union, DCBank, Frisco ATMs, BMO Banque de Montréal, Caisse populaire Desjardins, HSBC, Canadian Imperial Bank of Commerce, Caisse Populaire Desjardins, ScotiaBank, TD Bank, President's Choice Financial, Caisse Populaire Desjardins d'Amos, Coast Capital, Banque nationale, coastcapital savings, Affinity Credit Union, Cambrian Credit Union] -centerLine: yellow -isAdvisorySpeedLimitKnown: true -isCenterLeftTurnLaneKnown: true -isSlowZoneKnown: false +centerLineStyle: yellow +hasAdvisorySpeedLimitSign: true +hasCenterLeftTurnLane: true +hasSlowZone: false mobileCountryCode: 302 +noParkingSignStyle: mutcd +noStoppingSignStyle: canada officialLanguages: [en, fr] orchardProduces: [tomato, apple, blueberry, cranberry, grape, chilli_pepper, sweet_pepper, strawberry, peach, cherry, raspberry, pear, plum, apricot, kiwi] popularReligions: [christian, muslim, jewish, hindu, sikh] diff --git a/app/src/main/assets/country_metadata/CD.yml b/app/src/main/assets/country_metadata/CD.yml index 6f6a0f45b1..c86704dab1 100644 --- a/app/src/main/assets/country_metadata/CD.yml +++ b/app/src/main/assets/country_metadata/CD.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Rawbank, Raw Bank, BIAC, RawBank] -centerLine: white +centerLineStyle: white mobileCountryCode: 630 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, mkw, ln, lua, sw] orchardProduces: [banana, guava, mango, mangosteen, papaya, pineapple, orange, avocado, tomato, chilli_pepper, sweet_pepper, coffee, rubber, grapefruit, lemon, lime, cacao, tea] -shoulderLine: short white dashes +shoulderLineStyle: short white dashes diff --git a/app/src/main/assets/country_metadata/CH.yml b/app/src/main/assets/country_metadata/CH.yml index 907a5f7ea6..b91961efc8 100644 --- a/app/src/main/assets/country_metadata/CH.yml +++ b/app/src/main/assets/country_metadata/CH.yml @@ -2,9 +2,10 @@ atmOperators: [Raiffeisen, PostFinance, Postfinance, UBS, Credit Suisse, Zürcher Kantonalbank, Raiffeisenbank, BCV, Post, ZKB, Bank Cler, Migros Bank, Valiant, La Poste, UBS Switzerland, Thurgauer Kantonalbank, Graubündner Kantonalbank, Die Post, BEKB, Raiffeisen Schweiz, Luzerner Kantonalbank, Kantonalbank, Hypothekarbank Lenzburg, St. Galler Kantonalbank, Valiant Bank, Schwyzer Kantonalbank, PostFinance AG, Bity SA, Aargauische Kantonalbank, Poste, Basler Kantonalbank, Neue Aargauer Bank AG, Die Schweizerische Post, Zuger Kantonalbank, BCGE, Basellandschaftliche Kantonalbank, La Posta, Migrosbank, Glarner Kantonalbank, BCVS, Bank Linth, Neue Aargauer Bank, Crédit Suisse, UBS AG, Obwaldner Kantonalbank, Banque Raiffeisen, Bank Avera Genossenschaft, Bezirkssparkasse Uster, Schweizerische Post, BCN, Banque Cantonale du Valais, AEK, NAB, BKB, AKB, Post Finance, Bitcoin Suisse AG, TKB, Berner Kantonalbank, Valiant Bank AG, St.Galler Kantonalbank, Schaffhauser Kantonalbank, Raiffaisen, Bezirks-Sparkasse Dielsdorf, Nidwaldner Kantonalbank, BCF / FKB, Clientis, acrevis, Urner Kantonalbank, Walliser Kantonalbank, GKB, BCJ, Berner Kantonalbank AG, Banque Cantonale Neuchâteloise, Acrevis Bank, Raiffeisen AG, Kantonal Bank, Coop, Zürcher Landbank, Ersparniskasse Schaffhausen, Bezirkssparkasse Dielsdorf, Raifeisenbank, Glarner Regionalbank, Baloise Bank, Raffeisen, Post Finace, Banca Cantonale Grigione, Banque Cantonale de Fribourg, BPS, SGKB, Baloise Bank SoBa, PostFinance SA, AEK Thun, Bank Oberaargau, Raiffeisen Marbach-Rebstein, raiffeisen, BCF, Bezirks-Sparkasse Dielsdorf (BSKD), Regiobank, Raiffeisen Bank, CLER, Graubündner Kanonalbank, Banque Cantonale du Valais (BCVs)] chargingStationOperators: [Tesla, IWB, Repower AG, Lidl, Groupe E, EVite, Tesla Motors Inc., EBL, ALTIS, ABB, easy4you, bike-energy, Altis, m-way, Technische Betriebe Glarus Nord, ESB, EKZ, evpass, Migros, Infovel, Gemeinde Pontresina, CKW, WWZ, IBAarau AG, FHNW, Enerti, Comfort Hotel Egerkingen, my elmo, greenmotion, ewl, evpass.ch, energie360°, eCarup, Renault, Raiffeisen, Move, Evpass, Eniwa AG, Eniva, Energie 360°, EWN, BKW, Agrola, AEW Energie AG, swisscharge, mway, move, groupe e, groupe, ewz, elmoove, ee-en.ch, eCarUp, Werkbetriebe Frauenfeld, Tesla Inc., Tesla Destination Charging, Technische Betriebe Wil, Technische Betriebe Kreuzlingen, Swisscharge, SwissCharge, Socar, SAK, Romande Energie, Repower, RTB Regionale Technische Betriebe, Landi Matzigen, IKEA, Hotel Riverside, GoFast, Garage Keigel, Energie Wasser Bern, Energie 360° AG, Elektrizitätswerk Obwalden, Elektra AG, Coop, BerufsBildungBaden, BMW, Axpo AG, Amag, Alpen Energie, AEW, AEK] clothesContainerOperators: [Texaid, Ville de Geneve, Contex, coop, TexAid, Coop, Commune de Lutry, texaid, TEXAID, Stadt Bülach, Schweizer Berghilfe, Lidl, Gemeinde Wettingen, Gemeinde Freienbach] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 228 officialLanguages: [de, fr, it, rm] orchardProduces: [apple, grape, tomato, pear, strawberry, apricot, cherry, plum, raspberry, walnut, chilli_pepper, sweet_pepper, kiwi, blueberry, peach, chestnut] diff --git a/app/src/main/assets/country_metadata/CI.yml b/app/src/main/assets/country_metadata/CI.yml index c13ef271b6..a959835efd 100644 --- a/app/src/main/assets/country_metadata/CI.yml +++ b/app/src/main/assets/country_metadata/CI.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [NSIA Banque, BNI] mobileCountryCode: 612 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, dyu, bci, any] orchardProduces: [cacao, cashew_nut, rubber, banana, chilli_pepper, sweet_pepper, coconut, coffee, guava, mango, mangosteen, kola_nut, pineapple, orange, tomato, avocado, grapefruit, brazil_nut] diff --git a/app/src/main/assets/country_metadata/CL.yml b/app/src/main/assets/country_metadata/CL.yml index 359b321ba5..ee991a0140 100644 --- a/app/src/main/assets/country_metadata/CL.yml +++ b/app/src/main/assets/country_metadata/CL.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco de Chile, Banco Estado, BancoEstado, Santander, Redbanc, Banco Santander, Scotiabank, BCI, Caja Vecina, RedBanc, Itaú, Servipag, banco chile, Transbank, REDBANC, Bancoestado] -centerLine: white +centerLineStyle: white chargingStationOperators: [Enel, Copec, e, copec, CGE, Copec Voltex] mobileCountryCode: 730 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es] orchardProduces: [grape, apple, tomato, peach, pear, plum, kiwi, lemon, lime, avocado, orange, olive, cranberry, walnut, cherry, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/CM.yml b/app/src/main/assets/country_metadata/CM.yml index c34734c9c4..9ebfd66fe9 100644 --- a/app/src/main/assets/country_metadata/CM.yml +++ b/app/src/main/assets/country_metadata/CM.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Société générale] -centerLine: white +centerLineStyle: white mobileCountryCode: 624 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, en] orchardProduces: [tomato, banana, pineapple, cacao, avocado, rubber, kola_nut, chilli_pepper, sweet_pepper, coffee, tea, coconut, peach, apricot, guava, mango, mangosteen, plum] popularSports: [soccer, tennis, basketball, handball] -shoulderLine: short white dashes +shoulderLineStyle: short white dashes diff --git a/app/src/main/assets/country_metadata/CN.yml b/app/src/main/assets/country_metadata/CN.yml index 47282a3ee8..ebe4546a1d 100644 --- a/app/src/main/assets/country_metadata/CN.yml +++ b/app/src/main/assets/country_metadata/CN.yml @@ -1,8 +1,9 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [ICBC, China Construction Bank, 中国银行, 中国建设银行, Bank of China, 中国工商银行, HSBC, 交通银行, 中国农业银行, ABC, 招商银行, 北京银行, Agricultural Bank of China, SPD Bank, 工商银行ATM, 上海浦东发展银行, Standard Chartered Bank, 中信银行, China Merchants Bank, 中国光大银行, 建设银行, 中国邮政储蓄银行, ICBC ATM, 工商银行, Standard Chartered, Hang Seng Bank, 建设银行ATM, 昌邑农村商业银行, 浦发银行, 中國銀行（香港）Bank of China (Hong Kong), 中国民生银行, 华夏银行, 江苏银行, 农业银行, 平安银行, Bank of Communications, 中国工商银行ICBC ATM, 交通银行BCM ATM, Postal Savings Bank of China, CGB, BOC, 恒生銀行 Heng Seng Bank, 农业银行ATM, 富顺农商银行ATM, CMB, Citibank, Bank of Shanghai, 滙豐 HSBC, Bank of Jiangsu, China Everbright Bank, Construction Bank of China, Yunnan Rural Credit Cooperatives, agricultural bank of china, 上海银行, Bank of Beijing, BEA, Agricultural Bank of China (ABC), 滙豐銀行 HSBC, CRS, Heng Seng Bank, Bank of China (Hong Kong), 中國銀行澳門分行 BOC Macau, Agricultural Bank Of China, China construction bank, 桂林银行, ABC Bank, 兴业银行, BNB, Cixi Rural Commercial Bank, 邮政储蓄银ATM] -centerLine: white -isAdvisorySpeedLimitKnown: true -isSlowZoneKnown: true +centerLineStyle: white +hasAdvisorySpeedLimitSign: true +hasSlowZone: true mobileCountryCode: 460 officialLanguages: [zh] orchardProduces: [tomato, apple, orange, chilli_pepper, sweet_pepper, pear, peach, grape, banana, plum, guava, mango, mangosteen, grapefruit, persimmon, strawberry, tea, lemon, lime] diff --git a/app/src/main/assets/country_metadata/CO.yml b/app/src/main/assets/country_metadata/CO.yml index d2f751f75d..f632c690b5 100644 --- a/app/src/main/assets/country_metadata/CO.yml +++ b/app/src/main/assets/country_metadata/CO.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Bancolombia, Davivienda, Servibanca, BBVA, A Toda Hora S.A. (Red Aval), ATH, Banco de Bogota, Banco de Bogotá, Banco Popular, Colpatria, Grupo Aval, Servibanca S.A., Banco Caja Social, Citibank, Av Villas, Banco Agrario, AV Villas, bancolombia, Caja Social, servibanca, Bacolombia, BanColombia, ServiBanca, Grupo AVAL, Banco Agrario de Colombia, Banco Colombia, Cajero Bancolombia, BANCOLOMBIA, banco de bogota, banco popular, Scotiabank, davivienda, A Toda Hora (ATH) S.A., cajero Bancolombia, cajero BBVA, Banco Pichincha, ath, cespo, BancoBogota, Banco de Occidente, Casa Kennedy, Cajero, polv, VIA baloto, COOMULDESA, Banco AV Villas, CAJERO BANCO POPULAR, DAVIVIENDA] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Codensa, parqueadero, Terpel, Mobil] mobileCountryCode: 732 +noParkingSignStyle: mutcd +noStoppingSignStyle: colombia officialLanguages: [es] orchardProduces: [banana, pineapple, coffee, tomato, guava, mango, mangosteen, avocado, lemon, lime, papaya, orange, coconut, cashew_nut, strawberry, cacao, peach, grape] popularSports: [soccer, tennis, basketball, baseball, volleyball] diff --git a/app/src/main/assets/country_metadata/CR.yml b/app/src/main/assets/country_metadata/CR.yml index 9ded7b6577..3905e982fa 100644 --- a/app/src/main/assets/country_metadata/CR.yml +++ b/app/src/main/assets/country_metadata/CR.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco de Costa Rica, BCR, Banco Nacional, Banco Popular, BAC Credomatic, ATH, BAC, Banco de Costa Rica (BCR), Cajero BCR, Scotiabank, Banco De Costa Rica] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Estación de Recarga] mobileCountryCode: 712 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [pineapple, banana, orange, coffee, papaya, tomato, guava, mango, mangosteen, lemon, lime, grapefruit, coconut, avocado, strawberry, pepper, chilli_pepper, sweet_pepper, cacao] diff --git a/app/src/main/assets/country_metadata/CU.yml b/app/src/main/assets/country_metadata/CU.yml index 76f1a73bb8..fd010e6833 100644 --- a/app/src/main/assets/country_metadata/CU.yml +++ b/app/src/main/assets/country_metadata/CU.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Metropolitano, BANDEC, BPA, Banco Popular de Ahorro, Cajero automático, Cajeros Automáticos, BPP, Bandec, Cajero Automático, Banco de Credito y Comercio, Banco, Banco Popular De Ahorro, Banco Popular de ahorro, BM, Banco metropolitano, Cajeros] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 368 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [es] orchardProduces: [tomato, guava, mango, mangosteen, banana, papaya, chilli_pepper, sweet_pepper, coconut, pineapple, grapefruit, grape, orange, lemon, lime, coffee, agave, avocado, cacao] popularSports: [baseball, basketball] diff --git a/app/src/main/assets/country_metadata/CW.yml b/app/src/main/assets/country_metadata/CW.yml index 7a9c2151a1..ce2329878b 100644 --- a/app/src/main/assets/country_metadata/CW.yml +++ b/app/src/main/assets/country_metadata/CW.yml @@ -1,4 +1,4 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white officialLanguages: [nl, pap, en] popularSports: [baseball] diff --git a/app/src/main/assets/country_metadata/CY.yml b/app/src/main/assets/country_metadata/CY.yml index f1fd2c7fac..92b1e7921c 100644 --- a/app/src/main/assets/country_metadata/CY.yml +++ b/app/src/main/assets/country_metadata/CY.yml @@ -1,5 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Euronet, Bank of Cyprus, Ziraat Bankası, JCC, Hellenic Bank, Near East Bank, Coop Bank, Türk Bankasi, Türkiye İş Bankası, Bankamatik, Turk Bankasi] +hasDailyAlternateSideParkingSign: true isLeftHandTraffic: true mobileCountryCode: 280 officialLanguages: [el, tr] diff --git a/app/src/main/assets/country_metadata/CZ.yml b/app/src/main/assets/country_metadata/CZ.yml index 03102f4c9f..6bc6019f6f 100644 --- a/app/src/main/assets/country_metadata/CZ.yml +++ b/app/src/main/assets/country_metadata/CZ.yml @@ -2,10 +2,11 @@ atmOperators: [Česká spořitelna, ČSOB, Komerční banka, Pharro, 'MONETA Money Bank, a.s.', Euronet, Česká Spořitelna, Raiffeisenbank, Air Bank, KB, Komerční Banka, GE Money Bank, UniCredit Bank, Moneta, MONETA Money Bank, Moneta Money Bank, 'Česká spořitelna, a.s.', Fio banka, CSOB, 'Komerční banka, a.s.', AirBank, EuroNet, 'Československá obchodní banka, a. s.', GE Money, Česká spořitelna a.s., Komerční banka a.s., Air bank, Sberbank, Poštovní spořitelna, Citibank, Moneta Bank, Airbank, ČS, Komeční banka, Raiffeisen Bank, Travelex, Fio, Unicredit Bank, GE, MONETA Money Bank a.s., Era, komerční banka, airbank, GE Money bank, Oberbank, 'Česká spořitelna, a. s.', FIO, ERA, UniCreditBank, www.wbtcb.com, UniCredit bank, České spořitelny, Moneta money bank, mBank, Fio Banka, Raiffeisen, MONETA, Česká spořitelna a. s., OK Point, Airbank a.s., Česká spořítelna] chargingStationOperators: [ČEZ, ČEZ (CCS/CHAdeMO/Mennekes type2), PRE, EVMAPA, E.ON (CCS/CHAdeMO/Mennekes), ČEZ (CCS/CHAdeMO/Mennekes typ2), beskolo, EON, E.ON, ČEZ (CCS/CHAdeMO/Mennekes type 2), Tesla, ČEZ (CCS/CHAdeMO and Mennekes type2), evmapa.cz, CCS/CHAdeMO and Mennekes type2, ČEZ (CCS/CHAdeMO/Mennekes), ČEZ (CCS/CHAdeMO/Menneke type2), VŠB, TS Opava, Město Dačice, MOL (CCS/CHAdeMO/Mennekes), MOL, Kaufland, InChaNet, EVmapa (Mennekes type 2)] clothesContainerOperators: [Textileco, Služby města Český Krumlov s.r.o., SAKO, Město Veltrusy, KLOK.TEX] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true -isUsuallyAnyGlassRecycleableInContainers: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true +isUsuallyAnyGlassRecyclableInContainers: true +livingStreetSignStyle: wide mobileCountryCode: 230 officialLanguages: [cs] orchardProduces: [apple, grape, tomato, hop, pear, plum, strawberry, cherry, chilli_pepper, sweet_pepper, apricot, peach, walnut, raspberry] diff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml index dc41688ddf..38f2dabfb1 100644 --- a/app/src/main/assets/country_metadata/DE.yml +++ b/app/src/main/assets/country_metadata/DE.yml @@ -2,9 +2,10 @@ atmOperators: [Sparkasse, Postbank, Euronet, Volksbank, Deutsche Bank, Commerzbank, ING-DiBa, Berliner Sparkasse, Raiffeisenbank, Berliner Volksbank, IC Cash Services GmbH, Oldenburgische Landesbank AG, Bankhaus August Lenz, Sparda-Bank, Sparkasse Aachen, ING DiBa, ING, Hamburger Sparkasse, Reisebank, Stadtsparkasse München, Sparkasse Essen, Sparkasse KölnBonn, ReiseBank, HypoVereinsbank, Sparkasse Ansbach, VR-Bank, Kreissparkasse, Sparkasse Marburg-Biedenkopf, Sparkasse Göttingen, Sparkasse Bremen, Hamburger Volksbank eG, Sparda-Bank West eG, Volksbank Mittelhessen, VR Bank, Sparkasse Karlsruhe, Kreissparkasse München Starnberg Ebersberg, BBBank eG, Sparkasse MagdeBurg, Mittelbrandenburgische Sparkasse, Deutsche Postbank AG, Sparkasse Heidelberg, ING Diba, Deutsche Bank AG, Sparda Bank, Sparkasse Offenburg/Ortenau, Stadtsparkasse Augsburg, Commerzbank AG, Sparkasse Chemnitz, Volksbank eG - Die Gestalterbank, Sparkasse Bochum, BBBank, Sparkasse Holstein, BW-Bank, Kreissparkasse Köln, Saalesparkasse, Sparkasse Trier, Aachener Bank, ING-DiBa AG, Stadtsparkasse Düsseldorf, Sparkasse Leipzig, Degussa Bank, Sparkasse Herford, Kreissparkasse Böblingen, Berliner Volksbank eG, Sparkasse Bielefeld, Volksbank Dessau-Anhalt eG, Targobank, Sparkasse Hanauerland, Braunschweigische Landessparkasse, Stadtsparkasse, Sparkasse Hanau, Förde Sparkasse, Sparkasse Mittelthüringen, ING-Diba, Nord-Ostsee Sparkasse, Ostsächsische Sparkasse Dresden, Taunus Sparkasse, Sparkasse Bühl, Cardpoint GmbH, Sparkasse Bodensee, Sparkasse Mainz, Sparkasse Bayreuth, Volksbank Krefeld eG, Mainzer Volksbank, Bankhaus Lenz, Postbank AG, Santander, Deutsche Post, Volks- und Raiffeisenbank, Sparkasse Westholstein, Stadt-Sparkasse Solingen, Sparkasse Kraichgau, Cardpoint, Sparkasse Gießen, Nord-Ostsee-Sparkasse, Sparkasse Südpfalz, Kasseler Sparkasse, Sparkasse Siegen, Sparkasse Vorpommern, Sparkasse Nürnberg, Sparkasse Emden, Kreissparkasse Verden, Sparkasse Saarbrücken, Kreissparkasse Tübingen, Volksbank Kraichgau eG, Sparkasse Harburg-Buxtehude, Kreissparkasse Ludwigsburg, Ing Diba, Kreissparkasse Reutlingen, Sparkasse zu Lübeck, Sparkasse Neuss, Sparkasse Witten, Raiffeisenbank Oldenburg eG, Cashzone, Sparkasse Hannover, Sparkasse Langen-Seligenstadt, Münchner Bank, Sparkasse Dortmund, Sparkasse Schwäbisch Hall, Sparkasse Rhein Neckar Nord, BW Bank, Sparkasse Freising, Frankfurter Volksbank, Sparkasse Mittelsachsen, Volksbank Reutlingen, ReiseBank AG, Stadtsparkasse Kaiserslautern, Volksbank Raiffeisenbank, Sparkasse LeerWittmund, Landessparkasse zu Oldenburg, Erzgebirgssparkasse, Kreissparkasse Ostalb, Volksbank Köln Bonn eG, Sparkasse Jena-Saale-Holzland, Oldenburgische Landesbank, Bremische Volksbank eG, VR-Bank Bad Hersfeld-Rotenburg eG, Frankfurter Sparkasse, Sparkasse HRV, Landesbank Baden-Württemberg, Kreissparkasse Waiblingen, Stadtsparkasse Wuppertal, Kreissparkasse Esslingen-Nürtingen, Sparkasse Paderborn-Detmold, Volksbank Lahr eG, Sparkasse Hildesheim, Nassauische Sparkasse, Sparkasse Münsterland Ost, Sparkasse Düsseldorf, Sparkasse Spree-Neiße, Sparkasse Darmstadt, Sparkasse Duisburg, VR Bank Schwäbisch Hall-Crailsheim eG, Ostsächsische Sparkasse, Niederrheinische Sparkasse RheinLippe, Kreissparkasse Biberach, Sparkasse Rhein-Nahe, Sparkasse Regensburg, Sparkasse Leverkusen, Sparkasse Schwäbisch Hall - Crailsheim, Volksbank Bühl eG, Volksbank Trier eG, Ing-Diba, Kreissparkasse Gelnhausen, cardpoint, Haspa, transact Elektronische Zahlungssysteme GmbH, moneyserv, Sparkasse Vest Recklinghausen, cash zone, Hannoversche Volksbank, ICCash Services, Bremische Volksbank, Sparkasse Ingolstadt, Kreissparkasse Ravensburg, Sparkasse Ulm, Hamburger Volksbank, Sparkasse Lüneburg, Kreissparkasse Heilbronn, Volksbank eG, Kreissparkasse Schwalm-Eder, Ing-DiBa, Volksbank Heilbronn, Volksbank Bielefeld-Gütersloh eG, Sparkasse Rosenheim, Sparda-Bank München eG, VÖB-ZVD Processing GmbH, ATM, Stadtsparkasse Bocholt, PSD Bank Karlsruhe-Neustadt eG, Sparkasse Arnstadt-Ilmenau, Deutsche Post AG, Sparkasse Westmünsterland, Sparkasse Düren, OSPA Rostock, DiBa, Raiffeisen, Sparda-Bank Berlin eG, Volksbank Paderborn-Höxter-Detmold eG, Sparkasse Allgäu, Sparkasse Dachau, VR Bank eG, Volksbank Kraichgau, Sparkasse Wuppertal, Ostfriesische Volksbank, Sparkasse Vogtland, Volksbank Stuttgart, Volksbank Stuttgart eG, Cash Group, Sparkasse Koblenz, VR Bank Südliche Weinstraße-Wasgau eG, Sparkasse Hamm, VR Bank Main-Kinzig-Büdingen eG, Sparkasse Kleve, BB Bank, Volksbank Karlsruhe, Sparkasse Rastatt-Gernsbach, Sparda-Bank Baden-Württemberg eG, Vereinigte Volksbank eG, Kreissparkasse Augsburg, Kreissparkasse Heidenheim, Sparkasse Pforzheim Calw, Sparkasse Uckermark, Kreissparkasse Groß-Gerau, Sparkasse Westerwald-Sieg, Volksbank Mitte eG, Sparkasse Fürstenfeldbruck, Sparkasse Nienburg, Sparkasse Bamberg, Sparkasse Uelzen Lüchow-Dannenberg, Sparkasse Südholstein, VR-Bank Langenau-Ulmer Alb eG, Kreissparkasse Kaiserslautern, Sparkasse Neckartal-Odenwald, Volksbank Lüneburger Heide eG, Sparkasse HagenHerdecke, Bankhaus August Lenz & Co. AG, Volksbank im Siegerland, Santander Bank, Kreissparkasse Bitburg-Prüm, Sparkasse Bensheim, Sparkasse Rosenheim-Bad Aibling, VR Bank Main-Kinzig-Büdingen, Ikano Bank, Sparkasse Rhein-Haardt, Sparkasse Landshut, Raiffeisenbank Sulzbach-Rosenberg eG, Sparkasse Waldeck-Frankenberg, Kreis- und Stadtsparkasse Erding-Dorfen, Kreissparkasse Göppingen, CardPoint, Volksbank Karlsruhe eG, Sparkasse Coburg - Lichtenfels, Reisebank AG, Kreissparkasse Bautzen, Sparkasse Berlin, Harzsparkasse, Sparkasse Celle, Deutsche Postbank, VR-Bank eG, Sparda-Bank Hamburg eG, Volksbank Göppingen, Sparkasse Wilhelmshaven, Sparkasse Engen-Gottmadingen, Sparkasse Kulmbach-Kronach, HypoVereinsbank UniCredit Bank AG, Sparkasse Barnim, Sparkasse Mecklenburg-Schwerin, Sparkasse Meißen, Sparkasse Vorderpfalz, Weser-Elbe Sparkasse, Volksbank Viersen eG, IngDiBa, Sparkasse Krefeld, IngDiba, EuroNet, VR, MVB, Kreissparkasse Osterholz, Kreissparkasse Ahrweiler, Volksbank Bochum Witten eG, VÖB, Volksbank Raiffeisenbank Rosenheim-Chiemsee eG, Sparkasse Gera-Greiz, Sparkasse Oberhessen, Hypo Vereinsbank, Sparkasse Fürth, ING DIBA, Frankfurter Volksbank eG, Sparkasse Forchheim, Sparkasse Köln/Bonn, Sparkasse Wiesental, Volksbank Halle, Kieler Volksbank, Volksbank Oberberg eG, Sparkasse Neuwied, National Bank, VR-Bank Erding eG, Sparda, Sparda-Bank Hessen eG, Sparkasse Uecker-Randow, Volksbank Elsterland eG, ICCash, cashzone, Volksbank Kassel Göttingen eG, Ostseesparkasse Rostock, VR-Bank Rhein-Sieg, Sparkasse Lemgo, Sparkasse Osnabrück, Augusta-Bank, Raiffeisenbank eG, Sparkasse Erding-Dorfen, Stadtsparkasse Burgdorf, Sparkasse Passau, Sparkasse Weserbergland, Rhön-Rennsteig-Sparkasse, Sparkasse Wittenberg, ING-DIBA, VR Bank Bamberg, Sparkasse Mittelmosel, Sparda-Bank Südwest, Volksbank Osnabrück eG, Volksbank Münster, Sparkasse Worms-Alzey-Ried, Dortmunder Volksbank, Reise Bank, Volksbank RheinAhrEifel eG, Südwestbank, Sparkasse Bad Hersfeld-Rotenburg, Sparkasse Neu-Ulm - Illertissen, Kreissparkasse Düsseldorf, Geldautomat, Sparkasse Lüdenscheid, Ing DiBa, Nordthüringer Volksbank eG, Volksbank Bielefeld Gütersloh eG, Sparkasse Mülheim, Volksbank Eifel eG, Volksbank Halle (Saale) eG, Sparkasse Spree-Neisse, Sparkasse Schwarzwald-Baar, Kreissparkasse Miesbach-Tegernsee, Volksbank Hohenlohe eG, Volksbank Kurpfalz H + G BANK eG, Santander Consumer Bank, Sparkasse Pfullendorf-Meßkirch, VR Bank Westküste eG, Sparkasse Aurich-Norden, Rheingauer Volksbank eG, Raiffeisenbank München Süd eG, Sparkasse Neunkirchen, Sparda-Bank West, InterCard, VR-Bank Erlangen-Höchstadt-Herzogenaurach eG, Hypovereinsbank, Sparkasse Minden-Lübbecke, Sparkasse Memmingen-Lindau-Mindelheim, ZVD Processing, Volksbank Mittelhessen eG, VR-Bank Rottal-Inn eG, Deutsche Apotheker- und Ärztebank eG, Volksbank Ludwigsburg, Baden-Württembergische Bank, Edekabank AG, Deutsche Kreditbank AG, IC Cash Services, Sparkasse Paderborn Detmold, Note Machine, Volksbank Raiffeisenbank Dachau eG, CashZone, Hambuger Sparkasse, Studentenwerk, Sparkasse Dresden, Volksbank Hameln-Stadthagen, Raiffeisenbank Voreifel eG, UniCredit Bank AG, Sparkasse Gevelsberg-Wetter, Landesbank Berlin, Salzlandsparkasse, Volksbank Alzey-Worms eG, Sparkasse Freiburg-Nördlicher Breisgau, Volksbank Kur- und Rheinpfalz eG, Volksbank Kirchheim-Nürtingen, Sparkasse Wetterau, Volksbank Magdeburg, Sparkasse Südwestpfalz, Stadtsparkasse Mönchengladbach, Sparkasse Donauwörth, Sparkasse Kassel, Sparkasse Schweinfurt, Volksbank Paderborn, Vereinigte Volksbank eG Saarlouis - Sulzbach/Saar, Volksbank Westerstede eG, Sparkasse Nienburg/Weser, August Lenz, Frankfurter Sparkasse 1822, Kreissparkasse Heinsberg, Volksbank an der Niers eG, Sparkasse Ostunterfranken, Volksbank Odenwald, Sparkasse Geldautomat, Volksbank Siegerland eG, CashPool, Volksbank Cloppenburg eG, Volkswagen Bank, Volksbank Pforzheim, Wiesbadener Volksbank, Sparkasse Mülheim an der Ruhr, IKANO Bank, VR-Bank Nordeifel, HASPA, Sparkasse Coburg-Lichtenfels, Sparkasse Dieburg, Sparkasse Starkenburg, Sparkasse Günzburg-Krumbach, Sparkasse Burgenlandkreis, Kreissparkasse Nordhausen, Sparkasse Grünberg, Volkswagen Bank direct, Shell, Volksbank Neckartal eG, Sparkasse Merzig-Wadern, Community Bank, Sparkasse Hofgeismar, Mittelbrandenburgische Sparkasse in Potsdam, Volksbank Raiffeisenbank Bayern Mitte eG, Raiffeisenbank Regensburg-Wenzenbach eG, Eckernförder Bank, Berliner Bank, VR-Bank Mittelfranken West eG, Sparkasse Gelsenkirchen, VR Bank Rhein-Neckar, Allianz, Sparkasse UnnaKamen, Volksbank-Raiffeisenbank, Sparkasse Hegau-Bodensee, Volksbank Paderborn-Höxter-Detmold, Volksbank eG Bremerhaven-Cuxland, Kasseler Bank, Kreissparkasse Tuttlingen, Deutsche Apotheker- und Ärztebank, Targo Bank, Post Bank, Stadtsparkasse Cuxhaven, Sparkasse Haltern am See, Volksbank Alzey-Worms, Sparkasse Zollernalb, Sparkasse Hildesheim Goslar Peine, Sparkasse Hattingen, Sparkasse Mainfranken, Edekabank, Sparkasse Niederlausitz, Sparkasse Offenbach, Freisinger Bank, OstseeSparkasse Rostock, Volksbank Raiffeisenbank eG, Volksbank Reutlingen eG, Kreis-Sparkasse Northeim, Sparda-Bank Hannover eG, Sparkasse Zwickau, DKB, Sparkasse Oberpfalz Nord, Norderstedter Bank eG, Sparkasse Offenburg, Sparkasse Amberg-Sulzbach, Volksbank Breisgau Nord eG, VR Bank Biedenkopf-Gladenbach, Volksbank Ermstal-Alb eG, Degussa Bank AG, Kreissparkasse Herzogtum Lauenburg, Spardabank, Kreissparkasse Grafschaft Diepholz, Städtische Sparkasse zu Schwelm, Volksbank im Bergischen Land eG, Sparkasse Hochrhein, Cash Zone, Leipziger Volksbank, Sparkasse Aschaffenburg-Alzenau, transact Elektronische Zahlungssysteme, IC-Cash, Volksbank in der Ortenau, Kreissparkasse Vulkaneifel, Euronet Worldwide, Stadt- und Kreissparkasse Leipzig, Raiffeisenbank Kraichgau eG, Raiffeisenbank Frankenhardt-Stimpfach eG, Euronet ATM, Raiffeisen-Volksbank Miltenberg eG, NCR, Volksbank-Raiffeisenbank Rhön-Grabfeld, Erfurter Bank eG, Volksbank Heinsberg eG, Bank für Sozialwirtschaft, Volksbank Remseck eG, Volksbank Chemnitz eG, VR-Bank Coburg, Sparkasse Bergkamen-Bönen, Volksbank Erft eG, Stuttgarter Volksbank, Sparkasse Gifhorn-Wolfsburg, Stuttgarter Volksbank AG, Volksbank Wolfenbüttel-Salzgitter eG, Sparkasse Rotenburg Osterholz, Stadtsparkasse Hameln, Postbank Hannover, TARGOBANK, Raiffeisen-Volksbank, Sparkasse Höxter, VerbundVolksbank OWL eG, Sparkasse Radevormwald-Hückeswagen, Kreissparkasse Euskirchen, Erfurter Bank, Volksbank Baden-Baden - Rastatt, Mainzer Volksbank eG, Volksbank Bielefeld-Gütersloh eG SB, Volksbank Lüneburger Heide, VR-Bank Neckar-Enz eG, Volksbank Herrenberg-Rottenburg, Volksbank Bruhrain-Kraich-Hardt eG, UniCredit, Sparkasse Mecklenburg-Strelitz, Volksbank Plochingen, Volksbank BraWo, Sparkasse Staufen-Breisach, Kölner Bank eG, Dortmunder Volksbank eG, Sparkasse Duderstadt, Volksbank Tettnang, Raiffeisenbank Kempten, Kreissparkasse Grafschaft Bentheim zu Nordhorn, Volksbank Tübingen, Sparkasse Vest, Volksbank in Schaumburg eG, Volksbank im Märkischen Kreis, Sparkasse Scheeßel, Stadtsparkasse Oberhausen, Sparkasse Neu-Ulm, Volksbank Raiffeisenbank Fürstenfeldbruck eG, Sparkasse am Niederrhein, Volksbank Bergstraße, Kreissparkasse Wiedenbrück, Raiffeisen Volksbank, Volksbank Bochum Witten, Sparkasse Altenburger Land, Volksbank Bad Oeynhausen-Herford eG, Sparkasse Oberlausitz-Niederschlesien, LZO (Sparkasse), Raiffeisenbank Westallgäu eG, Volksbank Darmstadt, Volksbank Dreieich eG, VR PLUS Altmark-Wendland eG, V+R Bank, Vereinigte Volksbank Maingau eG, Volksbank Forchheim, Deutsche Bank 24, Sparkasse Heilbronn, Sparkasse Dessau-Roßlau, Frankfurter Sparkassee 1822, Sparkasse Weißenfels, Volksbank Bigge-Lenne, Stadtsparkasse Duisburg, Volksbank Hildesheim eG, Sparkasse Lippstadt, Grafschafter Volksbank, Volksbank Raiffeisenbank Dresden, Sparkasse Sonneberg, NORD/LB, Stadtsparkasse Gladbeck, Volksbank Schleswig, Sparkasse München, Volksbank Saaletal eG, Föhr-Amrumer Bank eG, Sparkasse Lünen, Sparkasse Werra-Meißner, GLS Bank, Sparkasse Rügen, ing-diba, Volksbank Main-Tauber eG, Volksbank Griesheim, Deutsche Apotheker und Ärztebank, ing Diba, Sparda-Bank Ostbayern, Volksbank Saaletal, Bordesholmer Sparkasse, Volksbank Sandhofen eG, Raiffeisen-Volksbank Aschaffenburg eG, Sparkasse Stade-Altes-Land, Sparkasse im Landkreis Cham, Bankverein Werther, Sparda-Bank Ostbayern eG, Volksbank Riesa eG, Wiesbadener Volksbank eG, Volksbank Unna, Sparkasse Neubrandenburg-Demmin, Raiffeisenbank Westeifel, Sparkasse Hagen, Stadtsparkasse Bad Oeynhausen, Intercard, Sparkasse Gütersloh-Rietberg, Volksbank Wittenberg eG, Sparkasse Tauberfranken, Sparkasse Donnersberg, Bank 1 Saar, ec, Sparkasse Moosburg, Werther Bank, Volksbank / Sparkasse, Sparkasse & Volksbank, Volksbank Kleverland eG, Volksbank Kurpfalz, Sparkasse Fulda, Volksbank Uckermark, Sparkasse Odenwaldkreis, SSK Düsseldorf, Wartburgsparkasse, Sparda Bank Hessen eG, Sparkasse ALK, B + S Visa Card Service, Sparkasse Stade-Altes Land, Stadtsparkasse Wermelskirchen, Raiffeisen-Volksbank Ries eG, Dithmarscher Volks- und Raiffeisenbank eG, Sparkasse Wetter, Volksbank Freiburg, Volksbank Sauerland eG, Kreissparkasse St. Wendel, Stadtsparkasse Dessau, Kreissparkasse Saarpfalz, postbank, Kreissparkasse Saale-Orla, Harzer Volksbank, VÖB ZVD Bank, VR Vorpommern, Stadtsparkasse Dortmund, Volksbank Hochrhein, Ulmer Volksbank, 'Sparkasse, Volksbank', PSD Bank Kiel, Raiffeisenbank München Süd, Sparkasse Köln-Bonn, Stadtsparkasse Schwedt, Brandenburger Bank, Sparkasse Solingen, Sparkasse Unstrut-Hainich, Volksbank Sauerland, Sparkasse Erlangen, Müritz-Sparkasse, Volksbank Rhein-Erft, Ostsee-Sparkasse, Volks-und Raiffeisenbank, VÖB-ZVD Processing, Sparkasse Freiburg, VVB Maingau, Bankcard-Servicenetz, Volksbank Brenztal, Sparda-Bank Südwest eG, Volksbank Kempen-Grefrath eG, Volksbank Esens, Sparkasse Köln, Volksbank-Raiffeisenbank Riedlingen, Volksbank Altshausen eG, VR Bank Südpfalz, HSV Processing, VR-Bank Fläming eG, Sparda-Bank Hessen, Sparkasse Gunzenhausen, Volksbank Braunschweig Wolfsburg, VR-Bank in Südniedersachsen eG, Sparkasse Rottal-Inn, Raiffeisenbank Ehingen-Hochsträß, Rheingauer Volksbank, Raiffeisenbank Seebachgrund, VR Bank Bad Orb-Gelnhausen eG, VR Bank Bad Orb-Gelnhausen, Kreissparkasse Saarlouis, VR Bank München Land eG, Husumer Volksbank eG, Volksbank in Südwestfalen eG, Volksbank Bautzen, Volksbank Bühl, Raiffeisenbank Essenbach, Volksbank Baden-Baden/Rastatt, Stadt- und Kreissparkasse Moosburg an der Isar, Sparkasse Anhalt-Bitterfeld, KSK Ludwigsburg, Raiffeisenbank Unteres Vilstal eG, Sparkasse Gummersbach-Bergneustadt, Sparkasse Siegen AöR, Voksbank, Sparkasse Eichsfeld, VR Bank Oldenburg Land eG, LZO, Kreissparkasse Steinfurt, Volksbank Nienburg, Sparkasse Remscheid, Harzer Volksbank eG, Volksbank Breisgau-Süd, Frankenberger Bank, Sparkassen-Finanzgruppe, Stadt- und Kreissparkasse Erlangen, VakifBank, Sparkasse Leer-Wittmund, Volksbank Rhein-Lippe eG, Spreewaldbank eG, Kreissparkasse Eichsfeld, PSD Bank, Volksbank Nordschwarzwald, Heidelberger Volksbank, Volksbank Dortmund-Nordwest eG, Raiffeisenbank eG Moormerland, Kreissparkasse Gotha, Volkswagen Bank GmbH, PSD-Bank, Volksbank Braunlage, VR-Bank Rhein-Sieg eG, Volksbank Bielefeld-Gütersloh, Volksbank Göttingen eG, Volksbank Oldenburg eG, Kreissparkasse Garmisch-Partenkirchen, Evangelische Bank, Sylter Bank eG, Volksbank Hellweg e.G., Volksbank Bocholt, VR-Bank Mittelsachsen eG, Kreissparkasse Mayen, Sparkasse Osterode am Harz, Volksbank Chemnitz, Kreissparkasse Traunstein-Trostberg, Sparkasse Markgräflerland, Raiffeisenbank Mecklenburger Seenplatte eG, Donau-Iller Bank, Hannoversche Volksbank eG, Travelex, MoneyServ, VR-Bank Bayreuth-Hof eG, Raiffeisenbank Oberursel eG, Sparkasse Wasserburg am Inn, Volksbank Dreiländereck eG, Sparkasse Bad Tölz-Wolfratshausen, Volksbank Raiffeisenbank Rhön-Grabfeld eG, Raiffeisen-Volksbank Miltenberg, Sparkasse Schwerte, ATM Geldautomat, Volksbank Castrop-Rauxel, Raiffeisnbank Sulzbach-Rosenberg eG, Transact Elektronische Zahlungssysteme GmbH, EC Geldautomat, EC, VR-Bank Gerolzhofen, Volksbank Backnang eG, Sparkasse Oder-Spree, Volksbank Staufen, CashGroup, Stadtparkasse Wuppertal, meine Volksbank Raiffeisenbank eG, VR Bank Schleswig-Mittelholstein eG, Raiffeisenbank im Oberland eG, IC Cash] chargingStationOperators: [Stromnetz Hamburg, Stadtwerke München, EnBW, innogy, RWE, Allego, allego, RWE-Effizienz, Innogy, E-WALD GmbH, LEW, EWE, e-regio GmbH & Co. KG, SWU Stadtwerke Ulm/Neu-Ulm GmbH, Tesla, EnBW Energie Baden-Württemberg AG, be emobil, NEW, Lidl, Kaufland, Tank & Rast, SWM, Vattenfall, Stadtwerke Augsburg, Lechwerke AG, Ionity, Energie- und Wasserversorgung Bonn/Rhein-Sieg GmbH, Tesla Motors Inc., E.ON, Tesla Motors, FairEnergie GmbH, innogy SE, ENSO Energie Sachsen Ost AG, DREWAG - Stadtwerke Dresden GmbH, Aldi Süd, ADAC, N-Ergie, Stadtwerke Norderstedt, EWE Vertrieb GmbH, Westfalen Weser Netz, BMW, EWV, E-Werk Mittelbaden, Stadtwerke Leipzig, Mainova, Energie Baden-Württemberg AG, innogy eMobility Solutions GmbH, IKEA, Stadtwerke Osnabrück, Stadtwerke Düsseldorf, RheinEnergie, Kreiswerke Main-Kinzig GmbH, Ionity GmbH, Energie- und Wasserversorgung Bruchsal GmbH, Energie und Wasser Potsdam GmbH, wallbe, Stadtwerke Witten, Regensburger Energie- und Wasserversorgung AG & Co KG, Fastned, eins energie in sachsen, Stadtwerke Bielefeld, NewMotion, envia M, STAWAG, EWR, enviaM, eE4mobile eG, Stadtwerke Tübingen, Stadtwerke Speyer GmbH, ladenetz.de, TheNewMotion, SWB, Edeka, Bauhaus, Süwag Energie AG, Stawag, Stadtwerke Marburg, Stadtwerke Bochum, Porsche, DREWAG - Stadtwerke Dresden, Bayernwerk AG, Allego GmbH, eon, e-on Drive, VGS mbH, Süwag, Stadtwerke Meerbusch GmbH, N-ERGIE Aktiengesellschaft, N-ERGIE, Lech Elektrizitätswerke Augsburg, Ikea, Audi AG, ALDI Süd, swb, Stadtwerke Pforzheim, Stadtwerke Heide, Pfalzwerke, OVAG, IONITY, Entega Energie GmbH, Energieversorgung Rodau GmbH, ENTEGA Energie GmbH, DREWAG, Bayernwerk, Stadtwerke Tübingen GmbH, Stadtwerke Iserlohn - Heimatversorger, Ovag, Mainzer Stadtwerke, Kreis Paderborn, Entega, E-Wald GmbH, BEW, Allegro, enercity, eeMobility, e.on, e.dis, WVV, The New Motion, TankE GmbH, TEAG, Stadtwerke Rhede GmbH, Stadtwerke Herne, Rheinenergie, RWE Effizienz GmbH, Mennekes, Ladeverbund+, Kreiswerke Main-Kinzig, Filderstadtwerke, ENBW, EAM, emma, SÜC Energie und H2O GmbH, Stadtwerke Göttingen, Stadtwerke Baden-Baden, RWE / DEW21, Pfalzwerke AG, Maingau, LEW Augsburg, Innogy eMobility Solutions GmbH, Energieversorgung Leverkusen GmbH & Co. KG (EVL), EGG Energieversorgung Gera, Charge-ON GmbH] clothesContainerOperators: [Deutsches Rotes Kreuz, Loop, Aktion Hoffnung, AWG, GEB, ALBA Braunschweig GmbH, Humana, Malteser, Stadtreinigung Hamburg, Stadt Karlsruhe, AHE;Deutsches Rotes Kreuz, Abfallwirtschaftsgesellschaft Wuppertal, Vorwerker Diakonie, DRK, Zweckverband für Abfallwirtschaft Kempten, Texaid, Technische Betriebe Velbert AöR, Abfallwirtschaftsbetrieb München, hoelp, Kolping, AWB Köln, AWB, AHE, AWO, GOA, bonnorange AöR, Technische Betriebe Remscheid, Darbo Recycling, Step, Malteser Hilfsdienst e.V., Landkreis Prignitz, Remondis, Malteser Hilfsdienst, FWS, CityGreenPoint, aha Zweckverband Abfallwirtschaft Region Hannover, Stadt Stuttgart, TEXAID, Berlin-Textilrecycling, Bayerisches Rotes Kreuz, Aktex Rohstoff-Recycling Nord, Diakoniewerk Essen, Abfall- und Wertstofflogistik Neuss GmbH (AWL), Retextil Recycling International, Isevtex, Gew. Fa. Mettex, AWISTA, AHG alpha Handelskontor, AHA, unknown, ZKE, Veolia, Kolpingwerk, HeDi, DRK Kreisverband Bonn e.V., Brotex, AWM, illegal, Däsa Wiederverwertungs GmbH, Deutsches Rotes Kreuz e.V., Textil-Recycling Nord, TEXAID Deutschland GmbH, RS, Kolping Recycling GmbH, Altkleiderfirma Nargül, Stadt Karlsruhe Amt für Abfallwirtschaft, HUMANA Kleidersammlung GmbH, DRK-Kreisverband Trier-Saarburg e.V., Bera Textilrecycling, Baliz Textilwerke, Neue Arbeit Lahr, Johanniter, Hoppe, Familienschutzwerk, BRK, Akza Textilrecycling, AWISTA GmbH, AHE;Deutsches Rotes Kreuz;Ruhrtalengel, aha, TEXAID Collection GmbH, TEXAID Collection, SP Textilverwertung, Retextil, Maltheser Hilfsdienst, HUMANA, Diakonisches Werk Kassel, Deutsche Lebens-Rettungs-Gesellschaft e.V., DESWOS, Stadtreinigung Leipzig, SOEX, Haytex Textilrecycling, Ginotex, DRK-Kreisverband Koblenz-Stadt e.V., DRK KV Ammerland, Content KG, Bethel, Baliz, Awista, Arbeiter-Samariter-Bund, ZVO, Wittmann, USB, Stadtreiniger Kassel, Sehbehinderten Selbsthilfe Kurpfalz-Odenwald e.V., REMONDIS, OKA Textil, KuB GmbH, Kreisentsorgungs GmbH Vogtland (KEV), Kolpingsfamilie Ostbevern e. V., Faircollect, East-West Textilrecycling Kursun, East-West, Caritas] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 262 officialLanguages: [de] orchardProduces: [grape, apple, strawberry, tomato, hop, plum, pear, walnut, cherry, blueberry, chilli_pepper, sweet_pepper, raspberry, peach, apricot] diff --git a/app/src/main/assets/country_metadata/DK.yml b/app/src/main/assets/country_metadata/DK.yml index 65f047438c..49d821db6f 100644 --- a/app/src/main/assets/country_metadata/DK.yml +++ b/app/src/main/assets/country_metadata/DK.yml @@ -1,8 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Danske Bank, Nordea, Euronet, Sydbank, Jyske Bank, Arbejdernes Landsbank, Spar Nord, Nykredit, Sparekassen Kronjylland, Nordjyske Bank, Andelskassen, Sparekassen Sjælland, Totalbanken, Lån & Spar, Handelsbanken, SparekassenThy, Danske bank, SparNord, Vestjysk Bank, Skjern Bank, DiBa, Sparekassen Vendsyssel, Jutlander Bank, Sparekassen Thy, Ringkøbing Landbobank, Frøs Herreds Sparekasse, Lån & Spar Bank, Bank Nordik, Djurslands Bank] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: square mobileCountryCode: 238 officialLanguages: [da] orchardProduces: [apple, tomato, strawberry, pear, cherry, plum, raspberry, blueberry, hazelnut] diff --git a/app/src/main/assets/country_metadata/DO.yml b/app/src/main/assets/country_metadata/DO.yml index 2b9f3c9f7d..e4bc779f87 100644 --- a/app/src/main/assets/country_metadata/DO.yml +++ b/app/src/main/assets/country_metadata/DO.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Popular, Popular, BanReservas, Banreservas, BHD, Banco BHD Leon, Banco BHD, Banco de Reservas, Banco BHD León, Banca Popular, BPD] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 370 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es] orchardProduces: [banana, papaya, avocado, coconut, pineapple, tomato, orange, cacao, chilli_pepper, sweet_pepper, lemon, lime, guava, mango, mangosteen, coffee, grapefruit, cashew_nut, rubber] popularSports: [baseball, basketball, tennis] diff --git a/app/src/main/assets/country_metadata/DZ.yml b/app/src/main/assets/country_metadata/DZ.yml index c870ab0400..6dadfc70ec 100644 --- a/app/src/main/assets/country_metadata/DZ.yml +++ b/app/src/main/assets/country_metadata/DZ.yml @@ -2,6 +2,8 @@ atmOperators: [بريد الجزائر, Algérie Poste, بي إن بي باريبا, BNP Paribas El Djazaïr, Algerie Poste, القرض الشعبي الجزائري, الصندوق الوطني للتوفير والاحتياط, بنك الجزائر الخارجي, CPA, Algérie poste, سوسيتيه جنرال, CCP, GAB CCP, GAB, CNEP, Algerie poste, algerie poste] firstDayOfWorkweek: Su mobileCountryCode: 603 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar, ber, fr] orchardProduces: [tomato, date, olive, orange, grape, apple, apricot, pear, peach, fig, plum, lemon, lime, almond, chilli_pepper, sweet_pepper, cherry] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/EC.yml b/app/src/main/assets/country_metadata/EC.yml index e0f838a644..24c2e0934f 100644 --- a/app/src/main/assets/country_metadata/EC.yml +++ b/app/src/main/assets/country_metadata/EC.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Pichincha, Cooperativa JEP, Banco de Guayaquil, JEP, Banco Guayaquil, Banco Internacional, Banco del Pacífico, Banco del Austro, Banco Bolivariano, Banco del Pichincha, Banco de Loja, Produbanco, Banred, Cooperativa Policía Nacional, Banco del Pacifico, BanRed, Cooperativa Jep, Pichincha, Jardín Azuayo, Banco de Pichincha, Banco General Rumiñahui, jardín azuayo, banco de Guayaquil, Banco de Machala, CACPE, CAJERO JEP, Cajero Banco Pichincha, Coop Jep, Servipagos, Cooperativa Policia Nacional, Cooperativa de la Policia Nacional, Cajero Jep, banco internacional, Banco Pacífico, banco del Pacífico, produbanco, Cooperativa de Ahorro y Credito 23 de Julio, Coop Mego, banco Pichincha, Banco Pinchincha, Jardin Azuayo, Cooperativa Jardin Azuayo, Cajero Jep Depositos y retiros] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 740 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es, qu] orchardProduces: [banana, cacao, pineapple, orange, guava, mango, mangosteen, tomato, papaya, lemon, lime, rubber, avocado, coconut, plum, chilli_pepper, sweet_pepper, apple, pear] diff --git a/app/src/main/assets/country_metadata/EE.yml b/app/src/main/assets/country_metadata/EE.yml index 69fc287629..57cf25004a 100644 --- a/app/src/main/assets/country_metadata/EE.yml +++ b/app/src/main/assets/country_metadata/EE.yml @@ -3,9 +3,11 @@ additionalStreetsignLanguages: [ru] atmOperators: [Swedbank, SEB, Luminor | LHV, LHV | Luminor, LHV, Nordea, Luminor, Sampo/Nordea, Sweedpank, swedbank] chargingStationOperators: [Elmo, ELMO] clothesContainerOperators: [Tallinna Jäätmekeskus] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 248 officialLanguages: [et] orchardProduces: [apple, tomato, strawberry, plum, raspberry, cherry] diff --git a/app/src/main/assets/country_metadata/EG.yml b/app/src/main/assets/country_metadata/EG.yml index 940242c1cc..caaf9e5a86 100644 --- a/app/src/main/assets/country_metadata/EG.yml +++ b/app/src/main/assets/country_metadata/EG.yml @@ -3,6 +3,8 @@ additionalStreetsignLanguages: [en] atmOperators: [البنك الأهلي المصري, بنك مصر, CIB, HSBC, صيدلية شاهبور, بنك فيصل الإسلامي المصري, Commercial International Bank, Banque Misr, NBE, Bank of Egypt, بنك الإسكندرية, البريد المصري, بنك القاهرة, البنك التجاري الدولي CIB] firstDayOfWorkweek: Su mobileCountryCode: 602 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [tomato, grape, date, guava, mango, mangosteen, banana, orange, olive, apple, strawberry, peach, lemon, lime, fig, apricot, pear, chilli_pepper, sweet_pepper] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/ES.yml b/app/src/main/assets/country_metadata/ES.yml index 90ac3b21f3..c8a1ad6449 100644 --- a/app/src/main/assets/country_metadata/ES.yml +++ b/app/src/main/assets/country_metadata/ES.yml @@ -4,9 +4,12 @@ additionalValidHousenumberRegex: s/n atmOperators: [Santander, Bankia, Euronet, BBVA, La Caixa, CaixaBank, Banco Santander, Banco Popular, Telebanco 4B, Kutxabank, Caja Rural, Banco Sabadell, Caixabank, Banca March, Sabadell, Cajamar, Unicaja, Liberbank, Banc Sabadell, Deutsche Bank, ABANCA, Abanca, IberCaja, Ibercaja, Cash Zone, Servired, Euro 6000, Popular, Unicaja Banco, Telebanco, ING, Bankinter, Caja Duero, Euro6000, Caixa Bank, Kutxa, Laboral Kutxa, Euro Automatic Cash, BBK, Sabadell Atlántico, Euro, Caja de Canarias, Cajasol, BanCaixa, Targobank, EspañaDuero, Banco Pastor, BMN, BancaMarch, Xe, Cajasur, Bancaja, CAM, 4B, Banco de Sabadell, Targo Bank, kutxabank, CajaSur, cajamar, Euronet Worldwide, Caja Cantabria, ING Direct, la Caixa, Caja España, Caixa, Sabadell Guipuzcoano, Caja Madrid, Caja Rural de Extremadura, BANTIERRA, BANKIA, Banco de Santander, cash zone, Vital Kutxa, Sa Nostra, Banco de Andalucía, Banco Sabadell Atlántico, SabadellSolbank, Ruralcaja, CAI, Caja Granada, Caixa Galicia, Caja Laboral, bbva, Banco Caixa Geral, Catalunya Caixa, CAIXABANK, CajaMar, Caja Rural de Salamanca, Santander 4B, Caixa bank, Caja Rural de Soria, bankia, xe] chargingStationOperators: [IBIL, Tesla Motors Inc., EDP, Iberdrola, GIC, Viesgo, Feníe Energía, edp, Easycharger, Cargacoches, Urbener, Endesa, Àrea Metropolitana de Barcelona, Wenea, Ionity, Ibil, Fenienergia, EMT, Ajuntament de Vic, Tesla, Fenie Energia, Ajuntament de Lleida, VNG Aparcaments, Serrano Park III, Serrano Park I, Repsol, Parkmusa, Paradores, Mercadona, Ingeteam, EasyCharger, EDP VE, Carrefour, CEPSA, BonArea, Ayuntamiento de Segorbe, Ayuntamiento de Huelva, Ajuntament de les Masies de Voltregà] clothesContainerOperators: [Ajuntament de Santa Coloma de Cervelló, UROLA ERDIKO MANKOMUNITATEA, Madre Coraje, Cáritas, Humana, Roba Amiga, Ropa Amiga, Proyecto Lázaro, Madre coraje, Caritas, Ayuntamiento de Zaragoza, Ayuntamiento de Madrid] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasBiWeeklyAlternateSideParkingSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 214 officialLanguages: [es] orchardProduces: [olive, grape, tomato, orange, peach, chilli_pepper, sweet_pepper, lemon, lime, apple, banana, strawberry, persimmon, pear, almond, plum, apricot] diff --git a/app/src/main/assets/country_metadata/ET.yml b/app/src/main/assets/country_metadata/ET.yml index c149de3ba0..74ac6993e8 100644 --- a/app/src/main/assets/country_metadata/ET.yml +++ b/app/src/main/assets/country_metadata/ET.yml @@ -1,5 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [CBE, Government, Dashen Bank, Commercial Bank of Ethiopia, Wegagen Bank, Bank of Abyssinia, cbe, CBE ATM, Zemen Bank, Awash International Bank, Addis International Bank, United Bank, Commercial bank of Ethiopia, Awash Bank] mobileCountryCode: 636 +noParkingSignStyle: vienna officialLanguages: [am, om, so, ti] orchardProduces: [banana, coffee, chilli_pepper, sweet_pepper, guava, mango, mangosteen, avocado, papaya, hop, tomato, orange, tea, pineapple, lemon, lime, grape, pepper, sisal] diff --git a/app/src/main/assets/country_metadata/FI.yml b/app/src/main/assets/country_metadata/FI.yml index 2eda2b57a4..5ac92c6ada 100644 --- a/app/src/main/assets/country_metadata/FI.yml +++ b/app/src/main/assets/country_metadata/FI.yml @@ -2,9 +2,11 @@ atmOperators: [Otto, Suomen Automatia Oy, Nosto, Otto., Automatia Pankkiautomaatit Oy, OTTO, Osuuspankki, TalletusOtto, OttoPlus, Nordea, Nokas CMS Oy, Automatia, bittiraha.fi, OP, atm, Aktia, Ottopiste, Otto-automaatti] chargingStationOperators: [Virta, Fortum Charge & Drive, Fortum, KSSe, Tesla Motors Inc., K-Lataus, Plugit, Lidl, Fortum Charge&Drive, PlugIt, Motonet, Helen, k-lataus, Virtapiste, Tesla, Helsingin Energia, Charge&Drive] clothesContainerOperators: [UFF, Rinki, HSY, Rosk'n roll, Rinki Oy, Fida, Suomen Pakkauskierrätys RINKI Oy, Auringonnousu] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 244 officialLanguages: [fi, sv] orchardProduces: [tomato, strawberry, apple, raspberry, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/FR.yml b/app/src/main/assets/country_metadata/FR.yml index 1b72661794..3d7c7014a9 100644 --- a/app/src/main/assets/country_metadata/FR.yml +++ b/app/src/main/assets/country_metadata/FR.yml @@ -2,9 +2,11 @@ additionalStreetsignLanguages: [oc, ca, br] additionalValidHousenumberRegex: \p{N}{1,4}\sbis atmOperators: [La Banque Postale, Crédit Agricole, Société Générale, Caisse d'Épargne, Crédit Mutuel, LCL, BNP Paribas, CIC, Banque Populaire, La Poste, Caisse d'Epargne, Caisse d'épargne, Crédit du Nord, Crédit Mutuel de Bretagne, HSBC, Crédit agricole, BNP, Société générale, Credit Agricole, BRED, Banque Courtois, Banque populaire, Credit Mutuel, Banque Postale, CA, Société Marseillaise de Crédit, Crédit mutuel, La banque postale, Carrefour, La poste, La Banque postale, BFC, la banque postale, Le Crédit Lyonnais, Banque de Savoie, Societe Generale, Banque Rhône-Alpes, Crédit Lyonnais, OPT, BCI, Banque Populaire Alsace Lorraine Champagne, Banque Chabrières, Banque Dupuy de Parseval, BNP PARIBAS, Carrefour Banque, Orange bank, Groupama, credit agricole, Banque Populaire Grand Ouest, BNP Parisbas, Orange Bank, BNC, Banque Populaire du Sud, Banque Kolb, Banque de Polynésie, AXA, Crédit Maritime, BRED Banque Populaire, Banque Edel, Caisse d’Épargne, Euronet, CMB, Banque Tarneaud, crédit agricole, Banque BCP, crédit mutuel, Crédit coopératif, BCP, Banque de Tahiti, Barclays, Accord, Axa, CiC, Crédit Coopératif, Banque Nuger, société générale, Credit mutuel, Banque Chaix, BPFC, La Caisse d'Epargne, Groupement des Mousquetaires, Banque de France, Banque Populaire Rives de Paris, BPE, Societé Générale, Banque Laydernier, La Banque Populaire, Caisse d’Epargne, Banque Tarneau, BPI, banque populaire, Socredo, C.I.C., Crédit Mutuel Hazebrouck, Euro information, Banque Populaire des Alpes, Caixa Geral de Depositos, C.A., Banque Accord, Banque Palatine, Banque Révillon, Macif, Crédit Agricole des Savoie, Caisse Epargne, Société Génerale, Crédit Agricole Alpes Provence, Auchan, Banque Populaire de l'Ouest, Societe Générale, caisse d'épargne, banque postale, Arkea, Bred, Socrédo, Point Cash, Caisse D'épargne, Société Général, Banque Crédit Agricole] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasBiWeeklyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: square mobileCountryCode: 208 officialLanguages: [fr] orchardProduces: [grape, apple, tomato, plum, peach, apricot, pear, kiwi, strawberry, orange, chilli_pepper, sweet_pepper, walnut, cherry, olive, hazelnut] diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml index 546452a52a..484f600849 100644 --- a/app/src/main/assets/country_metadata/GB.yml +++ b/app/src/main/assets/country_metadata/GB.yml @@ -1,13 +1,15 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [cy, gd] +advisorySpeedLimitSignStyle: white atmOperators: [RBS, NatWest, Barclays, Cash Zone, Lloyds Bank, Barclays Bank PLC, Tesco, Sainsbury's Bank, Santander, Halifax, Royal Bank of Scotland, Post Office, Nationwide, HSBC UK, Sainsbury's, HSBC, Natwest, Note Machine, NoteMachine, Bank of Ireland, Cashzone, Link, Tesco Bank, TSB, CashZone, Lloyds, Bank of Scotland, Yorkshire Bank, Ulster Bank, Lloyds TSB, Clydesdale Bank, Co-op, Bank Machine, Sainsburys, The Co-operative Bank, Danske Bank, Co-operative Bank, The Co-operative, Co-operative, Clydesdale, Nationwide Building Society, Virgin Money, Asda, cashzone, Cooperative Bank, Sainsbury, First Trust, Co-Operative Bank, Notemachine, ASDA, Morrisons, HBOS, co-op, Alliance & Leicester, Nat West, Coop, Post Office Money, NM ATM, The Royal Bank of Scotland, Marks & Spencer, Sainsburys Bank, LINK, National Westminster Bank Plc, NMATM, The Co-operative Food, tesco, Cooperative, cash zone, One Stop, Royal Mail, Tesco Express, Bank of Ireland; Post Office, HSBC Bank plc, Barclays Bank, Co-Op, natwest, Sainsbury's Finance, Coop Bank, Bank Of Ireland, barclays, John Lewis Finance, Lloyds Bank plc, Metro Bank, link, The Co-Operative Bank, Post Office Ltd, National Westminster Bank, Sainsbury's Local, Co-op Bank, Cardtronics UK Ltd, The Co-operative Group, BankMachine, sainsburys, Poundland, DC ATM, Travelex, AIB, Wilko, Cashline, Abbey, The Co-Operative, Cardtronics, Lloyds Banking Group, Royal Bank Of Scotland, Spar, bankmachine, Coventry Building Society, Natwest Bank, Post office, post office, Nisa, Barclay's, SatoshiPoint, RBS Link, Lloyds Bank PLC, Note Machines, Link Machine, Central England Co-operative Society, Co-operative bank, Yorkshire Building Society, post_office, Lloyds TSB Scotland, nationwide, Marks and Spencer, Alliance and Leicester, ASDA - Barclays, Sainsbury Bank, Cashzone Ltd, sainsbury's, Northern Bank, NatWest Bank, Ward Insurance, Co-Operative, Post Office; Bank of Ireland, Halifax Bank of Scotland, CoOp, Lloyd Bank, InfoCash, Sainsbury's bank, RBS/Tesco, Waitrose, Shell, CashMachine, The Post Office, The Coventry, YourCash, Barclays Bank plc, NM, M&S, Kent Reliance, M&S Bank, cashZone, International Currency Exchange, Note magic, TSB Bank, Your Cash, Cardtronics UK Limited, Esso, Co-operative Group Ltd, NoteMachine Ltd, Paypoint, ChangeGroup, Summer Arcade, Tesco Stores Ltd, Tesco ATM, Tesco Express...] chargingStationOperators: [Ecotricity, Source London, Pod Point, Tesla Motors Inc., Tesla, ChargePlace Scotland, Ubitricity, Lancaster City Council, evolt, Birmingham City Council, InstaVolt, Chargemaster, CYC, Polar, GeniePoint, Charge Your Car, Booths, Lancaster University, Brighton and Hove City Council, ecotricity, ecars Northern Ireland, Pod-Point, Instavolt, POLAR, Exeter City Council, Charge Place Scotland, Tesco, Podpoint, PodPoint, Evolt, Chargeplace Scotland, Nissan, EV Driver, pod point, instavolt, chargemaster, SSE, Rolec, Lancashire County Council, Genie Point, ESB EV Solutions, ChargeMaster, polar, eVolt, Zero Carbon World, Tesla Motors, Shell, Polar Chargemaster, Lidl, GMEV, Engie, E.on, Circontrol, Charge Master, BP Chargemaster, BP, Asda, www.chargeyourcar.org.uk, vendelectric, tesla_standard, podpoint, engenie, West Point House, Warrington Borough Council, Victory Hall, Vattenfall, University of Sussex, St Modwen Properties, Shell Recharge, Sainsbury's, Polar Plus, Polar Network, Orkney Islands Council, Open University, Nissan West Way Wolverhampton, Milton Park - Pod Point, Milton Park, Kendal College, Hubsta, Eurotunnel, Elektromotive, ESB, Dunston Hall, Chargepoint Genie, ChargePlaceScotland, ChargePlace scotland, Charge your car, Charge your Car, Centro, Bullring, Boot and Shoe, Beech Hill Hotel, 'AutoCharge: EV Pedestal', Allego] clothesContainerOperators: [Salvation Army, The Fire Fighters Charity, Brighton & Hove City Council, The Salvation Army, British Heart Foundation, Scope, Rushcliffe Borough Council, Nottingham City Council, Traid, Cystic Fibrosis Trust, traid, South Norfolk Council, Cancer Fund for Children, The Firefighters Charity, TRAID, Severn Waste Services, Oxfam, Fife Council] -isAdvisorySpeedLimitKnown: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true isLeftHandTraffic: true -isLivingStreetKnown: true -isSlowZoneKnown: true lengthUnits: [meter, foot and inch] +livingStreetSignStyle: square mobileCountryCode: 234 officialLanguages: [en] orchardProduces: [apple, strawberry, tomato, pear, chilli_pepper, sweet_pepper, raspberry, plum, cherry, hop, grape] diff --git a/app/src/main/assets/country_metadata/GD.yml b/app/src/main/assets/country_metadata/GD.yml index af73a4bb79..d91b5f35b1 100644 --- a/app/src/main/assets/country_metadata/GD.yml +++ b/app/src/main/assets/country_metadata/GD.yml @@ -3,6 +3,8 @@ atmOperators: [Scotiabank] isLeftHandTraffic: true lengthUnits: [foot and inch, meter] mobileCountryCode: 352 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [coconut, banana, nutmeg, grapefruit, guava, mango, mangosteen, avocado, plum, orange, cacao, apple, tomato, lemon, lime, chilli_pepper, sweet_pepper, pineapple] popularSports: [cricket] diff --git a/app/src/main/assets/country_metadata/GE.yml b/app/src/main/assets/country_metadata/GE.yml index e0dd83f147..e3f06c846a 100644 --- a/app/src/main/assets/country_metadata/GE.yml +++ b/app/src/main/assets/country_metadata/GE.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [Bank of Georgia, TBC Bank, Liberty Bank, ProCredit Bank, Bank Republic, Tao Private Bank, საქართველოს ბანკი, Cartu Bank, Cryptomat, Bank Of Georgia, TBC Bank ATM, Procredit Bank, VTB Bank, TBC, Procredit bank, VTB bank, TBC Bank - თიბისი ბანკი, International Bank of Azerbaijan - Georgia, VTB, TBC BANK, Tbc Bank] -isLivingStreetKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +livingStreetSignStyle: portrait mobileCountryCode: 282 officialLanguages: [ka] orchardProduces: [grape, tomato, apple, peach, hazelnut, pear, plum, chilli_pepper, sweet_pepper, walnut, cherry, tea, strawberry, lemon, lime, orange, apricot] diff --git a/app/src/main/assets/country_metadata/GF.yml b/app/src/main/assets/country_metadata/GF.yml index 7c377b8ebb..e4c35e8769 100644 --- a/app/src/main/assets/country_metadata/GF.yml +++ b/app/src/main/assets/country_metadata/GF.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white officialLanguages: [fr] orchardProduces: [banana, pineapple, tomato, guava, mango, mangosteen, grapefruit, avocado, papaya, lemon, lime, coconut, orange] -shoulderLine: short white dashes +shoulderLineStyle: short white dashes diff --git a/app/src/main/assets/country_metadata/GH.yml b/app/src/main/assets/country_metadata/GH.yml index 0eba74514b..802c6679ca 100644 --- a/app/src/main/assets/country_metadata/GH.yml +++ b/app/src/main/assets/country_metadata/GH.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Ecobank, Fidelity Bank, GCB Bank, Stanbic Bank, Absa Group Limited, Access Bank, Standard Chartered, SG-SSB, UBA, GCB, GT Bank, Stanbic, Barclays Bank, Republic Bank (Ghana) Limited, ADB, Zenith Bank, Eco Bank, Barclays, Republic, Societe Generale Ghana Limited, Cal Bank, Republic Bank, Calbank] mobileCountryCode: 620 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en, ak, ee] orchardProduces: [cacao, orange, pineapple, coconut, tomato, chilli_pepper, sweet_pepper, guava, mango, mangosteen, banana, cashew_nut, lemon, lime, kola_nut, rubber, avocado, papaya, pepper] diff --git a/app/src/main/assets/country_metadata/GN.yml b/app/src/main/assets/country_metadata/GN.yml index 3c33da44a2..3e7eed6986 100644 --- a/app/src/main/assets/country_metadata/GN.yml +++ b/app/src/main/assets/country_metadata/GN.yml @@ -1,4 +1,6 @@ # Do not edit. Source files are in /res/country_metadata mobileCountryCode: 611 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, ff, emk, sus] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/GR.yml b/app/src/main/assets/country_metadata/GR.yml index f1899c71ea..e8a597e0c1 100644 --- a/app/src/main/assets/country_metadata/GR.yml +++ b/app/src/main/assets/country_metadata/GR.yml @@ -3,9 +3,11 @@ additionalStreetsignLanguages: [international] atmOperators: [Alpha Bank, Euronet, Εθνική Τράπεζα, Eurobank, Τράπεζα Πειραιώς, Piraeus Bank, Πειραιώς, Εθνική Τράπεζα της Ελλάδος, Euronet Worldwide, National Bank, Ελληνικά Ταχυδρομεία, Εθνική, Piraeus bank, National Bank of Greece, Εθνική Τράπεζα της Ελλάδος - National Bank of Greece NBG, ΤΡΑΠΕΖΑ ΠΕΙΡΑΙΩΣ, ALPHA BANK, Bank of Chania, alpha bank, ATM, Alpha bank, HSBC, Alpha, Ethniki Bank, Ethniki, Attica Bank, NBG, Piräus Bank, Alphabank, Cooperative Bank of Dodecanese, Citibank, Pireus Bank, Piraeusbank, ΕΘΝΙΚΗ ΤΡΑΠΕΖΑ, EuroNet, Τράπεζα Eurobank, piraeus bank, EUROBANK, NBG GROUP] chargingStationOperators: [blink, Δήμος Αλίμου, Fortizo, Peugeot, Δήμος Λαμιέων, 'https://mythicalpeloponnese.gr'] clothesContainerOperators: [Texcycle] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 202 officialLanguages: [el] orchardProduces: [olive, grape, tomato, peach, apple, kiwi, orange, apricot, lemon, lime, pear, strawberry, chestnut, walnut, almond, plum] diff --git a/app/src/main/assets/country_metadata/GT.yml b/app/src/main/assets/country_metadata/GT.yml index 4b13406d39..860864cb07 100644 --- a/app/src/main/assets/country_metadata/GT.yml +++ b/app/src/main/assets/country_metadata/GT.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [5B, Banco Industrial, Cajero 5B, Bancared, Cajero Automatico Bancared, son, Banca Red, banco industrial, Banrural, BI, veronica lopez, BAC, Cajero BI] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 704 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es, myn] orchardProduces: [banana, pineapple, rubber, tomato, coffee, orange, lemon, lime, avocado, guava, mango, mangosteen, papaya, chilli_pepper, sweet_pepper, peach, nutmeg, apple, coconut] diff --git a/app/src/main/assets/country_metadata/HK.yml b/app/src/main/assets/country_metadata/HK.yml index 66c39ec7c1..c21919d718 100644 --- a/app/src/main/assets/country_metadata/HK.yml +++ b/app/src/main/assets/country_metadata/HK.yml @@ -1,10 +1,10 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white chargingStationOperators: [HKEV, HK Electric, Tesla Motors Inc., Tesla Motors] isLeftHandTraffic: true mobileCountryCode: 454 officialLanguages: [en, zh] orchardProduces: [tomato] popularReligions: [chinese_folk, taoist, buddhist] -shoulderLine: two yellow lines +shoulderLineStyle: two yellow lines workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/HN.yml b/app/src/main/assets/country_metadata/HN.yml index f2ff98842c..12649bb50f 100644 --- a/app/src/main/assets/country_metadata/HN.yml +++ b/app/src/main/assets/country_metadata/HN.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BAC Honduras, Banco Atlántida, Banco de Occidente, Ficohsa, Banco Ficohsa, Davivienda] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 708 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [banana, coffee, orange, tomato, pineapple, grapefruit, guava, mango, mangosteen, chilli_pepper, sweet_pepper, coconut, lemon, lime, papaya, cashew_nut, avocado, cacao, pepper] diff --git a/app/src/main/assets/country_metadata/HR.yml b/app/src/main/assets/country_metadata/HR.yml index 30c8c531f2..e89355cb3f 100644 --- a/app/src/main/assets/country_metadata/HR.yml +++ b/app/src/main/assets/country_metadata/HR.yml @@ -2,9 +2,13 @@ additionalStreetsignLanguages: [sr, it] atmOperators: [Zagrebačka banka, PBZ, Euronet, Privredna banka Zagreb, Erste, HPB, Erste Bank, Hrvatska poštanska banka, ZABA, OTP Bank, RBA, OTP Banka, OTP banka, OTP, Raiffeisen, Euronet Worldwide, Splitska Banka, Raiffeisen Bank, Splitska banka, Addiko Bank, otpbanka, Auro Domus, Zagrebačka Banka, Hypo, Raiffeisen bank, Raiffeisenbank Austria, Zaba, Erste Banka, Raiffeisenbank, Addiko, Privredna Banka Zagreb, Hrvatska Poštanska Banka, Privredna banka, Karlovačka banka, Sberbank, Erste bank, Kreditna banka Zagreb, Zagrebacka banka, Raiffeisen BANK, MoneyGet, Hypo Group, Erste Bank Croatia, Erste banka, Erste & Steiermärkische banka, Raiffaisen Bank, Addiko bank, HypoGroup Alpe Adria, ERSTE, Zagrebačka banka d.d., Jadranska banka, Hpb, Volksbank, Poštanska banka, Otp, Zagrebacka Banka, Jadranska Banka, Raiffeisen banka, Erste&Steiermärkische Bank, Societe Generale - Splitska banka, Erste & Steiermärkische Bank, Hypo Alpe Adria, OTP banka d.d., Addiko Banka, Euonet, Hypo Alpe Adria Bank, BSpend, optbanka, ERSTE Bank, EuroNet, Payten] chargingStationOperators: [ELEN, Elen, Tesla Motors Inc., MOL Plugee, Eurokod] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 219 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [hr] orchardProduces: [grape, apple, tomato, olive, chilli_pepper, sweet_pepper, plum, peach, pear, strawberry, cherry, hazelnut, fig, apricot, walnut, orange] popularSports: [soccer, tennis, basketball, boules, handball] diff --git a/app/src/main/assets/country_metadata/HT.yml b/app/src/main/assets/country_metadata/HT.yml index b1421a83e2..4f562bbfd3 100644 --- a/app/src/main/assets/country_metadata/HT.yml +++ b/app/src/main/assets/country_metadata/HT.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Sogebank, Unibank, SogeBank] mobileCountryCode: 372 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, ht] orchardProduces: [guava, mango, mangosteen, banana, avocado, lemon, lime, coffee, coconut, grapefruit, orange, cacao, sisal, pineapple, tomato, papaya] diff --git a/app/src/main/assets/country_metadata/HU.yml b/app/src/main/assets/country_metadata/HU.yml index 9f48f89939..c00006b624 100644 --- a/app/src/main/assets/country_metadata/HU.yml +++ b/app/src/main/assets/country_metadata/HU.yml @@ -1,9 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [OTP Bank, OTP, Budapest Bank Zrt., CIB Bank Zrt., Erste Bank, Euronet, K&H, K&H Bank, CIB Bank, Erste, OTP Bank Nyrt., Budapest Bank, UniCredit Bank, Takarékbank, Takarékszövetkezet, MagNet Magyar Közösségi Bank Zrt., CIB, Erste Bank Hungary Zrt., OTP Nyrt., OTP Bank Zrt., otpbank, FHB Bank, OTP bank, otp, Unicredit Bank, MKB Bank, ERSTE Bank, Raiffeisen Bank, MKB, Otp Bank Nyrt., K&H Bank Zrt., Otp NyRt., Duna Takarék, Pannon Takarék Bank, Otp, ERSTE, Erste bank, Takarék Bank, Sopron Bank, UniCredit, Duna Takarék Bank, Raiffeisen Bank Zrt., B3 Takarék, K&H bank, Raiffeisenbank, Euronet Worldwide, Takarékbank Zrt.] chargingStationOperators: [NKM Mobilitás Kft., MOL Nyrt., ELMŰ, e-Mobi, E-On, Penny Market, e-mobi, Elektromobilitás Nonprofit Kft., e-Mobi Elekrtomobilitás Nonprofit Kft., NKM, Lidl, Evopro, evopro, emobi, e.on, NISSAN, ÉMÁSZ, eTank, e-mobi.hu, XVIII. kerület, Tesla Motors, Porsche Hungária Kft, Lidl Magyarország Kereskedelmi Bt., LUKOIL Magyarország Kft., IKEA, E-mobi, ABB] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 216 officialLanguages: [hu] orchardProduces: [apple, grape, tomato, chilli_pepper, sweet_pepper, plum, peach, pear, apricot, cherry, walnut, strawberry, raspberry, chestnut, almond, hazelnut] diff --git a/app/src/main/assets/country_metadata/ID.yml b/app/src/main/assets/country_metadata/ID.yml index 682dd748df..a36061db14 100644 --- a/app/src/main/assets/country_metadata/ID.yml +++ b/app/src/main/assets/country_metadata/ID.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BNI, BCA, BRI, Mandiri, Bank Mandiri, Bank BRI, BANK RAKYAT INDONESIA, BANK NASIONAL INDONESIA, BANK MANDIRI, 'BCA, Mandiri', CIMB, DKI, Bank BNI, BANK CENTRAL ASIA, 'BNI, Mandiri', 'BCA, BRI', Danamon, Bank BCA, 'BCA, BRI, Mandiri', ATM BNI, Bank Jatim, BANK TABUNGAN NEGARA, 'BRI, Mandiri', CIMB Niaga, ATM BCA, 'BCA, BNI', ATM BRI, mandiri, Bank Rakyat Indonesia, PT Bank Rakyat Indonesia, BANK BENGKULU, Maybank, 'BNI, BRI', 'CIMB, Mandiri', Bank Negara Indonesia, BANK DANAMON, Link, 'BCA, CIMB', ATM Mandiri, Bank Muamalat, Panin, PermataBank, Cimb Niaga, CIMB NIAGA, 'BNI, CIMB, Mandiri', 'BCA, BNI, Mandiri', Permata Bank, bri, ATM bank, bca, Bank Bri, NIAGA, 'BNI, CIMB', BJB, ATM, Bank NTT, 'BNI, BCA, Mandiri', Permata, Bank Central Asia, Bank BTN, Bank Central Asia (BCA), ATM Center, Mandiri Bank, BPD, PT Bank Central Asia, Bank Danamon, Bank Jateng, Bank BPD DIY, BANK Muamalat, Bank Jabar Banten, BANK MUAMALAT, bank mandiri, BANK BRI, HSBC, ATM Bank BRI, Sinarmas, Danamon ATM, Bank DKI, 'BCA, CIMB, Mandiri', 'BNI, BRI, CIMB, Mandiri', 'BCA, BNI, BRI, CIMB, Mandiri', Commonwealth Bank, UOB, Bank Sumsel Babel, BNI46, ATM BNI 46, ATM Bank Mandiri, Bank Nagari, BANK SYARIAH MANDIRI, BNI 46, Bank Negara Indonesia 46, PT Bank Negara Indonesia, Bank Panin, BANK INTERNASIONAL INDONESIA, Bank CIMB Niaga, Bank Kalsel KCPS Kedai Syariah Pelaihari, May bank, BRI & BNI, BRI Bank, Bank NTB, ATM Bank BCA, bank BRI, bank BNI, Bersama, Muamalat, DBS, BTN, 'BCA, DKI', 'BCA, BNI, BRI', 'BCA, BNI, BRI, DKI, Mandiri', 'BNI, BRI, Mandiri', 'BRI, BTN', 'Bukopin, CIMB', 'BCA, BRI, CIMB', desa oti, ds labean, desa samalili, desa bou, desa lembah mukti, desa saojo, taripa, buntongi, tuntung, ATM CIMB NIAGA, OCBC, ATM BNI Batui, 'PT Bank Mandiri (Persero),Tbk'] -centerLine: white +centerLineStyle: white isLeftHandTraffic: true mobileCountryCode: 510 +noParkingSignStyle: australia +noStoppingSignStyle: australia officialLanguages: [id, ms, jv, su, mad, min] orchardProduces: [coconut, banana, rubber, guava, mango, mangosteen, orange, chilli_pepper, sweet_pepper, pineapple, tomato, papaya, cacao, coffee, avocado, tea, areca_nut, cashew_nut] popularReligions: [muslim, christian, hindu, buddhist, chinese_folk] diff --git a/app/src/main/assets/country_metadata/IE.yml b/app/src/main/assets/country_metadata/IE.yml index f9106dde99..6e8ec68009 100644 --- a/app/src/main/assets/country_metadata/IE.yml +++ b/app/src/main/assets/country_metadata/IE.yml @@ -1,12 +1,14 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Bank of Ireland, AIB, Ulster Bank, Permanent TSB, Euronet, Spar] -centerLine: white +centerLineStyle: white chargingStationOperators: [ESB ecars, easygo.ie, Tesla, Nissan Ireland, Kildare Village, Ionity, Circle K, Dell EMC, Streetcharge, Radisson Blu Hotel, Plugsurfing GmbH] clothesContainerOperators: [Cork County Council, Cancer Fund for Children, Textile Recycling Limited] -isAdvisorySpeedLimitKnown: false +hasAdvisorySpeedLimitSign: false isLeftHandTraffic: true mobileCountryCode: 272 +noParkingSignStyle: mutcd +noStoppingSignStyle: mutcd officialLanguages: [en, ga] orchardProduces: [apple, strawberry, tomato, chilli_pepper, sweet_pepper, raspberry, hop] popularSports: [gaelic_games, rugby] -shoulderLine: short yellow dashes +shoulderLineStyle: short yellow dashes diff --git a/app/src/main/assets/country_metadata/IL.yml b/app/src/main/assets/country_metadata/IL.yml index aeb26768ad..52a1e635c4 100644 --- a/app/src/main/assets/country_metadata/IL.yml +++ b/app/src/main/assets/country_metadata/IL.yml @@ -2,8 +2,8 @@ additionalStreetsignLanguages: [en] atmOperators: [Bank Hapoalim, בנק לאומי, לאומי, הפועלים, בנק הפועלים, מזרחי טפחות, כספונט, דיסקונט, Bitcoin Change, Hapoalim, Leumi, בנק ירושלים] firstDayOfWorkweek: Su -isLivingStreetKnown: true -isSlowZoneKnown: true +hasLivingStreet: false +hasSlowZone: true mobileCountryCode: 425 officialLanguages: [heb, ar] orchardProduces: [tomato, chilli_pepper, sweet_pepper, grapefruit, orange, banana, apple, avocado, olive, lemon, lime, grape, peach, guava, mango, mangosteen, date, persimmon, pear] diff --git a/app/src/main/assets/country_metadata/IN.yml b/app/src/main/assets/country_metadata/IN.yml index a197a89bf1..d8d7000555 100644 --- a/app/src/main/assets/country_metadata/IN.yml +++ b/app/src/main/assets/country_metadata/IN.yml @@ -3,6 +3,8 @@ additionalStreetsignLanguages: [en] atmOperators: [State Bank of India, SBI, Axis Bank, ICICI Bank, HDFC Bank, Canara Bank, SBI ATM, HDFC, State Bank, Federal Bank, State Bank Of India, ICICI, Bank of Baroda, South Indian Bank, Punjab National Bank, sbi, Bank of India, Andhra Bank, Corporation Bank, Indian Bank, Federal Bank ATM, Union Bank, Axis Bank ATM, State Bank ATM, SBI Bank, HDFC Bank ATM, South Indian Bank ATM, IDBI Bank, Indian Overseas Bank, Karnataka Bank, Union Bank of India, Citibank, Syndicate Bank, Kotak Mahindra Bank, Central Bank of India, Canara Bank ATM, ICICI Bank ATM, state bank of india, BOI, UCO Bank, PNB, ATM, Vijaya Bank, Yes Bank, axis bank, Karur Vysya Bank, canara bank, Bank Of India, Punjab National Bank ATM, federal bank, State Bank of Mysore, Axis bank, State Bank Of India ATM, State Bank of India ATM, IndusInd Bank, south indian bank, Axis, HDFC ATM, SBT, State bank of india, IDBI, State bank of India, AXIS Bank, icici, Kerala Bank ATM, State Bank of India (SBI), Bank of India ATM, ICICI ATM, STATE BANK OF INDIA, FEDERAL BANK, IOB, Oriental Bank of Commerce, HDFC BANK, atm, CANARA BANK ATM, Kerala Gramin Bank, Bank Of Baroda, Lakshmi Vilas Bank, Canara bank, Bank of Maharashtra, Federal bank, Dena Bank, hdfc, State Bank of Travancore, Citi Bank, Union Bank ATM, ICICI bank, PNB ATM, sbi atm, ICICI BANK ATM, federal bank atm, Kotak Mahindra, IDBI Bank ATM, Standard Chartered Bank, Dhanalakshmi Bank, KVB, Syndicate Bank ATM, Karnataka Bank ATM, Cosmos Bank, Andhra Bank ATM, ICICI BANK, AXIS BANK, Indusind Bank, DCB Bank, Allahabad Bank, HDFC bank, icici bank atm, City Union Bank, United Bank of India, IDBI ATM, TMB, Union bank, Canara, Bandhan Bank, ICICI bank ATM, Bank of Maharastra, south indian bank atm, FEDERAL BANK ATM, SyndicateBank, Bank of Baroda ATM, HSBC, AXIS, Corporation Bank ATM, Corp Bank, CSB, Sbi, Tamilnad Mercantile Bank, Bank of baroda, Union Bank Of India, bank of india, SVC Bank, CANARA BANK, Central Bank, UCO, Standard Chartered, CitiBank, AXIS Bank ATM, Indian Overseas Bank ATM, SOUTH INDIAN BANK, corporation bank, BOB, Bank Of Maharashtra, Central Bank Of India, indian bank, Canara bank ATM, SBI atm, union bank, punjab national bank, axis, UBI, STATE BANK ATM, AXIS BANK ATM, state bank of India, IOB ATM, India One, central bank of india, Vijaya Bank ATM, Oriental Bank Of Commerce, Central Bank Of India ATM, BOI ATM, Central Bank ATM, Muthoot ATM, Sbi atm, Sbi Atm, Kerala Gramin Bank ATM, karur vysya bank, ING Vysya, Central Bank of India ATM, IDBI bank, SYNDICATE BANK, State bank Of India, Dhanlaxmi Bank, state Bank of India, Dhanalaxmi Bank, South Indian bank, Karnataka bank, State bank, Union Bank of India ATM, Saraswat Bank, government, uco bank, bank of baroda, Indicash, State bank atm, boi, Bank of india, BANK OF INDIA, Canada Bank, ubi, INDIA ONE ATM, SBH, Axis ATM, Baroda, canara, Icici, hdfc bank, Dhanalakshmi Bank ATM, icici bank, state bank atm, Syndicate bank, city union bank, axis bank atm, canara bank atm, ESAF Small Finance Bank, Indian bank, Bank Of Baroda ATM, Kotak Mahindra Bank ATM, UCO Bank ATM, Indicash ATM, canara bank ATM, Federal Bank Atm, ESAF ATM, State Bank ATM Sector 17 Chandigarh, State Bank ATM Sector 22 Chandigarh, State Bank ATM Sector 34 Chandigarh, kerala Gramin Bank, ESAF, Axis bank Atm, SIB ATM, kvb atm, State Bank of Patiala, Federal Bank Ltd., UBI ATM, OBC, ICIC Bank ATM, Deutsche Bank, Karur vysya bank, IndusInd bank, Indian Bank ATM, State Bank of Hyderabad, DCB, Ratnakar Bank, ICIC Bank, IDBI BANK, DBS Bank, Allahabad Bank ATM, Karur Vysya Bank ATM, YES Bank, United Bank Of India ATM, fedaral bank, yes bank, Canera Bank, State Bank of Mysore ATM, India ATM, Sate Bank of India, Ing Vysya Bank, Kotak Bank, Kotak, Punjab & Sindh Bank, Panjab National Bank, SBT ATM, SBI, Corporation bank, HDFC BANK ATM, Dena bank, State Bank ATM & CDM, Indusind Bank ATM, icici atm, jk bank, DBS, IndiCash, Ballia, India Post ATM, IndusInd Bank ATM, chamber, SBI ATM, State Bank Of India, RBL Bank, ICICI Bank Atm, City Union Bank ATM, state bank ATM, indian bank atm, tamilnadu mercantile bank, fedral bank ATM, India 1 atm, hdfc atm, syndicate bank, ICICI bank atm, SMG, state bank, State Bank Atm, India One ATM, Dhanalekshmi Bank, IDFC Bank, HITACHI, Vijaya, iob, Indusland Bank, PMC Bank, SBI BANK, PNB Bank, UNION BANK, Axis bank ATM, india1, J&K Bank, IDFC First Bank, State Bank Of India Atm, Union Bank Of India Atm, Atm, Kerala Gramin Bank Atm, HDFC bank atm, CSB ATM, TDCB ATM, State Bank ATM PGI Sector 12 Chandigarh, State Bank ATM Sector 9 Chandigarh, State Bank ATM Sector 31 Chandigarh, Dhanalaxmi Bank ATM, state bank of india atm, Union Bank Of India ATM, Bank Of India ATM, state bank of INDIA, Axis bank atm, ICICI Atm, State bank ATM, PUNJAB NATIONAL BANK, South indian bank, Fedral Bank ATM, INDIA ONE, union bank of india, IDCB, private, Catholic Syrian Bank, Dhanlaxmi Bank ATM, SOUTH INDIAN BANK ATM, Catholic Syrian Bank ATM, india one ATM, India1 Atm, State Bank of india, Union bank ATM, kerala gramin bank, GP Parsik Sahakari Bank] isLeftHandTraffic: true mobileCountryCode: 404 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [en, hi, bn, te, mr, ta, ur, gu, kn, ml, or, pa, as, mai, ks] popularReligions: [hindu, muslim, christian, buddhist, jain, sikh, bahai, animism] popularSports: [tennis, basketball, soccer, cricket, field_hockey] diff --git a/app/src/main/assets/country_metadata/IQ.yml b/app/src/main/assets/country_metadata/IQ.yml index 36179c2d79..0a9f477e7d 100644 --- a/app/src/main/assets/country_metadata/IQ.yml +++ b/app/src/main/assets/country_metadata/IQ.yml @@ -2,6 +2,8 @@ chargingStationOperators: [محطة وزن, محطة كهرباء المعرفة] firstDayOfWorkweek: Su mobileCountryCode: 418 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [date, tomato, grape, apple, chilli_pepper, sweet_pepper, apricot, olive, pear, lemon, lime, plum, fig, orange, walnut, peach, almond] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/IR.yml b/app/src/main/assets/country_metadata/IR.yml index b056aaf391..7d29716dfa 100644 --- a/app/src/main/assets/country_metadata/IR.yml +++ b/app/src/main/assets/country_metadata/IR.yml @@ -7,3 +7,4 @@ officialLanguages: [fa] orchardProduces: [tomato, apple, grape, orange, date, peach, pistachio, lemon, lime, walnut, kiwi, plum, apricot, cherry, banana, pear] popularReligions: [muslim, bahai] roofsAreUsuallyFlat: true +workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/IS.yml b/app/src/main/assets/country_metadata/IS.yml index bae26cba70..8c3e1d9784 100644 --- a/app/src/main/assets/country_metadata/IS.yml +++ b/app/src/main/assets/country_metadata/IS.yml @@ -2,9 +2,10 @@ atmOperators: [Íslandsbanki, Arion banki, Landsbankinn, Landsbanki Íslands, Landsbanki, Tomato] chargingStationOperators: [Orka náttúrunnar, Ísorka, Orka Náttúrunnar] clothesContainerOperators: [Sorpa] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 274 officialLanguages: [is] orchardProduces: [tomato] diff --git a/app/src/main/assets/country_metadata/IT.yml b/app/src/main/assets/country_metadata/IT.yml index fb15483673..13af366584 100644 --- a/app/src/main/assets/country_metadata/IT.yml +++ b/app/src/main/assets/country_metadata/IT.yml @@ -3,9 +3,10 @@ additionalStreetsignLanguages: [de] atmOperators: [Poste Italiane, Unicredit, Intesa Sanpaolo, Monte dei Paschi di Siena, Postamat, Carige, UBI Banca, Intesa San Paolo, Deutsche Bank, UniCredit, Poste, Euronet, Credem, BNL, Banca Popolare di Milano, BCC, Banca Popolare di Sondrio, Banco di Sardegna, Poste italiane, Banco BPM, Banca Carige, BPER, BPM, UniCredit Bank, Banca Sella, Unicredit Banca, BPER Banca, Cassa Rurale, Sparkasse, Credito Valtellinese, Banca Popolare Pugliese, Poste Italiane SpA, Banca Popolare di Novara, Poste Italiane S.p.A., Raiffeisen, Credito Bergamasco, Banca Popolare di Lodi, Banca Popolare di Fondi, Intesa SanPaolo, Bper, MPS, Banca Intesa, UniCredit Banca, UBI, Monte dei Paschi, Volksbank, Carisbo, Unipol Banca, Euronet Worldwide, Cassa di Risparmio di Volterra, Banco Popolare, Banco Desio, Posteitaliane, Banca di Credito Cooperativo, BancoPosta, Credit Agricole, Banco di Napoli, Bancoposta, Banco di Brescia, Unipol, Cassa di Risparmio del Veneto, Raiffeisenkasse, Banca Intesa San Paolo, UBI Banca Popolare di Bergamo, Banca di Credito Cooperativo di Roma, Cassa Rurale Alta Valsugana, Credito Artigiano, Poste Italiane S.p.a., Banco di Desio, Banca Popolare di Verona, Banca di Bologna, PosteItaliane, Banca Tercas, Cassa di Risparmio di Lucca Pisa Livorno, Banca Intesa Sanpaolo, Cassa di Risparmio di Venezia, Poste Italiane Spa, Unicredit S.p.a., Banca di Credito Cooperativo Valdostana, Banca Popolare del Lazio, poste italiane, Crédit Agricole, Banca di Asti, Banca Toscana, ChiantiBanca, Banca Popolare dell'Emilia Romagna, BNL Gruppo BNP Paribas, Banca Popolare di Bari, Banca delle Marche, Cassa di Risparmio di Ferrara, Friuladria, Banca Popolare di Spoleto, Carispezia Crédit Agricole, Monte Dei Paschi, San Paolo, Cariparma, Bancomat, Banca di Cividale, Monte dei paschi di Siena, Biverbanca, BCC di Carate Brianza, Cassa Padana, Credito Siciliano, Banca di Piacenza, Banca di Credito Popolare, Coinwave Srl, Banca Apulia S.p.a., unicredit, Ubi Banca, Banca Etruria, Banca di Credito Cooperativo di Fornacette, Raiffeisenkasse Tirol, Banca Popolare Friuladria, Cassa Rurale Alto Garda, Intesa Sanpaolo; Cassa di Risparmio di Ascoli Piceno, Raiffeisenkasse Überetsch - Cassa Raiffeisen Oltradige, Südtiroler Sparkasse - Cassa di Risparmio di Bolzano, Banca di Credito Cooperativo G. Toniolo di S. Cataldo, Banca Antonveneta, BCC Caravaggio, Banca Popolare di Ancona, Unicredito Italiano S.p.A., Chianti Banca, Banca di Credito Cooperativo del Belice, Banca CR Firenze, Raiffeisen Bank, Banca Atestina di Credito Cooperativo, Intesa Sanpaolo S.p.A., Banca Popolare di Bergamo, Banca di credito cooperativo, Banca Popolare del Cassinate, Raiffeisenkasse Terlan, SanPaolo, Banco Fiorentino, Cassa di Risparmio di Asti, Banco di Chiavari e della Riviera Ligure, Raiffeisenkasse Tauferer-Ahrntal, Banca di Imola, Banca Nazionale del Lavoro, Veneto Banca, Banca Fideuram, Carige Italia, Cassa di Risparmio di Firenze, Poste Italiane s.p.a., Banco di Sicilia, Banca Monte Dei Paschi Di Siena, BCC di Sesto San Giovanni, Emilbanca, CARIGE, Deutsche Bank Easy, UBI Banca Popolare, Cassa di risparmio di Volterra, CRS, Deustche Bank, Credito Cooperativo, Cassa di Risparmio di Pistoia, Banca Monte dei Paschi di Siena, La Cassa Rurale, Banca Popolare pugliese, Post Italiane S.p.A, Postomat, UBI banca] chargingStationOperators: [Enel, Enel X, a2a, Alperia, ENEL, Alperia Smart Mobility, Agsm Verona Spa, Tesla Motors Inc., enel x, Evway, ENEL X, Hera / AcegasApsAmga, Enel-X, Duferco, BlueTorino, A22, Tesla, Etraction, enel, SEMM, ENEL drive, Enel Drive, Comune di Firenze, A2A, Regione Umbria, Lidl, Iren, Enel Distribuzione, Emobitaly, E-Moving, Duferco Energia, ASM Terni, enelx, enel X, alperia, Stazione di ricarica per auto elettriche, IrenGo, Enelx, EnelX, EVBOX, EVAD, ENI, E-motion, DriWe, Atac, Amag, 'http://www.lampionet.it', evway, Tesla Motors (Destination Charging), Tesla Motors, SCAME, Repower, LIDL, Ionity, Enel spa, Enel X, ECO fuel, Comune di Vicenza, Comune di Albiate, Charge&Go, COGESER, BeCharge, AcegasApsAmga, ATAC] clothesContainerOperators: [Cannone, Caritas Ambrosiana, Humana, UIC, Aamps, Caritas, AMIU, Exodus, Umanitaria Padana onlus, Hera, Cooperativa Sociale Lavoro e Solidarietà, Comune di Vanzago, COSMARI, AMA] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: false +hasLivingStreet: false +hasSlowZone: true mobileCountryCode: 222 officialLanguages: [it] orchardProduces: [grape, tomato, olive, apple, orange, peach, pear, kiwi, lemon, lime, chilli_pepper, sweet_pepper, apricot, plum, strawberry, hazelnut, almond] diff --git a/app/src/main/assets/country_metadata/JA.yml b/app/src/main/assets/country_metadata/JA.yml index fcb9c5e19c..24f21cf707 100644 --- a/app/src/main/assets/country_metadata/JA.yml +++ b/app/src/main/assets/country_metadata/JA.yml @@ -1,2 +1,2 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white diff --git a/app/src/main/assets/country_metadata/JM.yml b/app/src/main/assets/country_metadata/JM.yml index 8dcc3ee5a0..1750b03141 100644 --- a/app/src/main/assets/country_metadata/JM.yml +++ b/app/src/main/assets/country_metadata/JM.yml @@ -2,5 +2,7 @@ atmOperators: [NCB, Scotiabank, National Commercial Bank, Sagicor, JNCB, JN, Jamaica National, Bank of Nova Scotia Jamaica Limited] isLeftHandTraffic: true mobileCountryCode: 338 +noParkingSignStyle: mutcd +noStoppingSignStyle: canada officialLanguages: [en, jam] orchardProduces: [coconut, banana, grapefruit, tomato, pineapple, lemon, lime, chilli_pepper, sweet_pepper, papaya, coffee, orange, guava, mango, mangosteen, avocado, cacao, sisal] diff --git a/app/src/main/assets/country_metadata/JO.yml b/app/src/main/assets/country_metadata/JO.yml index 2db8752f1d..1b6b1f4c66 100644 --- a/app/src/main/assets/country_metadata/JO.yml +++ b/app/src/main/assets/country_metadata/JO.yml @@ -1,9 +1,11 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [Arab Bank, Housing Bank, دائرة الجمارك الأردنية, Islamic International Arab Bank, Jordan Islamic Bank, Jordan Kuwait Bank, Salwa Islamic Bank, Bank al Etihad] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su mobileCountryCode: 416 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [tomato, olive, chilli_pepper, sweet_pepper, peach, grape, apple, lemon, lime, banana, orange, date, apricot, grapefruit, plum, strawberry, pear] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/JP.yml b/app/src/main/assets/country_metadata/JP.yml index 3b73932a08..c27f6714b3 100644 --- a/app/src/main/assets/country_metadata/JP.yml +++ b/app/src/main/assets/country_metadata/JP.yml @@ -1,11 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [ja-Latn] +advisorySpeedLimitSignStyle: white atmOperators: [ゆうちょ銀行, みずほ銀行, 三菱UFJ銀行, 三井住友銀行, セブン銀行, りそな銀行, 三菱東京UFJ銀行, イオン銀行, 横浜銀行, 七十七銀行, JA, 秋田銀行, 七十七銀行/77Bank, 埼玉りそな銀行, 京都銀行, 北都銀行, プロミス, 千葉銀行, 仙台銀行, アイフル, 東京スター銀行, 滋賀銀行, アコム, 京都中央信用金庫, 北洋銀行, 武蔵野銀行, 三井住友銀行／SMBC, 東北労働金庫, 但陽信用金庫, 北海道銀行, 仙台銀行/SendaiBank, 百十四銀行, JAバンク, 常陽銀行, レイク, 荘内銀行, みちのく銀行, 中国銀行, 東邦銀行, きのくに信用金庫, 但馬信用金庫, イオン銀行/AeonBank, セブン銀行/SevenBank, 徳島銀行, 広島銀行, 岩手銀行, 福岡銀行, 池田泉州銀行, Seven Bank, 但馬銀行, 青森銀行, きらやか銀行, Community Bank, MUFG, 京葉銀行, 京都信用金庫, 足利銀行, 東北労金, アコム/ACOM, JP Bank, 西武信用金庫, 高知信用金庫, 紀陽銀行, 十六銀行, 大垣共立銀行, 杜の都信用金庫, スルガ銀行, 三菱UFJ, 南都銀行／Nanto Bank, 七十七銀行／77Bank, ローソン銀行, 仙台銀行/Sendai Bank, Japan Post Bank, 川崎信用金庫, みずほ, 静岡銀行, ATM, 愛知銀行, 高知銀行, みなと銀行, 東北銀行, 七十七銀行・ゆうちょ銀行, 北日本銀行, 山形銀行, 大東銀行, イーネット, JAたじま, 関西アーバン銀行, 栃木銀行, 筑波銀行, 福島銀行, みなと銀行／MinatoBank, きらぼし銀行, レイクALSA, りそな, 尼崎信用金庫, 三菱東京UFJ, いわき信用組合, 清水銀行, 八十二銀行, 青い森信用金庫, 東奥信用金庫, 青梅信用金庫, 山陰合同銀行, 7-Eleven, 三菱東京ＵＦＪ銀行, エポスカード, 新生銀行, 鳥取銀行, JA横浜, 中央労働金庫, 7-bank, ゆうちょ, 鹿児島銀行, あぶくま信用金庫, 阿波銀行, JP, 北陸銀行, JAふくしま未来, 日本郵便, 宮城第一信用金庫, 七十七銀行・仙台銀行・ゆうちょ銀行, 東京都民銀行, セブンバンク, 巣鴨信用金庫, ろうきん, 群馬銀行, モビット, クレディセゾン, 新生銀行カードローンレイク, 北國銀行, 四国銀行, 百五銀行, 滋賀中央信用金庫, 湖東信用金庫, 南都銀行, 朝日信用金庫, JA福島さくら, 7-Bank, UFJ, MIZUHO ATM, 多摩信用金庫, JAならけん, 但馬銀行／TajimaBank, 埼玉県信用金庫, 紀陽銀行／KiyoBank, 京都北都信用金庫, JA兵庫南, 埼玉縣信用金庫, 仙南信用金庫/SennanShinkin] -centerLine: white +centerLineStyle: yellow chargingStationOperators: [EV Quick, 東光高岳, 浜松日産, Tesla Motors Inc.] -isAdvisorySpeedLimitKnown: true +hasAdvisorySpeedLimitSign: true +hasSlowZone: true isLeftHandTraffic: true -isSlowZoneKnown: true mobileCountryCode: 440 officialLanguages: [ja] orchardProduces: [apple, tomato, pear, persimmon, grape, strawberry, chilli_pepper, sweet_pepper, peach, apricot, tea, kiwi, plum, cherry, chestnut, fig] diff --git a/app/src/main/assets/country_metadata/KE.yml b/app/src/main/assets/country_metadata/KE.yml index c9c29b782f..8d37e2b441 100644 --- a/app/src/main/assets/country_metadata/KE.yml +++ b/app/src/main/assets/country_metadata/KE.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Barclays, Standard Chartered, KCB ATM, KCB, Standard Chartered Bank, Equity Bank ATM, Pesa Point, PesaPoint, Barclays Bank ATM, National Bank ATM, Equity Bank, Cooperative Bank, Equity ATM, Cooperative Bank ATM, Diamond Trust Bank, Cooprative Bank, Kenya Commercial Bank, CFC Stanbic, Equity Bank Atm, CBA ATM] -centerLine: yellow +centerLineStyle: yellow isLeftHandTraffic: true mobileCountryCode: 639 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, sw] orchardProduces: [banana, guava, mango, mangosteen, tea, tomato, pineapple, avocado, papaya, coconut, coffee, orange, cashew_nut, sisal, lemon, lime, grapefruit, pear] popularSports: [golf, soccer, tennis, basketball, cricket] diff --git a/app/src/main/assets/country_metadata/KG.yml b/app/src/main/assets/country_metadata/KG.yml index 4214510766..2c284c9366 100644 --- a/app/src/main/assets/country_metadata/KG.yml +++ b/app/src/main/assets/country_metadata/KG.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [РСК Банк, KICB, Demir Bank, Optima Bank, Demir bank, РСК, DemirBank, DEMiR Bank, КБ Кыргызстан, Халык Банк, Айыл Банк, РСК банк, АКБ КЫРГЫЗСТАН, Халык Банк Кыргызстан, Демир банк, Демир Банк, Коммерческий банк Кыргызстан] -isLivingStreetKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +livingStreetSignStyle: portrait mobileCountryCode: 437 officialLanguages: [ky, ru] orchardProduces: [tomato, apple, apricot, plum, pear, peach, grape, walnut, cherry, hazelnut, raspberry, strawberry, almond, chilli_pepper, sweet_pepper, pistachio] diff --git a/app/src/main/assets/country_metadata/KH.yml b/app/src/main/assets/country_metadata/KH.yml index 17d1d0bfde..24fbf8df2e 100644 --- a/app/src/main/assets/country_metadata/KH.yml +++ b/app/src/main/assets/country_metadata/KH.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [Canadia Bank, ABA Bank, ABA, T, Sathapana Bank, Maybank, ATM ABA Bank, ANZ Royal, FTB, ANZ, ACLEDA Bank, Cathay United Bank, BRED Bank, Mekong Bank, MB Bank, CAB Bank, RHB, Acleda, Sacombank, ATZ, QK4, anz, AMK, Aba bank, Sathapana] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Green E-Bike] +hasBiWeeklyAlternateSideParkingSign: true +hasDailyAlternateSideParkingSign: true mobileCountryCode: 456 officialLanguages: [km] orchardProduces: [banana, coconut, guava, mango, mangosteen, orange, pineapple, rubber, chilli_pepper, sweet_pepper, grapefruit, lemon, lime, pepper, coffee] diff --git a/app/src/main/assets/country_metadata/KM.yml b/app/src/main/assets/country_metadata/KM.yml index d8d569cc11..8b9044589b 100644 --- a/app/src/main/assets/country_metadata/KM.yml +++ b/app/src/main/assets/country_metadata/KM.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Exim Bank] mobileCountryCode: 654 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [ar, fr, swb, wni, zdj, wlc] orchardProduces: [coconut, banana, tomato, coffee, cacao, vanilla] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/KP.yml b/app/src/main/assets/country_metadata/KP.yml index 827714247c..42c227d8fd 100644 --- a/app/src/main/assets/country_metadata/KP.yml +++ b/app/src/main/assets/country_metadata/KP.yml @@ -1,5 +1,6 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +centerLineStyle: white mobileCountryCode: 467 officialLanguages: [ko] orchardProduces: [apple, pear, peach, tomato, chilli_pepper, sweet_pepper, chestnut, hop] +workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/KR.yml b/app/src/main/assets/country_metadata/KR.yml index c3297ce99f..3f1540d825 100644 --- a/app/src/main/assets/country_metadata/KR.yml +++ b/app/src/main/assets/country_metadata/KR.yml @@ -1,8 +1,9 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [ko-Latn] +advisorySpeedLimitSignStyle: white atmOperators: [신한은행, 우리은행, 국민은행, 하나은행, 농협, 농협은행, NH농협은행, IBK기업은행, 기업은행, Woori Bank, 부산은행, Citibank, KEB, KB국민은행, 경남은행, Shinhan Bank, KB, IBK] -centerLine: yellow -isAdvisorySpeedLimitKnown: true +centerLineStyle: yellow +hasAdvisorySpeedLimitSign: true mobileCountryCode: 450 officialLanguages: [ko] orchardProduces: [apple, orange, apple, tomato, persimmon, peach, grape, chilli_pepper, sweet_pepper, pear, strawberry, pear, peach, plum, tomato, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/KW.yml b/app/src/main/assets/country_metadata/KW.yml index 4444ff27f6..41f630566c 100644 --- a/app/src/main/assets/country_metadata/KW.yml +++ b/app/src/main/assets/country_metadata/KW.yml @@ -3,6 +3,8 @@ additionalStreetsignLanguages: [en] atmOperators: [NBK, National Bank of Kuwait, Gulf Bank, Burgan Bank, بنك الخليج, KFH, بيت التمويل الكويتي, بنك بوبيان] firstDayOfWorkweek: Su mobileCountryCode: 419 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [tomato, date, chilli_pepper, sweet_pepper, strawberry, orange, lemon, lime, grape, olive] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/KZ.yml b/app/src/main/assets/country_metadata/KZ.yml index a7f5adc2f4..a3941ec86f 100644 --- a/app/src/main/assets/country_metadata/KZ.yml +++ b/app/src/main/assets/country_metadata/KZ.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Jusan Bank, Народный банк Казахстана, 'Казкоммерцбанк, АО', Народный банк, Казкоммерцбанк, АО "Казкоммерцбанк", Kazkom, Halyk Bank, Сбербанк, Казком, Казкомерцбанк, Halyk bank, Народный Банк, Сбербанк России, КазКом, Халык банк, Qazkom, Казкоммерцбанк банкомат, HALYK BANK, KAZKOM, Халық банк, ForteBank, Альянс Банк, АТФ Банк, Народный банкомат, Альянс банк, КазКоммерцБанк, Евразийский банк, БТА банкомат, БТА, АТФ банк, БТА банк, Halyk, Kaspi bank, KAZ KOM, Халык Банк, Kaspi Bank, Bank RBK, Банк России, Centercredit, Банкомат Народный банк, АльянсБанк, Банкомат БТА банка, АТФ банкомат, Казпочта, Bank CenterCredit, KazCom, Народный банк казахстана, Нурбанк, Казкомерц банк, Халық банкі, Kazcom, АТФ, народный банк, HalykBank, halyk bank, QIWI, HALYK bank, Kaspi Bank терминал, АО Казкоммерцбанк, Qazkom банкомат, Kaspi, KaspiBank, Kaspi.kz] -isLivingStreetKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +livingStreetSignStyle: portrait mobileCountryCode: 401 officialLanguages: [kk, ru] orchardProduces: [tomato, chilli_pepper, sweet_pepper, apple, grape, apricot, pear, strawberry, plum, peach, walnut, cherry, almond] diff --git a/app/src/main/assets/country_metadata/LA.yml b/app/src/main/assets/country_metadata/LA.yml index 4f17d2884b..833c10ce2e 100644 --- a/app/src/main/assets/country_metadata/LA.yml +++ b/app/src/main/assets/country_metadata/LA.yml @@ -1,7 +1,8 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en, fr] atmOperators: [BCEL, LDB, Joint Development Bank, JDB, Phongsavanh Bank, Lao Development Bank, STB, APB, ANZ, LaoViet Bank, BFL, BCEL ATM, bfl, Indochina Bank, ທຄຕລ, Banque Franco-Lao, BCEL Public, ເເເ, Laoviet Bank] -centerLine: white +centerLineStyle: white +hasDailyAlternateSideParkingSign: true mobileCountryCode: 457 officialLanguages: [lo] orchardProduces: [banana, coffee, pineapple, orange, chilli_pepper, sweet_pepper, tea, grapefruit, lemon, lime, guava, mango, mangosteen, nutmeg] diff --git a/app/src/main/assets/country_metadata/LB.yml b/app/src/main/assets/country_metadata/LB.yml index 11d1bc76b9..f64a31c7f8 100644 --- a/app/src/main/assets/country_metadata/LB.yml +++ b/app/src/main/assets/country_metadata/LB.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [fr] atmOperators: [Byblos Bank, بنك عودة, كاستنيا] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 415 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [tomato, orange, apple, olive, lemon, lime, grape, banana, peach, almond, apricot, plum, chilli_pepper, sweet_pepper, cherry, pear, avocado] diff --git a/app/src/main/assets/country_metadata/LC.yml b/app/src/main/assets/country_metadata/LC.yml index 2fc6e45c56..1f5769af8c 100644 --- a/app/src/main/assets/country_metadata/LC.yml +++ b/app/src/main/assets/country_metadata/LC.yml @@ -2,6 +2,8 @@ isLeftHandTraffic: true lengthUnits: [foot and inch, meter] mobileCountryCode: 358 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [coconut, banana, grapefruit, orange, tomato, lemon, lime, guava, mango, mangosteen, avocado, pepper, cacao, pineapple, nutmeg] speedUnits: [miles per hour, kilometers per hour] diff --git a/app/src/main/assets/country_metadata/LI.yml b/app/src/main/assets/country_metadata/LI.yml index 0e4fd93a41..c4a133c3d5 100644 --- a/app/src/main/assets/country_metadata/LI.yml +++ b/app/src/main/assets/country_metadata/LI.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Liechtensteinische Landesbank AG, Liechtensteinische Landesbank] -isSlowZoneKnown: true +hasSlowZone: true mobileCountryCode: 295 officialLanguages: [de] orchardProduces: [grape] diff --git a/app/src/main/assets/country_metadata/LR.yml b/app/src/main/assets/country_metadata/LR.yml index c96bc3d4b1..3f22a2fd43 100644 --- a/app/src/main/assets/country_metadata/LR.yml +++ b/app/src/main/assets/country_metadata/LR.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: yellow +centerLineStyle: yellow lengthUnits: [foot and inch, meter] mobileCountryCode: 618 +noParkingSignStyle: mutcd +noStoppingSignStyle: mutcd officialLanguages: [en] orchardProduces: [banana, rubber, pineapple, orange, cacao, coconut, tomato, coffee] speedUnits: [miles per hour, kilometers per hour] diff --git a/app/src/main/assets/country_metadata/LS.yml b/app/src/main/assets/country_metadata/LS.yml index f93a40815e..3655a717ea 100644 --- a/app/src/main/assets/country_metadata/LS.yml +++ b/app/src/main/assets/country_metadata/LS.yml @@ -1,8 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Standard Lesotho Bank, FNB, NedBank, NedBank ATM, Post Bank] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 651 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [st, en] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/LT.yml b/app/src/main/assets/country_metadata/LT.yml index 4d846de856..2a7562cb04 100644 --- a/app/src/main/assets/country_metadata/LT.yml +++ b/app/src/main/assets/country_metadata/LT.yml @@ -2,8 +2,10 @@ atmOperators: [SEB, Swedbank, DNB, Luminor, Šiaulių bankas, Nordea, 'SEB, DNB', Medus, Citadele, AB SEB bankas, Danske Bank, Nordea/Parex/Danske/Ūkio, AB Swedbank, Luminor/Citadele, Perlas] chargingStationOperators: [Ignitis, Spark, Ignitis grupė, UAB „Elinta“, LAKD, Ignitis ON, Iginitis group, Elinta Charge] clothesContainerOperators: [UAB „VAATC“] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 246 officialLanguages: [lt] orchardProduces: [apple, tomato, strawberry, pear, raspberry, cherry, plum, blueberry] diff --git a/app/src/main/assets/country_metadata/LU.yml b/app/src/main/assets/country_metadata/LU.yml index d227be89ed..471e15d071 100644 --- a/app/src/main/assets/country_metadata/LU.yml +++ b/app/src/main/assets/country_metadata/LU.yml @@ -1,9 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BCEE, BIL, P&T, BGL BNP Paribas, Raiffeisen, Banque Raiffeisen, Post, S-Bank, Banque Internationale à Luxembourg, Post.lu, BNP Paribas] chargingStationOperators: [Chargy, Enovos] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasBiWeeklyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 270 officialLanguages: [fr, de, lb] orchardProduces: [grape, apple, pear, tomato, plum, strawberry, walnut, cherry, raspberry] diff --git a/app/src/main/assets/country_metadata/LV.yml b/app/src/main/assets/country_metadata/LV.yml index 3564f2e24e..e724a81901 100644 --- a/app/src/main/assets/country_metadata/LV.yml +++ b/app/src/main/assets/country_metadata/LV.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Swedbank, SEB, Citadele, Luminor, DNB, Nordea, DnB Nord, DnB, PrivatBank, Hipotēku banka, DNB banka, SEB Unibanka, DNB nord, BlueOrange] chargingStationOperators: [CSDD, Elektrum] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 247 officialLanguages: [lv] orchardProduces: [apple, tomato, strawberry, pear, cranberry, blueberry, raspberry, plum, cherry] diff --git a/app/src/main/assets/country_metadata/MA.yml b/app/src/main/assets/country_metadata/MA.yml index 575d43070e..45e542d138 100644 --- a/app/src/main/assets/country_metadata/MA.yml +++ b/app/src/main/assets/country_metadata/MA.yml @@ -2,7 +2,9 @@ additionalStreetsignLanguages: [fr, es] atmOperators: [BMCI, BMCE, Al Barid Bank, Crédit du Maroc, Societe Generale, البنك الشعبي, سوسيتيه جنرال, Banque Populaire, Crédit Agricole, التجاري وفا بنك, Cash Plus, banque populaire, البنك المغربي للتجارة والصناعة, CIH Bank, BMCE BANK] firstDayOfWorkweek: Su +hasDailyAlternateSideParkingSign: true mobileCountryCode: 604 +noParkingSignStyle: vienna officialLanguages: [ar, ber] orchardProduces: [tomato, olive, orange, apple, grape, banana, chilli_pepper, sweet_pepper, plum, strawberry, date, peach, almond, fig, apricot, avocado] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/MC.yml b/app/src/main/assets/country_metadata/MC.yml index fef9c5e75f..4f0fd1d1b8 100644 --- a/app/src/main/assets/country_metadata/MC.yml +++ b/app/src/main/assets/country_metadata/MC.yml @@ -1,4 +1,4 @@ # Do not edit. Source files are in /res/country_metadata -isSlowZoneKnown: true +hasSlowZone: true mobileCountryCode: 212 officialLanguages: [fr] diff --git a/app/src/main/assets/country_metadata/MD.yml b/app/src/main/assets/country_metadata/MD.yml index 1bec446c3d..9389340075 100644 --- a/app/src/main/assets/country_metadata/MD.yml +++ b/app/src/main/assets/country_metadata/MD.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Moldindconbank, Victoriabank, Агропромбанк, Moldova Agroindbank, Mobiasbanca, Eximbank, ЗАО «Агропромбанк», FinComBank, Moldincombank, BCR, Сбербанк, BCR Chișinău, Banca de Economii, Moldindcombank, MAIB, Moldinconbank, Banca Comerciala Romaneasca, Unibank, MobiasBanca, Agroindbank, Moldova-Agroindbank, ЗАО Агропромбанк, Эксимбанк, АПБ, MICB, Приднестровский Сбербанк, Energbank, micb.md, Victoriabank1] -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 259 officialLanguages: [ro] orchardProduces: [grape, apple, plum, tomato, apricot, peach, walnut, chilli_pepper, sweet_pepper, strawberry, pear, cherry, raspberry, almond, hazelnut] diff --git a/app/src/main/assets/country_metadata/ME.yml b/app/src/main/assets/country_metadata/ME.yml index 2a80696475..b4845a8dfc 100644 --- a/app/src/main/assets/country_metadata/ME.yml +++ b/app/src/main/assets/country_metadata/ME.yml @@ -1,6 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [CKB, Erste Bank, NLB, Atlas Banka, ERSTE Bank, Hipotekarna banka, NLB Banka, Addiko Bank, Societe Generale, Prva Banka, Universal Capital Bank] -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 297 officialLanguages: [sr, bs, sq, hr] orchardProduces: [grape, plum, pear, fig, tomato, chilli_pepper, sweet_pepper, orange, cherry, apple, peach, walnut, raspberry, kiwi, olive, tea] diff --git a/app/src/main/assets/country_metadata/MG.yml b/app/src/main/assets/country_metadata/MG.yml index 58fe3f08dd..00b032e628 100644 --- a/app/src/main/assets/country_metadata/MG.yml +++ b/app/src/main/assets/country_metadata/MG.yml @@ -1,6 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BNI, BOA, BFV-SG, BMOI, BOA Madagascar, MCB] -isLivingStreetKnown: true +hasLivingStreet: true +livingStreetSignStyle: sadc mobileCountryCode: 646 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [mg, fr] orchardProduces: [banana, guava, mango, mangosteen, orange, pineapple, coconut, coffee, tomato, avocado, sisal, grape, grapefruit, cacao, peach, apple, cashew_nut] diff --git a/app/src/main/assets/country_metadata/MK.yml b/app/src/main/assets/country_metadata/MK.yml index 6b0927ddac..1917db73c0 100644 --- a/app/src/main/assets/country_metadata/MK.yml +++ b/app/src/main/assets/country_metadata/MK.yml @@ -2,7 +2,10 @@ additionalStreetsignLanguages: [international] atmOperators: [Охридска Банка, Шпаркасе, Стопанска Банка АД - Скопје, Шпаркасе Банка Македонија АД Скопје, Комерцијална Банка, Уни Банка, НЛБ - Тутунска Банка, Stopanska Banka, Охридска банка, Комерцијална Банка АД Скопје, NLB, Halkbank, Стопанска Банка Битола, Central Cooperative Bank] chargingStationOperators: [EVN] -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 294 officialLanguages: [mk, sq] orchardProduces: [grape, chilli_pepper, sweet_pepper, tomato, apple, plum, olive, peach, pear, strawberry, cherry, walnut, apricot, fig, almond, chestnut] diff --git a/app/src/main/assets/country_metadata/ML.yml b/app/src/main/assets/country_metadata/ML.yml index 80b1d1539c..a4d3a781b4 100644 --- a/app/src/main/assets/country_metadata/ML.yml +++ b/app/src/main/assets/country_metadata/ML.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BNDA, BICIM] mobileCountryCode: 610 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, bm] orchardProduces: [guava, mango, mangosteen, tomato, banana, cashew_nut, papaya, chilli_pepper, sweet_pepper, lemon, lime, orange, grapefruit, date, tea] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/MN.yml b/app/src/main/assets/country_metadata/MN.yml index 46bb5ccba0..971b2487e7 100644 --- a/app/src/main/assets/country_metadata/MN.yml +++ b/app/src/main/assets/country_metadata/MN.yml @@ -1,6 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Хаан банк, Хаан, Хаанбанк, хаан банк, Голомт, Golomt Bank, АТМ, Голомт банк, Төрийн банк, khaan bank, Khan Bank, Khaan bank, Khan bank, ХХБ, Худалдаа хөгжлийн банк, atm, Хаан банк АТМ, Хаан Банк, Ger, Aa, zam, khaanbank] -isLivingStreetKnown: true +hasLivingStreet: true +livingStreetSignStyle: portrait mobileCountryCode: 428 officialLanguages: [mn] orchardProduces: [hazelnut] diff --git a/app/src/main/assets/country_metadata/MO.yml b/app/src/main/assets/country_metadata/MO.yml index 3a10eff935..8caddc1dec 100644 --- a/app/src/main/assets/country_metadata/MO.yml +++ b/app/src/main/assets/country_metadata/MO.yml @@ -1,12 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] -centerLine: white +centerLineStyle: white +hasSlowZone: true isLeftHandTraffic: true -isSlowZoneKnown: true mobileCountryCode: 455 officialLanguages: [zh, pt] orchardProduces: [pepper] popularReligions: [chinese_folk, taoist, bhuddist] -shoulderLine: yellow +shoulderLineStyle: yellow slowZoneLabelPosition: top slowZoneLabelText: ZONA diff --git a/app/src/main/assets/country_metadata/MR.yml b/app/src/main/assets/country_metadata/MR.yml index 0ae1d7ed71..1f693b93b3 100644 --- a/app/src/main/assets/country_metadata/MR.yml +++ b/app/src/main/assets/country_metadata/MR.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata mobileCountryCode: 609 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar, fr, ff, snk, wo] orchardProduces: [date] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/MT.yml b/app/src/main/assets/country_metadata/MT.yml index 16108ff56b..594a3ff6a2 100644 --- a/app/src/main/assets/country_metadata/MT.yml +++ b/app/src/main/assets/country_metadata/MT.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BOV, HSBC, Euronet, Bank of Valletta, Bank of Valleta, APS] +hasSlowZone: true isLeftHandTraffic: true -isSlowZoneKnown: true mobileCountryCode: 278 officialLanguages: [mt, en] orchardProduces: [tomato, grape, strawberry, lemon, lime, peach, orange, fig, olive, apricot, pear, apple, grapefruit] diff --git a/app/src/main/assets/country_metadata/MU.yml b/app/src/main/assets/country_metadata/MU.yml index 8dedc13237..462f0cb3a6 100644 --- a/app/src/main/assets/country_metadata/MU.yml +++ b/app/src/main/assets/country_metadata/MU.yml @@ -1,13 +1,16 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [SBM, MCB, Mauritius Commercial Bank, Barclays, HSBC, MCB ATM] -centerLine: white +centerLineStyle: white +hasLivingStreet: true +hasSlowZone: true isLeftHandTraffic: true -isLivingStreetKnown: true -isSlowZoneKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 617 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, fr, mfe] orchardProduces: [tomato, pineapple, banana, chilli_pepper, sweet_pepper, coconut, tea, pistachio] popularReligions: [hindu, christian, muslim] -shoulderLine: short white dashes +shoulderLineStyle: short white dashes slowZoneLabelPosition: bottom slowZoneLabelText: ZONE diff --git a/app/src/main/assets/country_metadata/MW.yml b/app/src/main/assets/country_metadata/MW.yml index 4b3cc8f0b3..ac07cd802e 100644 --- a/app/src/main/assets/country_metadata/MW.yml +++ b/app/src/main/assets/country_metadata/MW.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Standard Bank, National Bank, FDH, NBS Bank, FMB, FDH Bank, National Bank of Malawi, Ecobank] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 650 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, ny] orchardProduces: [guava, mango, mangosteen, tomato, banana, pineapple, orange, avocado, papaya, tea, lemon, lime, peach, coffee, tung_nut, apple, pepper, chilli_pepper, sweet_pepper] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/MX.yml b/app/src/main/assets/country_metadata/MX.yml index b9575cd8b5..3b2849b278 100644 --- a/app/src/main/assets/country_metadata/MX.yml +++ b/app/src/main/assets/country_metadata/MX.yml @@ -1,9 +1,13 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banorte, Santander, Banamex, HSBC, Bancomer, Scotiabank, Bansi, BBVA Bancomer, BBVA, Banjercito, Interacciones, Banco Azteca, BANCOMER, Inbursa, Afirme, BANORTE, Citibanamex, Coppel, Banco Santander, banorte, BANAMEX, BBVA BANCOMER, Multiva, Hsbc, 'BBVA Bancomer, S.A.', Banco Multiva, SANTANDER, CIBanco, Santander Serfin, CFE, Bancomer BBVA, Banco del Bajío, 'Santander Consumo, S.A. de C.V.', Bancoppel, hsbc] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Servicio de Transportes Eléctricos de la Ciudad de México] -isSlowZoneKnown: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: mexico mobileCountryCode: 334 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [orange, tomato, chilli_pepper, sweet_pepper, lemon, lime, banana, guava, mango, mangosteen, avocado, coconut, papaya, pineapple, apple, strawberry, grapefruit, grape, peach] popularSports: [soccer, basketball, baseball, tennis] diff --git a/app/src/main/assets/country_metadata/MY.yml b/app/src/main/assets/country_metadata/MY.yml index b2a67c6d97..85108ed736 100644 --- a/app/src/main/assets/country_metadata/MY.yml +++ b/app/src/main/assets/country_metadata/MY.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Maybank, CIMB, CIMB Bank, MEPS, Bank Islam, Bank Simpanan Nasional, Bank Rakyat, RHB Bank, RHB, AmBank, Affin Bank, Agrobank, ATM AmBank@7eleven, BSN, Bank Muamalat, Agro Bank, Cimb, Standard Chartered, ATM, Rhb, UOB, 7-Eleven Malaysia Sdn Bhd, MayBank, Public Bank, maybank, Meps, HSBC, Bank Islam Malaysia Berhad] -centerLine: white +centerLineStyle: white isLeftHandTraffic: true mobileCountryCode: 502 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ms] orchardProduces: [rubber, coconut, pineapple, banana, tomato, guava, mango, mangosteen, papaya, pepper, cashew_nut, orange, grapefruit, tea, coffee, lemon, lime, chilli_pepper, sweet_pepper] popularReligions: [muslim, buddhist, christian, hindu, chinese_folk, taoist] diff --git a/app/src/main/assets/country_metadata/MZ.yml b/app/src/main/assets/country_metadata/MZ.yml index 5afdc049c7..0ac12b959e 100644 --- a/app/src/main/assets/country_metadata/MZ.yml +++ b/app/src/main/assets/country_metadata/MZ.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BCI, BIM, Barclays, Millennium BIM, FNB, Standard Bank, Millennium Bim, StandardBank, Millennium bim, Moza] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 643 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [pt] orchardProduces: [banana, tomato, coconut, cashew_nut, pineapple, papaya, tea, guava, mango, mangosteen, grapefruit, lemon, lime, coffee, sisal, orange] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/NA.yml b/app/src/main/assets/country_metadata/NA.yml index bf0e28d04d..d346f2664c 100644 --- a/app/src/main/assets/country_metadata/NA.yml +++ b/app/src/main/assets/country_metadata/NA.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [FNB, Bank Windhoek, Standard Bank, Nedbank, First National Bank, FNB Namibia] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 649 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, af] orchardProduces: [grape, tomato, orange, chilli_pepper, sweet_pepper, date, guava, mango, mangosteen] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/NE.yml b/app/src/main/assets/country_metadata/NE.yml index 1495553f5f..f676037f16 100644 --- a/app/src/main/assets/country_metadata/NE.yml +++ b/app/src/main/assets/country_metadata/NE.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BIA, Nita] mobileCountryCode: 614 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr, ha] orchardProduces: [tomato, guava, mango, mangosteen, date, chilli_pepper, sweet_pepper, pepper] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/NG.yml b/app/src/main/assets/country_metadata/NG.yml index 90d81e4914..9a5c8f90e8 100644 --- a/app/src/main/assets/country_metadata/NG.yml +++ b/app/src/main/assets/country_metadata/NG.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Wema Bank, UBA] mobileCountryCode: 621 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [tomato, pineapple, guava, mango, mangosteen, papaya, cacao, coconut, rubber, kola_nut, cashew_nut, chilli_pepper, sweet_pepper, coffee] diff --git a/app/src/main/assets/country_metadata/NI.yml b/app/src/main/assets/country_metadata/NI.yml index 2050f97a79..7b184c7f79 100644 --- a/app/src/main/assets/country_metadata/NI.yml +++ b/app/src/main/assets/country_metadata/NI.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BAC, Banpro, LAFISE, BDF, banpro, BANPRO, Bancentro, Banco de América Central, Bampro, La Fise - Bancentro, ATM BAC, BAC Credomatic, VISA ATM] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 710 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [coffee, orange, banana, tomato, pineapple, chilli_pepper, sweet_pepper, coconut, cacao, agave] popularSports: [basketball, baseball, soccer] diff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml index f3d94020f6..e2dc9f50b2 100644 --- a/app/src/main/assets/country_metadata/NL.yml +++ b/app/src/main/assets/country_metadata/NL.yml @@ -2,8 +2,9 @@ atmOperators: [ING, Rabobank, Geldmaat, ABN AMRO, ABN Amro, ABN-AMRO, SNS, ING Bank, SNS Bank, Rabobank Westelijke Mijnstreek, 'Rabobank Peel, Maas en Leudal', Rabobank Eindhoven-Veldhoven, Rabobank Roermond-Echt, MCB, Rabobank Rijk van Nijmegen, ABN AMRO Bank N.V., Rabobank Oosterschelde, ABN-Amro, GWK Travelex, Rabobank Altena, Rabobank Peel Noord, Rabobank Maastricht e.o., ING bank, Rabobank West Betuwe, Rabobank 's-Hertogenbosch en Omstreken, ABN, Rabobank Amsterdam, Rabobank Helmond, Rabobank Sneek-ZuidwestFriesland, Rabobank Utrecht en omstreken, Rabobank Land van Cuijk en Maasduinen, Rabobank Hilversum-Vecht en Plassen, MCB Bank, Rabobank Rotterdam, Yourcash, Rabobank Dommelstreek, Rabobank Groene Hart Noord, Rabobank Venray, Rabobank Peelland Zuid, Rabobank Weerterland en Cranendonck, Rabobank Amerstreek, Rabobank Centraal Zuid-Limburg, Fortis, Rabobank Alkmaar e.o., Rabobank Walcheren/ Noord-Beveland, Rabobank Bommelerwaard, RABO, RBC, Rabo, YourCash, Rabobank Salland, Rabobank Haarlem en Omstreken, Rabobank Den Haag en omgeving, Rabobank De Kempen-West, Rabobank Twente Oost, Banco di Caribe, Rabobank Venlo e.o., Rabobank Leeuwarden-Noordwest Friesland, Rabobank Hulst, Rabobank Alblasserwaard Noord en Oost, Rabobank Drechtsteden, Rabobank Terneuzen-Sas van Gent, ABNAMRO, Rabo Bank, CMB, Rabobank Rijn en Veenstromen, Rabobank Noordenveld West Groningen, Rabobank Valkenswaard en Waalre, Rabobank IJsseldelta, Rabobank Vijfheerenlanden, Maestro, Rabobank Schagen-Wieringerland, Rabobank Oss e.o., Rabobank Waterland en Omstreken, Rabobank Ridderkerk Midden-IJsselmonde, Rabobank De Langstraat, Rabobank Zuidwest-Brabant, Rabobank Tilburg en omstreken, Ing, Rabobank Randmeren, GWK, Rabobank Zuid-Holland Midden, Abn Amro, Abn-Amro, WIB, Rabobank Amstel en Vecht, Rabobank Parkstad Limburg, Rabobank Noord-Groningen, Rabobank Arnhem en Omstreken, Rabobank Bodegraven-Woerden, Rabobank Maashorst, Rabobank Lopikerwaard, Rabobank Noord Gooiland, Rabobank Gouwestreek, Rabobank Oost Betuwe, Rabobank Noordoostpolder-Urk, Rabobank Westfriesland-Oost, Rabobank Noord-Holland Noord, Rabobank Noordoost Friesland, Rabobank Hilvarenbeek-Oisterwijk, Rabobank Katwijk, Rabobank Bergeijk, Rabobank Roosendaal-Woensdrecht, Rabobank Maas en Waal, geldmaat, Rabobank Utrechtse Heuvelrug, Rabobank Assen en Noord-Drenthe, Rabobank West-Brabant Noord, Rabobank Breda, ABN AMRO Bank, ABN Amro Bank, ABNAmro, Rabobank Uden Veghel, Rabobank Bernheze Maasland, Rabobank Voorne-Putten Rozenburg, AllTransact, ACU, Rabobank Kromme Rijnstreek, Giro Bank, Rabobank Regio Den Haag, abn amro, Rabobank West-Zeeuws-Vlaanderen, Rabobank Vaart en Vechtstreek, RBC Bank, Banco Di Caribe, Bancomatico, Arubabank, rabobank, ArubaBank, Your Cash, Albert Heijn] chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfall, EVnetNL, NewMotion, Rotterdam Elektrisch, Pitpoint, Qbuzz, allego, Gemeente Rotterdam, gemeente Rotterdam, ecotap, EVBox, EV-Box, We Drive Solar, Liander, Havendienst Gemeent Alkmaar, e-laad, PitPoint, LastMileSolutions, EVnet, Terberg Telecom, New Motion, Mitsubishi Electric, Green Flux, E-laad, Allegro, Agrisnellaad, GreenFlux, Gemeente Delft, Alfen, Gemeente Kerkrade, EV Box, E-bike, Aers Energy, e-laad.nl, Webcompanies.nl, Nuon/Vattenfall, Nuon-Heijmans, Lidl, Ionity, Flow, Essent, Enexis, Delta, All Fixed Green Energy, evnetnl, evnet.nl, The New Motion, Rotterdam elektrisch, Natuurmonumenten, Last Mile Solutions, Gemeente Utrecht, Evnet, Engie, Eneco, EcoTap, ENGIE, AgriSneltank, '''t Weggeler'] clothesContainerOperators: [ROVA, Sympany, Leger des Heils ReShare, Leger des Heils, Gemeente Amsterdam, RD4, Curitas, Twiddus, Noppes, Leger des heils, hetgoed, Waardlanden, Opnieuw & Co, HVC] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 204 officialLanguages: [nl] orchardProduces: [tomato, chilli_pepper, sweet_pepper, pear, apple, strawberry, blueberry, raspberry, plum, cherry, grape] diff --git a/app/src/main/assets/country_metadata/NO.yml b/app/src/main/assets/country_metadata/NO.yml index 54d5652ad9..33e65da834 100644 --- a/app/src/main/assets/country_metadata/NO.yml +++ b/app/src/main/assets/country_metadata/NO.yml @@ -1,11 +1,13 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: white atmOperators: [Nordea, DNB, Sparebanken Sør, Sandnes Sparebank, Nokas, Sparebanken Vest, DnB NOR, Sparebank1, Sparebanken Sogn og Fjordane, Haugesund Sparebank, SpareBank 1, Sparebank 1, Danske Bank, Sparebanken Møre, Sparebank1 SR-Bank, SpareBank 1 SMN, DNB Nor, NOKAS, SpareBank 1 SR-Bank, Helgeland Sparebank, DnB, Tinn Sparebank, SpareBank1, Sparebank1 Nord-Norge, SpareBank, Sparebanken Øst] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Fortum, Grønn Kontakt, Oslo kommune, BKK, Grønn kontakt, Q-Park, Fortum Charge & Drive, Jernbaneverket, Ringeriks-kraft AS, Stavanger kommune, EB Elbil AS, Oppegård kommune, BKK Nett AS for Hordaland fylkeskommune, Ionity, Sunnfjord energi, Charge365, Fortum Charge&Drive, EuroPark AS, Lyse/BKK, Orkdal kommune, BKK Nett AS, Akershus fylkeskommune, Atea, Østfold fylkeskommune, ladeinorge.no, Sveio kommune, Skien kommune, Sandefjord kommune, Radøy kommune, Nesodden kommune, NTNU, Larvik kommune, Hamar kommune, Grimstad kommune, Eid kommune, Bærum kommune, Bellona, Avinor, Våler Kommune, UMB Drifts- og vedlikeholdsavd., Tinn kommune, Sandnes Parkering KF, Ishavsveien, IKEA, Halden kommune, Fredrikstad kommune, EuroPark AS/Avinor, Coop, Bergen kommune, BKK Nett AS for Os kommune, Avinor AS, ukjent, eRoute 71, Sunnfjord Energi, Stokke kommune, Statens vegvesen, Nes kommune, Namsos kommune, Lillehammer kommune, Ishavskraft AS, EuroPark AS/Oslo Lufthavn AS, Elpro Industrier AS, Coop Norge Handel, Bodø kommune, Bergen Parkering KF, Asker kommune, Ås kommune, Vågsøy parkering, Universitetet i Agder, Tønsberg parkering Bydrift, Trøgstad kommune, Tesla, Sørlandssenteret, Rælingen kommune, Porsgrunn kommune, Porsgrunn Kommune, Oslo Kommune, Nittedal Kommune, Nannestad kommune, NRK, Moving City AS, Midt Kraft, Mandal Parkering, Lindås kommune, Kongsvinger kommune, Knarvik Senter AS, Kiwi, Horten kommune, Hordaland Fylkeskommune, Gjerstad Kommune, Fortum Charge&Go, Drammen parkering KF, Drammen Parkering KF, Bratsberg Gruppen, BKK/Lyse, Arendal kommune] clothesContainerOperators: [Fretex, UFF, Idrettsinnsamlingen, Uff, Frelsesarméen, Røde Kors, Kirkens Bymisjon, Frelsesarmeen] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: square mobileCountryCode: 242 officialLanguages: [nb, nn, no] orchardProduces: [apple, tomato, strawberry, raspberry, plum, cherry, pear, blueberry] diff --git a/app/src/main/assets/country_metadata/NP.yml b/app/src/main/assets/country_metadata/NP.yml index 43028b97b2..d2bf444aac 100644 --- a/app/src/main/assets/country_metadata/NP.yml +++ b/app/src/main/assets/country_metadata/NP.yml @@ -4,6 +4,8 @@ chargingStationOperators: [Shrestha Niwas] firstDayOfWorkweek: Su isLeftHandTraffic: true mobileCountryCode: 429 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [ne] orchardProduces: [guava, mango, mangosteen, banana, orange, chilli_pepper, sweet_pepper, lemon, lime, pear, apple, tea, areca_nut, papaya, pineapple, peach, plum, walnut, nutmeg] popularReligions: [hindu, buddhist] diff --git a/app/src/main/assets/country_metadata/NZ.yml b/app/src/main/assets/country_metadata/NZ.yml index 35de1676ee..7dc811de4a 100644 --- a/app/src/main/assets/country_metadata/NZ.yml +++ b/app/src/main/assets/country_metadata/NZ.yml @@ -1,12 +1,16 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [ANZ, Westpac, ASB, Bank of New Zealand, Kiwibank, BNZ, ASB Bank, Kiwi Bank, bnz, Quick Cash, Quickcash, KiwiBank, ANZ Bank, TSB Bank, NBS, NZCU, TSB] -centerLine: white +centerLineStyle: white chargingStationOperators: [ChargeNet NZ, charge.net.nz, Vector, Orion, ChargeNet, Unison, Charge.net.nz, Vector Limited, Thundergrid, Tesla, Powerco, Network Waitaki, Network Tasman] -isAdvisorySpeedLimitKnown: true +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: true isLeftHandTraffic: true -isLivingStreetKnown: true -isSlowZoneKnown: true +livingStreetSignStyle: australia mobileCountryCode: 530 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [apple, grape, kiwi, tomato, avocado, pear, orange, lemon, lime, strawberry, apricot, blueberry, chilli_pepper, sweet_pepper, cherry, persimmon, peach] popularReligions: [christian, hindu, buddhist] diff --git a/app/src/main/assets/country_metadata/OM.yml b/app/src/main/assets/country_metadata/OM.yml index 163864538f..28abd0d5f6 100644 --- a/app/src/main/assets/country_metadata/OM.yml +++ b/app/src/main/assets/country_metadata/OM.yml @@ -1,11 +1,13 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [Bank Muscat, بنك مسقط, HSBC, NBO, صراف بنك مسقط, Bank Dhofar, bank muscat, دائرة الجمارك الأردنية, بنك ظفار, Bank Muscat ATM, Arab Bank, Jordan Kuwait Bank, Salwa Islamic Bank] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su mobileCountryCode: 422 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [date, tomato, banana, guava, mango, mangosteen, chilli_pepper, sweet_pepper, lemon, lime, papaya] popularReligions: [muslim] roofsAreUsuallyFlat: true -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/PA.yml b/app/src/main/assets/country_metadata/PA.yml index 5e6de8f374..f2433b7746 100644 --- a/app/src/main/assets/country_metadata/PA.yml +++ b/app/src/main/assets/country_metadata/PA.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco General, Banistmo, Banco Nacional de Panama, Global] -centerLine: yellow +centerLineStyle: yellow mobileCountryCode: 714 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [banana, pineapple, orange, tomato, coconut, avocado, papaya, guava, mango, mangosteen, coffee, chilli_pepper, sweet_pepper, cacao] popularSports: [soccer, basketball, baseball, tennis] diff --git a/app/src/main/assets/country_metadata/PE.yml b/app/src/main/assets/country_metadata/PE.yml index 9e04e616f7..e469a8f2d1 100644 --- a/app/src/main/assets/country_metadata/PE.yml +++ b/app/src/main/assets/country_metadata/PE.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BCP, Scotiabank, Banco de la Nación, Caja Arequipa, Interbank, Globalnet, BBVA, globalnet, Multired, GlobalNet, Banco de Crédito del Perú, Banco de la Nacion, BBVA Continental, multiRed, banco de la nacion, Banco Continental, MultiRed, Banco de Credito, Caja Piura, 1, Multi Red, Caja Cusco, banco de la nación, Banco de Crédito, Global Net, Continental, max, Scotia Bank, Banco de La Nación, CODO DE POZUZO, multired, Banco de la nación] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [La Puntilla] -isSlowZoneKnown: true +hasSlowZone: true mobileCountryCode: 716 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es, qu, ay] orchardProduces: [grape, pineapple, avocado, orange, guava, mango, mangosteen, coffee, banana, lemon, lime, tomato, papaya, apple, chilli_pepper, sweet_pepper, cacao, olive, peach] diff --git a/app/src/main/assets/country_metadata/PG.yml b/app/src/main/assets/country_metadata/PG.yml index 30a031b3ab..2d6b0e83b9 100644 --- a/app/src/main/assets/country_metadata/PG.yml +++ b/app/src/main/assets/country_metadata/PG.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [BSP, ANZ Bank] -centerLine: white +centerLineStyle: white isLeftHandTraffic: true mobileCountryCode: 537 +noParkingSignStyle: australia +noStoppingSignStyle: australia officialLanguages: [tpi, en, ho] orchardProduces: [banana, coconut, coffee, cacao, pineapple, rubber, tea, tomato, vanilla, nutmeg, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/PH.yml b/app/src/main/assets/country_metadata/PH.yml index ae360356c3..27d7557d0b 100644 --- a/app/src/main/assets/country_metadata/PH.yml +++ b/app/src/main/assets/country_metadata/PH.yml @@ -1,8 +1,14 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [BPI, BDO, Bank of the Philippine Islands, Metrobank, Landbank, Land Bank of the Philippines, BDO Unibank, RCBC, PNB, Philippine National Bank, Metropolitan Bank and Trust Company, Security Bank, China Bank, Landbank of the Philippines, Luzon Development Bank, DBP, 'BDO Unibank, Inc.', PSBank, Philippine Savings Bank, Rizal Commercial Banking Corporation, Development Bank of the Philippines, Land Bank, Banco de Oro, Security Bank Corporation, Chinabank, UCPB, Allied Bank, One Network Bank, China Banking Corporation, East West Banking Corporation, Banco De Oro, LandBank, Bank of Commerce, Union Bank of the Philippines, MetroBank, Land Bank ATM, EastWest Unibank, First Consolidated Bank, Bank of the Philippine Island, Philippine Business Bank, AUB, DBP ATM, Euronet, PS Bank, United Coconut Planters Bank, Veterans Bank, ChinaBank, Maybank, Citibank, 'China Bank Savings, Inc.', security bank, LANDBANK, Unionbank, LBP, Metrobank ATM, Union Bank, PBCom, Various Banks, City Savings Bank, BDO Network Bank, PBCOM, Veteran's Bank, Asia United Bank, UnionBank, Chinabank ATM, CitySavings Bank, BDO ATM, UCPB Savings Bank, pnb, Robinsons Bank Corporation, CARD Bank, Gretchen R. Leonardo, BDO Bank, Landbank ATM, BPI Family Savings Bank] -centerLine: white -isAdvisorySpeedLimitKnown: true +centerLineStyle: white +hasAdvisorySpeedLimitSign: true +hasNoStandingSign: true mobileCountryCode: 515 +noParkingSignStyle: mutcd +noStandingSignStyle: mutcd text waiting +noStoppingSignStyle: mutcd officialLanguages: [en, fil, es, ceb, ilo, hil] orchardProduces: [coconut, banana, pineapple, guava, mango, mangosteen, rubber, cashew_nut, tomato, papaya, coffee, grapefruit, chilli_pepper, sweet_pepper, avocado, orange, cacao, agave] popularSports: [basketball, tennis, soccer, volleyball] +workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/PK.yml b/app/src/main/assets/country_metadata/PK.yml index 1f9dd33b30..6f42e90928 100644 --- a/app/src/main/assets/country_metadata/PK.yml +++ b/app/src/main/assets/country_metadata/PK.yml @@ -2,6 +2,8 @@ atmOperators: [HBL, UBL, Askari Bank, MCB, Meezan Bank, HBL ATM, NBP, Standard Chartered Bank, Allied Bank, JS Bank, Bank Al Habib, ubl, Hbl, Bank Islami, Faysal Bank, ATM, Soneri Bank, National Bank, Bank Alfalah, Summit Bank, Habib Bank, Habib Metro Bank, Dubai Islamic Bank, Habib Bank Limited, Habib Bank ATM, Meezan Bank Limited, Habib Bank Ltd, Bank AL Habib, Allied bank, Askari bank, National Bank of Pakistan, mohsin house, NIB Bank, UBL ATM, hbl atm] isLeftHandTraffic: true mobileCountryCode: 410 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [ur, en, pa] orchardProduces: [guava, mango, mangosteen, orange, tomato, apple, date, apricot, chilli_pepper, sweet_pepper, banana, lemon, lime, peach, grape, plum, almond, pear, walnut] popularReligions: [muslim, hindu, christian, animism] diff --git a/app/src/main/assets/country_metadata/PL.yml b/app/src/main/assets/country_metadata/PL.yml index 2d2c48eccb..fa9a85f3fa 100644 --- a/app/src/main/assets/country_metadata/PL.yml +++ b/app/src/main/assets/country_metadata/PL.yml @@ -2,9 +2,11 @@ atmOperators: [Euronet, PKO BP, Planet Cash, Bank Millennium S.A., Santander, Bank Spółdzielczy, BZ WBK, PKO, Pekao SA, PKO Bank Polski, SGB, ING Bank Śląski, ING, Bank Pekao, Pekao S.A., Pekao, Grupa BPS, BPS, Cash4You, PKO BP SA, SKOK, Bank Zachodni WBK, eCard, BZWBK, Bank Pekao SA, PKO SA, PKO S.A., BGŻ, Millennium, Santander Bank Polska S.A., Euronet Polska, Santander Bank Polska, Global Cash, PEKAO SA, Planet cash, Bank Pekao S.A., PeKaO S.A., PEKAO, BNP Paribas, PBS, PlanetCash, Krakowski Bank Spółdzielczy, Millennium Bank, WBK, PKO BP S.A., BGŻ BNP Paribas, BS, Eurobank, Bank Zachodni WBK S. A., mBank, Spółdzielcza Grupa Bankowa, ING Bank, Citi Handlowy, Bank BGŻ, Bankomat PKO BP, Planet, BPH, TFI SKOK, Bank Millennium, Euronet sp. z o.o., Bank Spółdzielczy w Zambrowie, PEKAO S.A., Millenium, Millenium Bank, Cash 4 You, Santander Bank, PKO B.P., Eurocash, Alior Bank, Bank Polski, Credit Agricole, SKOK24, PKO Bank Polski S.A., Kredyt Bank, Bank PKO BP, Cash4you, Bank Spółdzielczy w Starym Sączu, Bank BPS, PeKaO SA, GBW, Podkarpacki Bank Spółdzielczy, Euronet Sp.z.o.o, Planetcash, Bank Spółdzielczy Sochaczew, 'Euronet Sp. z o.o., wpłatomat', Bank Spółdzielczy w Limanowej, Ecard, SKOK Stefczyka, Bank Zachodni WBK S.A., Skok Stefczyka, Bank Polskiej Spółdzielczości SA, Cash4U, Bank Polskiej Spółdzielczości S.A., bank spółdzielczy, KDBS, Bank Polska Kasa Opieki Spółka Akcyjna, Bank Spóldzielczy, Getin Bank, cash4you, Cash4u, Euronet Worldwide, Centrum Kart SKOK, BP SA, Bank Spółdzielczy w Piwnicznej Zdrój, Łącki Bank Spółdzielczy, Planet Cash Sp. z o.o., Bank Spółdzielczy w Łopusznie, Bank BGŻ BNP Paribas, Bank Spółdzielczy Rzemiosła w Krakowie, PKOBP, Nordea, Santander Bank Polska SA, Euronet WorldWide, ITCARD, Bank Millenium, WBK Bank Zachodni, PeKaO, BOŚ, Bank Spółdzielczy w Podegrodziu, PBS Lubaczów, KB, ATM PKO S.A., Bankomat PBS, Bank Śląski, e Card, Bank Ochrony Środowiska, Bank BPH, ecard, Bank spółdzielczy, PKO Bank Polski SA, PBS Bank, GBS, 'Planet Cash SA, Grupa BPS', PKO PB, BNP Paribas Bank, Eutonet, Bank Spółdzielczy w Głownie, Bankomat SGB, BGŻ S.A., PNB Paribas, Raiffeisen Polbank, Bank Spółdzielczy Rzemiosła, PeKaO S. A., PeKao, Bank Spółdzielczy w Kamiennej Górze, Bank Polskiej Spółdzielczości, Cardtronics, Bank Polskiej Spóldzielczosci S.A., PKO-BP, GBS Międzyrzecz, SKOK 24, Pekao Bank S.A., Bank Spółdzielczy w Wolbromiu, Euro-net Sp. z o.o., Skok, Pieniński Bank Spółdzielczy, CashLine, Bank Spółdzielczy Kamienna Góra, Kasa Stefczyka, Bank Spółdzielczy w Suchedniowie, 'Grupa BPS, Planet Cash SA', 'PKO BP, wpłatomat', 'Pekao SA I Oddział w Gdyni, Filia 2 w Wejherowie', SGB Bank Spółdzielczy Połczyn-Zdrój, KDBS Bank, Skok24, 'PBSbank, Podkarpacki Bank Spółdzielczy', PEKAO SĄ, BGZ BNP Paribas, SBL, Bank Nowy BFG, Pekao S.A, Bank Spółdzielczy w Iłży] chargingStationOperators: [GreenWay, RWE, Lotos, Orlen, GO+EAuto, Energa, Zdrojowa Invest & Hotels, LIDL, GreenWay Polska, Tesla, PGE Nowa Energia, Leroy Merlin, EV+, greenway, Tesla Motors Inc., Tauron, RWE Polska, PKP S.A., PKP Energetyka, PKN Orlen, Nissan, Miasto Ostrów Wielkopolski, IKEA, Grupa PGE, Greenway, GreenWay Polska Sp. z o.o., GreenGoo, Galactico, Fortum, EVplus Sp. z o.o., DBT, ABB] clothesContainerOperators: [Polski Czerwony Krzyż, PCK, Eco Textil, Fundacja Uśmiechu, Fundacja Eco Textil, Caritas, Fundacja z Sercem, Fundacja uśmiechu, Fundacja Dar] -isAdvisorySpeedLimitKnown: false -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: false +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 260 officialLanguages: [pl] orchardProduces: [apple, tomato, strawberry, raspberry, cherry, plum, pear, blueberry, peach, walnut, hazelnut, hop, apricot, chestnut] diff --git a/app/src/main/assets/country_metadata/PR.yml b/app/src/main/assets/country_metadata/PR.yml index 12a86f65dd..cffe09bf05 100644 --- a/app/src/main/assets/country_metadata/PR.yml +++ b/app/src/main/assets/country_metadata/PR.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: yellow +centerLineStyle: yellow lengthUnits: [foot and inch, meter] +noParkingSignStyle: mutcd text spanish +noStoppingSignStyle: mutcd officialLanguages: [en] orchardProduces: [banana, guava, mango, mangosteen, tomato, orange, papaya, pineapple, coffee, chilli_pepper, sweet_pepper, coconut, grapefruit, avocado, lemon, lime] popularSports: [basketball, tennis, baseball] diff --git a/app/src/main/assets/country_metadata/PS.yml b/app/src/main/assets/country_metadata/PS.yml index 873b36d1a7..ed14ba1223 100644 --- a/app/src/main/assets/country_metadata/PS.yml +++ b/app/src/main/assets/country_metadata/PS.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata -firstDayOfWorkweek: Su +firstDayOfWorkweek: Sa mobileCountryCode: 425 officialLanguages: [ar] orchardProduces: [tomato, olive, grape, chilli_pepper, sweet_pepper, lemon, lime, orange, almond, date, fig, strawberry, banana, peach, plum, guava, mango, mangosteen, cherry] diff --git a/app/src/main/assets/country_metadata/PT.yml b/app/src/main/assets/country_metadata/PT.yml index 4e82292aa9..723a7bd80c 100644 --- a/app/src/main/assets/country_metadata/PT.yml +++ b/app/src/main/assets/country_metadata/PT.yml @@ -2,8 +2,8 @@ atmOperators: [Caixa Geral de Depósitos, Santander Totta, Multibanco, Millennium BCP, Crédito Agrícola, Euronet, Montepio, BPI, SIBS, Novo Banco, Santander, Millennium bcp, MB Multibanco, multibanco, ATM, BES, Caixa de Crédito Agrícola, Caixa Agrícola, CCAM, MB, CGD, Novo Banco dos Açores, Banco Popular, Banif, Barclays, SIBS Multibanco, Euronet Worldwide, Millennium, Crédito agrícola, Deutsche Bank, Branco BPI, Banco BIC, caixiave, credito agricola, BCP Millenium, Credito Agricola, Banco Montepio] chargingStationOperators: [MOBI.E, KLC, Mobi.E, EDP Comercial, Tesla, Powerdot, Galp Power, Prio.E, Rede Piloto, Mobilectric, Galp Geste, GalpGeste, Mobi-e, EV Power, Mobie, Mobiletric, Emacom, Tesla Motors Inc., Repsol, Propel-Cepsa, Loulé Concelho Global, EDP MOP, Ucharge, Mota Engil II, Mobi, CME, Mobi.e, Mobi-E, MOBI.e, Factor Energia, Emel, EVCE Power, Bluecharge] clothesContainerOperators: [Ultriplo Lda] -isAdvisorySpeedLimitKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasSlowZone: true mobileCountryCode: 268 officialLanguages: [pt] orchardProduces: [tomato, grape, olive, orange, apple, pear, peach, chestnut, kiwi, plum, banana, raspberry, lemon, lime, almond, strawberry] diff --git a/app/src/main/assets/country_metadata/PY.yml b/app/src/main/assets/country_metadata/PY.yml index 9863fa880e..3b1d69b7cc 100644 --- a/app/src/main/assets/country_metadata/PY.yml +++ b/app/src/main/assets/country_metadata/PY.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Itaú, Banco Continental, Itau, BBVA, Banco Itau, Banco Nacional de Fomento, Sudameris Bank, BNF - Dinelco, Banco Itaú, ITAU, Dinelco, Banco Itaú S.A., Continental, BNF, Bancop, Itaú - Infonet, Banco Sudameris] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [Petropar] mobileCountryCode: 744 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es, gug] orchardProduces: [orange, mate, banana, pineapple, tomato, tung_nut, grapefruit, guava, mango, mangosteen, avocado, papaya, lemon, lime, chilli_pepper, sweet_pepper, strawberry, grape, plum] diff --git a/app/src/main/assets/country_metadata/QA.yml b/app/src/main/assets/country_metadata/QA.yml index 4a6d6725ca..6db34e51aa 100644 --- a/app/src/main/assets/country_metadata/QA.yml +++ b/app/src/main/assets/country_metadata/QA.yml @@ -1,9 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] +advisorySpeedLimitSignStyle: white atmOperators: [Doha Bank, QNB, QIB, Commercial Bank of Qatar] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su mobileCountryCode: 427 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [date, tomato, chilli_pepper, sweet_pepper, fig, grape] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/RO.yml b/app/src/main/assets/country_metadata/RO.yml index f38a436867..04c736a3dd 100644 --- a/app/src/main/assets/country_metadata/RO.yml +++ b/app/src/main/assets/country_metadata/RO.yml @@ -2,9 +2,11 @@ atmOperators: [BCR, BRD, Banca Transilvania, Raiffeisen Bank, CEC Bank, Raiffeisen, ING, Alpha Bank, UniCredit Bank, Bancpost, ING România, Euronet, BT, ATM Bancpost, First Bank, CEC, ATM RZB, Piraeus Bank, Garanti Bank, UniCredit Bank SA, GarantiBank, Unicredit Bank, OTP Bank, ATM Unicredit Bank, Raiffeisenbank, MKB Nextebank, Vista Bank, Banca Românească, Banca Comercială Română SA, RZB, ATM Dezinstalat, Unicredit Țiriac, ATM, citibank, ProCredit Bank, Credit Europe Bank, Banca Comercială Română, Raifeissen Bank, ING Bank, CEC bank, ATM Alpha Bank, ATM Piraeus Bank, Garantibank, Alpha] chargingStationOperators: [STPT, Renovatio, Lidl, Kaufland, Flow, Enel] clothesContainerOperators: [Caritas] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: square mobileCountryCode: 226 officialLanguages: [ro] orchardProduces: [grape, tomato, plum, apple, chilli_pepper, sweet_pepper, cherry, pear, walnut, apricot, strawberry, peach, cranberry, hazelnut, blueberry, hop] diff --git a/app/src/main/assets/country_metadata/RS.yml b/app/src/main/assets/country_metadata/RS.yml index 7f860a234c..8b76964da8 100644 --- a/app/src/main/assets/country_metadata/RS.yml +++ b/app/src/main/assets/country_metadata/RS.yml @@ -1,8 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Комерцијална банка, Banca Intesa, Komercijalna banka, Raiffeisen Bank, TEB, Poštanska Štedionica, NLB Banka, Eurobank, AIK Banka, Raiffeisen, Erste bank, NLB, OTP Bank, Poštanska štedionica, BKT, TEB Bank, Bankomat, Aik Banka, Hypo Alpe Adria, Telenor, Postanska stedionica, OTP BANK, Pcb, Erste, Credit Agricole, BPB, OTP Banka, ProCredit Bank, Банка Поштанска штедионица, Bank Intesa, Addiko bank, Banka Intesa, NLB Bank, Поштанска штедионица, Banka Ekonomike] chargingStationOperators: [putevi srbije] -isLivingStreetKnown: true -isSlowZoneKnown: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 220 officialLanguages: [sr] orchardProduces: [plum, apple, chilli_pepper, sweet_pepper, tomato, grape, raspberry, peach, pear, apricot, strawberry, cherry, walnut, hazelnut, hop] diff --git a/app/src/main/assets/country_metadata/RU.yml b/app/src/main/assets/country_metadata/RU.yml index 55aeadafbc..2e0f1d3b71 100644 --- a/app/src/main/assets/country_metadata/RU.yml +++ b/app/src/main/assets/country_metadata/RU.yml @@ -2,9 +2,11 @@ atmOperators: [Сбербанк, Промсвязьбанк, ПАО "Сбербанк", Сбербанк России, ПАО Сбербанк, Ак Барс Банк, Газпромбанк, ВТБ, Альфа-Банк, Генбанк, РНКБ, ПАО Банк Санкт-Петербург, ВТБ24, Банк ВТБ (ПАО), Росбанк, ОАО "Сбербанк России", Россельхозбанк, Уралсиб, ТрансКредитБанк, МДМ Банк, ВТБ 24, Балтийский банк, Банк Москвы, ЮниКредит Банк, РГС банк, Петрокоммерц, Райффайзен, Киви, Райффайзенбанк, АК БАРС БАНК, Челябинвестбанк, Почта Банк, Открытие, АБ Россия, Бинбанк, Крайинвестбанк, КУБ, Санкт-Петербург, Банк Приморье, Терминал QIWI, Банк "Уралсиб", УБРиР, Банк "Открытие", Возрождение, ПриватБанк, ПАО «МИнБанк», СКБ-Банк, Екатеринбургский муниципальный банк, Плюс Банк, ОАО "Альфа-Банк", Запсибкомбанк, Московский Индустриальный Банк, ПАО "МИнБанк", Аверс, ПАО КБ «УБРиР», ВТБ-24, сбербанк, АО "Альфа-Банк", Московский индустриальный банк, Банк Открытие, Альфа-банк, Транскапиталбанк, Банк «Возрождение» (ПАО), Авангард, Тинькофф, Сургутнефтегазбанк, АО «Райффайзенбанк», УралСиб, Номос-Банк, Курскпромбанк, ПАО "БАНК СГБ", Челиндбанк, МТС Банк, Банк Санкт-Петербург, Русский Стандарт, Банк Возрождение, АКБ «РосЕвроБанк» (АО), ПАО АКБ "Авангард", Московский кредитный банк, Sberbank, ПАО "Почта Банк", ОТП Банк, Кредит Европа Банк, УРАЛСИБ, МКБ, Совкомбанк, СКБ-банк, ПАО "Сбербанк России", Тинькофф Банк, Экспресс-волга банк, Банк Зенит, Аккобанк, ПАО «Банк Уралсиб», ОАО «МДМ Банк», Райффайзен банк, РайффайзенБанк, Банк Россия, Россия, Транскредитбанк, ОАО "Московский кредитный банк", Кузнецкбизнесбанк, БинБанк, БИНБАНК, ЮниКредит, Tinkoff, Связь-Банк, Севергазбанк, Банк "Отрытие", Траст, ОАО "МДМ Банк", ПАО Банк "ФК Открытие", РосБанк, Росгосстрах Банк, Севастопольский Морской Банк, Банк ЗЕНИТ, ЧБРР, Азиатско-Тихоокеанский Банк, СМП Банк, ОАО «АК БАРС» Банк, Европейский, Уральский банк реконструкции и развития, АО "Банк Финсервис", Таврический Банк, ПАО Сбербанк России, Экономбанк, Raiffeisen, Мособлбанк, Юниаструм Банк, ВБРР, Примсоцбанк, Банк Уралсиб, Юникредитбанк, Альфа банк, Севастопольский Морской банк, QIWI, Тинькофф банк, Балтийский Банк, Русский стандарт, Томскпромстройбанк, ГазПромБанк, Банк Авангард, МКБ Москомприватбанк, СберБанк, АО "Россельхозбанк", Альфабанк, Санкт Петербург, Банк "Возрождение", Новокузнецкий муниципальный банк, Райффайзен Банк, ПромСвязьБанк, Газэнергобанк, Стройкредит, Банк Петрокоммерц, ОАО "Сбербанк", Почта банк, Сбербанк (ограниченный доступ), ЗАО "ЮниКредит Банк", Московский Кредитный Банк, Банк ВТБ, Восточный банк, Собинбанк, ОАО "Центр-инвест", Фондсервисбанк, Московский Индустриальный банк, ЗапСибКомБанк, Банк Кузнецкий, Сбер, ПAO «Промсвязьбанк», Кедр, Связьбанк, Банк Союз, Российский капитал, Банк "Авангард", Ханты-Мансийский банк, СБЕРБАНК, ЧЕЛИНДБАНК, BSGV, СДМ-Банк, ВТБ Банк Москвы, Центр-Инвест, Связь Банк, Балтинвестбанк, ПАО МОСОБЛБАНК, ОАО АКБ "Росбанк", ГазпромБанк, Ханты-Мансийский Банк, Ставропольпромстройбанк, Банк СГБ, Банк Левобережный, ПАО "Совкомбанк", АО Альфа-Банк, Урал ФД, Новобанк, ПАО «Сбербанк», Абсолют Банк, Дальневосточный банк, '"Газпромбанк" (Акционерное общество)', Всероссийский банк развития регионов, ДВБ, МТС-Банк, Девон-Кредит, ПАО "БАНК УРАЛСИБ", СМП банк, Кольцо Урала, Мастербанк, ОАО Банк "Возрождение", ПАО "Московский кредитный банк", Москомприватбанк, Альфа Банк, АКБ Московский Индустриальный Банк, Восточный экспресс банк, Банк ВТБ (публичное акционерное общество), ТрансКапиталБанк, Восточный, Севастопольский морской банк, АБ РОССИЯ, ЗАО "Кредит Европа Банк", Юниаструм, Липецккомбанк, РусьБанк, Меткомбанк, ОАО «СКБ-банк», Газпром Банк, ОАО "Газэнергобанк", Хоум Кредит, РОСБАНК, Приморье, РосСельхозБанк, ЗАО "Райффайзенбанк", АКБ Росбанк, ПАО Банк «ФК Открытие», ОАО «Газэнергобанк», ПАО "Росбанк", СГБ, ОАО "ТРАНСКАПИТАЛБАНК", UniCredit Bank, ГЕНБАНК, АБ Россия (ограниченный доступ), Банк Снежинский, Союз, СвязьБанк, Связь-банк, Банк УРАЛСИБ, Райфайзен, Qiwi, ФК Открытие, «АК БАРС», Экспресс-Тула, Хоум Кредит Банк, Российский промышленный банк, АТБ, Национальный залоговый банк, Газпром, НС Банк, Банк Русский Стандарт, Инвесткапиталбанк, МДМ банк, ПримСоцБанк, Home Credit, ИнтерПрогрессБанк, Интеза, Зенит, Юникредит, СМП-Банк, АвтоГрадБанк, Sperbank, рнкб, МТС, ПАО РОСБАНК, Банкомат Сбербанк, Тинькоф, ВТБ (ПАО), Снежинский банк, НОМОС-Банк, АО ЮниКредит Банк, 'Уралсиб, ОАО', Банк Восточный, Банк «ТРАСТ» (ПАО), Снежинский, Региобанк, АК Барс Банк, Муниципальный Камчатпрофитбанк, Банк Агророс, Банк Акцепт, Банкомат, Хоум Кредит энд Финанс Банк, Промстройбанк, КрайИнвестБанк, Первый экспресс, ЛипецкКомБанк, Форабанк, ЕРИЦ - Коммун. услуги, МоскомПриватБанк, Углеметбанк, Банк «Возрождение», МБРР, Росгосстрах, Банк Элита, Ситибанк, НОМОС-БАНК, Внешпромбанк, МТС банк, АКБ МИнБ, Visa QIWI Wallet, ПAO «МИнБанк», Homecredit, ББР Банк, ЮниКредитБанк, МТС-банк, Возрождение Банк, КС-БАНК, банк Открытие, Новикомбанк, СаровБизнесБанк, Югра, Бевонкредит, АО Газпромбанк, ОАО Сбербанк России, Венец, АЛЬФА-БАНК, Всероссийский Банк Развития Регионов, СДМ-банк, СберБанк России, СМП, Кредит Европа банк, Челябинвест, Unicreditbank, Alfabank, Элекснет, Почта-Банк, ПАО «Московский кредитный банк», СельхозБанк, Почта-банк, Ижкомбанк, Тиньков, АльфаБанк, АКБ Авангард, АК БАРС, Rosbank, Коммерческий Банк Восточный, банк Возрождение, газпромбанк, Инвестбанк, Банк Оренбург, Челябинвест банк, СБ, Unicredit, Пересвет-банк, ИнвестКапиталБанк, Левобережный, Национальный банк Траст, Банк Русский стандарт, Инвестторгбанк, Смоленский банк, Барклайс, Кубань Кредит, Енисейский Объединенный Банк, Северный Народный Банк, Девон-кредит, Evrofinance Mosnarbank, Поволжский банк, Ухтабанк, VTB, Ханты-Мансииский банк, 'Новокузнецкий муниципальный банк, Кузнецкбизнесбанк', Девонкредит, Роял Кредит Банк, Элита, Уралсиб банк, CitiBank, Саровбизнесбанк, Хлынов, Райфайзен Банк, Кредит Урал Банк, sberbank, Росгосстрахбанк, Банк Центр-Инвест, Кубань-кредит, Петрокомерц, Ак Барс банк, Банк24.ру, Home Credit Bank, Alfa-Bank, Citibank, Финсервис, Морской банк, VTB 24, Рост Банк, Московский областной банк, Райффайзен Банк Аваль, ДВ Банк, Оранжевый, Абсолют банк, Росгосстрах банк, ВУЗ-банк, Транскредит банк, Аверс Банк, Запcибкомбанк, Нокссбанк, ЛКБ, Раффайзен банк, МИБ, Кубань кредит, АК Барс банк, Банкомат Сбербанк России, Уральский Банк Сбербанка России, АкБарс Банк, Татсоцбанк, МИНБ, сбербанк, Славия, КредитЕвропаБанк, Сиаб, Раффайзен, Славянский кредит, Банк Хоум Кредит, СБЕР, ББР банк, ВТБ 24 (ПАО), Банк РОССИИ, КредитУралБанк, СКБ банк, углемет банк, Raiffeisenbank, Центр Инвест, СКБ, Интерпрогрессбанк, сбербанк россии, Рублев, Gazprombank, Уралпромбанк, убрир, Фора Банк, Tinkoff Bank, Alfa Bank, ПАО АКБ «Авангард», Банк ЧБРР, МБА-Москва, ТинькоффБанк, УбРиР, Бин Банк, РоссельхозБанк, СеверГазбанк, МИнБанк, РНКБ Банк (ПАО), Втб, Сбербанк 24/7, «Банк «Санкт-Петербург», ПАО Банк Зенит] chargingStationOperators: ['"ПАО ""Ленэнерго"""', Мосэнерго, МРСК Волги, '"ПАО ""МРСК Волги"""', Татнефть, '"АК ""Транснефть"""', ТюменьЭнерго, Револьта, СУЭНКО, Русгидро, РосНефть, ОАО «МРСК Урала»] clothesContainerOperators: [Перемолка, Лепта, Спасибо] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: portrait mobileCountryCode: 250 officialLanguages: [ru] orchardProduces: [tomato, apple, grape, cherry, strawberry, raspberry, plum, pear, apricot, peach, blueberry, tea, hop, orange] diff --git a/app/src/main/assets/country_metadata/RW.yml b/app/src/main/assets/country_metadata/RW.yml index c350ebe07e..a0ec19d322 100644 --- a/app/src/main/assets/country_metadata/RW.yml +++ b/app/src/main/assets/country_metadata/RW.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Bank of Kigali, Ecobank] -centerLine: white +centerLineStyle: white mobileCountryCode: 635 +noParkingSignStyle: vienna variant +noStoppingSignStyle: vienna officialLanguages: [rw, en, fr] orchardProduces: [banana, tomato, tea, coffee, pineapple, avocado, guava, mango, mangosteen, lemon, lime, chilli_pepper, sweet_pepper, orange, pepper, papaya] diff --git a/app/src/main/assets/country_metadata/SA.yml b/app/src/main/assets/country_metadata/SA.yml index 55d60c1284..2bb3de434c 100644 --- a/app/src/main/assets/country_metadata/SA.yml +++ b/app/src/main/assets/country_metadata/SA.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [بنك الرياض, مصرف الراجحي, SABB, صراف الراجحي, الراجحي, Bank Al-Bilad, Al Rajhi Bank, مصرف الإنماء, NCB, SAMBA, الأهلي, صراف الأهلي, صراف العربي, Bank AlJazira, Al Rajhi, بنك الراجحي, البنك الأهلي التجاري, Samba, البنك العربي, مصرف الانماء, البنك الاهلي, صراف الرياض, البنك السعودي للاستثمار, سامبا, Alahli NCB, الإنماء, البنك العربي الوطني, Saudi Hollandi Bank, الاهلي, Al Rajhi ATM, صرافة بنك الرياض, البنك السعودي الفرنسي, Riyad Bank, البنك الاول, Riyadh Bank, Al-Rajhi Bank, Alarabi Bank, Alrajhi Bank, Alinma Bank, العربي, Alinma ATM, Albilad, بنك الجزيرة, Bank Aljazira, بنك البلاد, صراف بنك الراجحي, Al Rayhi Bank, صراف الاهلي, صراف ساب] -centerLine: yellow +centerLineStyle: yellow firstDayOfWorkweek: Su mobileCountryCode: 420 officialLanguages: [ar] diff --git a/app/src/main/assets/country_metadata/SC.yml b/app/src/main/assets/country_metadata/SC.yml index 34e0f6368b..79b474a527 100644 --- a/app/src/main/assets/country_metadata/SC.yml +++ b/app/src/main/assets/country_metadata/SC.yml @@ -1,7 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Barclays, Nouvobanq, MCB] +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 633 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, fr, crs] orchardProduces: [coconut, banana, tomato, guava, mango, mangosteen, lemon, lime, orange, pineapple, tea, avocado] diff --git a/app/src/main/assets/country_metadata/SD.yml b/app/src/main/assets/country_metadata/SD.yml index 975e21004d..5c2dd7a351 100644 --- a/app/src/main/assets/country_metadata/SD.yml +++ b/app/src/main/assets/country_metadata/SD.yml @@ -2,6 +2,8 @@ atmOperators: [Bank of Khartoum, بنك الخرطوم, ATM BOK, بنك امدرمان الوطني, FAISAL ISLAMIC BANK, بنك فيصل الاسلامي السوداني, بنك الخرطوم فرع الكلاكله شرق, Sudanese French Bank, Faisal Islamic Bank, بنك المزارع التجاري, صراف آلي بنك فيصل الإسلامي, البنك السوداني الفرنسي, Faisal Islamic Bank ATM, بنك فيصل الإسلامية السوداني, بنك الخرطوم Bank of Khartoum, صراف آلي بنك الخرطوم] firstDayOfWorkweek: Su mobileCountryCode: 634 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar, en] orchardProduces: [banana, guava, mango, mangosteen, tomato, date, lemon, lime, grapefruit, orange, chilli_pepper, sweet_pepper, pineapple] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/SE.yml b/app/src/main/assets/country_metadata/SE.yml index 6ab4f405cf..363e75e987 100644 --- a/app/src/main/assets/country_metadata/SE.yml +++ b/app/src/main/assets/country_metadata/SE.yml @@ -2,9 +2,10 @@ atmOperators: [Swedbank, Bankomat AB, Nordea, Bankomat, Handelsbanken, SEB, Kontanten, ICA Banken, ICA, Länsförsäkringar, ICA-banken, Ica, Kontanten AB, Nokas, Danske Bank, bankomat, Uttag, Länsförsäkringar Bank, Forex, Autocash, Ica Banken] chargingStationOperators: [Fortum Charge & Drive, Tesla Motors Inc., Bee, Tesla, Vattenfall, InCharge, CaCharge, Göteborgs Energi, Umeå Energi, Sundsvall Elnät/Green Highway, Karlshamn Energi, Jämtkraft, Clever, CLEVER, Bee Charging Solutions, Ultra, BTEA, inCharge, e-on, charge&drive, VB Energi, SKF, NOVI Ressort, Mönsterås Kommun, Ljusdal Energi, Lidl, Kraftringen, Ionity, IKEA, Gävle Energi, Fyrfasen Energi, Fortum, Enkla Elbolaget, Drive&charge, Charge & Drive, Affärsverken] clothesContainerOperators: [Myrorna, Human Bridge, FTI] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: false +hasAdvisorySpeedLimitSign: true +hasLivingStreet: true +hasSlowZone: false +livingStreetSignStyle: wide mobileCountryCode: 240 officialLanguages: [sv] orchardProduces: [apple, strawberry, tomato, pear, raspberry, plum, cherry, blueberry] diff --git a/app/src/main/assets/country_metadata/SG.yml b/app/src/main/assets/country_metadata/SG.yml index 28674b4cda..9888770ccf 100644 --- a/app/src/main/assets/country_metadata/SG.yml +++ b/app/src/main/assets/country_metadata/SG.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [UOB, POSB, OCBC, DBS, Citibank, OCBC Bank, HSBC, SAM, DBS/POSB, Standard Chartered, AXS, UOB ATM] -centerLine: white +centerLineStyle: white chargingStationOperators: [Greenlots] isLeftHandTraffic: true mobileCountryCode: 525 diff --git a/app/src/main/assets/country_metadata/SI.yml b/app/src/main/assets/country_metadata/SI.yml index fbc100e4f7..defdbbbb91 100644 --- a/app/src/main/assets/country_metadata/SI.yml +++ b/app/src/main/assets/country_metadata/SI.yml @@ -1,9 +1,11 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [NLB, NKBM, Abanka, Nova KBM, SKB, Gorenjska banka, Banka Koper, ABanka, NKBM d.d., Gorenjska Banka, UniCredit Bank, ABANKA, Delavska hranilnica, Banka Celje, Bitnik d.o.o., Euronet, Nova Ljubljanska banka, SKB banka, SKB Banka, Nova Ljubljanska banka d.d., NLB d. d., NovaKBM, Addiko Bank, A banka, Bitnik, Intesa San Paolo, Addiko bank, Hypo Alpe-Adria-Bank d.d.] chargingStationOperators: [SODO, Petrol, Elektro Maribor, unknovn, elektro Celje, dravske elektrarne maribor, Renault, Elektro Ljubljana d.d., Elektro Gorenjska, EM] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 293 officialLanguages: [sl] orchardProduces: [grape, apple, pear, tomato, walnut, cherry, peach, plum, hop, persimmon, strawberry, olive, chilli_pepper, sweet_pepper, apricot, kiwi] diff --git a/app/src/main/assets/country_metadata/SK.yml b/app/src/main/assets/country_metadata/SK.yml index 628935d526..b56c4aff21 100644 --- a/app/src/main/assets/country_metadata/SK.yml +++ b/app/src/main/assets/country_metadata/SK.yml @@ -2,9 +2,11 @@ atmOperators: [VÚB, Slovenská sporiteľňa, Tatra banka, ČSOB, Prima banka, Poštová banka, UniCredit Bank, OTP banka, Euronet, OTP Bank, 365.bank, ATM Point, OTP Banka, ATM point, Prima Banka, Tatra Banka, General Bytes, Slovenská Sporiteľňa] chargingStationOperators: [ZSE, GreenWay, ejoin, ZSE Drive, ebajk connect, Slovnaft, Billa, ebajkconnect, VSE, ebajkonnect, Lidl, Greenway, Farmárska reštaurácia, EvMapa, BMW T.O.B.] clothesContainerOperators: [Ekocharita, HUMANA, EKOCHARITA, Humana, Nadácia ECO, Ľudia k ľuďom n.o., FCC Trnava, Ekotextil, ECO textil] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: wide mobileCountryCode: 231 officialLanguages: [sk] orchardProduces: [grape, apple, tomato, chilli_pepper, sweet_pepper, peach, strawberry, plum, pear, apricot, hop, cherry, raspberry, walnut, chestnut] diff --git a/app/src/main/assets/country_metadata/SL.yml b/app/src/main/assets/country_metadata/SL.yml index 32d49bb34f..f646fba22d 100644 --- a/app/src/main/assets/country_metadata/SL.yml +++ b/app/src/main/assets/country_metadata/SL.yml @@ -1,4 +1,6 @@ # Do not edit. Source files are in /res/country_metadata mobileCountryCode: 619 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en, kri] orchardProduces: [coffee, guava, mango, mangosteen, tomato, cacao, kola_nut, coconut, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/SM.yml b/app/src/main/assets/country_metadata/SM.yml index ecd4762f17..cb985a24f0 100644 --- a/app/src/main/assets/country_metadata/SM.yml +++ b/app/src/main/assets/country_metadata/SM.yml @@ -1,4 +1,4 @@ # Do not edit. Source files are in /res/country_metadata -isSlowZoneKnown: true +hasSlowZone: true mobileCountryCode: 292 officialLanguages: [it] diff --git a/app/src/main/assets/country_metadata/SO.yml b/app/src/main/assets/country_metadata/SO.yml index 417f999136..a99475cf9b 100644 --- a/app/src/main/assets/country_metadata/SO.yml +++ b/app/src/main/assets/country_metadata/SO.yml @@ -1,5 +1,5 @@ # Do not edit. Source files are in /res/country_metadata -firstDayOfWorkweek: Su +firstDayOfWorkweek: Sa mobileCountryCode: 637 officialLanguages: [so, ar] orchardProduces: [tomato, banana, date, coconut, orange, lemon, lime, grapefruit, guava, mango, mangosteen] diff --git a/app/src/main/assets/country_metadata/SR.yml b/app/src/main/assets/country_metadata/SR.yml index 0fdbbe5208..80f5052f49 100644 --- a/app/src/main/assets/country_metadata/SR.yml +++ b/app/src/main/assets/country_metadata/SR.yml @@ -2,6 +2,8 @@ atmOperators: [DSB, Hakrinbank, Republic Bank, De Surinaamsche Bank] isLeftHandTraffic: true mobileCountryCode: 746 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [nl] orchardProduces: [banana, coconut, orange, grapefruit, guava, mango, mangosteen, tomato, pineapple, cherry, papaya, lemon, lime, coffee, cacao] popularReligions: [christian, hindu, muslim] diff --git a/app/src/main/assets/country_metadata/ST.yml b/app/src/main/assets/country_metadata/ST.yml index 6c73218151..c3fb6ccc8c 100644 --- a/app/src/main/assets/country_metadata/ST.yml +++ b/app/src/main/assets/country_metadata/ST.yml @@ -1,4 +1,6 @@ # Do not edit. Source files are in /res/country_metadata mobileCountryCode: 626 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [pt] orchardProduces: [banana, coconut, cacao, coffee] diff --git a/app/src/main/assets/country_metadata/SV.yml b/app/src/main/assets/country_metadata/SV.yml index 17e0c66e28..f1d3ba6187 100644 --- a/app/src/main/assets/country_metadata/SV.yml +++ b/app/src/main/assets/country_metadata/SV.yml @@ -1,6 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Agrícola, Banco de América Central, Banco Cuscatlan, Scotiabank, Caja de Crédito, Davivienda] -centerLine: yellow +centerLineStyle: yellow +hasDailyAlternateSideParkingSign: true mobileCountryCode: 706 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [coconut, apple, coffee, guava, mango, mangosteen, tomato, lemon, lime, avocado, olive, chilli_pepper, sweet_pepper, papaya, orange, pineapple, agave, cashew_nut, tea] diff --git a/app/src/main/assets/country_metadata/SX.yml b/app/src/main/assets/country_metadata/SX.yml index 68752ad405..ce67259efb 100644 --- a/app/src/main/assets/country_metadata/SX.yml +++ b/app/src/main/assets/country_metadata/SX.yml @@ -1,2 +1,4 @@ # Do not edit. Source files are in /res/country_metadata +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [nl, en] diff --git a/app/src/main/assets/country_metadata/SZ.yml b/app/src/main/assets/country_metadata/SZ.yml index 6295cdba89..f07d4ab0a7 100644 --- a/app/src/main/assets/country_metadata/SZ.yml +++ b/app/src/main/assets/country_metadata/SZ.yml @@ -1,9 +1,10 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Standard Bank, FNB, Nedbank, First National Bank] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 653 officialLanguages: [ss, en] orchardProduces: [grapefruit, orange, pineapple, banana, tomato, plum, almond, avocado, date, guava, mango, mangosteen] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/TG.yml b/app/src/main/assets/country_metadata/TG.yml index 30ead0121f..c3352e8a76 100644 --- a/app/src/main/assets/country_metadata/TG.yml +++ b/app/src/main/assets/country_metadata/TG.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Ecobank, BTCI] mobileCountryCode: 615 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [fr] orchardProduces: [banana, cacao, coffee, orange, coconut, cashew_nut, tomato, chilli_pepper, sweet_pepper, pineapple, nutmeg] diff --git a/app/src/main/assets/country_metadata/TH.yml b/app/src/main/assets/country_metadata/TH.yml index aa83838ee2..1f7581bca0 100644 --- a/app/src/main/assets/country_metadata/TH.yml +++ b/app/src/main/assets/country_metadata/TH.yml @@ -1,7 +1,8 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en, th-Latn] +advisorySpeedLimitSignStyle: yellow atmOperators: [Bangkok Bank, Siam Commercial Bank, Krungsri, Kasikorn Bank, Krungthai Bank, SCB, KTB, Kasikorn, Krungthai, TMB, ธนาคารกสิกรไทย, ธนาคารไทยพาณิชย์, ธนาคารกรุงไทย, ธนาคารกรุงเทพ, Government Savings Bank, GSB, Krungsri Bank, Kasikornbank, Thanachart Bank, KBANK, KBank, ATM, ธนาคารออมสิน, Bank of Ayudhya, Siam City Bank, Siam Commercial, K-Bank, Kasikornthai, Krung Thai Bank, ธนาคารกรุงศรีอยุธยา, Omsin, ธนาคารทหารไทย, ธนาคารธนชาต, K-bank, Goverment Savings Bank, UOB, Aeon, K Bank, Thanachart, กสิกรไทย, BBL, Easybank, Baac, CIMB Thai, Krung Thai, Siam Commercial Bank (SCB), ออมสิน, Ktb, Bangkok, Kasikornthai Bank, 'KBANK, SCB, KTB', TCAP, BAY, 'KBANK, SCB', Oomsin, Krungsiri, TMB Bank, Bangkok Bank (BBL), Krung Thai Bank (KTB), Kbank, 'KTB, BBL, GSB', ธนาคารกรุงไทย (Krungthai Bank), LH Bank, ธนาคารซีไอเอ็มบีไทย, ไทยพาณิชย์, government savings bank, Krungthai Bank ธนาคารกรุงไทย, Cimb, Krungsri Bay, Easy Bank, uob, SNA, bangkok bank, bike park, Aomsin Bank, Thai Military Bank, atm, ธ.ออมสิน, Krungsri ATM, ATM Krungsri, Bangkok bank, ธ.ไทยพาณิชย์, ATM Siam Commercial Bank] -centerLine: yellow +centerLineStyle: yellow isLeftHandTraffic: true mobileCountryCode: 520 officialLanguages: [th] diff --git a/app/src/main/assets/country_metadata/TJ.yml b/app/src/main/assets/country_metadata/TJ.yml index c5109fe762..46d05704bb 100644 --- a/app/src/main/assets/country_metadata/TJ.yml +++ b/app/src/main/assets/country_metadata/TJ.yml @@ -1,6 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Kazkom, Амонатбонк, Amonat Bank, Алиф бонк, Amonatbonk, Эсхата, KazKom, Amonatbank, Агроинвест бонк, Бонки Эсхата, амонатбонк, Банкомат, Eskhata Bank, Эсхата Банк, терминали шот гузарони, Dushanbe City ATM 178, Halyk Bank] mobileCountryCode: 436 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [tg, ru] orchardProduces: [tomato, apple, grape, apricot, peach, lemon, lime, plum, almond, pepper, orange, fig, hazelnut] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/TM.yml b/app/src/main/assets/country_metadata/TM.yml index 41e8e59380..a3de3e2842 100644 --- a/app/src/main/assets/country_metadata/TM.yml +++ b/app/src/main/assets/country_metadata/TM.yml @@ -1,5 +1,7 @@ # Do not edit. Source files are in /res/country_metadata mobileCountryCode: 438 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [tk, ru] orchardProduces: [tomato, grape, apple, plum, apricot, peach, almond] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/TN.yml b/app/src/main/assets/country_metadata/TN.yml index 37a420a336..27e799da12 100644 --- a/app/src/main/assets/country_metadata/TN.yml +++ b/app/src/main/assets/country_metadata/TN.yml @@ -2,6 +2,8 @@ additionalStreetsignLanguages: [fr] atmOperators: [الاتحاد البنكي للتجارة والصناعة, بنك تونس العربي الدولي, البنك الوطني الفلاحي, Banque de Tunisie, STB] mobileCountryCode: 605 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [ar] orchardProduces: [tomato, olive, date, grape, peach, apple, orange, grapefruit, almond, lemon, lime, apricot, fig, chilli_pepper, sweet_pepper, pear, plum] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/TR.yml b/app/src/main/assets/country_metadata/TR.yml index e4034463f7..d925ec3b66 100644 --- a/app/src/main/assets/country_metadata/TR.yml +++ b/app/src/main/assets/country_metadata/TR.yml @@ -2,7 +2,8 @@ atmOperators: [Akbank, Ziraat Bankası, Türkiye İş Bankası, Garanti Bankası, Denizbank, Vakıfbank, İş Bankası, Halkbank, Yapı Kredi, TEB, ING, DenizBank, Finansbank, Garanti, Akbank ATM, QNB Finansbank, HSBC, İş Bankası ATM, Ziraat Bankası ATM, Deniz Bank, ING Bank, PTT, Vakıfbank ATM, VakıfBank, Ziraat Bankasi, Bankamatik, Garanti Bankası ATM, Garanti BBVA, Halkbank ATM, YapiKredi, AKBANK, Kuveyt Türk, Denizbank ATM, Yapı Kredi Bankası, Halk Bankası, Yapı Kredi ATM, VakifBank, Şekerbank, QNB, Ziraat, Yapi Kredi, Ziraat Bank, YapıKredi, TEB ATM, Govermental, denizbank, Garanti BBVA ATM, Garanti Bank, Türkiye Bankasi, Ing Bank, T.C. Ziraat Bankası, Zıraat Bankası, Türkiye İş Bankası A.Ş., private, Türkiye Finans, Türkiye İş Bankası Bankamatik, Ziraat ATM, İş Bankası Bankamatik, Finansbank ATM, İşbank, ZiraatBank, QNB Finansbank ATM, Akbank Atm, deniz bank, Şeker Bank, AkBank, Deniz Bank ATM, Vakifbank, Ptt, various, Garanti bank, Ak Bank, ING BANK, alBaraka, ARİF KARADEMİR, ATM, Türk Ekonomi Bankası, Halk Bank, DenizBank ATM, iş Bankası, şekerbank, akbank, Yapıkredi Bankası, Yapı Kredi Bank, Yapıkredi ATM, Türkiye Garanti Bankası A.Ş., İŞ BANKASI, FİNANSBANK, İş Bank, garanti, vakıfbank, HALKBANK, Garanti Atm, AKBANK ATM, yapıkredi, İngBank, Odeabank, AK BANK ATM, Akbank A.Ş., iş bankası atm, VakıfBank ATM, İşbank ATM, Garanti bankamatik, akbank atm] chargingStationOperators: [SHARZ, VOLTRUN, ZES, Sharz, Eşarj, EŞARJ] clothesContainerOperators: [Maltepe Belediyesi] -isLivingStreetKnown: true +hasLivingStreet: true +livingStreetSignStyle: wide mobileCountryCode: 286 officialLanguages: [tr] orchardProduces: [tomato, grape, apple, olive, orange, lemon, lime, apricot, peach, hazelnut, pear, strawberry, banana, fig, plum, grapefruit] diff --git a/app/src/main/assets/country_metadata/TT.yml b/app/src/main/assets/country_metadata/TT.yml index e4649deaeb..6139a525c5 100644 --- a/app/src/main/assets/country_metadata/TT.yml +++ b/app/src/main/assets/country_metadata/TT.yml @@ -2,6 +2,8 @@ atmOperators: [Republic Bank, First Citizens Bank, RBC, Scotiabank, First Citizens, Scotia Bank, RBC Royal Bank, Eastern Credit Union, FCB, Republic Bank Ltd., Republic Bank ATM] isLeftHandTraffic: true mobileCountryCode: 374 +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [coconut, banana, lemon, lime, orange, tomato, pineapple, grapefruit, chilli_pepper, sweet_pepper, papaya, guava, mango, mangosteen, avocado, nutmeg, cacao, coffee] popularReligions: [christian, hindu] diff --git a/app/src/main/assets/country_metadata/TW.yml b/app/src/main/assets/country_metadata/TW.yml index 87f9210638..d395e770c6 100644 --- a/app/src/main/assets/country_metadata/TW.yml +++ b/app/src/main/assets/country_metadata/TW.yml @@ -1,10 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [華南銀行, 中華郵政, 國泰世華銀行, 中華郵政股份有限公司, 臺灣銀行, 土地銀行, 郵局, 玉山銀行, 高雄銀行, 台新銀行, 彰化銀行, 中國信託, Cathay United Bank, post, 兆豐國際商業銀行, 中國信託商業銀行, 永豐銀行, 合作金庫銀行, 臺灣土地銀行, CTBC, 兆豐銀行, 國泰世華商業銀行, taiwan cooperative, 國泰世華, 永豐商業銀行, First Bank, 台灣銀行, 上海商銀, 元大商業銀行, 聯邦銀行, Union Bank, 台北富邦銀行, 玉山商業銀行, 聯邦商業銀行] -centerLine: white +centerLineStyle: white chargingStationOperators: [英屬開曼群島商睿能新動力股份有限公司台灣分公司, 睿能創意股份有限公司, Gogoro Inc., gogoro, Gogoro, Gogoro Taiwan, 台灣城市動力股份有限公司] clothesContainerOperators: [高雄市方舟就業服務協會] mobileCountryCode: 466 +noParkingSignStyle: taiwan +noStoppingSignStyle: vienna officialLanguages: [zh] orchardProduces: [pineapple, banana, guava, mango, mangosteen, orange, tomato, pear, papaya, areca_nut, grape, grapefruit, persimmon, lemon, lime, chilli_pepper, sweet_pepper, peach, apricot] popularReligions: [chinese_folk, taoist, buddhist, christian] diff --git a/app/src/main/assets/country_metadata/TZ.yml b/app/src/main/assets/country_metadata/TZ.yml index 649d76d0df..89002d0587 100644 --- a/app/src/main/assets/country_metadata/TZ.yml +++ b/app/src/main/assets/country_metadata/TZ.yml @@ -1,10 +1,13 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [CRDB, NMB, NBC, CRDB Bank, crdb, Barclays, Stanbic Bank, nmb, FNB, Ecobank, CRDB BANK, National Microfinance Bank (NMB), CRDB bank, Absa, NBC Bank, National Bank of Commerce, Barclays Bank, Exim Bank, Umoja, NMB Bank, Machochwe Ranger Post, NMB wakala, Tpb bank, NMB & CRDB Wakala] -centerLine: white +centerLineStyle: white chargingStationOperators: [Jaza Energy] +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 640 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [sw, en] orchardProduces: [banana, coconut, tomato, orange, guava, mango, mangosteen, pineapple, cashew_nut, coffee, tea, sisal, lemon, lime, chilli_pepper, sweet_pepper, cacao, pear, grape] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/UA.yml b/app/src/main/assets/country_metadata/UA.yml index df54f3cf39..ecfcc41094 100644 --- a/app/src/main/assets/country_metadata/UA.yml +++ b/app/src/main/assets/country_metadata/UA.yml @@ -2,9 +2,11 @@ atmOperators: [ПриватБанк, Альфа-Банк, Генбанк, РНКБ, Ощадбанк, Приватбанк, Райффайзен Банк Аваль, УкрСиббанк, Райффайзен Банк, АБ Россия, ПУМБ, Укрсиббанк, Укрексімбанк, Укргазбанк, Аваль, Кредобанк, Укрсоцбанк, Приват Банк, Privatbank, Euronet, Крайинвестбанк, ОщадБанк, Credit Agricole, Райфайзен Банк Аваль, Райфайзен банк Аваль, Райффайзен банк Аваль, УкрСибБанк, UniCredit Bank, Севастопольский Морской Банк, ЧБРР, Россия, ПАТ "Укрсоцбанк", Севастопольский Морской банк, Промінвестбанк, приватбанк, Банк Россия, Приват банк, Правекс-Банк, PrivatBank, Кредитпромбанк, Надра, Райффайзенбанк Аваль, Банк Південний, Полтава-Банк, Crédit Agricole, Банк Хрещатик, Приват, УкрЕксімБанк, KredoBank, Індустріалбанк, Проминвестбанк, Банк Форум, Надра Банк, Брокбізнесбанк, Експрес-Банк, Сбербанк России, Raiffeisen Bank Aval, Universal Bank, партнер Укрсиббанку, Мегабанк, Приват-Банк, Севастопольский морской банк, АБ РОССИЯ, Raiffeisen Bank, Укрінбанк, UniCredit, Privat Bank, КредоБанк, Сбербанк, ГЕНБАНК, АБ "УКРГАЗБАНК", АБ Россия (ограниченный доступ), ЦРБ, Експрес Банк, Индустриалбанк, Правекс Банк, УкрСоцБанк, Банк Січ, РайфайзенБанк Аваль, Райфайзен банк, ощадбанк, рнкб, приват банк, Raiffeisen, УкрГазБанк, Креді Агріколь Банк, Райфайзен, Фінанси і кредит, PromInvestBank, VAB, Банк «КЛІРИНГОВИЙ ДІМ», UniCreditBank, Kredobank, ВТБ Банк, УкрСіббанк, Південний, Пумб, OTP Bank, Экспресс-банк, Ukrsibbank, Euronet партнер Укрсиббанку, Таскомбанк, Unicredit Bank, Ощад, Райффайзен, Oschadbank, VAB Банк, Надрабанк, Эксимбанк, Брокбизнесбанк, КрайИнвестБанк, Пивденный, Aval, Укрпромбанк, Індекс Банк, Marfinbank, Альфа-банк, ВТБ, АТМ, ПРИВАТБАНК, Банк Аккордбанк, Marfin Bank, Сбербанк Росії, Райфайзен банк АВАЛЬ, Банк Кредит Дніпро, Unex Bank, Unicredit, АТ Ощадбанк, ProCredit Bank, Индустриал банк, ПриваБанк, Приват банкомат, Банк РОССИИ, Райффайзен банк аваль, Правекс-банк, Райффайзен банк, Oshchadbank, Терминал Приватбанк, АкордБанк, UkrEximBank, Рублев, UKR Exim Bank, Центральный Республиканский Банк, Банк ЧБРР, црб, Экспресс-Банк, 'Ощадбанк, ПАТ', Приват-банк, Альфа Банк, РНКБ Банк (ПАО), MTB Bank, Exim-банк, UKRSIBBANK, Термінал, ГосБанк] chargingStationOperators: [Одеська міська рада, АвтоЭнтерпрайз, ЕлектроДрайв, Autoenterprise, AutoEnterprise, '"Перша національна мережа електрозаправних комплексів ""Тока"""', Yasno, ElectroUA, Автоэнтерпрайз, Автоентерпрайз, Silver Fox Energy, Electro UA, AutoEnterprise 201, АвтоЕнтерпрайз, Tesla Club Ukraine, Go To-U, AutoVolt] clothesContainerOperators: [Емаус-Оселя] -isAdvisorySpeedLimitKnown: true -isLivingStreetKnown: true -isSlowZoneKnown: true +hasAdvisorySpeedLimitSign: true +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +hasSlowZone: true +livingStreetSignStyle: portrait mobileCountryCode: 255 officialLanguages: [uk, ru] orchardProduces: [tomato, apple, grape, plum, chilli_pepper, sweet_pepper, cherry, pear, walnut, apricot, strawberry, raspberry, peach, blueberry, hop, cranberry] diff --git a/app/src/main/assets/country_metadata/UG.yml b/app/src/main/assets/country_metadata/UG.yml index f161866d78..17db45c746 100644 --- a/app/src/main/assets/country_metadata/UG.yml +++ b/app/src/main/assets/country_metadata/UG.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Stanbic Bank Uganda, Centenary Rural Development Bank, Stanbic Bank, Crane Bank, Barclays Bank of Uganda, DFCU Bank, Diamond Trust Bank Uganda, Orient Bank, Tropical Bank, Centenary Bank, Standard Chartered Bank, Equity Bank Uganda, Barclays, Housing Finance Bank, Ecobank Uganda, Bank of Baroda, Finance Trust Bank, DFCU, Bank of Africa-Uganda, KCB Bank Uganda, Stanbic, Equity Bank, dfcu Bank, Cairo International Bank, Crane Bank Ltd., United Bank for Africa, Ecobank, Pride Microfinance, Postbank, Opportunity Bank, Barclays Bank, NC Bank Uganda, Guaranty Trust Bank, FINCA Uganda, Post Bank Uganda, centenary, Equity bank] -centerLine: yellow +centerLineStyle: yellow isLeftHandTraffic: true mobileCountryCode: 641 officialLanguages: [sw, en] diff --git a/app/src/main/assets/country_metadata/US.yml b/app/src/main/assets/country_metadata/US.yml index 58e3005a63..199967e34d 100644 --- a/app/src/main/assets/country_metadata/US.yml +++ b/app/src/main/assets/country_metadata/US.yml @@ -1,11 +1,16 @@ # Do not edit. Source files are in /res/country_metadata +advisorySpeedLimitSignStyle: yellow atmOperators: [Bank of America, Wells Fargo, Chase, PNC Bank, US Bank, U.S. Bank, Citibank, Fifth Third Bank, KeyBank, BB&T, Banco Popular, TD Bank, BECU, Citizens Bank, Publix, Athena Bitcoin Inc., M&T Bank, Chase Bank, First Bank, SunTrust, PNC, MSUFCU, Commerce Bank, First National Bank, Allpoint, Cash Points, Bank of the West, Regions Bank, Bank Of America, Cardtronics, Black Frog, BMO Harris Bank, Capital One, Huntington Bank, Union Bank, Wells Fargo Bank, Wells Fargo ATM, Santander, Huntington, State Employees' Credit Union, Partners Credit Union, First Hawaiian Bank, iTHINK Financial, First Citizens Bank, Navy Federal Credit Union, Pinnacle Bank, Regions, USAA, TCF Bank, MetaBank, ATM, Bitcoin of America, Rockitcoin, CEFCU, BBVA Compass, ANZ Guam, United Community Bank, Bank of Hawaii, Umpqua Bank, Columbia Bank, Cardtronics ATM, Associated Bank, Synovus, California Coast Credit Union, Arvest Bank, Great Western Bank, State Employee's Credit Union, San Diego County Credit Union, Access to Money, CU Anytime, Key Bank, SunTrust Bank, Local Government Federal Credit Union, OnPoint, Bank of Washington, CashPoints® ATM, LibertyX Bitcoin ATM, Wachovia, Swipe, Travelex, UW Credit Union, Suntrust, Cash Points ATM, 7-Eleven, Banner Bank, State Employees Credit Union, State Employee's Credit Union (ATM), Coin Cloud, Scotiabank, Kansas State Bank, ESL, Pioneer Bank, Alaska USA Federal Credit Union, Chase ATM, Comerica Bank, First National Bank of Omaha, Triton, AmeriCU Credit Union, Webster Bank, First Republic Bank, Great Southern Bank, Academy Bank, Capitol One, Founders Federal Credit Union, Heritage Bank, HomeStreet Bank, Athena Bitcoin ATM, Palmetto Citizens Federal Credit Union ATM, WesBanco, Valley Bank ATM, Venco, Michigan State Federal Credit Union, Eastern Bank, MSU Federal Credit Union, First Midwest Bank, California Bank & Trust, South Carolina Federal Credit Union, IBC Bank, First Financial Bank, Centennial Bank, Premier Bank, Washington Federal, Liberty Bank, Busey Bank, First State Bank, UMB Bank, Nautilus Hyosung, CapitolOne, Diebold Nixdorf, Bank of Springfield, Community First Credit Union, AlaskaUSA Federal Credit Union, Vermont Federal Credit Union, Randolph Brooks Federal Credit Union, Hancock Whitney, Citizen's Bank, Bay Federal Credit Union, USE Credit Union, AlaskaUSA, Associated Credit Union, Sovereign Bank, PenFed Credit Union, TCF, Golden 1 Credit Union, Michigan State University Federal Credit Union, Mission Federal Credit Union, M&T, First School, City National Bank, ESL Federal Credit Union, Florence Savings Bank, Comerica, Think Bank, Boeing Employees Credit Union, San Mateo Credit Union, Zions Bank, Homestreet Bank, State Employees Credit Union (ATM), Walmart, Provident Credit Union, Charter One, Arvest, First Bank & Trust, Dacotah Bank, Suncoast Credit Union, Delta Community Credit Union, NBT Bank, Seattle Metropolitan Credit Union, Popular, Oriental, American National Bank, Ameris Bank, Community Bank of the South, East West Bank, Worldwide, Bank of the Southwest, Bank of Colorado, Bremer Bank, Horizon Bank, Hantle, Tampa Bay Federal Credit Union, iQ Credit Union, Bank Independent, University Federal Credit Union, BMO Harris, First Community Credit Union, The Huntington National Bank, Michigan Tech Employees Federal Credit Union, BBVA Compass Bank, Bank of America ATM, United Bank of Union, Bank of Sullivan, Western Union, 'ATM Network, Inc.', Citibank ATM, Cashpoints, CardTronics, SchoolsFirst, WSECU, Citizens National Bank, State Employees' Credit Union (ATM), VyStar, State Employee Credit Union (ATM), CVS, ATM (Wells Fargo Bank), North Shore Bank, PNC Bank ATM, Bitcoin Depot ATM, Visions Federal Credit Union, citibank, City ATM, Cypress Advantage, Well's Fargo, JP Morgan Chase, Cornerstone Bank, PSECU, Partners Federal Credit Union, M & T Bank, First Niagara Bank, Webster, UMB, Bank of Oklahoma, AZ Federal Credit Union, First Niagara, WSFS, Credit Union of Colorado, Suntrust Bank, Town Bank, First Security Bank, Digital Credit Union, Public Service Credit Union, Bank of Texas, Jersey Shore State Bank, Eastman Credit Union, Johns Hopkins Federal Credit Union, United Bank, usbank, CitiBank, Univest, Penn Community Bank, Mountain America Credit Union, Home Federal, Nusenda Credit Union, Leonardville State Bank, Village Pointe, Bank of New Hampshire, Presto!, Peoples Bank, WECU, Bank Midwest, Caltech Employees Federal Credit Union, First American Bank, Exchange Bank, Washington State Employees Credit Union, Kennebec Savings Bank, Fidelity Bank, First National Bank of Northern California, Triangle Credit Union, University of Colorado Colorado Springs, Ent Credit Union, Fifth Third, Valley National Bank, Banterra Bank, Morton Community Bank, 5/3, SECU, CorTrust Bank, Home Federal Bank, First Dakota National Bank, CashPoints, Old Second Bank, Farmers & Merchants State Bank, Cal-Ed Federal Credit Union, Security First Bank, Elevations Credit Union, Busey, Veridian Credit Union, Well Fargo, Wells Fargo (Perm. Closed), Kitsap Credit Union, Bank of North Georgia, LGE Community Credit Union, Capital Bank, Community Resource Bank, Sun Trust, BMO, Southern Mississippi Federal Credit Union, TD, Coinucopia.io, Patelco Credit Union, Alliant Credit Union, Fort Campbell Federal Credit Union, FNBT, Sunflower Bank, XBTeller, Canandaigua National Bank & Trust, Glass City Federal Credit Union, Purdue Federal Credit Union, Riverview Community Bank, NC State Employees Credit Union, First Tech Federal Credit Union, First Commonwealth Bank, United Bank & Trust, Citizens State Bank, Oregon Community Credit Union | OCCU, Columbia Credit Union, 'Payment Alliance International, Inc.', INB, Bank Iowa, Oriental Bank, First Financial Northwest Bank, Ohio University Credit Union, Truist, Opus Bank, Happy State Bank, Mainstreet Credit Union, Bitcoin ATM, WestAmerica Bank, Affinity, Community Banks of Colorado, Banco Popular de Puerto Rico, First National Santa Fe, Bank of Franklin County, Bmo, Reliance Bank, TFCU, North Carolina State Employees' Credit Union, InRoads Credit Union, Premier, Credit Union of Georgia, Seattle Credit Union, EcoATM, Frost Bank, ecoATM, Hills Bank and Trust Company, Sidney Federal Credit Union, Beacon Credit Union, BECU (Burien Plaza), HSBC, ATM Express, Blue Eagle Credit Union, Express Mart, Valley National Bank ATM, Santander Bank ATM, ATM (TD Bank), NC State Employees' Credit Union, wells fargo, Canvas Credit Union, Heartland State Bank, Tri Counties Bank, The First, First Commonweaith, Guadalupe Credit Union, Trustco Bank, Stanford Federal Credit Union, Century Bank, U.S. Bank ATM, LANB, Freedom Federal Credit Union, Altra Federal Credit Union, First-Knox National Bank, Xplore, Genmega, 1st Source Bank, Terre Haute Savings Bank, Cash Points (ATM), Bank OZK, Northwest Bank, Red Canoe, Broadway Bank, Educators Credit Union, ChaseBank, Centra Credit Union, AllPoint, Richton Bank & Trust Company] -centerLine: yellow -isAdvisorySpeedLimitKnown: true -isCenterLeftTurnLaneKnown: true -isSlowZoneKnown: false +centerLineStyle: yellow +hasAdvisorySpeedLimitSign: true +hasCenterLeftTurnLane: true +hasNoStandingSign: true +hasSlowZone: false lengthUnits: [foot and inch] mobileCountryCode: 310 +noParkingSignStyle: mutcd text +noStandingSignStyle: mutcd text standing +noStoppingSignStyle: mutcd text officialLanguages: [en] orchardProduces: [tomato, grape, apple, orange, strawberry, almond, peach, lemon, lime, grapefruit, pear, walnut, cranberry, plum, pistachio, blueberry] popularReligions: [christian, jewish] diff --git a/app/src/main/assets/country_metadata/UY.yml b/app/src/main/assets/country_metadata/UY.yml index 3bef8a658d..064864ed51 100644 --- a/app/src/main/assets/country_metadata/UY.yml +++ b/app/src/main/assets/country_metadata/UY.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco República, BROU, Santander, Itaú, Banred, BBVA, Devoto Pando, Scotiabank, Casa de Cambio, RedBROU, RedBrou] -centerLine: yellow +centerLineStyle: yellow chargingStationOperators: [UTE] mobileCountryCode: 748 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es] orchardProduces: [orange, grape, apple, lemon, lime, tomato, chilli_pepper, sweet_pepper, peach, pear, olive, plum, grapefruit] diff --git a/app/src/main/assets/country_metadata/UZ.yml b/app/src/main/assets/country_metadata/UZ.yml index ce2facb990..1df84fdfbb 100644 --- a/app/src/main/assets/country_metadata/UZ.yml +++ b/app/src/main/assets/country_metadata/UZ.yml @@ -1,5 +1,6 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Hamkorbank, Kapitalbank, Asia Alliance Bank, UZCARD;HUMO, Kapital Bank, UZCARD;HUMO - HAMKORBANK, Xalq banki, Agrobank, Xalq Bank, NBU, Агробанк, Xalqbanki, SQB, Хамкор Банк, ипотека банк, Milliy bank, Mikrokreditbank, Ipak yo`li bank, Kapital24, OFB, Orient Finans Bank, Asaka Bank, капитал банк, Халк Банки, ипак йули банк, турон банк, Kapital Bank (VISA), банк, UZCARD;HUMO - ALOQA BANK, UZCARD;HUMO - MILLIY BANK, Turon bank, Transbank, InfinBANK, QISHLOQQURILISHBANK, HUMO] +hasDailyAlternateSideParkingSign: true mobileCountryCode: 434 officialLanguages: [uz, ru] orchardProduces: [tomato, grape, apple, apricot, peach, cherry, plum, pear, persimmon, walnut, almond, strawberry, chilli_pepper, sweet_pepper, fig, hazelnut] diff --git a/app/src/main/assets/country_metadata/VE.yml b/app/src/main/assets/country_metadata/VE.yml index d9e123de1e..c7f2e5936e 100644 --- a/app/src/main/assets/country_metadata/VE.yml +++ b/app/src/main/assets/country_metadata/VE.yml @@ -1,7 +1,9 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Mercantil, Banco Mercantil, Banco de Venezuela, Banco Mercantil (Solo Personal), Provincial, Sofitasa, Banco del Tesoro (Solo Personal), Banco del Tesoro, Banesco, Bicentenario, Banco Provincial, Banco Exterior, Banco Bicentenario del Pueblo, BOD] -centerLine: white +centerLineStyle: white mobileCountryCode: 734 +noParkingSignStyle: mutcd latin +noStoppingSignStyle: mutcd latin officialLanguages: [es] orchardProduces: [pineapple, banana, papaya, tomato, orange, guava, mango, mangosteen, coconut, avocado, chilli_pepper, sweet_pepper, lemon, lime, peach, coffee, strawberry, cacao, grape] popularSports: [baseball] diff --git a/app/src/main/assets/country_metadata/VN.yml b/app/src/main/assets/country_metadata/VN.yml index 1f1bc4ae02..c88d1a8353 100644 --- a/app/src/main/assets/country_metadata/VN.yml +++ b/app/src/main/assets/country_metadata/VN.yml @@ -1,6 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Vietcombank, BIDV, Agribank, Agribank - ATM, Techcombank - ATM, Techcombank, Saigon Bank - ATM, Sacombank, Vietcombank - ATM, Vietinbank - ATM, Vietinbank, BIDV - ATM, ACB, Dong A - ATM, SHB, Saigon Bank, VietinBank, SHB - ATM, BIDV - Pos, Eab - ATM, HSBC, Dongabank - ATM, BIDV - May Pos - ATM, BIDV - Pos - ATM, DongA Bank, Dongabank, Southerbank - ATM, SCB - ATM, HSBC - ATM, Eximbank, Eximbank - ATM, Eab, Sacombank - ATM, ANZ, VIB, MB Bank, Military Bank - ATM, ACB - ATM, Vpbank - ATM, VPBank, Techcom Bank, Ngân hàng TMCP Đông Á, MB, SeABank, VP Bank, Habubank - ATM, ANZ - ATM, Military Bank, OCB - ATM, MB - ATM, MHB Bank - ATM, Vietin Bank, Vietcom Bank, Bidv, SeA Bank, Militarybank - ATM, VietcomBank, bidv, Maritime Bank, Habubank, MHB - ATM, Msb - ATM, Navibank - ATM, Abbank - ATM, Vietbank, Techombank, Chùa Thiên Tường, AgriBank, MSB, BitcoinVN, Nasbank - ATM, VIB - ATM, PG Bank, Bank for Investment and Development of Vietnam, Viettinbank, Dong A Bank, agribank, DongA, SeABank ATM, SCB, Vietinbank - Atm, ATM Agribank, VCB, Vietcombank - Atm, Vpb - ATM, Anz - Atm, Seabank - ATM, Southern Bank - ATM, Vpbank - Atm, Donga Bank - ATM, Vietcombank -Atm, Vibank - ATM, Đông Á, East Asia, Việt Á Bank, Southern Bank, Indovina Bank, TechcomBank, Asia Commercial Bank, TCB, TP Bank, MB Bank - ATM w/out fee, sacombank, Mb Bank, vietinbank, BDIV, cơ quan 2, gpco, Abc, Kfc gò vấp, cơ quan, cty cát vàng, sumimoto, sen viet, 1343 tl8, ms sctv, ms vong xoay hm, golden HT, AGRI, ACB Bank, LienVietPostBank, ATM, MB Bank ATM, OCB, techcom, quan tri vien, SCB Saigon Commercial Bank, Donga Bank] -centerLine: white +centerLineStyle: white +hasDailyAlternateSideParkingSign: true mobileCountryCode: 452 officialLanguages: [vi] orchardProduces: [banana, coffee, coconut, rubber, cashew_nut, guava, mango, mangosteen, orange, pineapple, grapefruit, tea, pepper, chilli_pepper, sweet_pepper, grape] diff --git a/app/src/main/assets/country_metadata/XK.yml b/app/src/main/assets/country_metadata/XK.yml index 462defc64a..b8870bcb6b 100644 --- a/app/src/main/assets/country_metadata/XK.yml +++ b/app/src/main/assets/country_metadata/XK.yml @@ -1,5 +1,8 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [TEB, Raiffeisen Bank, NLB Banka, BKT, TEB Bank, NLB, Pcb, BPB, ProCredit Bank, Banka Ekonomike] +hasDailyAlternateSideParkingSign: true +hasLivingStreet: true +livingStreetSignStyle: wide mobileCountryCode: 221 officialLanguages: [sq, sr] popularReligions: [muslim] diff --git a/app/src/main/assets/country_metadata/ZA.yml b/app/src/main/assets/country_metadata/ZA.yml index 8e653c1730..c557cde070 100644 --- a/app/src/main/assets/country_metadata/ZA.yml +++ b/app/src/main/assets/country_metadata/ZA.yml @@ -1,10 +1,13 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [ABSA, Standard Bank, FNB, Nedbank, First National Bank, Capitec, Absa, Standard, Standard bank, ABSA Atm, Standard Bank ATM, nedbank, Absa Bank, NEDBANK, STANDARD BANK, Capitec Bank, NedBank, Netbank, Nedbank ATM, Stanbic Bank] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 655 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, zu, xh, af, st, tn, nso, ts] orchardProduces: [grape, orange, apple, tomato, pear, lemon, lime, banana, grapefruit, peach, pineapple, plum, guava, mango, mangosteen, avocado, apricot, chilli_pepper, sweet_pepper] popularSports: [tennis, soccer, bowls, basketball, golf, cricket, netball, field_hockey, rugby] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/ZM.yml b/app/src/main/assets/country_metadata/ZM.yml index 6f6e4823e8..7670650621 100644 --- a/app/src/main/assets/country_metadata/ZM.yml +++ b/app/src/main/assets/country_metadata/ZM.yml @@ -1,10 +1,13 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [FNB, Zanaco, Absa Bank, Stanbic Bank, Ecobank, Stanbic, Barclay's] -centerLine: white +centerLineStyle: white +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 645 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, bem, ny] orchardProduces: [tomato, coffee, orange, tea, banana, chilli_pepper, sweet_pepper, pepper] popularSports: [soccer, tennis, cricket] -shoulderLine: yellow +shoulderLineStyle: yellow diff --git a/app/src/main/assets/country_metadata/ZW.yml b/app/src/main/assets/country_metadata/ZW.yml index fbb829ecf0..b3f6406ae6 100644 --- a/app/src/main/assets/country_metadata/ZW.yml +++ b/app/src/main/assets/country_metadata/ZW.yml @@ -1,6 +1,9 @@ # Do not edit. Source files are in /res/country_metadata +hasLivingStreet: true isLeftHandTraffic: true -isLivingStreetKnown: true +livingStreetSignStyle: sadc mobileCountryCode: 648 +noParkingSignStyle: sadc +noStoppingSignStyle: sadc officialLanguages: [en, sn, nd] orchardProduces: [banana, tomato, tea, lemon, lime, orange, grapefruit, apple, grape, pepper, guava, mango, mangosteen, avocado, peach, coffee, plum, strawberry] diff --git a/app/src/main/assets/country_metadata/default.yml b/app/src/main/assets/country_metadata/default.yml index 7a1c75247b..cb387ba12c 100644 --- a/app/src/main/assets/country_metadata/default.yml +++ b/app/src/main/assets/country_metadata/default.yml @@ -1,20 +1,26 @@ # Do not edit. Source files are in /res/country_metadata -centerLine: white +advisorySpeedLimitSignStyle: blue +centerLineStyle: white firstDayOfWorkweek: Mo -isAdvisorySpeedLimitKnown: false -isCenterLeftTurnLaneKnown: false +hasAdvisorySpeedLimitSign: false +hasBiWeeklyAlternateSideParkingSign: false +hasCenterLeftTurnLane: false +hasDailyAlternateSideParkingSign: false +hasLivingStreet: false +hasNoStandingSign: false +hasSlowZone: false isLeftHandTraffic: false -isLivingStreetKnown: false -isSlowZoneKnown: false -isUsuallyAnyGlassRecycleableInContainers: false +isUsuallyAnyGlassRecyclableInContainers: false lengthUnits: [meter] +noParkingSignStyle: vienna +noStoppingSignStyle: vienna officialLanguages: [en] orchardProduces: [] popularReligions: [] popularSports: [] regularShoppingDays: 6 roofsAreUsuallyFlat: false -shoulderLine: white +shoulderLineStyle: white speedUnits: [kilometers per hour] weightLimitUnits: [ton] workweekDays: 5 diff --git a/res/country_metadata/hasBiWeeklyAlternateSideParkingSign.yml b/res/country_metadata/hasBiWeeklyAlternateSideParkingSign.yml index a17be3e739..f28c27ac0c 100644 --- a/res/country_metadata/hasBiWeeklyAlternateSideParkingSign.yml +++ b/res/country_metadata/hasBiWeeklyAlternateSideParkingSign.yml @@ -1,13 +1,13 @@ # Whether signs for alternate-side-parking (bi-weekly - first/last half of month) exist -# +# # sources: # - subpages of https://en.wikipedia.org/wiki/Template:Traffic_signs and linked sources # - https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_by_country # - mapillary -# +# default: false BE: true # https://nl.wikipedia.org/wiki/Beurtelings_parkeren ES: true # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Spain FR: true # https://fr.wikipedia.org/wiki/Panneau_de_signalisation_d'un_stationnement_interdit_ou_réglementé_en_France KH: true # https://en.wikipedia.org/wiki/Road_signs_in_Cambodia -LX: true # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Luxembourg +LU: true # https://commons.wikimedia.org/wiki/Category:Diagrams_of_prohibitory_road_signs_of_Luxembourg From e336bbdda947558bd1dce773682bed670564c6e4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Nov 2021 20:44:04 +0100 Subject: [PATCH 12/20] remove some mcc magic, use country metadata instead --- .../streetcomplete/ktx/CountryInfo.kt | 6 +- .../foot/AddProhibitedForPedestriansForm.kt | 6 +- .../quests/max_speed/AddMaxSpeedForm.kt | 36 +++---- .../res/drawable-mcc208/ic_living_street.xml | 4 - .../res/drawable-mcc250/ic_living_street.xml | 4 - .../res/drawable-mcc255/ic_living_street.xml | 4 - .../res/drawable-mcc257/ic_living_street.xml | 4 - .../res/drawable-mcc268/ic_living_street.xml | 4 - .../res/drawable-mcc283/ic_living_street.xml | 4 - .../res/drawable-mcc400/ic_living_street.xml | 4 - .../res/drawable-mcc401/ic_living_street.xml | 4 - .../res/drawable-mcc428/ic_living_street.xml | 4 - .../res/drawable-mcc437/ic_living_street.xml | 4 - .../res/drawable-mcc505/ic_living_street.xml | 4 - .../res/drawable-mcc530/ic_living_street.xml | 4 - .../res/drawable-mcc617/ic_living_street.xml | 4 - .../res/drawable-mcc630/ic_living_street.xml | 4 - .../res/drawable-mcc631/ic_living_street.xml | 4 - .../res/drawable-mcc633/ic_living_street.xml | 4 - .../res/drawable-mcc640/ic_living_street.xml | 4 - .../res/drawable-mcc643/ic_living_street.xml | 4 - .../res/drawable-mcc645/ic_living_street.xml | 4 - .../res/drawable-mcc646/ic_living_street.xml | 4 - .../res/drawable-mcc648/ic_living_street.xml | 4 - .../res/drawable-mcc649/ic_living_street.xml | 4 - .../res/drawable-mcc650/ic_living_street.xml | 4 - .../res/drawable-mcc651/ic_living_street.xml | 4 - .../res/drawable-mcc652/ic_living_street.xml | 4 - .../res/drawable-mcc653/ic_living_street.xml | 4 - .../res/drawable-mcc654/ic_living_street.xml | 4 - .../res/drawable-mcc655/ic_living_street.xml | 4 - ...square.xml => ic_living_street_france.xml} | 0 .../res/drawable/ic_living_street_mexico.xml | 38 +++----- ...rtrait.xml => ic_living_street_russia.xml} | 0 .../layout-mcc234/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc242/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc302/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc310/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc440/quest_maxspeed_advisory.xml | 11 --- .../layout-mcc450/quest_maxspeed_advisory.xml | 10 -- .../layout-mcc460/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc505/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc515/quest_maxspeed_advisory.xml | 9 -- .../layout-mcc530/quest_maxspeed_advisory.xml | 9 -- ... => dialog_living_street_confirmation.xml} | 6 +- .../res/layout/quest_maxspeed_advisory.xml | 9 -- .../layout/quest_maxspeed_advisory_blue.xml | 1 + .../layout/quest_maxspeed_advisory_white.xml | 8 +- .../layout/quest_maxspeed_advisory_yellow.xml | 7 +- .../quest_maxspeed_living_street_sign.xml | 6 +- .../livingStreetSignStyle.yml | 96 +++++++++---------- .../{wide.svg => default.svg} | 0 .../{square.svg => france.svg} | 0 53 files changed, 104 insertions(+), 320 deletions(-) delete mode 100644 app/src/main/res/drawable-mcc208/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc250/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc255/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc257/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc268/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc283/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc400/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc401/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc428/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc437/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc505/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc530/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc617/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc630/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc631/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc633/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc640/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc643/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc645/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc646/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc648/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc649/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc650/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc651/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc652/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc653/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc654/ic_living_street.xml delete mode 100644 app/src/main/res/drawable-mcc655/ic_living_street.xml rename app/src/main/res/drawable/{ic_living_street_square.xml => ic_living_street_france.xml} (100%) rename app/src/main/res/drawable/{ic_living_street_portrait.xml => ic_living_street_russia.xml} (100%) delete mode 100644 app/src/main/res/layout-mcc234/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc242/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc302/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc310/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc440/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc450/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc460/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc505/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc515/quest_maxspeed_advisory.xml delete mode 100644 app/src/main/res/layout-mcc530/quest_maxspeed_advisory.xml rename app/src/main/res/layout/{quest_maxspeed_living_street_confirmation.xml => dialog_living_street_confirmation.xml} (70%) delete mode 100644 app/src/main/res/layout/quest_maxspeed_advisory.xml rename res/graphics/living street graphics/{wide.svg => default.svg} (100%) rename res/graphics/living street graphics/{square.svg => france.svg} (100%) diff --git a/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt b/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt index 89f12b47f9..2c51354974 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/ktx/CountryInfo.kt @@ -11,10 +11,10 @@ val CountryInfo.advisorySpeedLimitSignLayoutResId: Int? get() = when(advisorySpe } val CountryInfo.livingStreetSignDrawableResId: Int? get() = when(livingStreetSignStyle) { - "wide" -> R.drawable.ic_living_street - "portrait" -> R.drawable.ic_living_street_portrait - "square" -> R.drawable.ic_living_street_square + "vienna" -> R.drawable.ic_living_street "sadc" -> R.drawable.ic_living_street_sadc + "russia" -> R.drawable.ic_living_street_russia + "france" -> R.drawable.ic_living_street_france "australia" -> R.drawable.ic_living_street_australia "mexico" -> R.drawable.ic_living_street_mexico else -> null diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansForm.kt index 92f70d687b..11347a1d68 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansForm.kt @@ -2,6 +2,8 @@ package de.westnordost.streetcomplete.quests.foot import androidx.appcompat.app.AlertDialog import de.westnordost.streetcomplete.R +import de.westnordost.streetcomplete.databinding.DialogLivingStreetConfirmationBinding +import de.westnordost.streetcomplete.ktx.livingStreetSignDrawableResId import de.westnordost.streetcomplete.quests.AbstractQuestAnswerFragment import de.westnordost.streetcomplete.quests.AnswerItem import de.westnordost.streetcomplete.quests.foot.ProhibitedForPedestriansAnswer.* @@ -29,8 +31,10 @@ class AddProhibitedForPedestriansForm : AbstractQuestAnswerFragment applyAnswer(IS_LIVING_STREET) } .setNegativeButton(R.string.quest_generic_confirmation_no, null) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index b7d21be83b..ce8d2013f5 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -3,18 +3,16 @@ package de.westnordost.streetcomplete.quests.max_speed import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo -import android.widget.ArrayAdapter -import android.widget.EditText -import android.widget.FrameLayout -import android.widget.Spinner +import android.widget.* import androidx.annotation.IdRes import androidx.appcompat.app.AlertDialog import androidx.core.view.children import androidx.core.view.isGone -import com.google.android.material.textview.MaterialTextView import de.westnordost.streetcomplete.R import de.westnordost.streetcomplete.databinding.QuestMaxspeedBinding import de.westnordost.streetcomplete.databinding.QuestMaxspeedNoSignNoSlowZoneConfirmationBinding +import de.westnordost.streetcomplete.ktx.advisorySpeedLimitSignLayoutResId +import de.westnordost.streetcomplete.ktx.livingStreetSignDrawableResId import de.westnordost.streetcomplete.ktx.numberOrNull import de.westnordost.streetcomplete.ktx.showKeyboard import de.westnordost.streetcomplete.quests.AbstractQuestFormAnswerFragment @@ -95,12 +93,7 @@ class AddMaxSpeedForm : AbstractQuestFormAnswerFragment() { binding.rightSideContainer.removeAllViews() speedType?.layoutResId?.let { layoutInflater.inflate(it, binding.rightSideContainer, true) } - if(speedType == ZONE) { - enableAppropriateLabelsForSlowZone(binding.rightSideContainer) - } - speedInput = binding.rightSideContainer.findViewById(R.id.maxSpeedInput) - speedInput?.addTextChangedListener(TextChangedWatcher { checkIsFormComplete() }) speedUnitSelect = binding.rightSideContainer.findViewById(R.id.speedUnitSelect) @@ -108,6 +101,18 @@ class AddMaxSpeedForm : AbstractQuestFormAnswerFragment() { speedUnitSelect?.adapter = ArrayAdapter(requireContext(), R.layout.spinner_item_centered, speedUnits) speedUnitSelect?.setSelection(0) + when(speedType) { + ZONE -> { + enableAppropriateLabelsForSlowZone(binding.rightSideContainer) + } + LIVING_STREET -> { + val drawableResId = countryInfo.livingStreetSignDrawableResId + val livingStreetImageView = binding.rightSideContainer.findViewById(R.id.livingStreetImage) + if (drawableResId != null) livingStreetImageView.setImageResource(drawableResId) + } + } + + if (speedType == ZONE && LAST_INPUT_SLOW_ZONE != null) { speedInput?.setText(LAST_INPUT_SLOW_ZONE.toString()) } else { @@ -129,14 +134,9 @@ class AddMaxSpeedForm : AbstractQuestFormAnswerFragment() { private fun enableAppropriateLabelsForSlowZone(layoutWithSign: FrameLayout) { val position = countryInfo.slowZoneLabelPosition - val text = countryInfo.slowZoneLabelText - - // no label - if (text == null) { - return - } + val text = countryInfo.slowZoneLabelText ?: return - val label: MaterialTextView = layoutWithSign.findViewById(when (position) { + val label = layoutWithSign.findViewById(when (position) { "bottom" -> R.id.slowZoneLabelBottom "top" -> R.id.slowZoneLabelTop else -> return // should never happen @@ -150,7 +150,7 @@ class AddMaxSpeedForm : AbstractQuestFormAnswerFragment() { ZONE -> R.layout.quest_maxspeed_zone_sign LIVING_STREET -> R.layout.quest_maxspeed_living_street_sign NSL -> R.layout.quest_maxspeed_national_speed_limit_sign - ADVISORY -> R.layout.quest_maxspeed_advisory + ADVISORY -> countryInfo.advisorySpeedLimitSignLayoutResId ?: R.layout.quest_maxspeed_advisory_blue else -> null } diff --git a/app/src/main/res/drawable-mcc208/ic_living_street.xml b/app/src/main/res/drawable-mcc208/ic_living_street.xml deleted file mode 100644 index 84741e1c5e..0000000000 --- a/app/src/main/res/drawable-mcc208/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc250/ic_living_street.xml b/app/src/main/res/drawable-mcc250/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc250/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc255/ic_living_street.xml b/app/src/main/res/drawable-mcc255/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc255/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc257/ic_living_street.xml b/app/src/main/res/drawable-mcc257/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc257/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc268/ic_living_street.xml b/app/src/main/res/drawable-mcc268/ic_living_street.xml deleted file mode 100644 index 84741e1c5e..0000000000 --- a/app/src/main/res/drawable-mcc268/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc283/ic_living_street.xml b/app/src/main/res/drawable-mcc283/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc283/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc400/ic_living_street.xml b/app/src/main/res/drawable-mcc400/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc400/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc401/ic_living_street.xml b/app/src/main/res/drawable-mcc401/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc401/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc428/ic_living_street.xml b/app/src/main/res/drawable-mcc428/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc428/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc437/ic_living_street.xml b/app/src/main/res/drawable-mcc437/ic_living_street.xml deleted file mode 100644 index ae4be15cd4..0000000000 --- a/app/src/main/res/drawable-mcc437/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc505/ic_living_street.xml b/app/src/main/res/drawable-mcc505/ic_living_street.xml deleted file mode 100644 index 6715fc8a2a..0000000000 --- a/app/src/main/res/drawable-mcc505/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc530/ic_living_street.xml b/app/src/main/res/drawable-mcc530/ic_living_street.xml deleted file mode 100644 index 6715fc8a2a..0000000000 --- a/app/src/main/res/drawable-mcc530/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc617/ic_living_street.xml b/app/src/main/res/drawable-mcc617/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc617/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc630/ic_living_street.xml b/app/src/main/res/drawable-mcc630/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc630/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc631/ic_living_street.xml b/app/src/main/res/drawable-mcc631/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc631/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc633/ic_living_street.xml b/app/src/main/res/drawable-mcc633/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc633/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc640/ic_living_street.xml b/app/src/main/res/drawable-mcc640/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc640/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc643/ic_living_street.xml b/app/src/main/res/drawable-mcc643/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc643/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc645/ic_living_street.xml b/app/src/main/res/drawable-mcc645/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc645/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc646/ic_living_street.xml b/app/src/main/res/drawable-mcc646/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc646/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc648/ic_living_street.xml b/app/src/main/res/drawable-mcc648/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc648/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc649/ic_living_street.xml b/app/src/main/res/drawable-mcc649/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc649/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc650/ic_living_street.xml b/app/src/main/res/drawable-mcc650/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc650/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc651/ic_living_street.xml b/app/src/main/res/drawable-mcc651/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc651/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc652/ic_living_street.xml b/app/src/main/res/drawable-mcc652/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc652/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc653/ic_living_street.xml b/app/src/main/res/drawable-mcc653/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc653/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc654/ic_living_street.xml b/app/src/main/res/drawable-mcc654/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc654/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-mcc655/ic_living_street.xml b/app/src/main/res/drawable-mcc655/ic_living_street.xml deleted file mode 100644 index fdd5ccdc39..0000000000 --- a/app/src/main/res/drawable-mcc655/ic_living_street.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_living_street_square.xml b/app/src/main/res/drawable/ic_living_street_france.xml similarity index 100% rename from app/src/main/res/drawable/ic_living_street_square.xml rename to app/src/main/res/drawable/ic_living_street_france.xml diff --git a/app/src/main/res/drawable/ic_living_street_mexico.xml b/app/src/main/res/drawable/ic_living_street_mexico.xml index 4308bfac8c..fe4c499de9 100644 --- a/app/src/main/res/drawable/ic_living_street_mexico.xml +++ b/app/src/main/res/drawable/ic_living_street_mexico.xml @@ -5,48 +5,43 @@ android:viewportHeight="26.458"> + android:fillColor="@color/traffic_yellow"/> + android:fillColor="@color/traffic_black"/> + android:fillColor="@color/traffic_yellow"/> + android:strokeColor="@color/traffic_black"/> + android:fillColor="@color/traffic_black" + android:pathData="M8.5166,7.3515m-1.9164,0a1.9164,1.9164 0,1 1,3.8329 0a1.9164,1.9164 0,1 1,-3.8329 0" /> + android:strokeColor="@color/traffic_black"/> @@ -54,24 +49,21 @@ android:pathData="m19.2341,22.7656c0.2186,-1.9671 0.8743,-3.4971 0.8743,-3.7157 0.4371,0.8743 1.7486,1.3114 1.7486,1.3114l1.53,-0.8743" android:strokeLineJoin="round" android:strokeWidth="1.3229167" - android:fillColor="#00000000" - android:strokeColor="#000" + android:strokeColor="@color/traffic_black" android:strokeLineCap="round"/> diff --git a/app/src/main/res/drawable/ic_living_street_portrait.xml b/app/src/main/res/drawable/ic_living_street_russia.xml similarity index 100% rename from app/src/main/res/drawable/ic_living_street_portrait.xml rename to app/src/main/res/drawable/ic_living_street_russia.xml diff --git a/app/src/main/res/layout-mcc234/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc234/quest_maxspeed_advisory.xml deleted file mode 100644 index b497f8acfd..0000000000 --- a/app/src/main/res/layout-mcc234/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc242/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc242/quest_maxspeed_advisory.xml deleted file mode 100644 index b497f8acfd..0000000000 --- a/app/src/main/res/layout-mcc242/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc302/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc302/quest_maxspeed_advisory.xml deleted file mode 100644 index e52c2f5a9b..0000000000 --- a/app/src/main/res/layout-mcc302/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc310/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc310/quest_maxspeed_advisory.xml deleted file mode 100644 index e52c2f5a9b..0000000000 --- a/app/src/main/res/layout-mcc310/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc440/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc440/quest_maxspeed_advisory.xml deleted file mode 100644 index 81ac2c62cd..0000000000 --- a/app/src/main/res/layout-mcc440/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout-mcc450/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc450/quest_maxspeed_advisory.xml deleted file mode 100644 index 4f5e6bdcb4..0000000000 --- a/app/src/main/res/layout-mcc450/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/layout-mcc460/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc460/quest_maxspeed_advisory.xml deleted file mode 100644 index e52c2f5a9b..0000000000 --- a/app/src/main/res/layout-mcc460/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc505/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc505/quest_maxspeed_advisory.xml deleted file mode 100644 index e52c2f5a9b..0000000000 --- a/app/src/main/res/layout-mcc505/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc515/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc515/quest_maxspeed_advisory.xml deleted file mode 100644 index b497f8acfd..0000000000 --- a/app/src/main/res/layout-mcc515/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-mcc530/quest_maxspeed_advisory.xml b/app/src/main/res/layout-mcc530/quest_maxspeed_advisory.xml deleted file mode 100644 index e52c2f5a9b..0000000000 --- a/app/src/main/res/layout-mcc530/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/quest_maxspeed_living_street_confirmation.xml b/app/src/main/res/layout/dialog_living_street_confirmation.xml similarity index 70% rename from app/src/main/res/layout/quest_maxspeed_living_street_confirmation.xml rename to app/src/main/res/layout/dialog_living_street_confirmation.xml index ea833f0360..5c121ab0ee 100644 --- a/app/src/main/res/layout/quest_maxspeed_living_street_confirmation.xml +++ b/app/src/main/res/layout/dialog_living_street_confirmation.xml @@ -1,6 +1,6 @@ - + tools:src="@drawable/ic_living_street"/> diff --git a/app/src/main/res/layout/quest_maxspeed_advisory.xml b/app/src/main/res/layout/quest_maxspeed_advisory.xml deleted file mode 100644 index 4aa17601ff..0000000000 --- a/app/src/main/res/layout/quest_maxspeed_advisory.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/quest_maxspeed_advisory_blue.xml b/app/src/main/res/layout/quest_maxspeed_advisory_blue.xml index 7cf796050b..11e81bff70 100644 --- a/app/src/main/res/layout/quest_maxspeed_advisory_blue.xml +++ b/app/src/main/res/layout/quest_maxspeed_advisory_blue.xml @@ -13,6 +13,7 @@ android:id="@+id/maxSpeedInput" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center" android:background="#0fff" android:textColor="@color/traffic_white" android:inputType="number" diff --git a/app/src/main/res/layout/quest_maxspeed_advisory_white.xml b/app/src/main/res/layout/quest_maxspeed_advisory_white.xml index 165fe2cbf0..eb7089d1ab 100644 --- a/app/src/main/res/layout/quest_maxspeed_advisory_white.xml +++ b/app/src/main/res/layout/quest_maxspeed_advisory_white.xml @@ -6,15 +6,15 @@ android:background="@drawable/background_rectangular_sign_white" android:gravity="center" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> - diff --git a/app/src/main/res/layout/quest_maxspeed_advisory_yellow.xml b/app/src/main/res/layout/quest_maxspeed_advisory_yellow.xml index 1975f7791f..c98e0e0e69 100644 --- a/app/src/main/res/layout/quest_maxspeed_advisory_yellow.xml +++ b/app/src/main/res/layout/quest_maxspeed_advisory_yellow.xml @@ -6,15 +6,15 @@ android:background="@drawable/background_rectangular_sign_yellow" android:gravity="center" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/res/layout/quest_maxspeed_living_street_sign.xml b/app/src/main/res/layout/quest_maxspeed_living_street_sign.xml index 461b573b46..49a8ae6452 100644 --- a/app/src/main/res/layout/quest_maxspeed_living_street_sign.xml +++ b/app/src/main/res/layout/quest_maxspeed_living_street_sign.xml @@ -1,7 +1,7 @@ - + tools:src="@drawable/ic_living_street" /> diff --git a/res/country_metadata/livingStreetSignStyle.yml b/res/country_metadata/livingStreetSignStyle.yml index e96a2f3db2..07c375042b 100644 --- a/res/country_metadata/livingStreetSignStyle.yml +++ b/res/country_metadata/livingStreetSignStyle.yml @@ -7,68 +7,68 @@ # - same as hasLivingStreet # # styles: -# - wide - white on blue, white border, wide/landscape -# - portrait - white on blue, white border, narrow/portrait -# - square - white on blue, white border, square -# - sadc - white on blue, red border, narrow/portrait +# - vienna - white on blue, white border, wide/landscape +# - sadc - same as vienna, only in portrait orientation and with red border +# - russia - same as vienna, only in portrait orientation +# - france - white on blue, white border, square, also shows a cylist # - australia - black "Shared zone" with speed limit sign on white rectangular narrow/portrait with black border -# - mexico - black on yellow, black border, wide/landscape -AL: wide -AM: portrait +# - mexico - same as vienna, but black on yellow +AL: vienna +AM: russia AO: sadc -AT: wide +AT: vienna AU: australia # https://en.wikipedia.org/wiki/Shared_Zone -BA: wide -BE: wide -BG: wide -BW: wide -BY: portrait -CH: wide # https://de.wikipedia.org/wiki/Begegnungszone -CZ: wide -DE: wide -DK: square # https://www.retsinformation.dk/eli/lta/2012/802 -EE: wide -ES: wide -FI: wide -FR: square # https://fr.wikipedia.org/wiki/Zone_de_rencontre -GB: square # https://en.wikipedia.org/wiki/Home_zone -GE: portrait -GR: wide -HR: wide -HU: wide -IS: wide -KZ: portrait -KG: portrait +BA: vienna +BE: vienna +BG: vienna +BW: vienna +BY: russia +CH: vienna # https://de.wikipedia.org/wiki/Begegnungszone +CZ: vienna +DE: vienna +DK: vienna # https://www.retsinformation.dk/eli/lta/2012/802 +EE: vienna +ES: vienna +FI: vienna +FR: france # https://fr.wikipedia.org/wiki/Zone_de_rencontre +GB: vienna # https://en.wikipedia.org/wiki/Home_zone +GE: russia +GR: vienna +HR: vienna +HU: vienna +IS: vienna +KZ: russia +KG: russia LS: sadc -LT: wide -LV: wide -LU: wide -MD: wide -ME: wide +LT: vienna +LV: vienna +LU: vienna +MD: vienna +ME: vienna MG: sadc -MK: wide -MN: portrait +MK: vienna +MN: russia MU: sadc MW: sadc MX: mexico # https://wiki.openstreetmap.org/wiki/File:SP-E17a_Calle_residencial.png MZ: sadc -NL: wide +NL: vienna NA: sadc -'NO': square # https://no.wikipedia.org/wiki/Gatetun +'NO': vienna # https://no.wikipedia.org/wiki/Gatetun NZ: australia -PL: wide -RO: square -RU: portrait # https://ru.wikipedia.org/wiki/Жилая_зона -RS: wide +PL: vienna +RO: vienna +RU: russia # https://ru.wikipedia.org/wiki/Жилая_зона +RS: vienna SC: sadc -SK: wide -SI: wide -SE: wide +SK: vienna +SI: vienna +SE: vienna SZ: sadc -TR: wide +TR: vienna TZ: sadc -UA: portrait -XK: wide +UA: russia +XK: vienna ZA: sadc ZM: sadc ZW: sadc \ No newline at end of file diff --git a/res/graphics/living street graphics/wide.svg b/res/graphics/living street graphics/default.svg similarity index 100% rename from res/graphics/living street graphics/wide.svg rename to res/graphics/living street graphics/default.svg diff --git a/res/graphics/living street graphics/square.svg b/res/graphics/living street graphics/france.svg similarity index 100% rename from res/graphics/living street graphics/square.svg rename to res/graphics/living street graphics/france.svg From 68a583f34270e9269464daf70e454e56059b0dc1 Mon Sep 17 00:00:00 2001 From: Stephen Michel Date: Mon, 29 Nov 2021 14:42:48 -0500 Subject: [PATCH 13/20] Improve readability of location betterThan check - Convert early return back to an if statement and convert comparison to an extension function, for better readability at the call site. - Replace broken link with an archive.org version that works. - Use consistent brace style for the early `if ... return` statements - Rename 'Significantly' to 'Much'. Shorter = easier to parse. - Rename `currentBestLocation` to `previous`, also shorter, and the previous location isn't *necessarily* the previous best, it could be used to compare any two locations. - Remove redundant `return` statement (inside and outside the `when`). --- .../location/FineLocationManager.kt | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt b/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt index 020745f2ce..91a12e511f 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt @@ -35,10 +35,10 @@ class FineLocationManager(context: Context, locationUpdateCallback: (Location) - private val locationListener = object : LocationUpdateListener { override fun onLocationChanged(location: Location) { - if (!isBetterLocation(location, lastLocation)) return - - lastLocation = location - locationUpdateCallback(location) + if (location.isBetterThan(lastLocation)) { + lastLocation = location + locationUpdateCallback(location) + } } } @@ -83,48 +83,42 @@ class FineLocationManager(context: Context, locationUpdateCallback: (Location) - } } -// taken from https://developer.android.com/guide/topics/location/strategies.html#kotlin +// Based on https://web.archive.org/web/20180424190538/https://developer.android.com/guide/topics/location/strategies.html#BestEstimate private const val TWO_MINUTES = 1000L * 60 * 2 -/** Determines whether one Location reading is better than the current Location fix - * @param location The new Location that you want to evaluate - * @param currentBestLocation The current Location fix, to which you want to compare the new one - */ -private fun isBetterLocation(location: Location, currentBestLocation: Location?): Boolean { - // check whether this is a valid location at all. Happened once that lat/lon is NaN, maybe issue - // of that particular device - if (location.longitude.isNaN() || location.latitude.isNaN()) return false - - if (currentBestLocation == null) { - // A new location is always better than no location - return true - } +// Determines whether this Location reading is better than the current Location fix +private fun Location.isBetterThan(previous: Location?): Boolean { + // Check whether this is a valid location at all. + // Happened once that lat/lon is NaN, maybe issue of that particular device + if (this.longitude.isNaN() || this.latitude.isNaN()) return false + + // A new location is always better than no location + if (previous == null) return true // Check whether the new location fix is newer or older - val timeDelta = location.time - currentBestLocation.time - val isSignificantlyNewer = timeDelta > TWO_MINUTES - val isSignificantlyOlder = timeDelta < -TWO_MINUTES + val timeDelta = this.time - previous.time + val isMuchNewer = timeDelta > TWO_MINUTES + val isMuchOlder = timeDelta < -TWO_MINUTES val isNewer = timeDelta > 0L // Check whether the new location fix is more or less accurate - val accuracyDelta = location.accuracy - currentBestLocation.accuracy + val accuracyDelta = this.accuracy - previous.accuracy val isLessAccurate = accuracyDelta > 0f val isMoreAccurate = accuracyDelta < 0f - val isSignificantlyLessAccurate = accuracyDelta > 200f + val isMuchLessAccurate = accuracyDelta > 200f - // Check if the old and new location are from the same provider - val isFromSameProvider = location.provider == currentBestLocation.provider + val isFromSameProvider = this.provider == previous.provider // Determine location quality using a combination of timeliness and accuracy return when { // the user has likely moved - isSignificantlyNewer -> return true + isMuchNewer -> true // If the new location is more than two minutes older, it must be worse - isSignificantlyOlder -> return false + isMuchOlder -> false isMoreAccurate -> true isNewer && !isLessAccurate -> true - isNewer && !isSignificantlyLessAccurate && isFromSameProvider -> true + isNewer && !isMuchLessAccurate && isFromSameProvider -> true else -> false } } From 28d450af004480e77e5c486730889337cb21ba3d Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 30 Nov 2021 12:51:26 +0100 Subject: [PATCH 14/20] refine wording of level quest (#3529) --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9eb9752616..85145f4638 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1103,7 +1103,7 @@ If you are overwhelmed by the number of quests, you can always fine-tune which q This diameter looks implausible. "Are you sure? Sometimes the diameter can be found on the hydrant itself." No - On which level is %s located? + On which level number is %s located? Select language System default From 75e1142b8c3d4afa59fa37561165adb57c973582 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 30 Nov 2021 12:51:34 +0100 Subject: [PATCH 15/20] refine comment --- .../westnordost/streetcomplete/location/FineLocationManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt b/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt index 91a12e511f..8ef3a5338e 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/location/FineLocationManager.kt @@ -87,7 +87,7 @@ class FineLocationManager(context: Context, locationUpdateCallback: (Location) - private const val TWO_MINUTES = 1000L * 60 * 2 -// Determines whether this Location reading is better than the current Location fix +/** Determines whether this Location reading is better than the previous Location fix */ private fun Location.isBetterThan(previous: Location?): Boolean { // Check whether this is a valid location at all. // Happened once that lat/lon is NaN, maybe issue of that particular device From 1ef18915d53bc32c6908d5840da4920fb58110c4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 30 Nov 2021 13:00:07 +0100 Subject: [PATCH 16/20] use different wording for floor and level(fix #3529) --- .../streetcomplete/quests/LocationLabel.kt | 14 +++++++++----- app/src/main/res/values/strings.xml | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt index 97eacf27d6..9c39c6ea8d 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt @@ -13,12 +13,16 @@ fun Resources.getLocationLabelString(tags: Map): CharSequence? { } private fun Resources.getLevelLabelString(tags: Map): CharSequence? { - /* prefer addr:floor etc. over level as level is rather an index than how the floor is - denominated in the building and thus may (sometimes) not coincide with it. E.g. - addr:floor may be "M" while level is "2" */ - val level = tags["addr:floor"] ?: tags["level:ref"] ?: tags["level"] + /* distinguish between "floor" and "level": + E.g. addr:floor may be "M" while level is "2". The "2" is in this case purely technical and + can not be seen on any sign. */ + val floor = tags["addr:floor"] ?: tags["level:ref"] + if (floor != null) { + return getString(R.string.on_floor, floor) + } + val level = tags["level"] if (level != null) { - return getString(R.string.on_level, level) + return getString(R.string.on_level, floor) } val tunnel = tags["tunnel"] if(tunnel != null && tunnel == "yes" || tags["location"] == "underground") { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 85145f4638..b0bbcb707a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -748,8 +748,9 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Restore hidden quests Restored %d hidden quests - + on level %s: + on floor %s: underground: sidewalk From e71ab098282cd3856669507abb3d845fc2eabc1b Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 30 Nov 2021 13:02:38 +0100 Subject: [PATCH 17/20] Fix using wrong variable (references #3529) --- .../java/de/westnordost/streetcomplete/quests/LocationLabel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt index 9c39c6ea8d..cd91a68602 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/LocationLabel.kt @@ -22,7 +22,7 @@ private fun Resources.getLevelLabelString(tags: Map): CharSequen } val level = tags["level"] if (level != null) { - return getString(R.string.on_level, floor) + return getString(R.string.on_level, level) } val tunnel = tags["tunnel"] if(tunnel != null && tunnel == "yes" || tags["location"] == "underground") { From daf20a0c084fc99effcf865f9bd82e9626d7b042 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 30 Nov 2021 13:13:47 +0100 Subject: [PATCH 18/20] clarify wording what classifies as "partially" wheelchair accessible (fixes #3528) --- app/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b0bbcb707a..bb6ec8bfdc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -327,9 +327,9 @@ The info you enter is then directly added to the OpenStreetMap in your name, wit Is the train station %s wheelchair accessible? Is the location %s wheelchair accessible? Partially - Partially means that there is no more than a single step to access the place and that most rooms inside are wheelchair accessible. - Partially means that there is no more than a single step to access it. - Partially means that there is no more than a single step to access it. + Partially means that there is no more than a ankle-high step to access the place and that most rooms inside are wheelchair accessible. + Partially means that there is no more than a ankle-high step to access it. + Partially means that there is no more than a ankle-high step to access it. "A wheelchair sign like this might be visible if the restroom is accessible. Partially means that a wheelchair can enter and use the restroom, but no handrail or adapted hand basin is present." What type of recycling facility is this? From 74f37cd32c15bcff59c7c1c5c4f94525f10ef851 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 30 Nov 2021 15:07:17 +0100 Subject: [PATCH 19/20] new version --- app/build.gradle.kts | 4 +- app/src/main/assets/country_metadata/AL.yml | 2 +- app/src/main/assets/country_metadata/AM.yml | 2 +- app/src/main/assets/country_metadata/AT.yml | 2 +- app/src/main/assets/country_metadata/BA.yml | 2 +- app/src/main/assets/country_metadata/BE.yml | 2 +- app/src/main/assets/country_metadata/BG.yml | 2 +- app/src/main/assets/country_metadata/BW.yml | 2 +- app/src/main/assets/country_metadata/BY.yml | 2 +- app/src/main/assets/country_metadata/CH.yml | 2 +- app/src/main/assets/country_metadata/CZ.yml | 2 +- app/src/main/assets/country_metadata/DE.yml | 2 +- app/src/main/assets/country_metadata/DK.yml | 2 +- app/src/main/assets/country_metadata/EE.yml | 2 +- app/src/main/assets/country_metadata/ES.yml | 2 +- app/src/main/assets/country_metadata/FI.yml | 2 +- app/src/main/assets/country_metadata/FR.yml | 2 +- app/src/main/assets/country_metadata/GB.yml | 2 +- app/src/main/assets/country_metadata/GE.yml | 2 +- app/src/main/assets/country_metadata/GR.yml | 2 +- app/src/main/assets/country_metadata/HR.yml | 2 +- app/src/main/assets/country_metadata/HU.yml | 2 +- app/src/main/assets/country_metadata/IS.yml | 2 +- app/src/main/assets/country_metadata/KG.yml | 2 +- app/src/main/assets/country_metadata/KZ.yml | 2 +- app/src/main/assets/country_metadata/LT.yml | 2 +- app/src/main/assets/country_metadata/LU.yml | 2 +- app/src/main/assets/country_metadata/LV.yml | 2 +- app/src/main/assets/country_metadata/MD.yml | 2 +- app/src/main/assets/country_metadata/ME.yml | 2 +- app/src/main/assets/country_metadata/MK.yml | 2 +- app/src/main/assets/country_metadata/MN.yml | 2 +- app/src/main/assets/country_metadata/NL.yml | 2 +- app/src/main/assets/country_metadata/NO.yml | 2 +- app/src/main/assets/country_metadata/PL.yml | 2 +- app/src/main/assets/country_metadata/RO.yml | 2 +- app/src/main/assets/country_metadata/RS.yml | 2 +- app/src/main/assets/country_metadata/RU.yml | 2 +- app/src/main/assets/country_metadata/SE.yml | 2 +- app/src/main/assets/country_metadata/SI.yml | 2 +- app/src/main/assets/country_metadata/SK.yml | 2 +- app/src/main/assets/country_metadata/TR.yml | 2 +- app/src/main/assets/country_metadata/UA.yml | 2 +- app/src/main/assets/country_metadata/XK.yml | 2 +- app/src/main/res/raw/changelog.yml | 6 + app/src/main/res/values-am/strings.xml | 6 + app/src/main/res/values-ar/strings.xml | 7 +- app/src/main/res/values-bg/strings.xml | 9 +- app/src/main/res/values-bs/strings.xml | 6 + app/src/main/res/values-ca/strings.xml | 7 +- app/src/main/res/values-cs/strings.xml | 11 +- app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 18 +- app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rGB/strings.xml | 9 +- .../res/values-en-rGB/translation_info.xml | 2 +- app/src/main/res/values-en/strings.xml | 11 +- app/src/main/res/values-es/strings.xml | 3 - .../main/res/values-es/translation_info.xml | 2 +- app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 475 +++++++++--------- .../main/res/values-fa/translation_info.xml | 2 +- app/src/main/res/values-fi/strings.xml | 3 - app/src/main/res/values-fr/strings.xml | 12 +- app/src/main/res/values-gl/strings.xml | 7 +- app/src/main/res/values-hr/strings.xml | 14 +- app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 6 + app/src/main/res/values-it/strings.xml | 9 +- .../main/res/values-it/translation_info.xml | 2 +- app/src/main/res/values-ja/strings.xml | 12 +- .../main/res/values-ja/translation_info.xml | 2 +- app/src/main/res/values-ko/strings.xml | 49 +- .../main/res/values-ko/translation_info.xml | 2 +- app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 3 - app/src/main/res/values-nl/strings.xml | 5 +- app/src/main/res/values-nn/strings.xml | 6 + app/src/main/res/values-no/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 17 +- .../res/values-pt-rBR/translation_info.xml | 2 +- app/src/main/res/values-pt/strings.xml | 5 +- app/src/main/res/values-ro/strings.xml | 7 +- app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 7 +- app/src/main/res/values-sv/strings.xml | 11 +- app/src/main/res/values-th/strings.xml | 6 + app/src/main/res/values-uk/strings.xml | 7 +- .../main/res/values-uk/translation_info.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values-zh/strings.xml | 30 +- .../main/res/values-zh/translation_info.xml | 2 +- metadata/fa/short_description.txt | 2 +- 95 files changed, 558 insertions(+), 348 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 88a59bd563..f4b3f31ba0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -36,8 +36,8 @@ android { applicationId = "de.westnordost.streetcomplete" minSdk = 21 targetSdk = 30 - versionCode = 3801 - versionName = "38.0" + versionCode = 3802 + versionName = "38.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/assets/country_metadata/AL.yml b/app/src/main/assets/country_metadata/AL.yml index 9bce39ef5e..a735214d02 100644 --- a/app/src/main/assets/country_metadata/AL.yml +++ b/app/src/main/assets/country_metadata/AL.yml @@ -2,7 +2,7 @@ atmOperators: [BKT, Fibank, Tirana Bank, Raiffeisen Bank, Raiffeisen BANK, Credins Bank, Raiffeisenbank, Raiffeisen, Alpha Bank, Credins, Bank Gjirokastra, donaldi, Banka Kombetare Tregtare, Raffeisen, Bkt, ALPHA BANK] hasDailyAlternateSideParkingSign: true hasLivingStreet: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 276 officialLanguages: [sq] orchardProduces: [tomato, grape, olive, apple, chilli_pepper, sweet_pepper, plum, fig, orange, peach, cherry, date, pear, chestnut, apricot, lemon, lime] diff --git a/app/src/main/assets/country_metadata/AM.yml b/app/src/main/assets/country_metadata/AM.yml index 611b7d1ea9..9a12265e0c 100644 --- a/app/src/main/assets/country_metadata/AM.yml +++ b/app/src/main/assets/country_metadata/AM.yml @@ -4,7 +4,7 @@ atmOperators: [Ameriabank, Unibank, VTB, ACBA, ABB, HSBC, Ararat Bank, Ardshinba hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 283 officialLanguages: [hy] orchardProduces: [tomato, grape, apple, apricot, peach, plum, pear, cherry, walnut, fig, hazelnut] diff --git a/app/src/main/assets/country_metadata/AT.yml b/app/src/main/assets/country_metadata/AT.yml index 28feb4c153..23d4511096 100644 --- a/app/src/main/assets/country_metadata/AT.yml +++ b/app/src/main/assets/country_metadata/AT.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: false hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 232 officialLanguages: [de] orchardProduces: [grape, apple, tomato, pear, chilli_pepper, sweet_pepper, strawberry, plum, apricot, cherry, walnut, peach, raspberry, hop] diff --git a/app/src/main/assets/country_metadata/BA.yml b/app/src/main/assets/country_metadata/BA.yml index b81b1264d0..9f7bebec4f 100644 --- a/app/src/main/assets/country_metadata/BA.yml +++ b/app/src/main/assets/country_metadata/BA.yml @@ -4,7 +4,7 @@ chargingStationOperators: [City] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 218 officialLanguages: [bs, hr, sr] orchardProduces: [plum, apple, tomato, grape, chilli_pepper, sweet_pepper, raspberry, pear, strawberry, peach, cherry, walnut, chestnut, apricot, avocado, fig] diff --git a/app/src/main/assets/country_metadata/BE.yml b/app/src/main/assets/country_metadata/BE.yml index 7090491eaf..4b110ccfae 100644 --- a/app/src/main/assets/country_metadata/BE.yml +++ b/app/src/main/assets/country_metadata/BE.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: false hasBiWeeklyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 206 officialLanguages: [nl, fr, de] orchardProduces: [pear, tomato, apple, strawberry, chilli_pepper, sweet_pepper, cherry, raspberry, grape, walnut, hop, plum] diff --git a/app/src/main/assets/country_metadata/BG.yml b/app/src/main/assets/country_metadata/BG.yml index 3593064ba9..f05bd3c91c 100644 --- a/app/src/main/assets/country_metadata/BG.yml +++ b/app/src/main/assets/country_metadata/BG.yml @@ -6,7 +6,7 @@ clothesContainerOperators: [БЧК, texcycle] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: false -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 284 officialLanguages: [bg] orchardProduces: [grape, tomato, pepper, plum, apple, peach, apricot, raspberry, strawberry, walnut, cherry, pear, chilli_pepper, sweet_pepper, almond, chestnut] diff --git a/app/src/main/assets/country_metadata/BW.yml b/app/src/main/assets/country_metadata/BW.yml index 6ba2d5f932..a68cf36c4d 100644 --- a/app/src/main/assets/country_metadata/BW.yml +++ b/app/src/main/assets/country_metadata/BW.yml @@ -3,7 +3,7 @@ atmOperators: [FNB, First National Bank, Barclays, Standard Chartered Bank, Barc centerLineStyle: white hasLivingStreet: true isLeftHandTraffic: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 652 noParkingSignStyle: sadc noStoppingSignStyle: sadc diff --git a/app/src/main/assets/country_metadata/BY.yml b/app/src/main/assets/country_metadata/BY.yml index 09bf02b50c..9143c1107b 100644 --- a/app/src/main/assets/country_metadata/BY.yml +++ b/app/src/main/assets/country_metadata/BY.yml @@ -5,7 +5,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 257 officialLanguages: [be, ru] orchardProduces: [apple, tomato, strawberry, pear, cherry, grape, walnut, plum, hazelnut, cranberry] diff --git a/app/src/main/assets/country_metadata/CH.yml b/app/src/main/assets/country_metadata/CH.yml index b91961efc8..7187b1de7a 100644 --- a/app/src/main/assets/country_metadata/CH.yml +++ b/app/src/main/assets/country_metadata/CH.yml @@ -5,7 +5,7 @@ clothesContainerOperators: [Texaid, Ville de Geneve, Contex, coop, TexAid, Coop, hasAdvisorySpeedLimitSign: false hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 228 officialLanguages: [de, fr, it, rm] orchardProduces: [apple, grape, tomato, pear, strawberry, apricot, cherry, plum, raspberry, walnut, chilli_pepper, sweet_pepper, kiwi, blueberry, peach, chestnut] diff --git a/app/src/main/assets/country_metadata/CZ.yml b/app/src/main/assets/country_metadata/CZ.yml index 6bc6019f6f..870b25f838 100644 --- a/app/src/main/assets/country_metadata/CZ.yml +++ b/app/src/main/assets/country_metadata/CZ.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasLivingStreet: true hasSlowZone: true isUsuallyAnyGlassRecyclableInContainers: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 230 officialLanguages: [cs] orchardProduces: [apple, grape, tomato, hop, pear, plum, strawberry, cherry, chilli_pepper, sweet_pepper, apricot, peach, walnut, raspberry] diff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml index 38f2dabfb1..e8c15ab76e 100644 --- a/app/src/main/assets/country_metadata/DE.yml +++ b/app/src/main/assets/country_metadata/DE.yml @@ -5,7 +5,7 @@ clothesContainerOperators: [Deutsches Rotes Kreuz, Loop, Aktion Hoffnung, AWG, G hasAdvisorySpeedLimitSign: false hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 262 officialLanguages: [de] orchardProduces: [grape, apple, strawberry, tomato, hop, plum, pear, walnut, cherry, blueberry, chilli_pepper, sweet_pepper, raspberry, peach, apricot] diff --git a/app/src/main/assets/country_metadata/DK.yml b/app/src/main/assets/country_metadata/DK.yml index 49d821db6f..ed8dc1897c 100644 --- a/app/src/main/assets/country_metadata/DK.yml +++ b/app/src/main/assets/country_metadata/DK.yml @@ -3,7 +3,7 @@ atmOperators: [Danske Bank, Nordea, Euronet, Sydbank, Jyske Bank, Arbejdernes La hasAdvisorySpeedLimitSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: square +livingStreetSignStyle: vienna mobileCountryCode: 238 officialLanguages: [da] orchardProduces: [apple, tomato, strawberry, pear, cherry, plum, raspberry, blueberry, hazelnut] diff --git a/app/src/main/assets/country_metadata/EE.yml b/app/src/main/assets/country_metadata/EE.yml index 57cf25004a..b04a8a5ef7 100644 --- a/app/src/main/assets/country_metadata/EE.yml +++ b/app/src/main/assets/country_metadata/EE.yml @@ -7,7 +7,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 248 officialLanguages: [et] orchardProduces: [apple, tomato, strawberry, plum, raspberry, cherry] diff --git a/app/src/main/assets/country_metadata/ES.yml b/app/src/main/assets/country_metadata/ES.yml index c8a1ad6449..c11f4bec72 100644 --- a/app/src/main/assets/country_metadata/ES.yml +++ b/app/src/main/assets/country_metadata/ES.yml @@ -9,7 +9,7 @@ hasBiWeeklyAlternateSideParkingSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 214 officialLanguages: [es] orchardProduces: [olive, grape, tomato, orange, peach, chilli_pepper, sweet_pepper, lemon, lime, apple, banana, strawberry, persimmon, pear, almond, plum, apricot] diff --git a/app/src/main/assets/country_metadata/FI.yml b/app/src/main/assets/country_metadata/FI.yml index 5ac92c6ada..837887c486 100644 --- a/app/src/main/assets/country_metadata/FI.yml +++ b/app/src/main/assets/country_metadata/FI.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 244 officialLanguages: [fi, sv] orchardProduces: [tomato, strawberry, apple, raspberry, chilli_pepper, sweet_pepper] diff --git a/app/src/main/assets/country_metadata/FR.yml b/app/src/main/assets/country_metadata/FR.yml index 3d7c7014a9..cf80cca9d0 100644 --- a/app/src/main/assets/country_metadata/FR.yml +++ b/app/src/main/assets/country_metadata/FR.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasBiWeeklyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: square +livingStreetSignStyle: france mobileCountryCode: 208 officialLanguages: [fr] orchardProduces: [grape, apple, tomato, plum, peach, apricot, pear, kiwi, strawberry, orange, chilli_pepper, sweet_pepper, walnut, cherry, olive, hazelnut] diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml index 484f600849..902c53a49a 100644 --- a/app/src/main/assets/country_metadata/GB.yml +++ b/app/src/main/assets/country_metadata/GB.yml @@ -9,7 +9,7 @@ hasLivingStreet: true hasSlowZone: true isLeftHandTraffic: true lengthUnits: [meter, foot and inch] -livingStreetSignStyle: square +livingStreetSignStyle: vienna mobileCountryCode: 234 officialLanguages: [en] orchardProduces: [apple, strawberry, tomato, pear, chilli_pepper, sweet_pepper, raspberry, plum, cherry, hop, grape] diff --git a/app/src/main/assets/country_metadata/GE.yml b/app/src/main/assets/country_metadata/GE.yml index e3f06c846a..ff4cbadbd1 100644 --- a/app/src/main/assets/country_metadata/GE.yml +++ b/app/src/main/assets/country_metadata/GE.yml @@ -3,7 +3,7 @@ additionalStreetsignLanguages: [en] atmOperators: [Bank of Georgia, TBC Bank, Liberty Bank, ProCredit Bank, Bank Republic, Tao Private Bank, საქართველოს ბანკი, Cartu Bank, Cryptomat, Bank Of Georgia, TBC Bank ATM, Procredit Bank, VTB Bank, TBC, Procredit bank, VTB bank, TBC Bank - თიბისი ბანკი, International Bank of Azerbaijan - Georgia, VTB, TBC BANK, Tbc Bank] hasDailyAlternateSideParkingSign: true hasLivingStreet: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 282 officialLanguages: [ka] orchardProduces: [grape, tomato, apple, peach, hazelnut, pear, plum, chilli_pepper, sweet_pepper, walnut, cherry, tea, strawberry, lemon, lime, orange, apricot] diff --git a/app/src/main/assets/country_metadata/GR.yml b/app/src/main/assets/country_metadata/GR.yml index e8a597e0c1..25811c8de8 100644 --- a/app/src/main/assets/country_metadata/GR.yml +++ b/app/src/main/assets/country_metadata/GR.yml @@ -7,7 +7,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 202 officialLanguages: [el] orchardProduces: [olive, grape, tomato, peach, apple, kiwi, orange, apricot, lemon, lime, pear, strawberry, chestnut, walnut, almond, plum] diff --git a/app/src/main/assets/country_metadata/HR.yml b/app/src/main/assets/country_metadata/HR.yml index e89355cb3f..fafbb5cba5 100644 --- a/app/src/main/assets/country_metadata/HR.yml +++ b/app/src/main/assets/country_metadata/HR.yml @@ -5,7 +5,7 @@ chargingStationOperators: [ELEN, Elen, Tesla Motors Inc., MOL Plugee, Eurokod] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 219 noParkingSignStyle: vienna noStoppingSignStyle: vienna diff --git a/app/src/main/assets/country_metadata/HU.yml b/app/src/main/assets/country_metadata/HU.yml index c00006b624..7165c1927d 100644 --- a/app/src/main/assets/country_metadata/HU.yml +++ b/app/src/main/assets/country_metadata/HU.yml @@ -4,7 +4,7 @@ chargingStationOperators: [NKM Mobilitás Kft., MOL Nyrt., ELMŰ, e-Mobi, E-On, hasAdvisorySpeedLimitSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 216 officialLanguages: [hu] orchardProduces: [apple, grape, tomato, chilli_pepper, sweet_pepper, plum, peach, pear, apricot, cherry, walnut, strawberry, raspberry, chestnut, almond, hazelnut] diff --git a/app/src/main/assets/country_metadata/IS.yml b/app/src/main/assets/country_metadata/IS.yml index 8c3e1d9784..9ec0dbc2c6 100644 --- a/app/src/main/assets/country_metadata/IS.yml +++ b/app/src/main/assets/country_metadata/IS.yml @@ -5,7 +5,7 @@ clothesContainerOperators: [Sorpa] hasAdvisorySpeedLimitSign: false hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 274 officialLanguages: [is] orchardProduces: [tomato] diff --git a/app/src/main/assets/country_metadata/KG.yml b/app/src/main/assets/country_metadata/KG.yml index 2c284c9366..4a693b68e2 100644 --- a/app/src/main/assets/country_metadata/KG.yml +++ b/app/src/main/assets/country_metadata/KG.yml @@ -2,7 +2,7 @@ atmOperators: [РСК Банк, KICB, Demir Bank, Optima Bank, Demir bank, РСК, DemirBank, DEMiR Bank, КБ Кыргызстан, Халык Банк, Айыл Банк, РСК банк, АКБ КЫРГЫЗСТАН, Халык Банк Кыргызстан, Демир банк, Демир Банк, Коммерческий банк Кыргызстан] hasDailyAlternateSideParkingSign: true hasLivingStreet: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 437 officialLanguages: [ky, ru] orchardProduces: [tomato, apple, apricot, plum, pear, peach, grape, walnut, cherry, hazelnut, raspberry, strawberry, almond, chilli_pepper, sweet_pepper, pistachio] diff --git a/app/src/main/assets/country_metadata/KZ.yml b/app/src/main/assets/country_metadata/KZ.yml index a3941ec86f..af319b6104 100644 --- a/app/src/main/assets/country_metadata/KZ.yml +++ b/app/src/main/assets/country_metadata/KZ.yml @@ -2,7 +2,7 @@ atmOperators: [Jusan Bank, Народный банк Казахстана, 'Казкоммерцбанк, АО', Народный банк, Казкоммерцбанк, АО "Казкоммерцбанк", Kazkom, Halyk Bank, Сбербанк, Казком, Казкомерцбанк, Halyk bank, Народный Банк, Сбербанк России, КазКом, Халык банк, Qazkom, Казкоммерцбанк банкомат, HALYK BANK, KAZKOM, Халық банк, ForteBank, Альянс Банк, АТФ Банк, Народный банкомат, Альянс банк, КазКоммерцБанк, Евразийский банк, БТА банкомат, БТА, АТФ банк, БТА банк, Halyk, Kaspi bank, KAZ KOM, Халык Банк, Kaspi Bank, Bank RBK, Банк России, Centercredit, Банкомат Народный банк, АльянсБанк, Банкомат БТА банка, АТФ банкомат, Казпочта, Bank CenterCredit, KazCom, Народный банк казахстана, Нурбанк, Казкомерц банк, Халық банкі, Kazcom, АТФ, народный банк, HalykBank, halyk bank, QIWI, HALYK bank, Kaspi Bank терминал, АО Казкоммерцбанк, Qazkom банкомат, Kaspi, KaspiBank, Kaspi.kz] hasDailyAlternateSideParkingSign: true hasLivingStreet: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 401 officialLanguages: [kk, ru] orchardProduces: [tomato, chilli_pepper, sweet_pepper, apple, grape, apricot, pear, strawberry, plum, peach, walnut, cherry, almond] diff --git a/app/src/main/assets/country_metadata/LT.yml b/app/src/main/assets/country_metadata/LT.yml index 2a7562cb04..a496fc6c49 100644 --- a/app/src/main/assets/country_metadata/LT.yml +++ b/app/src/main/assets/country_metadata/LT.yml @@ -5,7 +5,7 @@ clothesContainerOperators: [UAB „VAATC“] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 246 officialLanguages: [lt] orchardProduces: [apple, tomato, strawberry, pear, raspberry, cherry, plum, blueberry] diff --git a/app/src/main/assets/country_metadata/LU.yml b/app/src/main/assets/country_metadata/LU.yml index 471e15d071..f01e3146de 100644 --- a/app/src/main/assets/country_metadata/LU.yml +++ b/app/src/main/assets/country_metadata/LU.yml @@ -5,7 +5,7 @@ hasAdvisorySpeedLimitSign: true hasBiWeeklyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 270 officialLanguages: [fr, de, lb] orchardProduces: [grape, apple, pear, tomato, plum, strawberry, walnut, cherry, raspberry] diff --git a/app/src/main/assets/country_metadata/LV.yml b/app/src/main/assets/country_metadata/LV.yml index e724a81901..a62acbec2d 100644 --- a/app/src/main/assets/country_metadata/LV.yml +++ b/app/src/main/assets/country_metadata/LV.yml @@ -4,7 +4,7 @@ chargingStationOperators: [CSDD, Elektrum] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 247 officialLanguages: [lv] orchardProduces: [apple, tomato, strawberry, pear, cranberry, blueberry, raspberry, plum, cherry] diff --git a/app/src/main/assets/country_metadata/MD.yml b/app/src/main/assets/country_metadata/MD.yml index 9389340075..207e0f8c26 100644 --- a/app/src/main/assets/country_metadata/MD.yml +++ b/app/src/main/assets/country_metadata/MD.yml @@ -2,7 +2,7 @@ atmOperators: [Moldindconbank, Victoriabank, Агропромбанк, Moldova Agroindbank, Mobiasbanca, Eximbank, ЗАО «Агропромбанк», FinComBank, Moldincombank, BCR, Сбербанк, BCR Chișinău, Banca de Economii, Moldindcombank, MAIB, Moldinconbank, Banca Comerciala Romaneasca, Unibank, MobiasBanca, Agroindbank, Moldova-Agroindbank, ЗАО Агропромбанк, Эксимбанк, АПБ, MICB, Приднестровский Сбербанк, Energbank, micb.md, Victoriabank1] hasDailyAlternateSideParkingSign: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 259 officialLanguages: [ro] orchardProduces: [grape, apple, plum, tomato, apricot, peach, walnut, chilli_pepper, sweet_pepper, strawberry, pear, cherry, raspberry, almond, hazelnut] diff --git a/app/src/main/assets/country_metadata/ME.yml b/app/src/main/assets/country_metadata/ME.yml index b4845a8dfc..dfca806f2c 100644 --- a/app/src/main/assets/country_metadata/ME.yml +++ b/app/src/main/assets/country_metadata/ME.yml @@ -3,7 +3,7 @@ atmOperators: [CKB, Erste Bank, NLB, Atlas Banka, ERSTE Bank, Hipotekarna banka, hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 297 officialLanguages: [sr, bs, sq, hr] orchardProduces: [grape, plum, pear, fig, tomato, chilli_pepper, sweet_pepper, orange, cherry, apple, peach, walnut, raspberry, kiwi, olive, tea] diff --git a/app/src/main/assets/country_metadata/MK.yml b/app/src/main/assets/country_metadata/MK.yml index 1917db73c0..bcfeb2c0c6 100644 --- a/app/src/main/assets/country_metadata/MK.yml +++ b/app/src/main/assets/country_metadata/MK.yml @@ -5,7 +5,7 @@ chargingStationOperators: [EVN] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 294 officialLanguages: [mk, sq] orchardProduces: [grape, chilli_pepper, sweet_pepper, tomato, apple, plum, olive, peach, pear, strawberry, cherry, walnut, apricot, fig, almond, chestnut] diff --git a/app/src/main/assets/country_metadata/MN.yml b/app/src/main/assets/country_metadata/MN.yml index 971b2487e7..8a225a372e 100644 --- a/app/src/main/assets/country_metadata/MN.yml +++ b/app/src/main/assets/country_metadata/MN.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Хаан банк, Хаан, Хаанбанк, хаан банк, Голомт, Golomt Bank, АТМ, Голомт банк, Төрийн банк, khaan bank, Khan Bank, Khaan bank, Khan bank, ХХБ, Худалдаа хөгжлийн банк, atm, Хаан банк АТМ, Хаан Банк, Ger, Aa, zam, khaanbank] hasLivingStreet: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 428 officialLanguages: [mn] orchardProduces: [hazelnut] diff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml index e2dc9f50b2..ea14d7bc2f 100644 --- a/app/src/main/assets/country_metadata/NL.yml +++ b/app/src/main/assets/country_metadata/NL.yml @@ -4,7 +4,7 @@ chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfal clothesContainerOperators: [ROVA, Sympany, Leger des Heils ReShare, Leger des Heils, Gemeente Amsterdam, RD4, Curitas, Twiddus, Noppes, Leger des heils, hetgoed, Waardlanden, Opnieuw & Co, HVC] hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 204 officialLanguages: [nl] orchardProduces: [tomato, chilli_pepper, sweet_pepper, pear, apple, strawberry, blueberry, raspberry, plum, cherry, grape] diff --git a/app/src/main/assets/country_metadata/NO.yml b/app/src/main/assets/country_metadata/NO.yml index 33e65da834..053e0e02af 100644 --- a/app/src/main/assets/country_metadata/NO.yml +++ b/app/src/main/assets/country_metadata/NO.yml @@ -7,7 +7,7 @@ clothesContainerOperators: [Fretex, UFF, Idrettsinnsamlingen, Uff, Frelsesarmée hasAdvisorySpeedLimitSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: square +livingStreetSignStyle: vienna mobileCountryCode: 242 officialLanguages: [nb, nn, no] orchardProduces: [apple, tomato, strawberry, raspberry, plum, cherry, pear, blueberry] diff --git a/app/src/main/assets/country_metadata/PL.yml b/app/src/main/assets/country_metadata/PL.yml index fa9a85f3fa..9444e2b13e 100644 --- a/app/src/main/assets/country_metadata/PL.yml +++ b/app/src/main/assets/country_metadata/PL.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: false hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 260 officialLanguages: [pl] orchardProduces: [apple, tomato, strawberry, raspberry, cherry, plum, pear, blueberry, peach, walnut, hazelnut, hop, apricot, chestnut] diff --git a/app/src/main/assets/country_metadata/RO.yml b/app/src/main/assets/country_metadata/RO.yml index 04c736a3dd..5cd7892188 100644 --- a/app/src/main/assets/country_metadata/RO.yml +++ b/app/src/main/assets/country_metadata/RO.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: square +livingStreetSignStyle: vienna mobileCountryCode: 226 officialLanguages: [ro] orchardProduces: [grape, tomato, plum, apple, chilli_pepper, sweet_pepper, cherry, pear, walnut, apricot, strawberry, peach, cranberry, hazelnut, blueberry, hop] diff --git a/app/src/main/assets/country_metadata/RS.yml b/app/src/main/assets/country_metadata/RS.yml index 8b76964da8..0b57b2d1f2 100644 --- a/app/src/main/assets/country_metadata/RS.yml +++ b/app/src/main/assets/country_metadata/RS.yml @@ -4,7 +4,7 @@ chargingStationOperators: [putevi srbije] hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 220 officialLanguages: [sr] orchardProduces: [plum, apple, chilli_pepper, sweet_pepper, tomato, grape, raspberry, peach, pear, apricot, strawberry, cherry, walnut, hazelnut, hop] diff --git a/app/src/main/assets/country_metadata/RU.yml b/app/src/main/assets/country_metadata/RU.yml index 2e0f1d3b71..a6c6256baf 100644 --- a/app/src/main/assets/country_metadata/RU.yml +++ b/app/src/main/assets/country_metadata/RU.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 250 officialLanguages: [ru] orchardProduces: [tomato, apple, grape, cherry, strawberry, raspberry, plum, pear, apricot, peach, blueberry, tea, hop, orange] diff --git a/app/src/main/assets/country_metadata/SE.yml b/app/src/main/assets/country_metadata/SE.yml index 363e75e987..ad65ec65d7 100644 --- a/app/src/main/assets/country_metadata/SE.yml +++ b/app/src/main/assets/country_metadata/SE.yml @@ -5,7 +5,7 @@ clothesContainerOperators: [Myrorna, Human Bridge, FTI] hasAdvisorySpeedLimitSign: true hasLivingStreet: true hasSlowZone: false -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 240 officialLanguages: [sv] orchardProduces: [apple, strawberry, tomato, pear, raspberry, plum, cherry, blueberry] diff --git a/app/src/main/assets/country_metadata/SI.yml b/app/src/main/assets/country_metadata/SI.yml index defdbbbb91..271c18f731 100644 --- a/app/src/main/assets/country_metadata/SI.yml +++ b/app/src/main/assets/country_metadata/SI.yml @@ -5,7 +5,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 293 officialLanguages: [sl] orchardProduces: [grape, apple, pear, tomato, walnut, cherry, peach, plum, hop, persimmon, strawberry, olive, chilli_pepper, sweet_pepper, apricot, kiwi] diff --git a/app/src/main/assets/country_metadata/SK.yml b/app/src/main/assets/country_metadata/SK.yml index b56c4aff21..df6098e080 100644 --- a/app/src/main/assets/country_metadata/SK.yml +++ b/app/src/main/assets/country_metadata/SK.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 231 officialLanguages: [sk] orchardProduces: [grape, apple, tomato, chilli_pepper, sweet_pepper, peach, strawberry, plum, pear, apricot, hop, cherry, raspberry, walnut, chestnut] diff --git a/app/src/main/assets/country_metadata/TR.yml b/app/src/main/assets/country_metadata/TR.yml index d925ec3b66..6c05992fdd 100644 --- a/app/src/main/assets/country_metadata/TR.yml +++ b/app/src/main/assets/country_metadata/TR.yml @@ -3,7 +3,7 @@ atmOperators: [Akbank, Ziraat Bankası, Türkiye İş Bankası, Garanti Bankası chargingStationOperators: [SHARZ, VOLTRUN, ZES, Sharz, Eşarj, EŞARJ] clothesContainerOperators: [Maltepe Belediyesi] hasLivingStreet: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 286 officialLanguages: [tr] orchardProduces: [tomato, grape, apple, olive, orange, lemon, lime, apricot, peach, hazelnut, pear, strawberry, banana, fig, plum, grapefruit] diff --git a/app/src/main/assets/country_metadata/UA.yml b/app/src/main/assets/country_metadata/UA.yml index ecfcc41094..574a72024e 100644 --- a/app/src/main/assets/country_metadata/UA.yml +++ b/app/src/main/assets/country_metadata/UA.yml @@ -6,7 +6,7 @@ hasAdvisorySpeedLimitSign: true hasDailyAlternateSideParkingSign: true hasLivingStreet: true hasSlowZone: true -livingStreetSignStyle: portrait +livingStreetSignStyle: russia mobileCountryCode: 255 officialLanguages: [uk, ru] orchardProduces: [tomato, apple, grape, plum, chilli_pepper, sweet_pepper, cherry, pear, walnut, apricot, strawberry, raspberry, peach, blueberry, hop, cranberry] diff --git a/app/src/main/assets/country_metadata/XK.yml b/app/src/main/assets/country_metadata/XK.yml index b8870bcb6b..b5dd080060 100644 --- a/app/src/main/assets/country_metadata/XK.yml +++ b/app/src/main/assets/country_metadata/XK.yml @@ -2,7 +2,7 @@ atmOperators: [TEB, Raiffeisen Bank, NLB Banka, BKT, TEB Bank, NLB, Pcb, BPB, ProCredit Bank, Banka Ekonomike] hasDailyAlternateSideParkingSign: true hasLivingStreet: true -livingStreetSignStyle: wide +livingStreetSignStyle: vienna mobileCountryCode: 221 officialLanguages: [sq, sr] popularReligions: [muslim] diff --git a/app/src/main/res/raw/changelog.yml b/app/src/main/res/raw/changelog.yml index 0e18bcbcf5..4e7616be94 100644 --- a/app/src/main/res/raw/changelog.yml +++ b/app/src/main/res/raw/changelog.yml @@ -1,3 +1,9 @@ +v38.1: | +
    +
  • fix location wasn't updated after tabbing out and in again (#3543), thanks @smichel17
    • +
  • improve some wordings (#3528, #3529), thanks @1ec5
    • +
+ v38.0: |

New Quests

    diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml index 0468283a46..678eadce48 100644 --- a/app/src/main/res/values-am/strings.xml +++ b/app/src/main/res/values-am/strings.xml @@ -230,7 +230,11 @@ "የምድር ውስጥ ባቡር መግቢያ %s ለአካለ ጉዳተኞች ወንበር ተደራሽ ነው?" "%s የባቡር ጣቢያዉ ለአካለ ስንኩላን ወንበር ተደራሽ ነው?" "%s አካባቢ ለአካለ ጉዳተኞች ወንበር ተደራሽ ነው?" + + "በከፊል ማለት ቦታውን ለመድረስ ከአንድ እርምጃ በላይ አይበልጥም እና በውስጣቸው ያሉት አብዛኛዎቹ ክፍሎች ተሽከርካሪ ወንበሮች ተደራሽ ናቸው ማለት ነው ፡፡" + + "በከፊል ማለት እሱን ለመድረስ ከአንድ እርምጃ በላይ የለም ማለት ነው ፡፡" "%s ምህፃረ ቃል በስሙ ዉስጥ?" "ይህ የመፀዳጃ ክፍል ህፃናት የሚቀይሩበት ጠረጴዛ አለው?" @@ -575,6 +579,8 @@ "ለስላሳ" "%s ሙሉ በሙሉ ከመሬት በታች ነው?" "ይህ ህንፃ ሙሉ በሙሉ ከመሬት በታች ነውን?" + + "በከፊል ማለት እሱ ጋር ለመድረስ ከአንድ እርምጃ በላይ የለም ማለት ነው ፡፡" "ይህ ቦታ ተሽከርካሪ ወንበር ተደራሽ ነው?" "እነዚህ የትራፊክ መብራቶች የመራመጃ ምልክትን ለመጠየቅ አንድ አዝራር አላቸው?" diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index a10fe5d414..6f3a39c924 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -228,7 +228,11 @@ "هل مدخل مترو الأنفاق \"%s\" يمكن دخوله بكرسي معاقين؟" "هل محطة القطار %s يمكن دخولها بكرسي معاقين؟" "هل يمكن الوصول للموقع %s بواسطة كرسي متحرك؟" + + "يعني جزئيًا أنه لا يوجد أكثر من عتبة واحدة للوصول إلى المكان وأن معظم الغرف بالداخل يمكن الوصول إليها بواسطة الكراسي المتحركة." + + "تعني جزئيًا أنه لا يوجد أكثر من عتبة واحدة للوصول إليه." "اختصار في الاسم %s؟" "هل دورة المياه هذه تحتوي على طاولة تغيير لحفائظ للأطفال؟" @@ -588,6 +592,8 @@ "طري - ناعم - لين، مسار يمر عبر التربة /الرمال /العشب ولا يوجد فيه حصى وصخور" "هل %s تحت الأرض بالكامل؟" "هل هذا المبنى تحت الأرض بالكامل؟" + + "تعني جزئيًا أنه لا يوجد أكثر من عتبة واحدة للوصول إليه." "هل يمكن الوصول إلى هذا المكان على كرسي متحرك؟" "هل تحتوي إشارات المرور هذه على زر لطلب الضوء الأخضر لعبور مسار المشاة؟" @@ -1119,7 +1125,6 @@ "يتم تعطيل نوع المهمة هذا افتراضيًا لأن أشكال السقف غالبًا ما تكون غير مرئية بسهولة من الشارع، كما أن هذا النوع من المهام أيضًا يستغرق وقتًا طويلاً؛ لذا في معظم الحالات ، يكون من الأسهل والأكثر كفاءة تحديد هذا الأمر من خلال الصور الجوية في المنزل." "روحاني" "هل اكتملت هذه الخطوات؟" - "تظهر فقط في الليل" "إلغاء تحديد كافة المهام؟" "مبنى تخزين القوارب" "البناء الخارجي لـ الحدائق/المزارع المحصصة" diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 055fbda280..9e77e107ea 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -236,7 +236,11 @@ "Входът за метрото %s достъпен ли е за инвалидни колички?" "Гарата/станцията %s достъпна ли е за инвалидни колички?" "Мястото %s достъпно ли е за инвалидни колички?" + + "\"Частично\" означава, че няма повече от едно стъпало на входа и повечето стаи вътре са достъпни за инвалидни колички." + + "\"Частично\" означава, че няма повече от едно стъпало на входа." "Съкращението на името %s?" "Тоалетните имат ли маса за смяна на бебешки пелени?" @@ -582,6 +586,8 @@ "Мека" "%s напълно ли е под земята?" "Тази сграда напълно ли е под земята?" + + "\"Частично\" означава, че няма повече от едно стъпало." "Това място достъпно ли е за инвалидни колички?" "Тези светофари имат ли бутон за пешеходци?" @@ -1132,7 +1138,6 @@ "Тази задача е изключена по подразбиране, защото формата на покривите не е лесно видима от улицата и отнема много време. В повечето случаи е по-лесно и по-ефективно да се използват сателитни изображения." "Анимизъм" "Завършени ли са тези стълби?" - "Показва се само през нощта" "Изчистване избора на всички задачи?" @@ -1228,6 +1233,8 @@ "Преминаване през две бариери" "Шикан - бариери от двете страни" "Шикан - повече от 2 бариери" + + "На кое ниво се намира %s?" "Изберете език" \ No newline at end of file diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index adb0976aec..83e4c4c782 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -236,7 +236,11 @@ Ako duž cijele ulice nema znakova koji se odnose na istaknuti odjeljak, primjen "Je li ulaz u podzemnu željeznicu %s pristupačan za invalidska kolica?" "Je li željeznička stanica %s pristupačna za invalidska kolica?" "Je li lokacija %s pristupačna za invalidska kolica?" + + "\"Djelimično\" znači da nema više od jedne stepenice za pristup, i da je većina prostorija pristupačna za invalidska kolica." + + "\"Djelimično\" znači da nema više od jedne stepenice za pristup." "Kratica u nazivu %s?" "Ima li u ovom toaletu stol za presvlačenje beba?" @@ -585,6 +589,8 @@ Na primjer 1,3 ili 2–6." "Mekana" "Je li %s potpuno pod zemljom?" "Je li ova zgrada potpuno pod zemljom?" + + "\"Djelomično\" znači da nema više od jedne stepenice za pristup." "Je li ova lokacija pristupačna za invalidska kolica?" "Imaju li ovi semafori tipku za zahtjevanje prelaska pješaka?" diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index ac3f4b6273..f1ef3a07eb 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -226,7 +226,11 @@ Si no hi ha cap senyal en tot el carrer que s'apliqui en l'àrea realçada, s'ap "L'entrada de metro %s és accessible amb cadira de rodes?" "L'estació de tren %s és accessible amb cadira de rodes?" "La ubicació %s és accessible amb cadira de rodes?" + + "Parcialment significa que no hi ha més d'un esglaó per accedir al negoci i que la major part d'estances interiors són accessibles amb cadira de rodes." + + "Parcialment significa que no hi ha més d'un esglaó per accedir-hi." "Abreviatura amb el nom %s?" "Aquest vàter té un canviador per a nens?" @@ -567,6 +571,8 @@ Parcialment significa que una cadira de rodes pot entrar i utilitzar els lavabos "Tova" "%s és completament subterrani?" "Aquest edifici és completament subterrani?" + + "Parcialment significa que no hi ha més d'un esglaó per accedir-hi." "Aquest lloc és accessible amb cadira de rodes?" "Aquest semàfor té botó per a demanar llum verda?" @@ -1105,7 +1111,6 @@ Les dades s'actualitzen després de %1$s dies i les dades no utilitzades s'elimi "Aquest tipus de missió està desactivada per defecte perquè les formes del sostre sovint no són fàcilment visibles des del carrer. Aquest tipus de missió també consumeix molt temps; en la majoria dels casos és més fàcil i eficient traçar-ho a partir d'imatges aèries a casa." "Animista" "Aquests graons estan finalitzats?" - "Només es mostra de nit" "Desseleccionar totes les missions?" "Garatge de vaixells" "Barraca de l'hort" diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 260cd17996..6da34f4f06 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1532,7 +1532,7 @@ Mezi populární klávesnice, které podporují spoustu jazyků patří Google G "Nemáte nainstalovanou žádnou jinou mapovou aplikaci" - "číslo popisné" + "číslo domu" "číslo bloku" @@ -2003,7 +2003,7 @@ Tato data jsou důležitá nejen pro pošťáky, ale i pro navigační systémy. "Vyřešili jste %d úkolů, které se týkají budov. -Pamatujte, že tato aplikace se zeptá na popisné číslo budovy až po určení jejího druhu." +Pamatujte, že tato aplikace se zeptá na číslo budovy až po určení jejího druhu." "Šestý smysl" @@ -2131,7 +2131,7 @@ It is not big issue, but it would be nice to have it correctly. --> "Číslo popisné %s:" - "číslo popisné %s:" + "číslo domu %s:" "Jaká je otevírací doba %1$s (%2$s)?" "Je tato otevírací doba pro %s stále platná?" "Je tato otevírací doba pro %1$s (%2$s) stále platná?" @@ -2402,7 +2402,6 @@ Data jsou obnovena po %1$s dnech a nepoužitá data jsou smazána automaticky po "Tento typ úkolů je ve výchozím nastavení zakázán, protože tvar střechy často není snadno viditelný z ulice. Tento typ úkolů je také poněkud časově náročný; ve většině případů je snazší a efektivnější toto mapovat doma podle leteckých snímků." "Animismus" "Jsou tyto schody hotové?" - "Zobrazeno pouze v noci" "Zrušit výběr všech úkolů?" "Loděnice" "Zahradní chatka" @@ -2478,6 +2477,10 @@ Data jsou obnovena po %1$s dnech a nepoužitá data jsou smazána automaticky po "Průjezd mezi dvěma přkážkami" "Šikana - překážka na každé straně" "Šikana - více než dvě překážky" + + "Ve kterém patře se nachází %s?" "Vyberte jazyk" + "Jazyk systému +" \ No newline at end of file diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 19646c53cf..f40b551243 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2220,7 +2220,6 @@ fortrolighedserklæring</a> for mere information.</p>" "Er der en kantsten hvor disse veje møder hinanden? Hvilken slags?" "Denne opgavetype er slået fra som standard, da formen på bygningers tage kan være svære at se fra gadeplan. Opgavetypen er også meget tidskrævende; ofte er det nemmere og mere effektivt at kortlægge dette udfra luftfotos derhjemme." "Er disse trin færdiglavede?" - "Kun vist om natten?" "Fjern alle" "Bådhus" "Kolonihavehus" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 83540a710d..dd45ee0382 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -232,8 +232,12 @@ Wenn es keine Schilder entlang der gesamten Straße gibt, die für den hervorgeh "Ist der U-Bahn-Eingang %s zugänglich für Rollstühle?" "Ist die Bahnstation %s zugänglich für Rollstühle?" "Ist der Ort %s zugänglich für Rollstühle?" - "Teilweise bedeutet, dass es nicht mehr als eine Stufe zu überwinden gilt, um das Gebäude zu betreten und die meisten Räume darin zugänglich für Rollstühle sind." - "Teilweise bedeutet, dass es nicht mehr als eine Stufe zu überwinden gilt." + + + "Teilweise bedeutet, dass es nicht mehr als eine knöchelhohe Stufe zu überwinden gilt, um das Gebäude zu betreten und die meisten Räume darin zugänglich für Rollstühle sind." + + + "Teilweise bedeutet, dass es nicht mehr als eine knöchelhohe Stufe zu überwinden gilt." "Ist der Name %s abgekürzt?" "Gibt es einen Wickeltisch in dieser Toilette?" "Gibt es einen Wickeltisch in %s?" @@ -577,7 +581,9 @@ Teilweise bedeutet, dass man die Toilette schon im Rollstuhl benutzen kann, aber "Weich" "Ist %s komplett unterirdisch?" "Ist dieses Gebäude komplett unterirdisch?" - "Teilweise bedeutet, dass es nicht mehr als eine Stufe zu überwinden gilt." + + + "Teilweise bedeutet, dass es nicht mehr als eine knöchelhohe Stufe zu überwinden gilt." "Ist dieser Ort zugänglich für Rollstühle?" "Gibt es an dieser Ampel einen Knopf, um als Fußgänger Grün anzufordern?" "Wie viele Motorräder können hier abgestellt werden?" @@ -1075,7 +1081,6 @@ Die Daten werden nach %1$s Tagen aktualisiert und ungenutzte Daten werden nach % "Dieser Aufgabentyp ist standardmäßig deaktiviert, weil die Dachformen oft nicht gut von der Straße aus sichtbar sind. Dieser Aufgabentyp ist außerdem recht zeitaufwändig; in den meisten Fällen ist es einfacher und effizienter, diese von zuhause von Luftbildern zu erfassen." "Animistisch" "Ist diese Treppe fertig gebaut?" - "Nur nachts angezeigt" "Alle Aufgaben abwählen?" "Bootshaus" "Kleingartenlaube" @@ -1141,7 +1146,10 @@ Die Daten werden nach %1$s Tagen aktualisiert und ungenutzte Daten werden nach % "Durchgang zwischen zwei Barrieren" "Schikane – Barriere auf beiden Seiten" "Schikane – mehr als zwei Barrieren" - "In welchem Stockwerk ist %s?" + + + "Auf welcher Ebene ist %s?" "Sprache auswählen" "Systemvorgabe" + "In Stockwerk %s:" \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index daf5b93572..7c26da72a7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2247,7 +2247,6 @@ "Αυτός ο τύπος αναζήτησης είναι απενεργοποιημένος από προεπιλογή, επειδή συχνά το σχήμα της στέγης δεν είναι εύκολα ορατό από τον δρόμο. Αυτός ο τύπος αναζήτησης είναι επίσης αρκετά χρονοβόρος - στις περισσότερες περιπτώσεις είναι πιο εύκολο και αποτελεσματικό να γίνει η χαρτογράφηση από αεροφωτογραφίες στο σπίτι." "Ανιμισμός" "Έχουν ολοκληρωθεί αυτά τα σκαλοπάτια;" - "Εμφανίζεται μόνο τη νύχτα" "Αποεπιλογή όλων των αναζητήσεων;" "Αποθήκευση σκαφών" "Σπιτάκι κήπου" diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 3d0752a359..f2109d4797 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -227,7 +227,11 @@ If there are no signs along the whole street which apply for the highlighted sec "Is the underground entrance %s wheelchair accessible?" "Is the railway station %s wheelchair accessible?" "Is the location %s wheelchair accessible?" + + "Partially means that there is no more than a single step to access the place and that most rooms inside are wheelchair accessible." + + "Partially means that there is no more than a single step to access it." "Abbreviation in the name %s?" "Does this toilet have a baby changing table?" @@ -566,6 +570,8 @@ Partially means that a wheelchair can enter and use the toilet, but no handrail "Soft" "Is %s completely underground?" "Is this building completely underground?" + + "Partially means that there is no more than a single step to access it." "Is this place wheelchair accessible?" @@ -1059,7 +1065,6 @@ Data is refreshed after %1$s days and unused data is deleted after %2$s days aut "This quest type is disabled by default because the roof shapes are often not easily visible from the street. This quest type is also quite time-consuming; in most cases, it is easier and more efficient to map this from aerial imagery at home." "Animist" "Are these steps completed?" - "Only shown at night" "Deselect all quests?" "Boathouse" "Allotment building" @@ -1127,6 +1132,8 @@ Data is refreshed after %1$s days and unused data is deleted after %2$s days aut "Passage between two barriers" "Chicane - barrier on each side" "Chicane - more than two barriers" + + "On which level is %s located?" "Select language" "System default" diff --git a/app/src/main/res/values-en-rGB/translation_info.xml b/app/src/main/res/values-en-rGB/translation_info.xml index 1953c600c1..3ddf070ea2 100644 --- a/app/src/main/res/values-en-rGB/translation_info.xml +++ b/app/src/main/res/values-en-rGB/translation_info.xml @@ -1,4 +1,4 @@ - 100 + 99 diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 9eb9752616..bb6ec8bfdc 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -327,9 +327,9 @@ The info you enter is then directly added to the OpenStreetMap in your name, wit Is the train station %s wheelchair accessible? Is the location %s wheelchair accessible? Partially - Partially means that there is no more than a single step to access the place and that most rooms inside are wheelchair accessible. - Partially means that there is no more than a single step to access it. - Partially means that there is no more than a single step to access it. + Partially means that there is no more than a ankle-high step to access the place and that most rooms inside are wheelchair accessible. + Partially means that there is no more than a ankle-high step to access it. + Partially means that there is no more than a ankle-high step to access it. "A wheelchair sign like this might be visible if the restroom is accessible. Partially means that a wheelchair can enter and use the restroom, but no handrail or adapted hand basin is present." What type of recycling facility is this? @@ -748,8 +748,9 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Restore hidden quests Restored %d hidden quests - + on level %s: + on floor %s: underground: sidewalk @@ -1103,7 +1104,7 @@ If you are overwhelmed by the number of quests, you can always fine-tune which q This diameter looks implausible. "Are you sure? Sometimes the diameter can be found on the hydrant itself." No - On which level is %s located? + On which level number is %s located? Select language System default diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 286d6b1238..64929d3771 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2381,9 +2381,6 @@ Los datos se actualizan cada %1$s días y los datos sin utilizar se eliminan aut "Este tipo de tarea viene desactivada de serie porque las formas de los tejados no se ven muy bien a nivel de calle, estas tareas suelen llevar mucho rato y es mejor hacerlo desde casa con la imagen por satélite en una pantalla grande." "Animismo" "¿Se han completado estos pasos?" - - - "Solo se muestra de noche" "¿Quieres deseleccionar todas las tareas?" "Cobertizo (o casa) de botes" "Casa o caseta de aperos" diff --git a/app/src/main/res/values-es/translation_info.xml b/app/src/main/res/values-es/translation_info.xml index 3ddf070ea2..c46e86f95e 100644 --- a/app/src/main/res/values-es/translation_info.xml +++ b/app/src/main/res/values-es/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 98 diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 7dd82bddfa..c42697f83e 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -2407,7 +2407,6 @@ Ikus itzazu aukera posible guztiak: batzuetan ez da oso argia, adibidez errepide "Erronka mota hau desgaitua dago berez, teilatuaren formak ez direlako erraz ikusten kaletik. Bilaketa mota hau ere oso luzea izaten da, eta, gehienetan, errazagoa eta eraginkorragoa da hau etxeko aireko irudietatik mapatzea." "animista" "Pauso guzti hauek egin al dituzu?" - "Gauez baino ez da erakusten" "Erronka guztien aukera kendu?" "Barku-etxea" "Lorategia zaintzeko txabola bat" diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 6cdee55368..a2d4a8641a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -8,7 +8,7 @@ "نمایش" "%d مگابایت" "میزان فضای اشغال شده (مگابایت) روی حافظه خارجی برای ذخیره جزئیات نقشه" - "نمایش تمام یاداشت‌ها" + "نمایش تمام یادداشت‌ها" "و همچنین نمایش یادداشت‌هایی که به عنوان پرسش تعریف نشده‌اند" "نادیده گرفتن یادداشت‌هایی که به عنوان پرسش تعریف نشده است" "مقدار حافظه پنهان" @@ -19,19 +19,17 @@ "مطمئنید؟" "بله مطمئنم" "بررسی خواهم کرد" - "در عوض یک یاداشت می‌گذارید؟" + "در عوض یک یادداشت می‌گذارید؟" - "شما نیز می‌توانید یک یادداشت عمومی در این مکان بگذارید تا نقشه‌کش‌های دیگر در مورد آن نظر داده و در صورت امکان آن‌را حل نمایید و می‌توانید این مورد را برای خودتان پنهان کنید" + "شما نیز می‌توانید یک یادداشت عمومی در این مکان بگذارید تا نقشه‌کش‌های دیگر در مورد آن نظر داده و در صورت امکان آن را حل نمایید و می‌توانید این مورد را برای خودتان پنهان کنید" "تایید" - - "نه، فقط پنهان کن" "نام این مسیر چیست؟" "همان گونه که در تابلو خیابان نگاشته شده، کلمات اختصاری را هم وارد نمایید:" "گاهی علائم خیابان تنها در یک سوی خیابان است. همچنین توجه داشته باشید که ممکن است علائم تکمیلی برای معابر فرعی که به خیابان اصلی متصل هستند، وجود نداشته باشد. معمولا هر خیابان یا خانه دارای یک نام است." - "اگر نام را بدون اختصار می‌نویسید، می بایست آن را توضیح دهید. بسیاری از کلمات اختصاری اغلب در حالی که شما می‌نویسید، به طور خودکار توسط صفحه کلید هوشمند به کلمه اصلی باز می‌گردند، البته نه همه آنها." + "اگر نام را بدون اختصار می‌نویسید، می‌بایست آن را توضیح دهید. بسیاری از کلمات اختصاری اغلب در حالی که شما می‌نویسید، به طور خودکار توسط صفحه کلید هوشمند به کلمه اصلی باز می‌گردند، البته نه همه آنها." "بدون اختصار" @@ -59,10 +57,10 @@ "انتخاب روزهای هفته" - "به عبارت دیگر، آیا به صورت شبانه روزی باز است؟" + "به عبارت دیگر، آیا به صورت شبانه‌روزی باز است؟" - "آیا می توانید در این مورد یادداشتی بنویسید؟" + "آیا می‌توانید در این مورد یادداشتی بنویسید؟" "نه، مخفی‌کن" @@ -88,7 +86,7 @@ "بارگذاری پاسخ‌ها" - "شما کادر را خالی گذاشتید" + "شما کادر را خالی گذاشتید و هیچ جوابی ندادید" "بستن" @@ -129,22 +127,22 @@ "مجوز" - "پروانه عمومی همگانی گنو" + "پروانه عمومی همگانی GNU" "شما متصل نیستید" - "برای ثبت پاسخ ها، نیازمند ورود به حساب کاربری OSM خود هستید. آیا اکنون وارد می شوید؟" + "برای ثبت پاسخ‌ها، نیازمند ورود به حساب کاربری OSM خود هستید. آیا اکنون وارد می شوید؟" "مجاز نیست" - "این نسخه از برنامه اجازه بارگذاری پاسخ‌ها را ندارد! لطفا این نسخه را به روز کنید!" + "این نسخه از برنامه اجازه بارگذاری پاسخ‌ها را ندارد! لطفا این نسخه را به‌روز کنید!" - "برای مرور خودکار جستارهای اطراف، مکان نما را روشن کنید" + "برای مرور خودکار جستارهای اطراف، مکان‌نما را روشن کنید" "بعداً" @@ -153,7 +151,7 @@ "صرفاً این دو مسیر را به هم وصل می‌نماید" - "چیز دیگری هست(یادداشت بگذارید)" + "چیز دیگری هست (یادداشت بگذارید)" "بیانیه حریم شخصی" @@ -171,7 +169,7 @@ "پایان کار" - "شبانه روزی" + "شبانه‌روزی" "ماهیانه یا فصلی…" @@ -199,7 +197,7 @@ "این سقف چند شکل مختلف دارد" - "کوچک نمایی" + "کوچک‌نمایی" "بزرگنمایی" @@ -212,7 +210,7 @@ هر اقدامی که شما در این برنامه انجام می‌دهید به طور مستقیم به نقشه اضافه می‌شود و هیچ شخص سومی بین برنامه و زیرساخت osm وجود ندارد </p> <p> -ویرایش نقشه متن‌باز به صورت ناشناس امکان‌پذیر نیست، بنابراین هر تغییری که ایجاد می کنید با حساب کاربری OSM شما ذخیره می شود. این بدان معنی است که تاریخ، محتوا و به طور کلی مکان تغییرات شما به طور عمومی در وبگاه OSM قابل مشاهده است و در حساب کاربری شما ذخیره می‌شود. +ویرایش نقشه متن‌باز به صورت ناشناس امکان‌پذیر نیست، بنابراین هر تغییری که ایجاد می کنید با حساب‌کاربری OSM شما ذخیره می شود. این بدان معنی است که تاریخ، محتوا و به طور کلی مکان تغییرات شما به طور عمومی در وبگاه OSM قابل مشاهده است و در حساب کاربری شما ذخیره می‌شود. </p> <b> موقعیت مکانی</b><br/> @@ -272,7 +270,7 @@ "سنگ فرش هموار" - "سنگریزه (با لبه‌های گردشده)" + "سنگ‌ریزه (با لبه‌های گردشده)" "ماسه‌زار" @@ -282,7 +280,7 @@ "چوبی" - "آیا در این خیابان پیاده رو وجود دارد؟" + "آیا در این خیابان پیاده‌رو وجود دارد؟" "این خیابان کجاست؟" @@ -297,7 +295,7 @@ "شماره این ساختمان چیست؟" - "برنامه نقشه بردار نقشه‌متن‌باز" + "برنامه نقشه‌بردار نقشه‌متن‌باز" "کمک به بهبود نقشه‌متن‌باز با برنامه StreetComplete! @@ -313,13 +311,13 @@ "واقعا نامی ندارد؟" - "بله ، بدون نام است" + "بله، بدون نام است" "افزودن زمان ساعات کار" - "لطفا گزارش خطا را به سازنده ارسال کنید؟" + "لطفاً گزارش خطا را برای سازنده ارسال کنید؟" "برنامه در آخرین تلاش دچار خطا شد!" @@ -328,7 +326,7 @@ "ارسال ایمیل" - "هیچ حساب رایانامه ای تعیین نشده است." + "هیچ حساب رایانامه‌ای تعیین نشده است." "صفحه نمایش را روشن بگذارید" @@ -349,7 +347,7 @@ "آیا این ایستگاه اتوبوس سایبان دارد؟" - "چند دوچرخه را می توان در اینجا پارک کرد؟" + "چند دوچرخه را می‌توان در اینجا پارک کرد؟" "این شماره پلاک به نظر بسیار غیرعادی است." @@ -429,13 +427,13 @@ "همه منظوره" - "شما ورزش های زیادی را انتخاب کرده‌اید" + "شما ورزش‌های زیادی را انتخاب کرده‌اید" "آیا ایستگاه اتوبوس %s سایبان دارد؟" - "آیا این سرویس بهداشتی غیر رایگان است؟" + "آیا این سرویس‌بهداشتی غیررایگان است؟" "آیا این ایستگاه اتوبوس دارای سنگفرش آجدار ویژه نابینایان است؟" @@ -447,7 +445,7 @@ "آیا مطمئن هستید که این محل را بررسی کرده‌اید؟" - "آیا ایستگاه اتوبوس %s ، دارای سنگ‌فرش آجدار ویژه نابینایان است؟" + "آیا ایستگاه اتوبوس %s ، دارای سنگفرش آجدار ویژه نابینایان است؟" "فقط اطلاعاتی که در محل وجود دارد باید وارد شود." @@ -471,7 +469,7 @@ "آیا شما انتهای خیابان را بررسی کرده‌اید؟ اگر علائمی در کل خیابان وجود ندارد، برای تمام بخش انتخاب شده، محدودیت سرعت پیش‌فرض اعمال می‌شود." - "بله ، بدون علائم" + "بله، بدون علائم" "محدودیت سرعت پیش‌فرض راه‌های شهری با راه‌های روستایی متفاوت می‌باشد." @@ -485,7 +483,7 @@ "اگر علائمی مانند این در تقاطع اصلی خیابان وجود داشته باشد، علائم ویژه این منطقه را در این محدوده پیدا نخواهید کرد زیرا محدودیت سرعت قرار داده شده در این محدوده به کل منطقه اعمال می شود." "سافتبال" - "تنیس بدون تور" + "راکت‌بال" "اسکیت روی یخ" @@ -558,7 +556,7 @@ "سطل بزرگ فلزی" - "مخزن زیر زمینی" + "مخزن زیرزمینی" "شما یک کادر را خالی گذاشتید" @@ -590,7 +588,7 @@ "(نامشخص)" - "این وسیله اطفاء حریق از چه نوعی است؟" + "این وسیله اطفاء حریق (شیر آتش‌نشانی) از چه نوعی است؟" "شیر خیابانی" @@ -611,13 +609,13 @@ "ترجمه‌ها" - "نظام نامه مشارکت‌کنندگان" + "نظام‌نامه مشارکت‌کنندگان" "نویسنده و ویراستار" - "و بیشتر ..." + "و بیشتر..." "این یک خیابان محل سکونت است" @@ -654,23 +652,23 @@ "کاکائو" - "بادام زمینی" + "بادام‌زمینی" "گیلاس" - "شاه بلوط" + "شاه‌بلوط" "نارگیل" "قهوه" - "اس بری صغیر" + "کرنبری/توت‌خرس" - "تاریخ" + "خرما" "انجیر" @@ -713,7 +711,7 @@ "پرتقال" - "عنبه هندی" + "پاپایا/خربزه درختی" "هلو" @@ -729,7 +727,7 @@ "آناناس" - "فلفل کوبیده" + "فلفل" "پسته" @@ -772,10 +770,10 @@ "شب و روز روشنایی دارد" - "اگر نمی توانید اینجا را بررسی کنید با بزرگنمایی و کوچک نمایی نقشه سعی نمایید." + "اگر نمی‌توانید اینجا را بررسی کنید با بزرگنمایی و کوچک نمایی نقشه سعی نمایید." - "این تقاطع از چه نوعی چیست؟" + "این تقاطع از چه نوعی است؟" "گذرگاه عابر بدون خط‌ کشی" @@ -838,50 +836,50 @@ "اسم خانه" - "طبقات دارای پشت بام" + "طبقات دارای پشت‌بام" - "طبقات بدون پشت بام" + "طبقات بدون پشت‌بام" "متفاوت در هر بخش از ساختمان" - "در این بخش ، ارتفاع این قسمت از ساختمان را وارد نمایید" + "در این بخش، ارتفاع این قسمت از ساختمان را وارد نمایید" - "آیا مسیر پیاده روی این راه به صورت فیزیکی مجزا شده است (یعنی از طریق یک مانع)؟ محدودیت سرعت پیشفرض بستگی به این دارد که آیا این مورد وجود دارد یا خیر" + "آیا مسیر پیاده‌روی این راه به صورت فیزیکی مجزا شده است (یعنی از طریق یک مانع)؟ محدودیت سرعت پیشفرض بستگی به این دارد که آیا این مورد وجود دارد یا خیر" "بازخورد" "پیوست کردن تصویر" - "آیا می خواهید این تصویر را حذف کنید؟" + "آیا می‌خواهید این تصویر را حذف کنید؟" - "مسیر دوچرخه سواری" + "مسیر دوچرخه‌سواری" - "خط دوچرخه سواری" + "خط دوچرخه‌سواری" - "هیچیک" + "هیچکدام" - "خط دوچرخه سواری با سایر خطوط تردد خودرو مشترک است" + "خط دوچرخه‌سواری با سایر خطوط تردد خودرو مشترک است" "با خط اتوبوس مشترک است" - "با پیاده رو مشترک است." + "با پیاده‌رو مشترک است." - "ناتوان در ساخت تصویر" + "امکان ایجاد فایل برای عکس وجود ندارد" - "خط دوچرخه سواری، دوطرفه" + "خط دوچرخه‌سواری، دوطرفه" "مسیر دوچرخه سواری، دوطرفه" @@ -908,19 +906,19 @@ "آیا در %s خوراک گیاهی در منو وجود دارد؟" - "آیا در %s وعده های گیاه خواری وگان در منو وجود دارد؟" + "آیا در %s وعده‌های گیاه‌خواری وگان در منو وجود دارد؟" "فقط" - "وعده غذایی وگان بدون اجزاء حیوانی (بدون گوشت، بدون محصولات شیر، بدون تخم مرغ، ...)." + "وعده غذایی وگان بدون اجزاء حیوانی (بدون گوشت، بدون محصولات شیر، بدون تخم‌مرغ، ...)." "خوراک گیاهی بدون گوشت" - "اگر فقط تایید کنید بدین معنی است که در این محل برای هر نوع ذائقه خوراک سرو می شود ، در صورت عدم تایید ادامه دهید" + "اگر فقط تایید کنید بدین معنی است که در این محل برای هر نوع ذائقه خوراک سرو می شود، در صورت عدم تایید ادامه دهید" "روش نظافت خودرو چگونه است؟" @@ -938,13 +936,13 @@ "این نوع جستار را فعال کنید؟" - "این نوع جُستار به طور پیش فرض غیر فعال شده است زیرا شما ابتدا باید وارد این مکان شوید تا بتوانید به این جُستار پاسخ دهید." + "این نوع جُستار به طور پیش‌فرض غیرفعال شده است زیرا شما ابتدا باید وارد این مکان شوید تا بتوانید به این جُستار پاسخ دهید." "شماره اداری (پلاک خانه)" - "شماره جهت یابی (اختیاری)" + "شماره جهت‌یابی (اختیاری)" "مسیر رفت و برگشت دوچرخه سواری مجزا است…" @@ -976,8 +974,8 @@ " - "اگر سرویس بهداشتی برای صندلی چرخدار قابل دسترسی باشد ، ممکن است علائمی مانند این نصب شده باشد. -این بدآن معنی است که صندلی چرخدار در این سرویس بهداشتی قابل استفاده است ولی ممکن است هیچ مسیر عبور و یا سازه ایی برای آن وجود نداشته باشد." + "اگر سرویس بهداشتی برای صندلی چرخدار قابل دسترسی باشد، ممکن است علائمی مانند این نصب شده باشد. +این بدآن معنی است که صندلی چرخدار در این سرویس بهداشتی قابل استفاده است ولی ممکن است هیچ مسیر عبور و یا سازه‌ایی برای آن وجود نداشته باشد." "ایجاد یادداشت جدید" @@ -986,7 +984,7 @@ "برای ایجاد یادداشت بیشتر بزرگنمایی کنید" - "شما می توانید یک یادداشت ایجاد کنید تا نقشه‌کش های دیگر که اطلاعاتی در این مورد دارند آنرا تکمیل کنند . محل یادداشت را با جابجایی نقشه تغییر دهید:" + "شما می‌توانید یک یادداشت ایجاد کنید تا نقشه‌کش‌های دیگر که اطلاعاتی در این مورد دارند آن را تکمیل کنند. محل یادداشت را با جابجایی نقشه تغییر دهید:" "اغلب اینگونه به نظر می رسد:" @@ -995,7 +993,7 @@ "فلزی" - "آیا در اینجا مسیر دوچرخه سواری وجود دارد؟ از چه نوعی است؟" + "آیا در اینجا مسیر دوچرخه‌سواری وجود دارد؟ از چه نوعی است؟" "ساختار این پل چگونه است؟" @@ -1004,7 +1002,7 @@ "روش اتصال به شبکه در %s چگونه است؟" - "بی‌سیم(وایفای)" + "بی‌سیم (وایفای)" "با‌سیم" @@ -1016,7 +1014,7 @@ "بدون ارتباط" - "آیا ایستگاه قطار برقی %s سایبان دارد؟" + "آیا این ایستگاه تراموا %s سایبان دارد؟" "آیا این ایستگاه تراموا سایبان دارد؟" @@ -1044,10 +1042,10 @@ "شینتو" - "جودائسم" + "یهودیت" - "مذهب چینایی" + "تائوئیسم" "مورد استفاده تمام ادیان" @@ -1062,7 +1060,7 @@ "مذهب بهائی" - "کائودسیم" + "کائودائیسم" "مذهب ملت چین" @@ -1071,7 +1069,7 @@ "چه مذهبی در این محل وجود دارد؟" - "آیا برای پارک در این محل باید هزینه پرداخت؟" + "آیا برای پارک در اینجا باید پول پرداخت کنید؟ " "مسیر دوچرخه (با نشانه‌گذاری)" @@ -1080,13 +1078,13 @@ "سنگفرش نامرتب" - "نام این خیابان عابر پیاده چیست؟" + "نام این خیابان عابرپیاده چیست؟" "جنس سطح این میدان چیست؟" - "این میدان دارای کدام‌یک از این سطوح %s می‌باشد؟" + "این میدان دارای کدامیک از این سطوح %s می‌باشد؟" "بستگی به زمان و روز دارد…" @@ -1095,10 +1093,10 @@ "افزودن زمان" - "بله ، ولی فقط ..." + "بله، ولی فقط ..." - "بله ، ولی نه ..." + "بله، ولی نه ..." "در زمان دیگر" @@ -1165,7 +1163,7 @@ "اصلا %s موجود نیست." - "آیا این فضای استراحت ، سرویس بهداشتی دارد؟" + "آیا این استراحتگاه دارای سرویس بهداشتی است؟" "درجه سطح این مسیر چیست؟" @@ -1186,10 +1184,10 @@ "<p> در برخی از جستارها، اطلاعات اضافی از شخص ثالث دریافت می شود. به طور خاص یکی از روش های جستجوی جستارها یک API را نیز نمایش می دهد، و در Westnordost.de نیز میزبانی می‌شود، دیگر روش‌های پاسخ احتمالی .</p>" - "نه (توجه داشته باشید)" + "نه (یادداشت بگذارید)" - "بازنشانی هر دو جستار فعال شده و سفارش به طور پیش فرض؟" + "بازنشانی هر دو جستار فعال شده و سفارشی شده به حالت پیش‌فرض؟" "لطفا یک مقدار واضح‌تر را انتخاب کنید." @@ -1201,13 +1199,13 @@ "به سادگی کاربری اصلی این ساختمان را انتخاب کنید. به عنوان مثال. اگر یک فروشگاه در طبقه همکف با واحدهای فوقانی آن باشد، هنوز عمدتا یک واحد مسکونی است." - "هنوز ساخته شده است" + "هنوز در حال ساخت است" "مسکونی" - "ساختمان که در آن مردم زندگی می کنند" + "ساختمانی که مردم در آن زندگی می کنند" "خانه" @@ -1228,7 +1226,7 @@ "خانه دو تکه" - "ردیف خطی از خانه های مشابه هم" + "ردیف خطی از خانه‌های مشابه هم" "ساختمان هتل" @@ -1241,13 +1239,13 @@ "خانه‌های ییلاقی" - "کاروان ثابت" + "خانه سیار" "مجتمع تجاری" - "ساختمان که در آن مردم کار، خرید و یا هر گونه فعالیت های تجاری دیگر انجام می‌دهند" + "ساختمانی که افراد در آن کار، خرید یا هر فعالیت تجاری دیگری انجام می‌دهند" "ساختمان صنعتی" @@ -1287,10 +1285,10 @@ "ساختمان معبد" - "بتکده" + "پاگودا/بتکده" - "کنیسه" + "کنیسه/نیایش‌گاه یهودیان" "ساختمان اجتماعات" @@ -1327,7 +1325,7 @@ "برای خودروها" - "پارکینگ بدون سقف" + "پارکینگ بدون‌سقف" "مسقف برای خودرو" @@ -1379,7 +1377,7 @@ "ساختمان با ماشین آلات مانند پمپ و یا مبدل برق" - "حیاط" + "آشیانه/سوله" "آشیانه برای هواپیما، هلیکوپتر یا فضاپیما" @@ -1389,7 +1387,7 @@ "این ساختمان شماره ندارد…" - "این ساختمان به چه عنوانی برچسب‌گذاری شده :" + "این ساختمان با این عنوان برچسب‌گذاری شده:" "زیارتگاه" @@ -1404,19 +1402,19 @@ "منطقه رانندگی با سرعت کم" - "بدون علامت، پیش فرض اعمال می شود" + "بدون علامت، پیش‌فرض اعمال می شود" "بدون علائم زمان شروع کار" - "محدودیت سرعت‌در %s چه مقداری است؟" + "محدودیت سرعت در %s چه مقداری است؟" - "ورزشگاه" + "ورزشگاه/مرکز ورزشی" - "سرویس بهداشتی" + "سرویس‌بهداشتی" "محدودیت سرعت چگونه مشخص شده است؟" @@ -1431,10 +1429,10 @@ "برای بارگذاری تغییرات به صورت دستی، از دکمه‌ای که در نوار ابزار مشابه این است استفاده کنید." - "جداگانه" + "جدا از یکدیگر" - "دوچرخه سواران و عابرین پیاده در یک مسیر مشترک" + "دوچرخه‌سواران و عابرین پیاده در یک مسیر مشترک" "محدودیت ارتفاع در اینجا چه مقداری است؟" @@ -1443,7 +1441,7 @@ "برای ورودی پارکینگ محدودیت ارتفاع چه مقداری است؟" - "حد ارتفاع این محدود‌کننده ارتفاع چه مقداری است؟" + "حد ارتفاع این محدود کننده ارتفاع چه مقداری است؟" "محدویت ارتفاع ورود این تونل چه مقداری است؟" @@ -1459,7 +1457,7 @@ "%2$s, %1$s —" - "وارد شده توسط %1$s, %2$s" + "بسته شده توسط %1$s, %2$s" "دوباره فعال شده توسط %1$s, %2$s" @@ -1474,7 +1472,7 @@ "خروج از انتخاب همگی" - "از جمله ساختمان‌ها برای رستوران ها، کافی نت ها، ..." + "از جمله ساختمان‌هایی برای رستوران‌ها، کافه‌ها، فروشگاه‌های بزرگ…" "بعدی" @@ -1498,22 +1496,22 @@ "آیا این ساختمان بطور کامل زیرزمین است؟" - "اینگونه معنی می دهد که بیشتر از یک راه دسترسی وجود ندارد." + "اینگونه معنی می‌دهد که بیشتر از یک راه دسترسی وجود ندارد." "آیا در اینجا صندلی چرخدار قابل استفاده است؟" - "آیا این چراغ های راهنمایی برای درخواست نور سبز یک دکمه دارند؟" + "آیا این چراغ‌های راهنمایی برای درخواست نور سبز یک دکمه دارند؟" - "چند موتور سیکلت را می توان در اینجا پارک کرد؟" + "چند موتورسیکلت را می‌توان در اینجا پارک کرد؟" - "آیا پارکینگ موتور سیکلت سرپوشیده است؟ (از باران محافظت شده است)؟" + "آیا پارکینگ موتورسیکلت سرپوشیده است؟ (از باران محافظت شده است)؟" - "این نوع جُستار به طور پیش فرض غیر فعال گردیده‌است زیرا غالباً شما نیاز به بررسی تمام خیابان‌ها برای تابلو‌های محدودیت سرعت دارید و نه فقط بخش انتخاب شده. این موضوع گاهی اوقات می‌تواند یک جاذبه کاربرپسند برای رفع یک جُستار باشد." + "این نوع جُستار به طور پیش‌فرض غیرفعال گردیده است زیرا غالباً شما نیاز به بررسی تمام خیابان‌ها برای تابلوهای محدودیت سرعت دارید و نه فقط بخش انتخاب شده. این موضوع گاهی اوقات می‌تواند یک جاذبه کاربرپسند برای رفع یک جُستار باشد." "بازگرداندن جُستارهای پنهان" @@ -1542,7 +1540,7 @@ "آیا پیاده‌روی عابران در این جاده ممنوع است؟" - "این خیابان برای نداشتن پیاده رو در هر دو طرف برچسب‌گذاری شده است. در صورتی که پیاده رو وجود دارد، ولی به صورت جداگانه نمایش داده شده است، لطفا \"پیاده‌راه\" را مشخص نمایید." + "این خیابان برای نداشتن پیاده‌رو در هر دو طرف برچسب‌گذاری شده است. در صورتی که پیاده‌رو وجود دارد، ولی به صورت جداگانه نمایش داده شده است، لطفا \"پیاده‌رو\" را مشخص نمایید." "نوع این ساختمان چیست؟" @@ -1594,11 +1592,10 @@ "اضافه کردن تصویر سبب می‌شود، یادداشت بسیار مفیدتر واقع شود." - "زمان جمع آوری صندوق پستی %s را می‌دانید؟ -" + "زمان جمع آوری این صندوق پستی %s چه زمانی است؟" - "بهترین یادداشت را به زبان محلی بنگارید یا در غیر این صورت به زبان انگلیسی بنویسید." + "بهتر است یادداشت را به زبان محلی و یا به زبان انگلیسی بنویسید." "درختان اینجا برگ‌سوزنی هستند یا پهن‌برگ؟" @@ -1613,7 +1610,7 @@ "هر دو وجود دارند" - "سطح مسیر دوچرخه ‌سواری از چه جنسی است؟" + "سطح مسیر دوچرخه‌سواری از چه جنسی است؟" "تناقض در طول مسیر..." @@ -1622,7 +1619,7 @@ "اگر در طول راه تناقض وجود داشته باشد، اولین گام تفکیک راه است. پس از آن می‌توان برای هر قسمت تفکیک شده به طور جداگانه پاسخ جُستار را ارائه نمود. اکنون تفکیک کنید؟" - "روی مسیر ضربه بزنید و در نقطه ای (هایی) که چند پاسخ وجود دارد، آن مسیر را تفکیک کنید. سعی کنید تا حد ممکن دقیق باشید ، می توانید طبق معمول بزرگنمایی کنید." + "روی مسیر ضربه بزنید و در نقطه ای (هایی) که چند پاسخ وجود دارد، آن مسیر را تفکیک کنید. سعی کنید تا حد ممکن دقیق باشید، می توانید طبق معمول بزرگنمایی کنید." "لطفاً بیشتر بزرگنمایی کنید." @@ -1631,29 +1628,28 @@ "این راه‌ها به چند بخش تفکیک شده است. همیشه بعداً هم می‌توانید راه را تفکیک کنید." - "سطح این پیاده‌راه از چه جنسی است؟" + "سطح این پیاده‌رو از چه جنسی است؟" "آیا دستشویی با صندلی چرخدار %s قابل دسترسی است؟" - "آیا این توقف‌گاه خودرو دارای سنگفرش های برجسته است؟" + "آیا این تراموا دارای سنگفرش‌های برجسته است؟" - "آیا توقف‌گاه خودرو %s، سنگفرش های برجسته دارد؟" + "آیا تراموا %s، سنگفرش‌های برجسته دارد؟" "در اینجا محدودیت وزن چه مقدار است؟" - "این وزن غیرممکن به نظر می رسد. آیا مطمئن هستید که صحیح است؟" + "این وزن غیرممکن به نظر می‌رسد. آیا مطمئن هستید که صحیح است؟" "با علائم تفاوت دارد ..." - "آیا می خواهید یک یادداشت بگذارید؟ یک یادداشت با یک عکس - نقشه‌کش‌های دیگر را مجاب به نگهداری اطلاعات می‌کند." + "آیا می‌خواهید یک یادداشت بگذارید؟ یک یادداشت با یک عکس نقشه‌کش‌های دیگر را مجاب به نگهداری اطلاعات می‌کند." "آیا برای ورود به %s هزینه پرداخت می‌شود؟" @@ -1665,7 +1661,7 @@ "ساعات کار این مکان چیست؟ (%s)" - "نسخه فعلی:%s" + "نسخه فعلی: %s" "شماره این صندوق پستی چیست؟" @@ -1710,7 +1706,7 @@ "پلاستیک" - "همه نوع پلاستیک" + "هر نوع پلاستیکی" "کفش" @@ -1728,13 +1724,13 @@ "ضایعات فلزی" - "هر نوع شیشه" + "هر نوع شیشه‌ای" - "آیا فقط بطری‌های شیشه‌ای و شیشه در اینجا بازیافت می‌شود یا هر نوع شیشه؟" + "آیا فقط بطری‌های شیشه‌ای و شیشه در اینجا بازیافت می‌شود یا هر نوع شیشه‌ای؟" - "نمونه هایی از شیشه که غالباً پذیرفته نمی‌شوند: شیشه مات، پنجره‌های شیشه ای، ظروف شیشه ای، لامپ‌های روشنایی‌ حبابی یا کم‌مصرف." + "نمونه‌هایی از شیشه که غالباً پذیرفته نمی‌شوند: شیشه‌مات، پنجره‌های شیشه‌ای، ظروف شیشه‌ای، لامپ‌های روشنایی‌ حبابی یا کم‌مصرف." "تاریخچه نسخه‌ها" @@ -1743,10 +1739,10 @@ "چه خبر؟" - "رتبه این برنامه" + "امتیازدهی به این برنامه" - "در بازار گوگل" + "در گوگل پلی" "کمک‌مالی" @@ -1791,10 +1787,10 @@ "صفحه راهنما" - "اینجا برای زباله عمومی است" + "اینجا برای زباله‌های عمومی است" - "بنابراین، آیا این سطل که در آنجا قرار دارد برای هرگونه ضایعات، مانند زباله های خانگی یا تجاری می‌باشد؟" + "بنابراین، آیا این سطل که در آنجا قرار دارد برای هرگونه ضایعات، مانند زباله‌های خانگی یا تجاری می‌باشد؟" "آیا %s پرداخت نقدی را می پذیرد؟" @@ -1854,7 +1850,7 @@ "%d جُستار ویرایش شده هنوز منتشر نشده است." - "شما هنوز %d تغییر را منتشر نکرده اید. برای بارگذاری آنها باید وارد سامانه شوید." + "شما هنوز %d تغییر را منتشر نکرده‌اید. برای بارگذاری آنها باید وارد سامانه شوید." "پاسخ به جُستارها" @@ -1906,22 +1902,22 @@ "مطالب سرگرم کننده مربوط به نقشه برای شما، امتحان کنید" - "نقشه دوچرخه سواری" + "نقشه دوچرخه‌سواری" - "نقشه ای جستجوی مکان های قابل دسترسی صندلی چرخدار" + "نقشه‌ای برای جستجوی مکان‌های قابل دسترسی صندلی چرخدار" - "نقشه ای که ساختمان ها را به صورت سه بعدی نشان می دهد" + "نقشه‌ای که ساختمان‌ها را به صورت سه‌بعدی نشان می‌دهد" - "رستوران های خوراک گیاهی و گیاه خواری را در شهر خود بشناسید" + "رستوران‌های خوراک گیاهی و گیاه خواری را در شهر خود بشناسید" - "نقشه های لمسی را به راحتی برای هر نشانی ترسیم کنید." + "نقشه‌های لمسی را به راحتی برای هر نشانی ترسیم کنید." - "نقشه های لمسی برای کم بیناییان در مقیاس های مختلف" + "نقشه‌های لمسی برای کم بینایان در مقیاس‌های مختلف" "ویرایشگر کاملاً حرفه‌ای OSM برای رایانه. این ابزار قدرتمند برای مشارکت‌کنندگان فعال می‌باشد." @@ -1933,10 +1929,10 @@ "ویرایشگر ساده OSM به عنوان مرورگر. برای رایانه‌های شخصی یا رایانه های لوحی بزرگ بهینه‌سازی شده است" - "نقشه ها را با داده های سفارشی به سرعت ایجاد کرده و آنها را در وبگاه خود وارد نمایید" + "نقشه‌ها را با داده‌های سفارشی به سرعت ایجاد کرده و آنها را در وبسایت خود وارد نمایید" - "نقشه مسیرها و ایستگاه های حمل و نقل عمومی" + "نقشه مسیرها و ایستگاه‌های حمل و نقل عمومی" "با مشاهده تصاویر از شهر خود به OSM کمک کنید" @@ -1945,52 +1941,52 @@ "ویکی نقطه شروع شما برای ویرایش هر چیزی مرتبط با نقشه‌متن‌باز می‌باشد." - "تازه با نقشه‌متن‌باز آشنا شده‌اید؟ این یک راهنما برای مبتدی‌ها است" + "تازه با نقشه‌متن‌باز (osm) آشنا شده‌اید؟ این یک راهنما برای مبتدی‌ها است" - "سیاهه‌ایی بزرگ از آمار و تعداد مشارکت کنندگان در نقشه‌متن‌باز، مانند مکان و چگونگی مشارکت شما و اینکه چه کسی در نزدیکی شماست مانند یک صفحه راهنما" + "سیاهه‌ایی بزرگ از آمار و تعداد مشارکت‌کنندگان در نقشه‌متن‌باز، مانند مکان و چگونگی مشارکت شما و اینکه چه کسی در نزدیکی شماست مانند یک صفحه راهنما" "اطلاعات کلی در مورد نقشه‌متن‌باز و نحوه کار با آن به عنوان یک سازمان" - "سامانه و برنامه ای برای به اشتراک گذاری تصاویر سطح خیابان، با اجازه صریح استفاده از آنها برای مشارکت در OSM" + "سامانه و برنامه‌ای برای به اشتراک‌گذاری تصاویر سطح خیابان، با اجازه صریح استفاده از آنها برای مشارکت در OSM" - "سامانه و برنامه ای برای به اشتراک گذاری تصاویر سطح خیابان، با اجازه صریح استفاده از آنها برای مشارکت در OSM" + "سامانه و برنامه‌ای برای به اشتراک‌گذاری تصاویر سطح خیابان، با اجازه صریح استفاده از آنها برای مشارکت در OSM" "مسیریابی پویا برای معلولان با صندلی چرخدار" - "کد جغرافیایی داده های OSM که توسط بسیاری از سامانه های دیگر استفاده می شود" + "کد جغرافیایی داده‌های OSM که توسط بسیاری از سامانه‌های دیگر استفاده می‌شود" - "ارائه همه جاده های یک شهر برای چاپ روی پیراهن، لیوان، لیوان و ..." + "ارائه همه جاده‌های یک شهر برای چاپ روی تیشرت، لیوان و …" - "نقشه های قابل چاپ شهری را در چند گام ساده، به صورت انتخابی با فهرست راهنمای خیابانی ایجاد کنید" + "نقشه‌های قابل چاپ شهری را در چند گام ساده، به صورت انتخابی با فهرست راهنمای خیابانی ایجاد کنید" - "احتمالاً بهترین سامانه مسیریابی برای دوچرخه سواران" + "احتمالاً بهترین سامانه مسیریابی برای دوچرخه‌سواران" - "مشاهده ویرایش های OSM به صورت لحظه‌ای می‌باشد" + "مشاهده ویرایش‌های OSM به صورت لحظه‌ای می‌باشد" - "سریعترین سامانه مسیریابی اطراف" + "سریع ترین سامانه مسیریابی اطراف" "مسیریابی انواع وسایل نقلیه و پیاده به صورت دلخواه ارائه می شود. همچنین بطور همزمان زمان نیز قابل مشاهده است (نمایش زمان دستیابی از نقطه شروع)" - "استفاده از داده های OSM برای تولید یک هایکو (شعر بی قافیه سه سطری ژاپنی)" + "استفاده از داده‌های OSM برای تولید یک هایکو (شعر بی قافیه سه سطری ژاپنی)" - "نقشه ای که زیرساخت های برق، مخابرات، گاز و نفت را نشان می دهد" + "نقشه‌ای که زیرساخت‌های برق، مخابرات، گاز و نفت را نشان می‌دهد" - "نقشه های قابل چاپ برای جهت یابی ورزشی بسازید" + "نقشه‌های قابل چاپ برای جهت‌یابی ورزشی بسازید" "یک نقشه برای جستجوی عوارض نقشه OSM بر حسب دسته‌بندی" @@ -2005,7 +2001,7 @@ "اولین جُستار حل شد" - "به انجمن نقشه‌متن‌باز خوش آمدید! در نمایه خود می توانید اطلاعات بیشتری را درباره هر گونه جُستاری که پاسخ داده اید مشاهده کنید." + "به انجمن نقشه‌متن‌باز خوش آمدید! در نمایه خود می‌توانید اطلاعات بیشتری را درباره هر گونه جُستاری که پاسخ داده‌اید مشاهده کنید." "نقشه‌کش" @@ -2020,7 +2016,7 @@ "شما %d روز با این برنامه به OSM یاری رسانده‌اید! مشارکت‌کنندگان فعال، ستون اصلی OSM هستند، با تشکر از تلاش شما! ❤" - "دوچرخه سوار" + "دوچرخه‌سوار" "شما %d جُستار که به دوچرخه‌سواران کمک می‌کند را حل نموده‌اید!" @@ -2035,7 +2031,8 @@ "نامه‌رسان" - "شما برای کاوش تعداد %d نشانی کمک کردید! این داده ها نه تنها برای نامه‌رسان‌ها بلکه برای هر سامانه ناوبری ضروری است." + "شما به یافتن %d آدرس کمک کردید! +این داده ها نه تنها برای نامه‌رسان‌ها بلکه برای هر سامانه ناوبری ضروری است." "مرتفع" @@ -2047,7 +2044,7 @@ "حس ششم" - "شما %d جُستار موردنیاز افراد کم بینا را پاسخ داده‌اید." + "شما %d جُستار موردنیاز افراد کم‌بینا را پاسخ داده‌اید." "دونده" @@ -2080,16 +2077,16 @@ "منو" - "<p> داده‌های قابل مشاهده در نمایه شما از تاریخچه مشارکت‌های عمومی شما در نقشه‌متن‌باز جمع آوری شده و سپس روی سرور ما میزبانی می‌شود. </p>" + "<p> داده‌های قابل مشاهده در نمایه شما از تاریخچه مشارکت‌های عمومی شما در نقشه‌متن‌باز جمع‌آوری شده و سپس روی سرور ما میزبانی می‌شود. </p>" - "همچنین می توانید این کار را بعداً در صفحه نمایه انجام دهید." + "همچنین می‌توانید این کار را بعداً در صفحه نمایه انجام دهید." "مشارکت‌کنندگان هنری" - "پروژه های ساخته شده برای StreetComplete" + "پروژه‌های ساخته شده برای StreetComplete" "مشارکت‌کنندگان اصلی" "آمار شما همچنان در حال همگام سازی است. بعداً این صفحه را بررسی کنید." - "رتبه بندی در %2$s: %1$d" - "نقشه برداری پویا %s" + "رتبه‌بندی در %2$s: %1$d" + "نقشه‌برداری پویا %s" "براساس کشور" "براساس نوع جُستار" "رتبه‌بندی جهانی" @@ -2101,33 +2098,33 @@ "شماره (خانه) %s به کدام خیابان تعلق دارد؟" "وابسته به خیابانی که نامگذاری نشده است" "نام مکان:" - "روی جاده ای که به آن تعلق دارد ضربه بزنید یا در بخش ذیل آن را بطور کامل وارد نمایید:" + "روی جاده‌ای که به آن تعلق دارد ضربه بزنید یا در بخش ذیل آن را بطور کامل وارد نمایید:" "روغن پخت و پز" "روغن موتور" "یک افزونه مستقل به نام Nominatim ، در برگیرنده جستجوی فازی و جستجو براساس نوشتار شما می باشد." - "موتور مسیریابی بهینه" - "نقشه ای با مکانها و مسیرهای قابل جستجو" - "<p>برای نمایش نقشه ، قطعات نقشه از %1$s ها بازیابی می شوند. برای اطلاعات بیشتر به <a href=\"%2$s\">بیانیه حریم خصوصی</a>مراجعه کنید.</p>" + "یک موتور مسیریابی انعطاف پذیر و بهینه" + "نقشه‌ای با مکانها و مسیرهای قابل جستجو" + "<p>برای نمایش نقشه، قطعات نقشه از %1$s ها بازیابی می شوند. برای اطلاعات بیشتر به <a href=\"%2$s\">بیانیه حریم خصوصی</a>مراجعه کنید.</p>" "حامیان مالی" "تاریخچه" - "زمین شناسی" + "زمین‌شناسی" "گیاهان" "حیات وحش" - "طبیعت (چندین گزینه ای)" + "طبیعت (موضوعات متعدد)" "این یک تابلوی اعلانات است" "حمل و نقل عمومی" "موضوع این تابلو اطلاع رسانی چیست؟" - "بله ، جداگانه روی نقشه نمایش داده می شود" + "بله، جداگانه روی نقشه نمایش داده می‌شود" "این یک نقشه است." "آیا این فقط یک نقشه است و تمام؟" - "اگر تابلودر مورد یک موضوع خاص است، لطفاً آن را مشخص کنید، صرف نظر از اینکه این نقشه نیز در آن قرار دارد یا خیر. برای مثال، تابلوی حمل و نقل عمومی می تواند نقشه مسیر اتوبوس را داشته باشد. اگر موضوع در میان پاسخ های موجود ذکر نشده است، لطفاً به جای آن یادداشت بگذارید." + "اگر تابلو در مورد یک موضوع خاص است، لطفاً آن را مشخص کنید، صرف نظر از اینکه این نقشه نیز در آن قرار دارد یا خیر. برای مثال، تابلوی حمل و نقل عمومی می تواند نقشه مسیر اتوبوس را داشته باشد. اگر موضوع در میان پاسخ های موجود ذکر نشده است، لطفاً به جای آن یادداشت بگذارید." "چندین سطح ..." "آیا مطمئن هستید که تعیین جنس سطوح ناممکن است؟ گزینه \"اختلاف جنس سطوح در طول مسیر\" را مدنظر قرار دهید، تا بتوانید با جدا کردن مسیر اختلاف جنس سطح را مشخص کنید. لطفاً اگر جنس یکسان وجود دارد از پاسخ \"نمی توان بیان کرد\" استفاده کنید اما به عنوان یک پاسخ در دسترس نیست." - "لطفاً به طور خلاصه ماهیت جنس سطح را در اینجا مشخص کنید ، به عنوان مثال \"ماسه ای با قطعات سنگفرش\". طول متن به 255 نویسه محدود شده است." + "لطفاً به طور خلاصه ماهیت جنس سطح را در اینجا مشخص کنید، به عنوان مثال \"ماسه‌ای با قطعات سنگفرش\". طول متن به 255 نویسه محدود شده است." "%1$s – %2$s, %3$s" "%1$s – %2$s (%3$s), %4$s" "بین‌المللی" @@ -2143,7 +2140,7 @@ "افزودن روزهای حراج" "روز حراج" "مشخص نشده" - "آیا اینجا هنوز خط دوچرخه سواری وجود دارد؟" + "آیا اینجا هنوز خط دوچرخه‌سواری وجود دارد؟" "آیا در %1$s (%2$s) صندلی چرخدار قابل استفاده است؟" "فواصل تکرار بررسی" "کمتر بپرسید" @@ -2152,10 +2149,10 @@ "آیا %1$s (%2$s) پرداخت نقدی را قبول می کند؟" - "آیا توقفگاه خودرو %s نیمکت دارد؟" + "آیا تراموا %s نیمکت دارد؟" - "آیا این توقفگاه خودرو نیمکت دارد؟" + "آیا این تراموا نیمکت دارد؟" "آیا این ایستگاه اتوبوس نیمکت دارد؟" @@ -2165,44 +2162,44 @@ "آیا قله‌ای در %s ثبت شده است؟" "آیا داخل ساختمان دستگاه شوک الکتریکی موجود است؟" "به ترجمه این برنامه کمک کنید" - "%1$s %2$d%% ترجمه شده است" + "%1$s ترجمه شده %2$d%%" "آیا این خیابان یک طرفه است؟ به کدام سو؟" - "یکطرفه در این مسیر" + "یک طرفه در این مسیر" "یک طرفه نیست" "علامت را انتخاب کنید" "این پله‌ها ازکدام سو به سمت بالا می‌روند؟" "این راه بالا" "چند پله اینجا است؟" - "آیا در اینجا پارازیت برای امواج وجود دارد؟" + "آیا سیگنال‌های صوتی برای نابینایان در اینجا وجود دارد؟" "آیا این چراغ‌های راهنمایی برای افراد نابینا مجهز به دکمه لمسی برای عبور ایمن است؟" "نکته: اغلب این دکمه یک دکمه ارتعاشی یا یک مخروط چرخان در زیر بخش دکمه چراغ راهنمایی است." "شماره این ایستگاه اتوبوس چیست؟" - "شماره این ایستگاه واگن برقی چیست؟" + "شماره این ایستگاه واگن برقی/تراموا چیست؟" "خانه اختصاصی کوچک (خانه تابستانی ، کلبه تعطیلات ، کابین ...)" "از چه موانعی در این گذرگاه راه آهن استفاده می‌شود؟" "بدون موانع" "آیا اینجا سطح شیب‌دار دارد؟ از چه نوعی؟" "سطح شیب‌دار (قابل استفاده) ندارد" "سطح شیب‌دار دوچرخه" - "سطح شیب دار کالسکه" - "سطح شیب دار صندلی چرخدار" + "سطح شیب‌دار کالسکه" + "سطح شیب‌دار صندلی چرخدار" "نام بانک این خودپرداز چیست؟" - "چه کسی کمک های مالی برای این سطل پوشاک را پرداخت می کند؟" + "چه کسی کمک‌های مالی برای این سطل پوشاک را پرداخت می کند؟" "متصدی این ایستگاه شارژ کیست؟" - "نقشه های داخلی مراکز خرید ، ایستگاه های راه آهن و غیره را بیابید" + "نقشه‌های داخلی مراکز خرید، ایستگاه‌های راه آهن و غیره را بیابید" "شکارچی گنج" "شما %d جُستار را یافتید و پاسخ دادید که هنوز ناتمام بوده‌اند، تبریک می گویم!" "رتبه عالی" "شما %d جُستار مفید در زندگی روزمره این شهر را پاسخ دادید!" "فضای پیرامون" "شما %d جُستار مفید برای گردشگران را پاسخ دادید" - "آیا این گذرگاه عابر پیاده مکان جزیره‌ای دارد؟" + "آیا این گذرگاه عابرپیاده مکان جزیره‌ای دارد؟" "اینجا تابلو ندارد" - "آیا سطح شیب دار صندلی چرخدار به صورت راه جداگانه روی نقشه نمایش داده می شود؟" + "آیا سطح شیب‌دار صندلی چرخدار به صورت راه جداگانه روی نقشه نمایش داده می شود؟" "تفکیک شده" "بدون تفکیک" "بارگذاری خودکار پاسخ‌ها" @@ -2214,20 +2211,20 @@ "متروکه" "ساختمان بلا استفاده که کارکرد اصلی یا هدف آن ناشناخته است" "خرابه" - "ساختمانی متروکه ، ویران و غیرقابل شناسایی" - "چند خودرو در این ایستگاه شارژ می تواند به طور همزمان شارژ شود؟" - "نقشه ای که بلایای طبیعی اخیر را نشان می‌دهد و برای نقشه‌کش‌های همنوع دوست جالب است. همچنین، بسیاری از آمارهای متنوع را برای تجزیه و تحلیل چگونگی نقشه‌کشی و به روز بودن مکان ها نشان می‌دهد." - "این مسیر چند خط عبور برای خودرو ها دارد؟" + "ساختمانی متروکه، ویران و غیرقابل شناسایی" + "چند خودرو در این ایستگاه شارژ می‌تواند به طور همزمان شارژ شود؟" + "نقشه‌ای که بلایای طبیعی اخیر را نشان می‌دهد که برای نقشه‌برداران بشردوستانه جالب است. همچنین، بسیاری از آمارهای متنوع را برای تجزیه و تحلیل چگونگی نقشه‌کشی و به روز بودن مکان ها نشان می‌دهد." + "این مسیر چند خط عبور برای خودروها دارد؟" "با خطوط رنگی " "بدون خطوط رنگی" - "دارای دوربرگردان برای چرخش به چپ دو طرفه می باشد + "دارای دوربرگردان برای چرخش به چپ دو طرفه می‌باشد " "آیا این درست است؟" "حداکثر ارتفاع زیر پل چقدر است؟" - "اگر برای کل راه اعمال نمی شود، پاسخ \"%s\" را در نظر بگیرید." + "اگر برای کل راه اعمال نمی‌شود، پاسخ \"%s\" را در نظر بگیرید." "آیا اینجا جدول در کناره مسیر وجود دارد؟" "ارتفاع این جدول چقدر است؟" "هم سطح جاده" @@ -2238,17 +2235,17 @@ " - "تعداد کل خطوط تردد (هر دو جهت) قابل استفاده خودروها را مشخص کنید. خطوط دوچرخه و پارکینگ اختصاصی حساب نمی شوند. -اگر خطوطی ویژه اتوبوس ها ایجاد شده است ، لطفاً یادداشت کنید." + "تعداد کل خطوط تردد (هر دو جهت) قابل استفاده خودروها را مشخص کنید. خطوط دوچرخه و پارکینگ اختصاصی حساب نمی‌شوند. +اگر خطوطی ویژه اتوبوس‌ها ایجاد شده است، لطفاً یادداشت کنید." - "تعداد خطوط تردد قابل استفاده خودروها را در اینجا مشخص کنید. خطوط دوچرخه و پارکینگ اختصاصی حساب نمی شوند. -اگر خطوطی ویژه اتوبوس ها ایجاد شده است، لطفاً یادداشت کنید." + "تعداد خطوط تردد قابل استفاده خودروها را در اینجا مشخص کنید. خطوط دوچرخه و پارکینگ اختصاصی حساب نمی‌شوند. +اگر خطوطی ویژه اتوبوس‌ها ایجاد شده است، لطفاً یادداشت کنید." "سنگ" - "کامیون های مرتفع می توانند عبور کنند" + "کامیون‌های مرتفع می‌توانند عبور کنند" - "برای عبور کامیون های مرتفع مناسب نیست" + "برای عبور کامیون‌های مرتفع مناسب نیست" "روی جاده در نقشه ضربه بزنید" @@ -2273,17 +2270,18 @@ "نوع مکان اینجا را وارد کنید" - "این مغازه متروکه است. اکنون چه عارضه‌ای اینجاست؟" + "این فروشگاه متروکه است. اکنون چه عارضه‌ای اینجاست؟" "تعداد خطوط برای هر سمت متفاوت است" "سطح این زمین ورزشی چه پوششی دارد؟" - "این نوع جُستار به صورت پیش فرض غیرفعال است زیرا در برخی مناطق مفید نیست و احتمالاً مجبور خواهید بود که به مکان مورد نظر وارد شوید تا بتوانید به یک جُستار از این نوع پاسخ دهید." + "این نوع جُستار به صورت پیش‌فرض غیرفعال است زیرا در برخی مناطق مفید نیست و احتمالاً مجبور خواهید بود که به مکان مورد نظر وارد شوید تا بتوانید به یک جُستار از این نوع پاسخ دهید." "آیا %s محصولات حلال ارائه می دهد؟" "محصولات حلال مطابق با قوانین خاص تهیه می شود و مراکز صدور گواهینامه حلال محصولات، محصولات را مطابق با آن نشانه گذاری می‌کنند." - "اصلاً مسیر دوچرخه سواری وجود ندارد" + "اصلاً مسیر دوچرخه‌سواری وجود ندارد" - "طبق معمول ، روی یک سمت تصویر ضربه بزنید ، یک پاسخ مناسب را انتخاب نمایید و همین روش را برای سمت دیگر انجام دهید. به همه گزینه های موجود توجه داشته باشید: بعضی موارد واضح نیستند، مانند جاده یک طرفه ای که دوچرخه سواران می توانند در هر دو جهت حرکت کنند!" - "انتخاب اینکه، هیچ مسیر دوچرخه ای وجود ندارد" + "طبق معمول، روی یک سمت تصویر ضربه بزنید، یک پاسخ مناسب را انتخاب نمایید و همین روش را برای سمت دیگر انجام دهید. +به همه گزینه‌های موجود توجه داشته باشید: بعضی موارد واضح نیستند، مانند جاده یک طرفه ای که دوچرخه‌سواران می‌توانند در هر دو جهت حرکت کنند!" + "انتخاب اینکه، هیچ مسیر دوچرخه‌ای وجود ندارد" "تمام می‌شود در تاریخ ..." "چه زمانی کامل خواهد شد؟" "خاکی" @@ -2296,46 +2294,46 @@ "اینجا آب قابل شرب است؟ (%s)" "آب شرب (تایید شده)" "آب شرب (تایید نشده)" - "آب غیر قابل شرب (تایید شده)" - "آب غیر قابل شرب (تایید نشده)" + "آب غیرقابل شرب (تایید شده)" + "آب غیرقابل شرب (تایید نشده)" "رمز ملی روی این صندوق پستی چیست؟" "هیچ رمز ملی قابل مشاهده نیست" "تاج اسکاتلند" "ایستگاه آتش‌نشانی" - "فقط جعبههای نوشیدنی" + "فقط جعبه‌های نوشیدنی" "فقط بطری و جعبه پلاستیکی" "چند خودرو در این ایستگاه شارژ (%s) به طور همزمان قابل شارژ است؟" "حالت گروهی" "خروج از حالت گروهی" - "هنگام نقشه برداری از یک منطقه با هم در یک گروه می توانید برای تقسیم جُستارها بین همه اعضای گروه وارد حالت گروهی شوید." + "هنگام نقشه‌برداری از یک منطقه با هم در یک گروه می‌توانید برای تقسیم جُستارها بین همه اعضای گروه وارد حالت گروهی شوید." "حالت گروهی برای گروه های ۲ تا ۱۲ نفره استفاده می‌شود." "حالت گروهی فعال است" - "حالت گروهی عیرفعال است" + "حالت گروهی غیرفعال است" "آیا این زمین ورزشی روشنایی دارد؟" "آیا این محوطه ورزشی روشنایی دارد؟" - "کنترل عبور و مرور با چراغ های راهنمایی" + "کنترل عبور و مرور با چراغ‌های راهنمایی" "ویرایش زیر را واگرد کنید؟" "همگام سازی شده" "این ویرایش قبلاً همگام سازی شده است و قابل واگرد نیست" - "جداگانه روی نقشه نمایش داده می شود" + "جداگانه روی نقشه نمایش داده می‌شود" "یادداشت ایجاد شد" "یادداشت نظر داده شده" - "پنهانش کردی" + "شما آن را پنهان کردید" "راه را تقسیم کردید" "شما آن را حذف کردید" "%s اضافه شد" "%s حذف شد" - "به %s به روزرسانی شد" + "به %s به‌روزرسانی شد" "حافظه پنهان را حذف کنید" - "آیا فکر می کنید برخی از داده ها منسوخ شده اند" + "آیا فکر می‌کنید برخی از داده‌ها منسوخ شده‌اند" "حذف" "تمام داده‌های نقشه بارگیری شده، از جمله جُستارها، حذف شوند؟ -داده ها پس از %1$s روز به‌روز می‌شوند و داده های استفاده نشده پس از %2$s روز به طور خودکار حذف می گردند." +داده ها پس از %1$s روز، به‌روز می‌شوند و داده‌های استفاده نشده پس از %2$s روز به طور خودکار حذف می گردند." "%s چه نوع فروشگاهی است؟" - "این چه نوع مغازه ای است؟" - "نوع پس زمینه را انتخاب کنید" + "این چه نوع فروشگاهی است؟" + "نوع پس‌زمینه را انتخاب کنید" "نقشه" "هوایی (توسط Esri)" "این چه نوع مانعی است؟" @@ -2345,7 +2343,7 @@ "زنجیری" "طنابی" "بخش سیم متحرک" - "شبکه از راه رفتن دامها جلوگیری می کند" + "شبکه‌ای مانع از راه رفتن دام‌ها می‌شود" "جسم بزرگ بی حرکت" "دیوار نیوجرسی" "کُنده" @@ -2360,9 +2358,9 @@ "مانع دوچرخه" "دروازه لمسی" "نوار افقی" - "این چه نوع پاسگاهی است؟" + "این چه نوع ایستگاه پلیس/پاسگاهی است؟" "تبدیل به دروازه لمسی" - "این چه نوع نرده ای است؟" + "این چه نوع نرده‌ای است؟" "خانه (های) تک واحده" @@ -2370,19 +2368,19 @@ "%1$d از %2$d فعال شده " - "آیا ایستگاه واگن برقی %s روشنایی دارد؟" - "آیا این ایستگاه واگن برقی روشنایی دارد؟" - "آیا این ایستگاه اتوبوس روشنایی دار ؟" - "آیا این ایستگاه اتوبوس%s روشنایی دار ؟" + "آیا ایستگاه واگن برقی/تراموا %s روشنایی دارد؟" + "آیا این ایستگاه تراموا روشنایی دارد؟" + "آیا این ایستگاه اتوبوس روشنایی دارد؟" + "آیا این ایستگاه اتوبوس%s روشنایی دارد؟" "مجوز مکان" - "تراشه های چوبی" + "تراشه‌های چوبی" "برنامه دوربین موجود نیست" - "آیا ایستگاه واگن برقی %s سطل زباله دارد؟" + "آیا ایستگاه تراموا %s سطل زباله دارد؟" - "آیا این ایستگاه واگن برقی سطل زباله دارد؟" + "آیا این ایستگاه تراموا سطل زباله دارد؟" "آیا این ایستگاه اتوبوس سطل زباله دارد؟" @@ -2400,46 +2398,45 @@ "پرسش" "این ساختمان چند طبقه از روی سطح زمین دارد؟" "این بخش از ساختمان چند طبقه روی زمین دارد؟" - "آیا جداولی وجود دارد که این مسیر در اینجا به این جاده می رسد؟ از چه نوعی؟" + "آیا جداولی وجود دارد که این مسیر در اینجا به این جاده می‌رسد؟ از چه نوعی؟" "پیشفرض: %s" - "این نوع جُستار به طور پیش فرض غیرفعال است زیرا شکل سقف،معمولاً از خیابان به راحتی قابل مشاهده نیست. این نوع جُستار نیز بسیار وقت گیر است. در بیشتر موارد ترسیم آن از تصاویر هوایی در خانه آسانتر و کارآمدتر است." + "این نوع جُستار به طور پیش‌فرض غیرفعال است زیرا شکل سقف، معمولاً از خیابان به راحتی قابل مشاهده نیست. این نوع جُستار نیز بسیار وقت‌گیر است. در بیشتر موارد ترسیم آن از تصاویر هوایی در خانه آسان‌تر و کارآمدتر است." "متحرک" "آیا این مراحل تکمیل شده است؟" - "فقط در شب نشان داده می شود" "عدم انتخاب تمام جُستارها؟" - "قایق سواری" + "قایق‌سواری" "ساختمان پُشتی باغ" - "میز غرفه" + "غرفه/جایگاه" "جُستجو" "مدیریت پیشفرض‌ها" - "چند نفر در حال نقشه‌کشی هستند؟ شماره یکسان را برای همه تلفن‌ها وارد کنید." + "چند نفر در حال نقشه‌کشی هستند؟ شماره یکسانی را در تلفن همه وارد کنید." "در گام بعد، هر فرد باید رنگ متفاوتی را انتخاب کند. مورد خود را انتخاب کنید:" - "برنامه نقشه برای مسافران، کوهنوردان و دوچرخه سواران که بصورت آفلاین کار می‌کند" + "برنامه نقشه برای مسافران، کوهنوردان و دوچرخه‌سواران که بصورت آفلاین کار می‌کند" "اصلاً بدون محدودیت" - "چوبی پله ای روی پایه" + "چوبی پله‌ای روی پایه" "سنگ منقطع" "قابل جدا شدن (با یا بدون کلید)" "تاشو (با یا بدون کلید)" "موردی پیدا نشد" "کار زیاد است؟" - "مشارکت در درجه اول باید سرگرم کننده باشد! اگر از تعداد جُستارها غافلگیر شده اید، همیشه می توانید در تنظیمات مشخص کنید که کدام جُستارها و به چه ترتیب برای شما نمایش داده شوند." + "مشارکت در درجه اول باید سرگرم کننده باشد! اگر از تعداد جُستارها غافلگیر شده‌اید، همیشه می‌توانید در تنظیمات مشخص کنید که کدام جُستارها و به چه ترتیب برای شما نمایش داده شوند." "افزودن پیشفرض" "نام پیشفرض" "پیشفرض" "انتخابی" - "\"%s\" پیشفرض حذف شود؟ انتخاب جُستار و سفارش برای آن به طور برگشت ناپذیری از بین می رود." - "همگام سازی داده ها…" + "\"%s\" پیشفرض حذف شود؟ انتخاب جُستار و سفارش برای آن به طور برگشت ناپذیری از بین می‌رود." + "همگام سازی داده‌ها…" "همگام سازی داده" "ورزش، تمرینات" "اختیاری" "پل بین بُرج‌ها (آسمان راه)" "آیا این لباسشویی خدمات ارائه می دهد؟" "آیا %s محصولات حلال ارائه می دهد؟" - "محصولات حلال باید بر اساس قوانین ویژه ای تهیه شوند و بنگاه های صدور گواهینامه حلال محصولات را مطابق با آن نشانه‌گذاری می‌کنند." + "محصولات حلال باید بر اساس قوانین ویژه‌ای تهیه شوند و بنگاه‌های صدور گواهینامه حلال محصولات را مطابق با آن نشانه‌گذاری می‌کنند." "آیا این میز مسافرتی پوشیده شده است (از باران محافظت می شود)؟" @@ -2449,17 +2446,37 @@ "این چه نوع سرعتگیری است؟" "برآمدگی (کوتاه)" "قوز (بلند)" - "تخت (برآمدگی صفحه ای)" + "تخت (برآمدگی صفحه‌ای)" "بالشتک (برای وسایل نقلیه عریض ناهموار نیست)" "جاده باریک" "جزیره" - "پیچ(های) مصنوعی" + "پیچ (های) مصنوعی" "نوار (های) صوتی" "صفحات بتنی" "خطوط بتنی" - "چه قطری روی تابلوی این شیر آتش نشانی مشخص شده است؟" - "این قطر غیر قابل قبول به نظر می رسد." + "چه قطری روی تابلوی این شیر آتش‌نشانی مشخص شده است؟" + "این قطر غیر قابل قبول به نظر می‌رسد." "مطمئنید؟ گاهی اوقات می توان قطر را روی خود شیر یافت." "خوراک ندارد" "خیر" + "بازنشانی" + "تمام جُستارهایی که مخفی کرده‌اید بازنشانی شود؟" + "چه کسی مجاز است اینجا پارک کند؟ پارکینگ ممکن است رایگان یا پولی باشد." + "همگانی" + "هر شخصی که از یک مکان خاص بازدید می کند (به عنوان مثال فقط مشتریان)" + "فقط افراد با مجوز" + "آیا زمان تخلیه این صندوق پستی هنوز درست است؟" + "آیا زمان تخلیه صندوق پستی %s هنوز درست است؟" + "معتبر نیست. سعی کنید نوع مکان را وارد کنید، به عنوان مثال \"نانوایی\". در غیر این صورت، یادداشت بگذارید." + "محدودیت مسیر دوچرخه از چه نوعی است؟" + "عبور از یک مسیر خاص" + "گذرگاه باریک، رو به جلو تنگ شونده" + "عبور از بین دو مانع" + "مانع - مانع در هر طرف" + "مانع - بیش از دو مانع" + + + "%s در کدام سطح قرار دارد؟" + "زبان را انتخاب کنید" + "سامانه پیشفرض" \ No newline at end of file diff --git a/app/src/main/res/values-fa/translation_info.xml b/app/src/main/res/values-fa/translation_info.xml index c46e86f95e..3ddf070ea2 100644 --- a/app/src/main/res/values-fa/translation_info.xml +++ b/app/src/main/res/values-fa/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 99 diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 553ff395b9..cb241937f3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2064,9 +2064,6 @@ Jos jokin kaistoista on varattu busseille, jätä paikalle ilmoitus." "Tämä kysymystyyppi on oletuksena pois päältä, koska kattojen muotoa ei yleensä näe helposti kadulta. Tämä kysymystyyppi vie myös melko paljon aikaa: monissa tapauksissa se on helpompaa ja tehokkaampaa tehdä kotoa ilmakuvien avulla." "Animismi" "Onko nämä askelmat rakennettu?" - - - "Näytetään yöllä" "Poista kaikkien kysymysten valinta?" "Venevaja" "Siirtolapuutarhamökki" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 400858ac07..a805ae5e13 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -295,7 +295,11 @@ S’il n’y a pas de panneau applicable à ce tronçon le long de la voie, les "La bouche de métro %s est-elle accessible en fauteuil roulant ?" "La gare %s est-elle accessible en fauteuil roulant ?" "Le lieu %s est-il accessible en fauteuil roulant ?" + + "« En partie » signifie qu’il n’y a qu’une seule marche pour accéder au lieu et que la plupart des pièces à l’intérieur sont accessibles en fauteuil roulant." + + "« En partie » signifie qu’il n’y a qu’une seule marche pour y accéder." @@ -724,6 +728,8 @@ Sinon, vous pouvez télécharger un autre clavier dans l’app store. Les clavie "Sol quasi naturel avec marques de passages" "%s est-il complètement souterrain ?" "Ce bâtiment est-il complètement souterrain ?" + + "« En partie » signifie qu’il n’y a qu’une seule marche pour y accéder." "Cet endroit est-il accessible en fauteuil roulant ?" "Ces feux tricolores ont-ils un bouton pour demander le feu vert pour les piétons ?" @@ -1381,7 +1387,6 @@ Les données sont automatiquement mises à jour au bout de %1$s jours et les don "Ce type de quête est désactivé par défaut car la forme des toits est souvent peu visible depuis la rue. Cette quête est également très chronophage. Il est souvent plus efficace de renseigner ces informations depuis des images satellitaires." "Animiste" "Ces étapes sont-elles terminées ?" - "Ne montrer que la nuit" "Désélectionner toutes les quêtes ?" "Péniche" "Cabanon de jardin" @@ -1481,6 +1486,11 @@ Les données sont automatiquement mises à jour au bout de %1$s jours et les don "Passage entre deux barrières" "Chicane - barrière de chaque côté" "Chicane - plus de deux barrières" + + "À quel niveau se trouve %s ?" "Sélectionnez une langue" + + + "Défaut du système" \ No newline at end of file diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 24bda051f0..37740213e6 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -223,7 +223,11 @@ Se non hai sinais ó longo de toda a rúa á que pertence o treito escollido, em "Pódese circular pola entrada do metro %s nunha cadeira de rodas?" "A estación de trens %s é accesible nunha cadeira de rodas?" "O sitio %s é accesible nunha cadeira de rodas?" + + "\"De xeito parcial\" significa que hai como moito un chanzo para acceder ao lugar e que se pode acceder á meirande parte das salas nunha cadeira de rodas." + + "\"De xeito parcial\" significa que hai como moito un chanzo para acceder ó lugar." "%s contén algunha abreviación?" "Estes servizos teñen un cambiadoiro para meniños?" @@ -558,6 +562,8 @@ Se iso non é posíbel, podes descarregar outro teclado na tenda de aplicacións "Brando" "Está %s completamente baixo terra?" "Este edificio está completamente baixo terra?" + + "\"De xeito parcial\" significa que hai como moito un chanzo para acceder ó lugar." "Esta zona é accesíbel nunha cadeira de rodas?" "Estes semáforos teñen un botón para solicitar luz verde?" @@ -1047,7 +1053,6 @@ Os datos actualízanse após %1$s días e os datos non utilizados elimínanse de "Este tipo de pregunta está desactivada por defecto porque as formas dos tellados normalmente non se distinguen desde a rúa. Esta pregunta tamén consume moito tempo, é máis doado respondela desde a casa vendo imaxe aéreas." "Animista" "Completaches estos pasos?" - "Só visible pola noite" "Desmarcar tódalas peticións?" "Casa flotante" "Pequena horta ao carón do edificio" diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 229e9abddf..00cc002eb4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -235,7 +235,11 @@ Ako duž cijele ulice nema znakova koji se odnose na istaknuti odjeljak, primjen "Je li ulaz u podzemnu željeznicu %s pristupačan za invalidska kolica?" "Je li željeznička stanica %s pristupačna za invalidska kolica?" "Je li lokacija %s pristupačna za invalidska kolica?" + + "\"Djelomično\" znači da nema više od jedne stepenice za pristup, i da je većina prostorija pristupačna za invalidska kolica." + + "\"Djelomično\" znači da nema više od jedne stepenice za pristup." "Kratica u nazivu %s?" "Ima li u ovom toaletu stol za presvlačenje beba?" @@ -614,6 +618,8 @@ Na primjer 1,3 ili 2–6." "Mekana" "Je li %s potpuno pod zemljom?" "Je li ova zgrada potpuno pod zemljom?" + + "\"Djelomično\" znači da nema više od jedne stepenice za pristup." "Je li ova lokacija pristupačna za invalidska kolica?" "Imaju li ovi semafori tipku za zahtjevanje prelaska pješaka?" @@ -1239,9 +1245,6 @@ Podaci se automatski osvježavaju nakon %1$s dana, a nekorišteni podaci brišu "Ova vrsta zadatka je inicijalno onemogućena jer se oblici krova često ne vide lako s ulice. Ova vrsta zadatka također oduzima dosta vremena; u većini slučajeva je jednostavnije i učinkovitije krovove označiti iz zračnih snimaka kod kuće." "Animizam" "Jesu li ove stepenice dovršene?" - - - "Prikazuje se samo noću" "Isključi sve zadatke?" "Spremište za čamce" @@ -1371,6 +1374,11 @@ Podaci se automatski osvježavaju nakon %1$s dana, a nekorišteni podaci brišu "Namjerne krivulje (šikana) - više od dvije barijere" + + "Na kojem katu se nalazi %s?" "Odaberite jezik" + + + "Isti kao i sustav" \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ab4d4b0353..39173da77a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2389,7 +2389,6 @@ megállóban?" "Ez a kérdéstípus alapértelmezés szerint le van tiltva, mert a tetőformák az utcáról gyakran nehezen láthatók. Ez a kérdéstípus ráadásul meglehetősen időigényes is; az esetek többségében könnyebb és hatékonyabb ezt otthon légi felvételek segítségével feltérképezni." "Animista" "Be van-e fejezve ez a lépcső?" - "Csak éjszaka látható" "Visszavonod az összes kérdés kijelölését?" "Csónakház" "Kiskerti melléképület" diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index e81d519a65..c16995abe1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -325,7 +325,11 @@ Jika tidak ada tanda di sepanjang jalan yang berlaku untuk bagian yang disorot, "Apa jalan masuk kereta bawah tanah %s ramah kursi roda?" "Apa stasiun kereta %s ramah kursi roda?" "Apa tempat %s ramah kursi roda?" + + "Sebagian berarti tidak ada lebih dari satu anak tangga untuk mengakses tempat dan kebanyakan ruangan di dalam ramah kursi roda." + + "Sebagian berarti tidak ada lebih dari satu anak tangga untuk mengakses" "Singkatan untuk nama %s?" "Apakah kamar kecil ini ada meja ganti popok bayi?" @@ -772,6 +776,8 @@ Sebagian berarti kursi roda dapat masuk dan menggunakannya, tapi tidak ada pegan "Lemah" "Apa %s sepenuhnya di bawah tanah?" "Apa bangunan ini sepenuhnya di bawah tanah?" + + "Sebagian berarti tidak ada lebih dari 1 anak tangga untuk melewatinya." "Apa tempat ini ramah kursi roda?" "Apa lampu merah di sini punya tombol untuk menyeberang?" diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f0c912f462..2f82fbed0e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -235,7 +235,11 @@ Se non ci sono cartelli lungo tutta la strada nel tratto evidenziato allora si a "L'entrata della metro %s è accessibile con la sedia a rotelle?" "La stazione dei treni %s è accessibile con la sedia a rotelle?" "%s è accessibile con la sedia a rotelle?" + + "Parzialmente significa che c'è al massimo un gradino per entrare nel locale e che si può accedere con la sedia a rotelle alla maggior parte delle stanze." + + "\"Parzialmente\" significa che c'è al massimo un solo gradino di accesso." "Il nome %s contiene un'abbreviazione?" "Questo bagno ha un fasciatoio?" @@ -586,6 +590,8 @@ Altrimenti, è possibile scaricare un'altra tastiera. Le tastiere popolari che s "Soffice" "%s è completamente sotterraneo?" "Questo edificio è completamente sotterraneo?" + + "Parziale significa che per accedere non c'è più di un gradino." "Questo luogo è accessibile con una sedia a rotelle?" "Il semaforo ha un pulsante per richiedere il verde?" @@ -1122,7 +1128,6 @@ I dati vengono aggiornati dopo %1$s giorni e i dati inutilizzati vengono cancell "Questo tipo di missione è disabilitata perché la forma del tetto non è sempre facilmente visibile dalla strada. Questo tipo di missione è anche gravosa; nella maggior parte dei casi è più facile ed efficiente mappare queste informazioni usando le immagini satellitari da casa." "Animista" "Queste scale sono complete?" - "Mostra solo di notte" "Cancellare tutte le missioni?" "Rimessa" "Lotto giardino annesso" @@ -1200,6 +1205,8 @@ I dati vengono aggiornati dopo %1$s giorni e i dati inutilizzati vengono cancell "Passaggio tra due barriere" "Chicane - barriere su ogni lato" "Chicane - più di due barriere" + + "Su quale piano si trova %s?" "Seleziona lingua" "Predefinito di sistema" diff --git a/app/src/main/res/values-it/translation_info.xml b/app/src/main/res/values-it/translation_info.xml index 1953c600c1..3ddf070ea2 100644 --- a/app/src/main/res/values-it/translation_info.xml +++ b/app/src/main/res/values-it/translation_info.xml @@ -1,4 +1,4 @@ - 100 + 99 diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d192727958..a0eedf189f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1215,6 +1215,9 @@ OpenStreetMap を匿名で編集することはできないため、変更は OS "宿泊施設" "寮" "ハウスボート" + + + "バンガロー" "トレーラーハウス" "商業施設" "工業施設" @@ -1316,6 +1319,9 @@ OpenStreetMap を匿名で編集することはできないため、変更は OS "%s ポストの収集時刻は何時ですか?" "ノートは現地で話されている言語で書くのが最善ですが、そうでなければ英語で書いてください。" "ここの樹木の葉の種類は何ですか?" + + + "針葉樹" "広葉樹" "広葉樹と針葉樹" @@ -1366,10 +1372,14 @@ OpenStreetMap を匿名で編集することはできないため、変更は OS "情報掲示板" "情報端末" "地図" + "道標" "自分のプロフィール" "ログイン" "ログアウト" "OSM プロフィール" + + + "OpenStreetMapにようこそ" "StreetComplete で簡単に OpenStreetMap に貢献できます。 このアプリはあなたの周りで不足している情報(自転車レーン、住居表示、営業時間など...)を自動で探します。" "実績" @@ -1388,8 +1398,6 @@ OpenStreetMap を匿名で編集することはできないため、変更は OS レベル" "エンジン油" "<p>地図を表示するためにベクタータイルを %1$s から取得します。詳しくは %1$s の <a href=\"%2$s\">privacy statement</a> を参照してください。</p>" - - "歴史" "複数の路面…" diff --git a/app/src/main/res/values-ja/translation_info.xml b/app/src/main/res/values-ja/translation_info.xml index 8fdb25a3ed..581fca6689 100644 --- a/app/src/main/res/values-ja/translation_info.xml +++ b/app/src/main/res/values-ja/translation_info.xml @@ -1,4 +1,4 @@ - 61 + 62 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 77e1dccca7..3743418336 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2166,7 +2166,6 @@ StreetComplete는 주변에서 지도에 빠진 정보가 있는지 찾아요: "지붕 형태를 길거리에서 보는 것이 쉽지 않기 때문에 이 과제는 기본적으로 비활성화 되어있습니다. 이 과제는 또 시간을 많이 소모합니다; 대부분의 경우 집에서 위성사진을 통해 정보를 채워넣는 게 더 쉽고 효율적입니다." "애니미즘" "이 계단이 완공되었나요?" - "밤에만 보임" "모든 과제를 선택 해제할까요?" "선상가옥" "공동정원 변소" @@ -2193,4 +2192,52 @@ StreetComplete는 주변에서 지도에 빠진 정보가 있는지 찾아요: "프리셋 \"%s\"을(를) 지울까요? 해당되는 과제 목록과 순서가 지워지며 되돌릴 수 없습니다." + "데이터를 동기화하는 중..." + "데이터 동기화" + "스포츠, 운동" + "선택적" + "건물 사이에 위치한 다리(구름다리)" + "이 세탁소는 셀프 빨래방인가요?" + "%s에서 할랄 식품을 취급하나요?" + "할랄 식품은 할랄 인증 기관에서 정하는 특별한 규칙에 따라 제조된 식품을 의미합니다." + "이 피크닉 테이블에 (비를 막아주는) 지붕이 있나요?" + "이 부분은 계단입니다" + "벽이나 울타리를 통과하는 통로로 변환합니다." + "출입구로 변환합니다." + "이 과속 방지턱은 어떻게 생겼나요?" + "좁고 가파른 형태" + "넓고 완만한 형태" + "꼭대기가 평평함" + "(대형 차량은 영향을 받지 않게끔) 폭이 좁음" + "폭이 좁아지는 도로" + "섬" + "시케인(구불구불한 급커브)" + "작은 방지턱이 수십 개 나열됨" + "콘크리트 판" + "콘크리트 차로" + "이 소화전을 나타내는 표지판의 지름이 얼마인가요?" + "입력한 지름은 타당해 보이지 않습니다." + "확실한가요? 소화전 겉면에 지름이 적혀 있는 경우도 있습니다." + "음식이 없습니다" + "아니요" + "복구" + "숨긴 과제를 모두 복구하시겠습니까?" + "여기에 주차할 수 있는 사람이 누구인가요? 주차 요금은 있어도 되고, 없어도 됩니다." + "누구나 가능" + "특정 장소(가게 등)에 방문하는 사람만 가능" + "권한이 있는 사람만 가능" + "이 우체통의 수거 시각이 아직도 맞습니까?" + "이 우체통 %s의 수거 시각이 아직도 맞습니까?" + "인식할 수 없습니다. 장소의 유형(예: '빵집')을 입력해 주세요. 불가능하다면 참고를 남겨 주세요." + "이 자전거 방벽은 어떻게 생겼나요?" + "대각선 방향" + "좁은 통로, 위로 갈수록 좁아짐" + "두 방벽 사이의 통로" + "시케인 - 양쪽에 방벽이 있음" + "시케인 - 방벽이 세 개 이상 있음" + + + "%s은(는) 몇 층에 있나요?" + "언어 선택" + "시스템 기본값" \ No newline at end of file diff --git a/app/src/main/res/values-ko/translation_info.xml b/app/src/main/res/values-ko/translation_info.xml index 6e8116df47..3ddf070ea2 100644 --- a/app/src/main/res/values-ko/translation_info.xml +++ b/app/src/main/res/values-ko/translation_info.xml @@ -1,4 +1,4 @@ - 95 + 99 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d63ff14670..eebf2b5954 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -2226,6 +2226,5 @@ Pastebėtina, kad ši aplikacija klausia namo numerio tik po to, kai nustatytas "Ar šioje auobusų stotelėje yra šiukšliadėžė?" "DUK" "Kiek rūsio aukštų turi šis pastatas?" - "Rodyti tik naktį" "Ieškoti" \ No newline at end of file diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 239e062983..a289e3d60a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1965,9 +1965,6 @@ Data blir oppdatert etter %1$s dager og ubrukte data blir automatisk slettet ett "Animisme" "Er trappene ferdigbygget?" - - "Kun vist om natten" - "Opphev alle oppdrag?" diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 628d28210b..bddf51891b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2436,7 +2436,6 @@ Gegevens worden ververst na %1$s dagen en ongebruikte gegevens worden automatisc "Dit type vraag is standaard uitgeschakeld, omdat de dakvormen vaak niet gemakkelijk te zien zijn vanaf de straat. Deze vraag kost ook veel tijd; meestal is het makkelijker en efficiënter om dit thuis met hulp van luchtfoto's aan de kaart toe te voegen" "Animisme" "Is deze trap voltooid?" - "Wordt alleen 's nachts getoond" "Alle vragen deselecteren?" "Boothuis" "Volkstuingebouw" @@ -2491,6 +2490,10 @@ Gegevens worden ververst na %1$s dagen en ongebruikte gegevens worden automatisc "Weet je het zeker? Soms kan de diameter op de brandkraan zelf staan." "Het heeft geen eten" "Nee" + "Herstel" + "Toon alle vragen die u verborgen hebt" + + "Op welk niveau zit %s?" "Selecteer taal" "Standaardinstelling" diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 79e9785ae1..640e11862b 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -226,7 +226,11 @@ Appen delar ikkje GPS-posisjonen din med nokon. Han vert berre brukt til å auto "Er T-banenedgangen %s tilgjengeleg med rullestol?" "Er jernbanestasjonen %s tilgjengeleg med rullestol?" "Er %s tilgjengeleg med rullestol?" + + "«Delvis» vil seia at det ikkje er meir enn eitt trappetrinn ved inngangen og at inne er dei fleste romma tilgjengelege med rullestol." + + "«Delvis» vil seia at det ikkje er meir enn eitt trappetrinn ved inngangen." "Er det ei forkorting i namnet %s?" "Finst det stellebord ved dette toalettet?" @@ -572,6 +576,8 @@ Appen delar ikkje GPS-posisjonen din med nokon. Han vert berre brukt til å auto "Mjukt" "Ligg %s heilt under jorda?" "Er denne bygningen heilt under jorda?" + + "«Delvis» vil seia at det ikkje er meir enn eitt trappetrinn ved inngangen." "Er denne staden tilgjengeleg med rullestol?" "Har trafikklysa ein knapp for fotgjengarar?" diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 239e062983..a289e3d60a 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -1965,9 +1965,6 @@ Data blir oppdatert etter %1$s dager og ubrukte data blir automatisk slettet ett "Animisme" "Er trappene ferdigbygget?" - - "Kun vist om natten" - "Opphev alle oppdrag?" diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index aeef753582..deb3007826 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1971,7 +1971,6 @@ Dane są odświeżane automatycznie po %1$s dniach a nieużyte kasowane automaty "Ten typ zadania jest domyślnie wyłączony, ponieważ kształty dachu często nie są dobrze widoczne z ulicy. Ten typ zadania jest również dość czasochłonny. W większości przypadków łatwiej i wydajniej jest zmapować to na podstawie zdjęć lotniczych w domu." "Animista" "Czy te schody są skończone?" - "Widoczny tylko w nocy" "Odznaczyć wszystkie zadania?" "Przystań" "Budyneczek działki ogrodowej" diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 05acdb8c5b..bcc580feb9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2236,7 +2236,6 @@ Os dados são atualizados após %1$s dias e os dados não utilizados são exclu "Este tipo de missão é desabilitado por padrão porque as formas do telhado geralmente não são facilmente visíveis da rua. Esse tipo de missão também consome muito tempo; na maioria dos casos, é mais fácil e eficiente mapear isso a partir de imagens aéreas em casa." "Animista" "Essas etapas foram concluídas?" - "Mostrar apenas à noite" "Desmarcar todas as missões?" "Casa de barcos" "Dependência de loteamento de jardim" @@ -2275,10 +2274,26 @@ Os dados são atualizados após %1$s dias e os dados não utilizados são exclu "Esta parte são etapas" "Convertido em uma passagem, em uma parede/cerca/etc." "Convertido em um portão" + "Qual tipo de lombada é essa?" + "Lombada curta" + "Lombada longa" + "Lombada elevada" + "Estrada estreita" "Ilha" "Qual diâmetro está especificado no sinal para este hidrante?" "Este diâmetro parece implausível." "Você tem certeza? Às vezes, o diâmetro pode ser encontrado no próprio hidrante." "Não tem comida" "Não" + "Restaurar" + "Restaurar todas as missões que você escondeu?" + "Quem está autorizado a estacionar aqui? O estacionamento pode ser grátis ou pago." + "Qualquer pessoa" + "Qualquer pessoa que visite um local específico (por exemplo, apenas clientes)" + "Apenas individual(s), com permissão" + "Não reconhecido. Tente digitar o tipo de lugar, por exemplo \"padaria\". Caso contrário, considere deixar uma nota." + "Que tipo de barreira de bicicleta é essa?" + "Passagem entre duas barreiras" + "Selecione o idioma" + "Padrão do sistema " \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/translation_info.xml b/app/src/main/res/values-pt-rBR/translation_info.xml index 5b0ce213bb..c46e86f95e 100644 --- a/app/src/main/res/values-pt-rBR/translation_info.xml +++ b/app/src/main/res/values-pt-rBR/translation_info.xml @@ -1,4 +1,4 @@ - 97 + 98 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7af217acb6..f6ceeed008 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -276,6 +276,8 @@ Se não existir sinalização ao longo da estrada selecionada, por omissão é a "O local %s é acessível a cadeira de rodas?" + + "Parcialmente significa que não existe mais do que um degrau baixo para aceder ao local e que a maioria das divisões interiores são acessíveis a cadeira de rodas." @@ -714,6 +716,8 @@ Caso contrário, pode descarregar outro teclado na loja de apps. Alguns dos tecl "Suave" "%s está totalmente abaixo do solo?" "Este edifício está totalmente abaixo do solo?" + + "Parcialmente significa que não há mais que um degrau para aceder." "Este local é acessível a cadeiras de rodas?" "Estes semáforos têm um botão para mudar o sinal para verde?" @@ -1246,7 +1250,6 @@ Os dados são atualizados após %1$s dias e os dados não utilizados são elimin "Esta missão está por padrão desativada porque os formas dos telhados são muitas vezes difíceis de ver a partir da rua. Além disso este tipo de missão leva bastante tempo; na maioria dos casos é mais fácil e mais eficiente mapear isto num computador em casa com imagens de satélites." "Animista" "Estes degraus estão terminados?" - "Mostrado apenas durante a noite" "Desselecionar todas as missões?" "Barco-casa" "Barraco de horta" diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5631fa1299..bc2abc3bf3 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -387,7 +387,11 @@ Dacă nu există indicatoare de-a lungul întregii străzi care se aplică pentr "Intrare %s are acces pentru scaunul cu rotile?" "Stația de tren %s are acces pentru scaunul cu rotile?" "Locația %s are acces pentru scaunul cu rotile?" + + "Prin parțial se înțelege că nu este necesar mai mult de un pas pentru a intra in locație și că majoritate spațiilor din interior au facilitați pentru scaunul cu rotile." + + "Prin parțial se înțelege că nu este necesar mai mult de un pas pentru a intra." "Există abrevieri in numele %s?" "Are masă de schimbare a scutecelor copiilor această toaletă?" @@ -786,6 +790,8 @@ Parțial înseamnă că o persoană cu scaun cu rotile poate intra și folosi to "Moale" "%s este complet subterană?" "Această clădire este in întregime sub pământ?" + + "Prin parțial se înțelege că nu este necesar mai mult de un pas pentru a fi accesat." "Este acest loc accesibil scaunului cu rotile?" "Acest semafor are buton de solicitare a traversării?" @@ -1332,7 +1338,6 @@ Datele sunt actualizate după %1$s zile, iar datele neutilizate sunt șterse dup "Acest tip de misiune este dezactivat în mod implicit, deoarece formele acoperișului nu sunt adesea vizibile cu ușurință de pe stradă. Acest tip de misiune consumă, de asemenea, destul de mult timp; în majoritatea cazurilor, este mai ușor și mai eficient să cartografiați acest lucru din imagini aeriene acasă." "Animist" "Au fost parcurși acești pași?" - "Afișează noaptea" "Deselecatam toate provicările?" "Casa plutitoare" "Dependință pentru unelte" diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e6f1dd54a0..9de23b33f1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1607,7 +1607,6 @@ "Завершены ли эти шаги?" - "Отображается только ночью" "Отменить выбор всех заданий?" "Эллинг" "Пристройка для садового участка" diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d660db8730..8fc5c60e33 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -2437,7 +2437,6 @@ Pamätajte, že táto aplikácia sa pýta na súpisné číslo budovy až po ur "Tento typ úlohy je v predvolenom nastavení zakázaný, pretože tvary striech nie sú z ulice často dobre viditeľné. Tento typ úlohy je tiež dosť časovo náročný; vo väčšine prípadov je jednoduchšie a efektívnejšie to zmapovať z leteckých snímok doma." "Animista" "Sú tieto schody dokončené?" - "Zobrazuje sa iba v noci" "Zrušiť výber všetkých úloh?" "Lodenica" "Prístavba záhradného pozemku" diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 3f1a27a759..8524f90cec 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -225,7 +225,11 @@ "Да ли је улаз у метро %s доступан за инвалидска колица?" "Да ли је железничка станица %s доступна за инвалидска колица?" "Да ли је локација %s доступна за инвалидска колица?" + + "„Делимично“ значи да нема више од једног степеника за приступ, и да је већина просторија доступна за инвалидска колица." + + "„Делимично“ значи да нема више од једног степеника за приступ." "Да ли је то скраћеница у називу %s?" "Да ли овај тоалет има сто за пресвлачење беба?" @@ -564,6 +568,8 @@ "Мекана" "Да ли је %s потпуно под земљом?" "Да ли је овај објекат потпуно под земљом?" + + "„Делимично“ значи да нема више од једног степеника за приступ." "Да ли је ово место доступно за инвалидска колица?" "Да ли ови семафори имају дугме за захтевање преласка?" @@ -1092,7 +1098,6 @@ "Ова врста задатака је онемогућена јер се облици кровова често не виде добро са улице. Такође, одузимају доста врмена. Углавном је лакше и ефикасније кровове означити од куће, преко снимака из ваздуха." "Анимизам" "Да ли су ове степенице завршене?" - "Приказује се само ноћу" "Желите ли да искључите све задатке?" "„Гаража“ за чамце" "Вртна кућица" diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2d649be848..2e77519f21 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -229,7 +229,11 @@ Om det inte finns några skyltar längs hela vägen som gäller för den markera "Är tunnelbaneingången %s tillgänglig med rullstol?" "Är tågstationen %s tillgänglig med rullstol?" "Är %s tillgänglig med rullstol?" + + "Delvis innebär att det inte finns mer än ett enda steg för att komma åt verksamheten och att de flesta rum inuti är rullstolsanpassade." + + "Delvis innebär att det inte krävs mer än ett enda trappsteg för att komma åt det." "Är det en förkortning i namnet %s?" "Har den här toaletten ett skötbord?" @@ -578,6 +582,8 @@ Delvis betyder att rullstolsanvändare kan komma in och använda toaletten men a "Mjuk" "Är %s helt under jord?" "Är byggnaden helt under jord?" + + "Delvis innebär att det inte krävs mer än ett enda trappsteg för att komma åt det." "Är det här stället rullstolsanpassat?" "Har dessa trafikljus en knapp för att begära grön gubbe?" @@ -1140,7 +1146,6 @@ Kartdata uppdateras efter %1$s dagar och oanvänd data raderas automatiskt efter "Den här uppdragstypen är inaktiverad som standard eftersom det kan vara svårt att se takformen. Uppdraget är också ganska tidskrävande och det kan vara enklare att kartlägga detta från flygfoton hemma vid datorn." "Animism" "Är trappan färdigställd?" - "Visas bara nattetid" "Avmarkera alla uppdrag?" "Båthus" @@ -1226,5 +1231,9 @@ Kartdata uppdateras efter %1$s dagar och oanvänd data raderas automatiskt efter "Passage mellan två grindar" "Labyrintfålla - en grind på varje sida" "Labyrintfålla - tre eller fler grindar" + + + "På vilket våningsplan ligger %s?" + "Välj språk" "Systemstandard" \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 8224ce8237..7d75c93346 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -235,7 +235,11 @@ "ทางเข้ารถไฟฟ้า %s รองรับรถเข็นหรือไม่?" "สถานีรถไฟ %s เข้าถึงโดยรถเข็นได้หรือไม่?" "ตำแหน่งที่ตั้ง %s เข้าถึงโดยรถเข็นได้หรือไม่?" + + "บางส่วน หมายถึงไม่เกินหนึ่งขั้นบันไดสำหรับการเข้าถึง และห้องส่วนใหญ่สามารถใช้รถเข็นเข้าถึงได้" + + "บางส่วน หมายถึงไม่เกินหนึ่งขั้นบันไดสำหรับการเข้าถึง" "ตัวอักษรย่อในชื่อ %s?" "ห้องน้ำนี้มีโต๊ะเปลี่ยนผ้าอ้อมเด็กหรือไม่?" @@ -580,6 +584,8 @@ "อ่อน" "%s อยู่ใต้ดินทั้งหมดหรือไม่" "อาคารนี้อยู่ใต้ดินทั้งหมดหรือไม่" + + "บางส่วน หมายถึงไม่เกินหนึ่งขั้นบันไดสำหรับการเข้าถึง" "สถานที่แห่งนี้เข้าถึงโดยรถเข็นได้หรือไม่?" "ไฟจราจรมีปุ่มขอสัญญาณเดินหรือไม่" diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 39a1851a21..6d5158b97e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -240,7 +240,11 @@ "Чи доступна станція метро %s для інвалідних візків?" "Чи доступна залізнична станція %s для інвалідних візків?" "Чи доступне місце %s для інвалідних візків?" + + "«Частково» значить, що для доступу треба зробити не більше кроку і що більшість кімнат всередині обладнані для інвалідних візків." + + "«Частково» значить, що для доступу треба зробити не більше кроку." "Скорочення в назві %s?" "Чи є в цьому туалеті дитячий столик?" @@ -591,6 +595,8 @@ "М'яке" "Чи є повністю під землею %s?" "Чи є ця будівля повністю під землею?" + + "Частково означає що одного кроку достатньо для доступу" "Чи є доступ для людей у візках?" "Чи вмикається пішохідний світлофор кнопкою?" @@ -1148,7 +1154,6 @@ "Цей тип квесту вимкнено за замовчуванням, оскільки форми даху часто нелегко побачити з вулиці. Цей тип квесту також займає більше часу; здебільшого простіше та ефективніше розпізнати з аерознімків удома." "Анімізм" "Ці кроки завершені?" - "Показується лише вночі" "Прибрати виділення з усього?" "Елінг" "Садовий флігель" diff --git a/app/src/main/res/values-uk/translation_info.xml b/app/src/main/res/values-uk/translation_info.xml index 5b0ce213bb..d1260d5b8e 100644 --- a/app/src/main/res/values-uk/translation_info.xml +++ b/app/src/main/res/values-uk/translation_info.xml @@ -1,4 +1,4 @@ - 97 + 96 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d6543b786b..3a12963944 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2220,7 +2220,6 @@ "平移" "常見問題" "預設組合：%s" - "只在晚上出現" "取消選擇所有任務？" "船屋" "搜尋" diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1efb62dcc4..ea17eb97cd 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1498,6 +1498,8 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "这座建筑是否完全位于地下？" + + "部分意味着只需一步即可访问它。" @@ -2144,7 +2146,7 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "非独立式独栋别墅" - "这里的水质是否可以饮用？(%s)" + "这里的水源是否可以饮用？(%s)" "可安全饮用（已标明）" "可安全饮用（未标明）" "不能安全饮用（已标明）" @@ -2157,7 +2159,7 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "仅限塑料瓶与盒子" - "这个充电站 (%s) 可以同时给多少辆汽车充电？ + "这个充电站 (%s) 可以同时给多少辆车充电？ " "团队模式" "离开团队模式" @@ -2232,7 +2234,7 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "隔墙、围篱等…" - "杂物" + "杂物、废墟" "挤压式阶梯" @@ -2254,7 +2256,7 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "这个街车站有照明吗？" "这个公交车站有照明吗？" "%s 公交车站有照明吗？" - "位置资讯授权" + "位置授权" "碎木屑" @@ -2283,7 +2285,7 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "固定式（无法移动）" "这是什么类型的监视镜头？" "拱顶" - "修复" + "固定式" "平移" @@ -2310,9 +2312,6 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "这些步骤是否已完成？" - - "只在夜间显示" - "取消选择所有的任务？" @@ -2407,10 +2406,23 @@ OpenStreetMap 不接受匿名编辑，您需要登录您的 OpenStreetMap 帐号 "它不提供餐点" + "没有" + "恢复" - "恢复" + "要还原所有你已隐藏的问题吗？" + + + "谁被允许在此停车？停车可能是免费或付费的。" + + + "任何公众人员" + "访问特定地点的任何人（如仅限顾客）" + "只有获得许可的个人" + "此邮筒的收取时间仍然正确吗?" + "未被确认。请尝试报告此地的类型，例如\"面包店\"。否则,请考虑留下注解。" "选择语言" + "系统预设值" \ No newline at end of file diff --git a/app/src/main/res/values-zh/translation_info.xml b/app/src/main/res/values-zh/translation_info.xml index 5b0ce213bb..c46e86f95e 100644 --- a/app/src/main/res/values-zh/translation_info.xml +++ b/app/src/main/res/values-zh/translation_info.xml @@ -1,4 +1,4 @@ - 97 + 98 diff --git a/metadata/fa/short_description.txt b/metadata/fa/short_description.txt index dda51b0b32..bed5f0f15d 100644 --- a/metadata/fa/short_description.txt +++ b/metadata/fa/short_description.txt @@ -1 +1 @@ -برنامه نقشه بردار نقشه‌متن‌باز \ No newline at end of file +برنامه نقشه‌بردار نقشه‌متن‌باز \ No newline at end of file From 2982a06c93060bedebb78104e8ea7c93ec4547da Mon Sep 17 00:00:00 2001 From: Stephen Michel Date: Tue, 30 Nov 2021 10:12:42 -0500 Subject: [PATCH 20/20] Fix grammar: a -> an --- app/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb6ec8bfdc..15f119b4b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -327,9 +327,9 @@ The info you enter is then directly added to the OpenStreetMap in your name, wit Is the train station %s wheelchair accessible? Is the location %s wheelchair accessible? Partially - Partially means that there is no more than a ankle-high step to access the place and that most rooms inside are wheelchair accessible. - Partially means that there is no more than a ankle-high step to access it. - Partially means that there is no more than a ankle-high step to access it. + Partially means that there is no more than an ankle-high step to access the place and that most rooms inside are wheelchair accessible. + Partially means that there is no more than an ankle-high step to access it. + Partially means that there is no more than an ankle-high step to access it. "A wheelchair sign like this might be visible if the restroom is accessible. Partially means that a wheelchair can enter and use the restroom, but no handrail or adapted hand basin is present." What type of recycling facility is this?