From d443616d1f463d7463f25f48686336ff89397899 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 26 Oct 2021 01:44:57 +0200 Subject: [PATCH] Change order of mappings in charging stations theme --- .../charging_station/charging_station.json | 48 +++++++++---------- .../charging_station.protojson | 4 +- langs/layers/de.json | 10 ++-- langs/layers/en.json | 10 ++-- langs/layers/nl.json | 10 ++-- langs/layers/ru.json | 7 +++ 6 files changed, 48 insertions(+), 41 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index ce39f6343..3ec94777e 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -1704,9 +1704,9 @@ ] }, "then": { - "en": "This charging station is broken", - "nl": "Dit oplaadpunt is kapot", - "de": "Diese Ladestation ist kaputt" + "en": "This charging station works", + "nl": "Dit oplaadpunt werkt", + "de": "Diese Ladestation funktioniert" } }, { @@ -1719,6 +1719,22 @@ "amenity=charging_station" ] }, + "then": { + "en": "This charging station is broken", + "nl": "Dit oplaadpunt is kapot", + "de": "Diese Ladestation ist kaputt" + } + }, + { + "if": { + "and": [ + "planned:amenity=charging_station", + "construction:amenity=", + "disused:amenity=", + "operational_status=", + "amenity=" + ] + }, "then": { "en": "A charging station is planned here", "nl": "Hier zal binnenkort een oplaadpunt gebouwd worden", @@ -1728,8 +1744,8 @@ { "if": { "and": [ - "planned:amenity=charging_station", - "construction:amenity=", + "planned:amenity=", + "construction:amenity=charging_station", "disused:amenity=", "operational_status=", "amenity=" @@ -1745,9 +1761,9 @@ "if": { "and": [ "planned:amenity=", - "construction:amenity=charging_station", - "disused:amenity=", - "operational_status=broken", + "construction:amenity=", + "disused:amenity=charging_station", + "operational_status=", "amenity=" ] }, @@ -1756,22 +1772,6 @@ "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig", "de": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" } - }, - { - "if": { - "and": [ - "planned:amenity=", - "construction:amenity=", - "disused:amenity=charging_station", - "operational_status=broken", - "amenity=" - ] - }, - "then": { - "en": "This charging station works", - "nl": "Dit oplaadpunt werkt", - "de": "Diese Ladestation funktioniert" - } } ] }, diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson index 5a941d6b0..ac7a86b9b 100644 --- a/assets/layers/charging_station/charging_station.protojson +++ b/assets/layers/charging_station/charging_station.protojson @@ -609,7 +609,7 @@ "planned:amenity=", "construction:amenity=charging_station", "disused:amenity=", - "operational_status=broken", + "operational_status=", "amenity=" ] }, @@ -624,7 +624,7 @@ "planned:amenity=", "construction:amenity=", "disused:amenity=charging_station", - "operational_status=broken", + "operational_status=", "amenity=" ] }, diff --git a/langs/layers/de.json b/langs/layers/de.json index 664c8efa0..46ea03b70 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1085,19 +1085,19 @@ "Operational status": { "mappings": { "0": { - "then": "Diese Ladestation ist kaputt" + "then": "Diese Ladestation funktioniert" }, "1": { - "then": "Hier ist eine Ladestation geplant" + "then": "Diese Ladestation ist kaputt" }, "2": { - "then": "Hier wird eine Ladestation gebaut" + "then": "Hier ist eine Ladestation geplant" }, "3": { - "then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" + "then": "Hier wird eine Ladestation gebaut" }, "4": { - "then": "Diese Ladestation funktioniert" + "then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" } }, "question": "Ist dieser Ladepunkt in Betrieb?" diff --git a/langs/layers/en.json b/langs/layers/en.json index c5dbcbbc4..98e6506fc 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1175,19 +1175,19 @@ "Operational status": { "mappings": { "0": { - "then": "This charging station is broken" + "then": "This charging station works" }, "1": { - "then": "A charging station is planned here" + "then": "This charging station is broken" }, "2": { - "then": "A charging station is constructed here" + "then": "A charging station is planned here" }, "3": { - "then": "This charging station has beed permanently disabled and is not in use anymore but is still visible" + "then": "A charging station is constructed here" }, "4": { - "then": "This charging station works" + "then": "This charging station has beed permanently disabled and is not in use anymore but is still visible" } }, "question": "Is this charging point in use?" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 317a63c55..633812839 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1288,19 +1288,19 @@ "Operational status": { "mappings": { "0": { - "then": "Dit oplaadpunt is kapot" + "then": "Dit oplaadpunt werkt" }, "1": { - "then": "Hier zal binnenkort een oplaadpunt gebouwd worden" + "then": "Dit oplaadpunt is kapot" }, "2": { - "then": "Hier wordt op dit moment een oplaadpunt gebouwd" + "then": "Hier zal binnenkort een oplaadpunt gebouwd worden" }, "3": { - "then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig" + "then": "Hier wordt op dit moment een oplaadpunt gebouwd" }, "4": { - "then": "Dit oplaadpunt werkt" + "then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig" } }, "question": "Is dit oplaadpunt operationeel?" diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 534da2e01..33c93089d 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1429,6 +1429,13 @@ } }, "waste_basket": { + "iconSize": { + "mappings": { + "0": { + "then": "Контейнер для мусора" + } + } + }, "name": "Контейнер для мусора", "presets": { "0": {