From 68c5fb853ae331a2007d68c7855c28f503c06110 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 5 Jul 2025 01:51:52 +0200 Subject: [PATCH] Chore: lint themes --- .../charging_station/charging_station.json | 276 +++++++++--------- assets/layers/diets/diets.json | 1 - assets/layers/food/food.json | 1 - assets/layers/nsi_brand/nsi_brand.json | 2 +- assets/layers/nsi_operator/nsi_operator.json | 2 +- assets/layers/questions/questions.json | 8 +- .../sauna_at_leisure/sauna_at_leisure.json | 2 +- .../layers/tactile_model/tactile_model.json | 14 +- .../mapcomplete-changes.json | 25 +- assets/themes/sauna/sauna.json | 20 +- 10 files changed, 174 insertions(+), 177 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 859978de5..0912be190 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -10,7 +10,16 @@ "it": "Stazioni di ricarica", "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", + "it": "Una stazione di ricarica" + }, "source": { "osmTags": { "and": [ @@ -25,6 +34,7 @@ ] } }, + "minzoom": 10, "title": { "render": { "en": "Charging station", @@ -85,17 +95,119 @@ } ] }, - "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", - "it": "Una stazione di ricarica" - }, - "#": "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", + "it": "stazione di ricarica per biciclette elettriche", + "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", + "it": "stazione di ricarica per auto", + "uk": "зарядна станція для автомобілів" + } + } + ], "tagRenderings": [ "images", { @@ -3302,119 +3414,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", - "it": "stazione di ricarica per biciclette elettriche", - "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", - "it": "stazione di ricarica per auto", - "uk": "зарядна станція для автомобілів" - } - } - ], "filter": [ { "id": "vehicle-type", @@ -3758,6 +3757,19 @@ ] } ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + }, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, "units": [ { "maxstay": { @@ -3961,17 +3973,5 @@ } } ], - "allowMove": { - "enableRelocation": false, - "enableImproveAccuracy": true - }, - "deletion": { - "softDeletionTags": { - "and": [ - "amenity=", - "disused:amenity=charging_station" - ] - }, - "neededChangesets": 10 - } + "#": "no-question-hint-check" } diff --git a/assets/layers/diets/diets.json b/assets/layers/diets/diets.json index a430cddd1..d64e4b2a1 100644 --- a/assets/layers/diets/diets.json +++ b/assets/layers/diets/diets.json @@ -519,7 +519,6 @@ }, "id": "vegetarian" }, - { "labels": [ "diets", diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 934e75bfa..7de39bbaf 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -905,7 +905,6 @@ "child_highchair", "kids_area", "diets.diets", - { "id": "friture-take-your-container", "question": { diff --git a/assets/layers/nsi_brand/nsi_brand.json b/assets/layers/nsi_brand/nsi_brand.json index 791888e51..a8a1b50ad 100644 --- a/assets/layers/nsi_brand/nsi_brand.json +++ b/assets/layers/nsi_brand/nsi_brand.json @@ -517667,4 +517667,4 @@ "allowMove": false, "#dont-translate": "*", "generation_time": "2025-06-03T20:20:14.242Z" -} \ 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 ba3be922b..a5d0e1d71 100644 --- a/assets/layers/nsi_operator/nsi_operator.json +++ b/assets/layers/nsi_operator/nsi_operator.json @@ -452991,4 +452991,4 @@ "allowMove": false, "#dont-translate": "*", "generation_time": "2025-06-03T20:22:18.283Z" -} \ No newline at end of file +} diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 45c979d3b..2a880f931 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -3436,7 +3436,9 @@ } } ], - "filters": ["filters.child_highchair"] + "filters": [ + "filters.child_highchair" + ] }, { "id": "kids_area", @@ -3504,7 +3506,9 @@ "hideInAnswer": true } ], - "filter": ["filters.kids_area"] + "filter": [ + "filters.kids_area" + ] } ], "allowMove": false, diff --git a/assets/layers/sauna_at_leisure/sauna_at_leisure.json b/assets/layers/sauna_at_leisure/sauna_at_leisure.json index e2f965c66..70eeaf08c 100644 --- a/assets/layers/sauna_at_leisure/sauna_at_leisure.json +++ b/assets/layers/sauna_at_leisure/sauna_at_leisure.json @@ -7,7 +7,6 @@ "description": { "en": "A sauna is a small room or house designed as a place to experience dry or wet heat sessions, or an establishment with one or more of these and auxiliary facilities." }, - "#": "Use 'sauna_at_leisure.sauna_grouped' in a layer.tagRenderings to add the 'sauna information' expandle block (incl 'has sauna'); use 'sauna_at_leisure.expanded' to get all sauna questions directly (which does _not_ include the 'has sauna' question)", "source": { "osmTags": { "or": [ @@ -319,6 +318,7 @@ } ], "allowMove": true, + "#": "Use 'sauna_at_leisure.sauna_grouped' in a layer.tagRenderings to add the 'sauna information' expandle block (incl 'has sauna'); use 'sauna_at_leisure.expanded' to get all sauna questions directly (which does _not_ include the 'has sauna' question)", "credits": "Osmwithspace", "credits:uid": 8770388 } diff --git a/assets/layers/tactile_model/tactile_model.json b/assets/layers/tactile_model/tactile_model.json index 9f80bc3ab..f4752c8c3 100644 --- a/assets/layers/tactile_model/tactile_model.json +++ b/assets/layers/tactile_model/tactile_model.json @@ -7,13 +7,6 @@ "it": "Modelli tattili", "cs": "Hmatové modely" }, - "title": { - "en": "Tactile Model", - "de": "Taktiles Modell", - "ca": "Model tàctil", - "it": "Modello tattile", - "cs": "Hmatový model" - }, "description": { "en": "Layer showing tactile models, three-dimensional models of the surrounding area.", "de": "Ebene mit dreidimensionalen ertastbaren Modellen der Umgebung.", @@ -25,6 +18,13 @@ "osmTags": "information=tactile_model" }, "minzoom": 10, + "title": { + "en": "Tactile Model", + "de": "Taktiles Modell", + "ca": "Model tàctil", + "it": "Modello tattile", + "cs": "Hmatový model" + }, "pointRendering": [ { "marker": [ diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 7772c9691..10a61f17a 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -11,17 +11,6 @@ "it": "Modifiche fatte con MapComplete", "zh_Hant": "由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를 통해 이루어진 변경 사항을 표시합니다", - "it": "Mostra le modifiche fatte con MapComplete", - "zh_Hant": "顯示由MapComplete進行的變動" - }, "description": { "en": "This maps shows all the changes made with MapComplete", "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", @@ -34,11 +23,19 @@ "it": "Questa mappa mostra tutte le modifiche effettuate con MapComplete", "zh_Hant": "這個地圖顯示所有用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를 통해 이루어진 변경 사항을 표시합니다", + "it": "Mostra le modifiche fatte con MapComplete", + "zh_Hant": "顯示由MapComplete進行的變動" + }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, - "startLat": 0, - "startLon": 0, - "startZoom": 1, "layers": [ { "id": "mapcomplete-changes", diff --git a/assets/themes/sauna/sauna.json b/assets/themes/sauna/sauna.json index 0f45cb7ee..f9b846f79 100644 --- a/assets/themes/sauna/sauna.json +++ b/assets/themes/sauna/sauna.json @@ -10,7 +10,6 @@ "credits": [ "Osmwithspace" ], - "#layers": "sauna_at_leisure acts as fallback-layer and will show all objects with `sauna=yes`", "layers": [ "sauna", { @@ -43,7 +42,7 @@ "minzoom": 8, "id": "sports_centre_with_sauna", "presets=": [], - "filter=":[], + "filter=": [], "source": { "osmTags": { "and+": [ @@ -68,15 +67,13 @@ "override": { "id": "shops_with_sauna", "source": { - "osmTags": - { - "and+": [ - "sauna=yes" - ] - } - + "osmTags": { + "and+": [ + "sauna=yes" + ] + } }, - "presets=":[], + "presets=": [], "minzoom": 8, "filter=": [] } @@ -125,11 +122,12 @@ { "builtin": "toilet", "override": { - "minzoom":18, + "minzoom": 18, "name=": null } }, "sauna_at_leisure" ], + "#layers": "sauna_at_leisure acts as fallback-layer and will show all objects with `sauna=yes`", "credits:uid": 8770388 }