diff --git a/assets/layers/adult_changing_table/adult_changing_table.json b/assets/layers/adult_changing_table/adult_changing_table.json index 03781d620..0d96b83b8 100644 --- a/assets/layers/adult_changing_table/adult_changing_table.json +++ b/assets/layers/adult_changing_table/adult_changing_table.json @@ -1,5 +1,14 @@ { "id": "adult_changing_table", + "name": { + "en": "Adult changing tables", + "nl": "Verzorgingstafels voor volwassenen", + "it": "Fasciatoi per adulti" + }, + "description": { + "en": "An adult changing table is a bench where adult people can be placed on. They are often used by adults with a severe motoric handicap", + "it": "Un fasciatoio per adulti è una panca su cui possono essere posizionate persone adulte. Sono spesso utilizzati da adulti con gravi disabilità motorie" + }, "source": { "osmTags": { "or": [ @@ -10,33 +19,12 @@ ] } }, - "description": { - "en": "An adult changing table is a bench where adult people can be placed on. They are often used by adults with a severe motoric handicap", - "it": "Un fasciatoio per adulti è una panca su cui possono essere posizionate persone adulte. Sono spesso utilizzati da adulti con gravi disabilità motorie" - }, "minzoom": 6, - "allowMove": { - "enableRelocation": false, - "enableImproveAccuracy": true + "title": { + "en": "Adult changing table", + "nl": "Verzorgingstafel voor volwassenen", + "it": "Fasciatoio per adulti" }, - "deletion": true, - "name": { - "en": "Adult changing tables", - "nl": "Verzorgingstafels voor volwassenen", - "it": "Fasciatoi per adulti" - }, - "presets": [ - { - "title": { - "en": "an adult changing table", - "nl": "een verzorgingstafel voor volwassenen", - "it": "un fasciatoio per adulti" - }, - "tags": [ - "amenity=adult_changing_table" - ] - } - ], "pointRendering": [ { "location": [ @@ -51,6 +39,18 @@ ] } ], + "presets": [ + { + "title": { + "en": "an adult changing table", + "nl": "een verzorgingstafel voor volwassenen", + "it": "un fasciatoio per adulti" + }, + "tags": [ + "amenity=adult_changing_table" + ] + } + ], "tagRenderings": [ { "id": "height", @@ -261,9 +261,9 @@ ] } ], - "title": { - "en": "Adult changing table", - "nl": "Verzorgingstafel voor volwassenen", - "it": "Fasciatoio per adulti" + "deletion": true, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true } } diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 114ba2553..677695add 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", { @@ -3399,119 +3511,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", @@ -3855,6 +3854,19 @@ ] } ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + }, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, "units": [ { "maxstay": { @@ -4049,17 +4061,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/excrement_bag_dispenser/excrement_bag_dispenser.json b/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json index 60fa35a94..617e8d41f 100644 --- a/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json +++ b/assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json @@ -23,6 +23,40 @@ "it": "Distributore di sacchetti per escrementi" } }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "square", + "color": "white" + }, + { + "icon": "./assets/layers/excrement_bag_dispenser/excrement_bags.svg" + } + ], + "iconSize": "30,30" + } + ], + "presets": [ + { + "tags": [ + "amenity=vending_machine", + "vending=excrement_bags" + ], + "title": { + "en": "an excrement bag dispenser", + "it": "un distributore di sacchetti per escrementi" + }, + "description": { + "en": "A stand-alone dispenser giving out bags for animal waste.", + "it": "Un distributore autonomo che fornisce sacchetti per rifiuti animali." + } + } + ], "tagRenderings": [ { "id": "fee", @@ -56,42 +90,8 @@ }, "check_date" ], - "presets": [ - { - "tags": [ - "amenity=vending_machine", - "vending=excrement_bags" - ], - "title": { - "en": "an excrement bag dispenser", - "it": "un distributore di sacchetti per escrementi" - }, - "description": { - "en": "A stand-alone dispenser giving out bags for animal waste.", - "it": "Un distributore autonomo che fornisce sacchetti per rifiuti animali." - } - } - ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "square", - "color": "white" - }, - { - "icon": "./assets/layers/excrement_bag_dispenser/excrement_bags.svg" - } - ], - "iconSize": "30,30" - } - ], "allowMove": { "enableImproveAccuracy": true, "enableRelocation": true } -} \ No newline at end of file +} diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index f2bcd8a80..626335a84 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -652,7 +652,7 @@ }, { "if": "cuisine=spanish", - "icon": "\uD83C\uDDEA\uD83C\uDDF8", + "icon": "🇪🇸", "then": { "en": "Spanish dishes are served here" } diff --git a/assets/layers/grab_rail/grab_rail.json b/assets/layers/grab_rail/grab_rail.json index f9057eac6..23d780fd6 100644 --- a/assets/layers/grab_rail/grab_rail.json +++ b/assets/layers/grab_rail/grab_rail.json @@ -5,6 +5,10 @@ "it": "Un maniglione è un supporto per aiutare le persone con mobilità ridotta o disabilità motoria. Li aiuta a trasferirsi dalla sedia a rotelle al water, a stare in piedi sotto la doccia, a chiudere una porta, ... " }, "source": "special:library", + "pointRendering": [], + "lineRendering": [ + {} + ], "tagRenderings": [ { "id": "has_grab_rail_lr", diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json index 64f14e749..c6053e6d8 100644 --- a/assets/layers/mobility_hub/mobility_hub.json +++ b/assets/layers/mobility_hub/mobility_hub.json @@ -1,6 +1,36 @@ { - "credits": "Robin van der Linde", + "id": "mobility_hub", + "name": { + "en": "Mobility Hubs", + "nl": "Mobiliteitshubs", + "it": "Hub di mobilità" + }, + "description": { + "en": "Mobility hubs are places where different kinds of transit meet, making it easy to switch between them. These places are usually part of a larger network or system.", + "nl": "Mobiliteitshubs zijn plaatsen waar verschillende soorten vervoer bij elkaar komen, waardoor het makkelijk is om te wisselen van vervoer. Deze plaatsen maken meestal deel uit van een groter netwerk of systeem.", + "it": "Gli hub di mobilità sono luoghi dove diversi tipi di trasporto si incontrano, rendendo facile il passaggio da uno all'altro. Questi luoghi sono solitamente parte di una rete o sistema più ampio." + }, + "source": { + "osmTags": "amenity=mobility_hub" + }, "minzoom": 8, + "title": { + "render": { + "en": "Mobility hub", + "nl": "Mobiliteitshub", + "it": "Hub di mobilità" + }, + "mappings": [ + { + "if": "name~.*", + "then": { + "en": "Mobility hub {name}", + "nl": "Mobiliteitshub {name}", + "it": "Hub di mobilità {name}" + } + } + ] + }, "pointRendering": [ { "location": [ @@ -55,6 +85,47 @@ } } ], + "lineRendering": [ + { + "width": 1, + "color": { + "render": "#00b26b", + "mappings": [ + { + "if": "network=Groningen-Drenthe", + "then": "#0077db" + }, + { + "if": "network=Jelbi", + "then": "#f0d722" + } + ] + } + } + ], + "presets": [ + { + "title": { + "en": "a mobility hub", + "nl": "een mobiliteitshub", + "it": "un hub di mobilità" + }, + "tags": [ + "amenity=mobility_hub", + "tourism=information" + ], + "description": { + "en": "A mobility hub which is marked by a physical sign, usually with a logo.", + "nl": "Een mobiliteitshub die gemarkeerd is door een fysiek bord, meestal met een logo.", + "it": "Un hub di mobilità che è contrassegnato da un segnale fisico, solitamente con un logo." + }, + "exampleImages": [ + "./assets/layers/mobility_hub/hub-gd-sign.jpg", + "./assets/layers/mobility_hub/hoppin.jpg", + "./assets/layers/mobility_hub/Mobil.punkt.jpg" + ] + } + ], "tagRenderings": [ "images", { @@ -224,81 +295,10 @@ "condition": "_geometry:type=Point" } ], - "lineRendering": [ - { - "width": 1, - "color": { - "render": "#00b26b", - "mappings": [ - { - "if": "network=Groningen-Drenthe", - "then": "#0077db" - }, - { - "if": "network=Jelbi", - "then": "#f0d722" - } - ] - } - } - ], - "credits:uid": 5093765, - "id": "mobility_hub", - "name": { - "en": "Mobility Hubs", - "nl": "Mobiliteitshubs", - "it": "Hub di mobilità" - }, - "source": { - "osmTags": "amenity=mobility_hub" - }, - "description": { - "en": "Mobility hubs are places where different kinds of transit meet, making it easy to switch between them. These places are usually part of a larger network or system.", - "nl": "Mobiliteitshubs zijn plaatsen waar verschillende soorten vervoer bij elkaar komen, waardoor het makkelijk is om te wisselen van vervoer. Deze plaatsen maken meestal deel uit van een groter netwerk of systeem.", - "it": "Gli hub di mobilità sono luoghi dove diversi tipi di trasporto si incontrano, rendendo facile il passaggio da uno all'altro. Questi luoghi sono solitamente parte di una rete o sistema più ampio." - }, - "title": { - "render": { - "en": "Mobility hub", - "nl": "Mobiliteitshub", - "it": "Hub di mobilità" - }, - "mappings": [ - { - "if": "name~.*", - "then": { - "en": "Mobility hub {name}", - "nl": "Mobiliteitshub {name}", - "it": "Hub di mobilità {name}" - } - } - ] - }, - "presets": [ - { - "title": { - "en": "a mobility hub", - "nl": "een mobiliteitshub", - "it": "un hub di mobilità" - }, - "tags": [ - "amenity=mobility_hub", - "tourism=information" - ], - "description": { - "en": "A mobility hub which is marked by a physical sign, usually with a logo.", - "nl": "Een mobiliteitshub die gemarkeerd is door een fysiek bord, meestal met een logo.", - "it": "Un hub di mobilità che è contrassegnato da un segnale fisico, solitamente con un logo." - }, - "exampleImages": [ - "./assets/layers/mobility_hub/hub-gd-sign.jpg", - "./assets/layers/mobility_hub/hoppin.jpg", - "./assets/layers/mobility_hub/Mobil.punkt.jpg" - ] - } - ], "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false - } -} \ No newline at end of file + }, + "credits": "Robin van der Linde", + "credits:uid": 5093765 +} diff --git a/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json b/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json index 7c79877b0..c1c0b5acc 100644 --- a/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json +++ b/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json @@ -2,6 +2,19 @@ "id": "toilet_at_amenity_lib", "description": "Special layer which makes it easy to add, as a group, information about toilets to any POI", "source": "special:library", + "pointRendering": [ + { + "location": [ + "centroid", + "point" + ], + "marker": [ + { + "icon": "circle" + } + ] + } + ], "tagRenderings": [ { "id": "toilets-group", @@ -80,18 +93,5 @@ } } ], - "allowMove": false, - "pointRendering": [ - { - "location": [ - "centroid", - "point" - ], - "marker": [ - { - "icon": "circle" - } - ] - } - ] + "allowMove": false } diff --git a/assets/layers/windpump/windpump.json b/assets/layers/windpump/windpump.json index 21358614d..1014e90b2 100644 --- a/assets/layers/windpump/windpump.json +++ b/assets/layers/windpump/windpump.json @@ -1,22 +1,5 @@ { "id": "windpump", - "presets": [ - { - "tags": [ - "man_made=windpump" - ], - "title": "a windpump", - "description": { - "en": "A wind pump is a kind of windmill that is used for pumping natural gas or water." - }, - "exampleImages": [ - "./assets/layers/windpump/windpump_1.jpg", - "./assets/layers/windpump/windpump_2.jpg", - "./assets/layers/windpump/tjasker.jpg" - - ] - } - ], "name": { "en": "Windpumps", "nl": "Pompen op windenergie" @@ -34,23 +17,6 @@ "en": "Windpump {ref}" } }, - "tagRenderings": [ - "images", - { - "id": "operator", - "question": { - "en": "Who operates this windpump?" - }, - "render": { - "en": "Operated by {operator}" - }, - "freeform": { - "key": "operator" - } - }, - "ref", - "wikipedia" - ], "pointRendering": [ { "location": [ @@ -69,6 +35,39 @@ ] } ], + "presets": [ + { + "tags": [ + "man_made=windpump" + ], + "title": "a windpump", + "description": { + "en": "A wind pump is a kind of windmill that is used for pumping natural gas or water." + }, + "exampleImages": [ + "./assets/layers/windpump/windpump_1.jpg", + "./assets/layers/windpump/windpump_2.jpg", + "./assets/layers/windpump/tjasker.jpg" + ] + } + ], + "tagRenderings": [ + "images", + { + "id": "operator", + "question": { + "en": "Who operates this windpump?" + }, + "render": { + "en": "Operated by {operator}" + }, + "freeform": { + "key": "operator" + } + }, + "ref", + "wikipedia" + ], "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 0188616a0..18d93f66a 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -10,16 +10,6 @@ "ko": "MapComplete로 이루어진 변경 사항", "it": "Modifiche fatte con 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" - }, "description": { "en": "This maps shows all the changes made with MapComplete", "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", @@ -31,11 +21,18 @@ "ko": "이 지도는 MapComplete를 사용하여 이루어진 모든 변경 사항을 표시합니다", "it": "Questa mappa mostra tutte le modifiche effettuate con 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" + }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, - "startLat": 0, - "startLon": 0, - "startZoom": 1, "layers": [ { "id": "mapcomplete-changes",