From 15562f8bc6066a4ee681e38cd10e9a633a3ed5bb Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 13 Mar 2025 20:08:29 +0100 Subject: [PATCH] Chore: lint themes --- assets/layers/building/building.json | 40 +-- .../charging_station/charging_station.json | 272 +++++++++--------- assets/layers/cyclestreets/cyclestreets.json | 164 +++++------ .../cycleways_and_roads.json | 2 +- assets/layers/kerbs/kerbs.json | 2 +- assets/layers/nsi_brand/nsi_brand.json | 2 +- assets/layers/nsi_operator/nsi_operator.json | 2 +- assets/layers/waste_basket/waste_basket.json | 2 +- .../layers/waste_disposal/waste_disposal.json | 2 +- .../layers/wayside_shrine/wayside_shrine.json | 6 +- .../mapcomplete-changes.json | 21 +- 11 files changed, 256 insertions(+), 259 deletions(-) diff --git a/assets/layers/building/building.json b/assets/layers/building/building.json index 2d9965c111..03cf34113e 100644 --- a/assets/layers/building/building.json +++ b/assets/layers/building/building.json @@ -1,8 +1,11 @@ { "id": "building", - "isCounted": false, - "source": { - "osmTags": "building~*" + "name": { + "en": "Buildings", + "ca": "Edificis", + "cy": "Adeiladau", + "de": "Gebäude", + "cs": "Budovy" }, "description": { "en": "All buildings", @@ -10,6 +13,20 @@ "de": "Alle Gebäude", "cs": "Všechny budovy" }, + "source": { + "osmTags": "building~*" + }, + "isCounted": false, + "minzoom": 18, + "title": { + "render": { + "en": "Building", + "ca": "Edifici", + "cy": "Adeilad", + "de": "Gebäude", + "cs": "Budova" + } + }, "pointRendering": [ { "location": [ @@ -30,22 +47,6 @@ "width": 1 } ], - "name": { - "en": "Buildings", - "ca": "Edificis", - "cy": "Adeiladau", - "de": "Gebäude", - "cs": "Budovy" - }, - "title": { - "render": { - "en": "Building", - "ca": "Edifici", - "cy": "Adeilad", - "de": "Gebäude", - "cs": "Budova" - } - }, "tagRenderings": [ { "id": "architecture", @@ -406,7 +407,6 @@ }, "address.address" ], - "minzoom": 18, "allowMove": { "enableRelocation": false, "enableImproveAccuracy": true diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 361217b213..70fc469835 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -9,7 +9,15 @@ "es": "Puntos de carga", "uk": "Зарядні станції" }, - "minzoom": 10, + "description": { + "en": "A charging station", + "nl": "Oplaadpunten", + "ca": "Una estació de càrrega", + "cs": "Nabíjecí stanice", + "de": "Eine Ladestation", + "es": "Un punto de carga", + "fr": "Une station de recharge" + }, "source": { "osmTags": { "and": [ @@ -24,6 +32,7 @@ ] } }, + "minzoom": 10, "title": { "render": { "en": "Charging station", @@ -81,16 +90,117 @@ } ] }, - "description": { - "en": "A charging station", - "nl": "Oplaadpunten", - "ca": "Una estació de càrrega", - "cs": "Nabíjecí stanice", - "de": "Eine Ladestation", - "es": "Un punto de carga", - "fr": "Une station de recharge" - }, - "#": "no-question-hint-check", + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "pin", + "color": "#fff" + }, + { + "icon": { + "render": "./assets/themes/charging_stations/plug.svg", + "mappings": [ + { + "if": "bicycle=yes", + "then": "./assets/themes/charging_stations/bicycle.svg" + }, + { + "if": { + "or": [ + "car=yes", + "motorcar=yes" + ] + }, + "then": "./assets/themes/charging_stations/car.svg" + } + ] + } + } + ], + "iconBadges": [ + { + "if": { + "or": [ + "disused:amenity=charging_station", + "operational_status=broken" + ] + }, + "then": "close:#c22;" + }, + { + "if": { + "or": [ + "proposed:amenity=charging_station", + "planned:amenity=charging_station" + ] + }, + "then": "./assets/layers/charging_station/under_construction.svg" + }, + { + "if": { + "and": [ + "bicycle=yes", + { + "or": [ + "motorcar=yes", + "car=yes" + ] + } + ] + }, + "then": "circle:#fff;./assets/themes/charging_stations/car.svg" + } + ], + "anchor": "bottom", + "iconSize": "50,50" + } + ], + "lineRendering": [ + { + "color": "black", + "width": 2, + "fillColor": "#80808080" + } + ], + "presets": [ + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes" + ], + "title": { + "en": "charging station for electrical bikes", + "nl": "oplaadpunt voor elektrische fietsen", + "ca": "Estació de càrrega de bicicletes elèctriques", + "cs": "nabíjecí stanice pro elektrokola", + "de": "Ladestation für Elektrofahrräder", + "es": "punto de carga para bicicletas eléctricas", + "uk": "зарядна станція для електровелосипедів" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=yes", + "bicycle=no" + ], + "title": { + "en": "charging station for cars", + "nl": "oplaadstation voor elektrische auto's", + "ca": "estació de càrrega per a cotxes", + "cs": "nabíjecí stanice pro auta", + "de": "Ladestation für Autos", + "es": "punto de carga para coches", + "uk": "зарядна станція для автомобілів" + } + } + ], "tagRenderings": [ "images", { @@ -3252,117 +3362,6 @@ } } ], - "lineRendering": [ - { - "color": "black", - "width": 2, - "fillColor": "#80808080" - } - ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "pin", - "color": "#fff" - }, - { - "icon": { - "render": "./assets/themes/charging_stations/plug.svg", - "mappings": [ - { - "if": "bicycle=yes", - "then": "./assets/themes/charging_stations/bicycle.svg" - }, - { - "if": { - "or": [ - "car=yes", - "motorcar=yes" - ] - }, - "then": "./assets/themes/charging_stations/car.svg" - } - ] - } - } - ], - "iconBadges": [ - { - "if": { - "or": [ - "disused:amenity=charging_station", - "operational_status=broken" - ] - }, - "then": "close:#c22;" - }, - { - "if": { - "or": [ - "proposed:amenity=charging_station", - "planned:amenity=charging_station" - ] - }, - "then": "./assets/layers/charging_station/under_construction.svg" - }, - { - "if": { - "and": [ - "bicycle=yes", - { - "or": [ - "motorcar=yes", - "car=yes" - ] - } - ] - }, - "then": "circle:#fff;./assets/themes/charging_stations/car.svg" - } - ], - "anchor": "bottom", - "iconSize": "50,50" - } - ], - "presets": [ - { - "tags": [ - "amenity=charging_station", - "motorcar=no", - "bicycle=yes" - ], - "title": { - "en": "charging station for electrical bikes", - "nl": "oplaadpunt voor elektrische fietsen", - "ca": "Estació de càrrega de bicicletes elèctriques", - "cs": "nabíjecí stanice pro elektrokola", - "de": "Ladestation für Elektrofahrräder", - "es": "punto de carga para bicicletas eléctricas", - "uk": "зарядна станція для електровелосипедів" - } - }, - { - "tags": [ - "amenity=charging_station", - "motorcar=yes", - "bicycle=no" - ], - "title": { - "en": "charging station for cars", - "nl": "oplaadstation voor elektrische auto's", - "ca": "estació de càrrega per a cotxes", - "cs": "nabíjecí stanice pro auta", - "de": "Ladestation für Autos", - "es": "punto de carga para coches", - "uk": "зарядна станція для автомобілів" - } - } - ], "filter": [ { "id": "vehicle-type", @@ -3685,6 +3684,19 @@ ] } ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + }, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, "units": [ { "maxstay": { @@ -3879,17 +3891,5 @@ } } ], - "allowMove": { - "enableRelocation": false, - "enableImproveAccuracy": true - }, - "deletion": { - "softDeletionTags": { - "and": [ - "amenity=", - "disused:amenity=charging_station" - ] - }, - "neededChangesets": 10 - } -} \ No newline at end of file + "#": "no-question-hint-check" +} diff --git a/assets/layers/cyclestreets/cyclestreets.json b/assets/layers/cyclestreets/cyclestreets.json index 147e25a910..149e3f4f16 100644 --- a/assets/layers/cyclestreets/cyclestreets.json +++ b/assets/layers/cyclestreets/cyclestreets.json @@ -1,6 +1,5 @@ { "id": "cyclestreets", - "allowSplit": true, "name": { "nl": "Fietsstraten", "en": "Cyclestreets", @@ -22,16 +21,6 @@ "uk": "Велодороги", "ko": "자전거 전용 도로" }, - "minzoom": 7, - "source": { - "osmTags": { - "or": [ - "cyclestreet=yes", - "bicycle_road=yes" - ] - } - }, - "isShown": "id~way/.*", "description": { "nl": "Een fietsstraat is een straat waar gemotoriseerd verkeer een fietser niet mag inhalen", "en": "A cyclestreet is a street where motorized traffic is not allowed to overtake a cyclist", @@ -48,7 +37,86 @@ "ko": "자전거 전용 도로는 차량이 자전거를 추월할 수 없는 도로 입니다", "zh_Hant": "單車街道是機動車輛不被允許超車單車" }, + "source": { + "osmTags": { + "or": [ + "cyclestreet=yes", + "bicycle_road=yes" + ] + } + }, + "isShown": "id~way/.*", + "minzoom": 7, "title": "{name}", + "pointRendering": [ + { + "marker": [ + { + "icon": { + "render": "./assets/themes/cyclestreets/F111.svg", + "mappings": [ + { + "if": "traffic_sign=DE:244.1,1020-30", + "then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg" + }, + { + "if": "traffic_sign=DE:244.1,1022-12,1024-10", + "then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg" + }, + { + "if": "traffic_sign=DE:244.1,1022-12", + "then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg" + }, + { + "if": "traffic_sign=DE:244.1,1024-10", + "then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg" + }, + { + "if": "_country=de", + "then": "./assets/themes/cyclestreets/Zeichen_244.svg" + }, + { + "if": "_country=fi", + "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg" + } + ] + } + } + ], + "iconSize": { + "render": "40,40,center", + "mappings": [ + { + "if": { + "or": [ + "traffic_sign=DE:244.1,1020-30", + "traffic_sign=DE:244.1,1022-12,1024-10" + ] + }, + "then": "40,62,center" + }, + { + "if": { + "or": [ + "traffic_sign=DE:244.1,1022-12", + "traffic_sign=DE:244.1,1024-10" + ] + }, + "then": "40,70,center" + } + ] + }, + "location": [ + "projected_centerpoint" + ] + } + ], + "lineRendering": [ + { + "color": "#0000ff", + "width": "10" + } + ], "tagRenderings": [ "images", { @@ -445,74 +513,6 @@ } } ], - "pointRendering": [ - { - "marker": [ - { - "icon": { - "render": "./assets/themes/cyclestreets/F111.svg", - "mappings": [ - { - "if": "traffic_sign=DE:244.1,1020-30", - "then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg" - }, - { - "if": "traffic_sign=DE:244.1,1022-12,1024-10", - "then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg" - }, - { - "if": "traffic_sign=DE:244.1,1022-12", - "then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg" - }, - { - "if": "traffic_sign=DE:244.1,1024-10", - "then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg" - }, - { - "if": "_country=de", - "then": "./assets/themes/cyclestreets/Zeichen_244.svg" - }, - { - "if": "_country=fi", - "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg" - } - ] - } - } - ], - "iconSize": { - "render": "40,40,center", - "mappings": [ - { - "if": { - "or": [ - "traffic_sign=DE:244.1,1020-30", - "traffic_sign=DE:244.1,1022-12,1024-10" - ] - }, - "then": "40,62,center" - }, - { - "if": { - "or": [ - "traffic_sign=DE:244.1,1022-12", - "traffic_sign=DE:244.1,1024-10" - ] - }, - "then": "40,70,center" - } - ] - }, - "location": [ - "projected_centerpoint" - ] - } - ], - "lineRendering": [ - { - "color": "#0000ff", - "width": "10" - } - ], - "allowMove": false -} \ No newline at end of file + "allowMove": false, + "allowSplit": true +} diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 53b59ede02..087e021da0 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -1972,4 +1972,4 @@ "cs": "silnice nebo cyklostezka", "ca": "una carretera o un carril bici" } -} \ No newline at end of file +} diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index cb8f473f8a..0d90a75818 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -518,4 +518,4 @@ "es": "un bordillo", "ca": "un kerb" } -} \ No newline at end of file +} diff --git a/assets/layers/nsi_brand/nsi_brand.json b/assets/layers/nsi_brand/nsi_brand.json index e48c48f2a0..38a4a7470b 100644 --- a/assets/layers/nsi_brand/nsi_brand.json +++ b/assets/layers/nsi_brand/nsi_brand.json @@ -517301,4 +517301,4 @@ ], "allowMove": false, "#dont-translate": "*" -} \ No newline at end of file +} diff --git a/assets/layers/nsi_operator/nsi_operator.json b/assets/layers/nsi_operator/nsi_operator.json index f92e1c83e2..81d52b78d6 100644 --- a/assets/layers/nsi_operator/nsi_operator.json +++ b/assets/layers/nsi_operator/nsi_operator.json @@ -452776,4 +452776,4 @@ ], "allowMove": false, "#dont-translate": "*" -} \ No newline at end of file +} diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 0e9a5469b2..2f8b8e7666 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -490,4 +490,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index 9c22641881..af978159d6 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -326,4 +326,4 @@ "enableImproveAccuracy": true, "enableRelocation": true } -} \ No newline at end of file +} diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json index d2bb7ddc31..ebe563e702 100644 --- a/assets/layers/wayside_shrine/wayside_shrine.json +++ b/assets/layers/wayside_shrine/wayside_shrine.json @@ -390,10 +390,10 @@ }, "neededChangesets": 1 }, - "credits": "Bastian Greshake Tzovaras", - "credits:uid": 20617622, "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false - } + }, + "credits": "Bastian Greshake Tzovaras", + "credits:uid": 20617622 } diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 79db547a08..1c3e1789fa 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -9,15 +9,6 @@ "nl": "Wijzigingen gemaakt met MapComplete", "ko": "MapComplete로 이루어진 변경 사항" }, - "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt die von MapComplete vorgenommenen Änderungen an", - "cs": "Zobrazuje změny provedené nástrojem MapComplete", - "es": "Muestra los cambios realizados por MapComplete", - "fr": "Afficher les modifications faites avec MapComplete", - "nl": "Toont wijzigingen gemaakt met MapComplete", - "ko": "MapComplete를 통해 이루어진 변경 사항을 표시합니다" - }, "description": { "en": "This maps shows all the changes made with MapComplete", "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", @@ -28,11 +19,17 @@ "nl": "Deze kaarten tonen alle wijzigingen die zijn gemaakt met MapComplete", "ko": "이 지도는 MapComplete를 사용하여 이루어진 모든 변경 사항을 표시합니다" }, + "shortDescription": { + "en": "Shows changes made by MapComplete", + "de": "Zeigt die von MapComplete vorgenommenen Änderungen an", + "cs": "Zobrazuje změny provedené nástrojem MapComplete", + "es": "Muestra los cambios realizados por MapComplete", + "fr": "Afficher les modifications faites avec MapComplete", + "nl": "Toont wijzigingen gemaakt met MapComplete", + "ko": "MapComplete를 통해 이루어진 변경 사항을 표시합니다" + }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, - "startLat": 0, - "startLon": 0, - "startZoom": 1, "layers": [ { "id": "mapcomplete-changes",