diff --git a/assets/layers/beehive/beehive.json b/assets/layers/beehive/beehive.json index 7aa7d63c1..b485b1c93 100644 --- a/assets/layers/beehive/beehive.json +++ b/assets/layers/beehive/beehive.json @@ -14,6 +14,23 @@ "en": "Beehive", "de": "Bienenstock" }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": "./assets/layers/beehive/beehive.svg" + } + ] + } + ], "presets": [ { "title": { @@ -52,26 +69,9 @@ ] } ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "circle", - "color": "white" - }, - { - "icon": "./assets/layers/beehive/beehive.svg" - } - ] - } - ], + "deletion": true, "allowMove": { "enableImproveAccuracy": true, "enableRelocation": true - }, - "deletion": true -} \ No newline at end of file + } +} diff --git a/assets/layers/bicycle_counter/bicycle_counter.json b/assets/layers/bicycle_counter/bicycle_counter.json index cf29a2221..4fe9da0b3 100644 --- a/assets/layers/bicycle_counter/bicycle_counter.json +++ b/assets/layers/bicycle_counter/bicycle_counter.json @@ -22,6 +22,7 @@ ] } }, + "minzoom": 13, "title": { "render": { "en": "Bicycle counter", @@ -31,6 +32,39 @@ "nl": "Fietsteller" } }, + "pointRendering": [ + { + "marker": [ + { + "icon": "pin", + "color": "#538EE8" + }, + { + "icon": "./assets/layers/bicycle_counter/bicycle_monitoring_station.svg" + } + ], + "location": [ + "point", + "centroid" + ], + "anchor": "bottom" + } + ], + "presets": [ + { + "title": { + "en": "a bicycle counter", + "cs": "počítadlo jízdních kol", + "de": "eine Fahrradzählstelle", + "es": "un contador de bicicletas", + "nl": "een fietsteller" + }, + "tags": [ + "man_made=monitoring_station", + "monitoring:bicycle=yes" + ] + } + ], "tagRenderings": [ "images", { @@ -237,42 +271,8 @@ } } ], - "pointRendering": [ - { - "marker": [ - { - "icon": "pin", - "color": "#538EE8" - }, - { - "icon": "./assets/layers/bicycle_counter/bicycle_monitoring_station.svg" - } - ], - "location": [ - "point", - "centroid" - ], - "anchor": "bottom" - } - ], - "minzoom": 13, + "deletion": true, "allowMove": { "enableImproveAccuracy": true - }, - "deletion": true, - "presets": [ - { - "title": { - "en": "a bicycle counter", - "cs": "počítadlo jízdních kol", - "de": "eine Fahrradzählstelle", - "es": "un contador de bicicletas", - "nl": "een fietsteller" - }, - "tags": [ - "man_made=monitoring_station", - "monitoring:bicycle=yes" - ] - } - ] + } } diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json index c564c6f71..f4ee9d3b9 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.json +++ b/assets/layers/bike_cleaning/bike_cleaning.json @@ -361,4 +361,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 8fd7e8847..ee83f83df 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -340,7 +340,6 @@ "tagRenderings": [ "shops.*" ], - "#filter": "no-auto", "filter": [ { "id": "sells_second-hand", @@ -390,6 +389,7 @@ }, "open_now" ], + "#filter": "no-auto", "deletion": true, "allowMove": true } diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 866cb56b9..c57b57660 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -445,4 +445,4 @@ ] }, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/charge_point/charge_point.json b/assets/layers/charge_point/charge_point.json index 6ce38e172..a1f2b5d4c 100644 --- a/assets/layers/charge_point/charge_point.json +++ b/assets/layers/charge_point/charge_point.json @@ -15,30 +15,6 @@ "en": "Charge point" } }, - "tagRenderings": [ - "images", - { - "id": "ref", - "question": { - "en": "What is the reference number of this charge point?" - }, - "freeform": { - "key": "ref", - "placeholder": { - "en": "Reference number of the charge point, e.g. 2126" - } - }, - "render": { - "en": "The reference of this charge point is {ref}" - } - }, - "charging_station.capacity", - "charging_station.Available_charging_stations (generated)", - "charging_station.plugs-amount", - "questions", - "charging_station.questions-technical", - "charging_station.technical" - ], "pointRendering": [ { "location": [ @@ -70,8 +46,32 @@ } } ], + "tagRenderings": [ + "images", + { + "id": "ref", + "question": { + "en": "What is the reference number of this charge point?" + }, + "freeform": { + "key": "ref", + "placeholder": { + "en": "Reference number of the charge point, e.g. 2126" + } + }, + "render": { + "en": "The reference of this charge point is {ref}" + } + }, + "charging_station.capacity", + "charging_station.Available_charging_stations (generated)", + "charging_station.plugs-amount", + "questions", + "charging_station.questions-technical", + "charging_station.technical" + ], "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false } -} \ No newline at end of file +} diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index f308cf6ba..07bb77f5b 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -8,7 +8,15 @@ "de": "Ladestationen", "es": "Puntos de carga" }, - "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": [ @@ -23,6 +31,7 @@ ] } }, + "minzoom": 10, "title": { "render": { "en": "Charging station", @@ -71,16 +80,114 @@ } ] }, - "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", + "cs": "nabíjecí stanice pro elektrokola", + "de": "Ladestation für Elektrofahrräder", + "es": "punto de carga para bicicletas eléctricas" + } + }, + { + "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" + } + } + ], "tagRenderings": [ "images", { @@ -2990,114 +3097,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", - "cs": "nabíjecí stanice pro elektrokola", - "de": "Ladestation für Elektrofahrräder", - "es": "punto de carga para bicicletas eléctricas" - } - }, - { - "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" - } - } - ], "filter": [ { "id": "vehicle-type", @@ -3385,6 +3384,19 @@ ] } ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + }, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, "units": [ { "maxstay": { @@ -3579,17 +3591,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/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index aaf85d5e4..b7bb044c3 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -36,6 +36,7 @@ ] } }, + "isCounted": false, "minzoom": 18, "title": { "render": { @@ -163,6 +164,5 @@ "es": "una pared, un acantilado o una roca", "cs": "zeď, útes nebo skála", "nl": "een muur, klif of rots" - }, - "isCounted": false + } } diff --git a/assets/layers/clock/clock.json b/assets/layers/clock/clock.json index 5f9810fd4..b27961fc7 100644 --- a/assets/layers/clock/clock.json +++ b/assets/layers/clock/clock.json @@ -681,4 +681,4 @@ ], "deletion": true, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 56f74cdec..7845851b6 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -47,6 +47,9 @@ ] } }, + "calculatedTags": [ + "width:= ! ! (feat.properties['width:carriageway']) ? feat.properties['width:carriageway'] : feat.properties['width'] " + ], "minzoom": 16, "title": { "render": { @@ -273,9 +276,6 @@ "width": "8" } ], - "calculatedTags": [ - "width:= ! ! (feat.properties['width:carriageway']) ? feat.properties['width:carriageway'] : feat.properties['width'] " - ], "tagRenderings": [ "images", { diff --git a/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json index b246d5ff5..7016e3426 100644 --- a/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json +++ b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json @@ -1,5 +1,25 @@ { - "credits": "Robin van der Linde", + "id": "cyclist_waiting_aid", + "name": { + "en": "Cyclist Waiting Aids", + "de": "Radfahrer-Wartehilfen", + "es": "Ayudas a la espera de ciclistas" + }, + "description": { + "en": "Various pieces of infrastructure that aid cyclists while they wait at a traffic light.", + "de": "Verschiedene Infrastruktureinrichtungen, die Radfahrern helfen, während sie an einer Ampel warten.", + "es": "Diversas infraestructuras que ayudan a los ciclistas mientras esperan en un semáforo." + }, + "source": { + "osmTags": "highway=cyclist_waiting_aid" + }, + "title": { + "render": { + "en": "Cyclist Waiting Aid", + "de": "Radfahrer-Wartehilfe", + "es": "Ayuda para ciclistas en espera" + } + }, "pointRendering": [ { "location": [ @@ -18,6 +38,32 @@ "anchor": "bottom" } ], + "lineRendering": [ + { + "width": 1, + "color": "blue" + } + ], + "presets": [ + { + "title": { + "en": "a cyclist waiting aid", + "de": "eine Radfahrer-Wartehilfe", + "es": "un ciclista espera ayuda" + }, + "tags": [ + "highway=cyclist_waiting_aid" + ], + "description": { + "en": "A footrest, handrail or other aid, to improve comfort while waiting at traffic lights", + "de": "Eine Fußstütze, ein Handlauf oder ein anderes Hilfsmittel zur Verbesserung des Komforts beim Warten an der Ampel", + "es": "Reposapiés, pasamanos u otro tipo de ayuda para mejorar la comodidad durante la espera en los semáforos" + }, + "snapToLayer": [ + "cycleways_and_roads" + ] + } + ], "tagRenderings": [ "images", { @@ -111,34 +157,6 @@ } } ], - "lineRendering": [ - { - "width": 1, - "color": "blue" - } - ], - "credits:uid": 5093765, - "id": "cyclist_waiting_aid", - "description": { - "en": "Various pieces of infrastructure that aid cyclists while they wait at a traffic light.", - "de": "Verschiedene Infrastruktureinrichtungen, die Radfahrern helfen, während sie an einer Ampel warten.", - "es": "Diversas infraestructuras que ayudan a los ciclistas mientras esperan en un semáforo." - }, - "source": { - "osmTags": "highway=cyclist_waiting_aid" - }, - "name": { - "en": "Cyclist Waiting Aids", - "de": "Radfahrer-Wartehilfen", - "es": "Ayudas a la espera de ciclistas" - }, - "title": { - "render": { - "en": "Cyclist Waiting Aid", - "de": "Radfahrer-Wartehilfe", - "es": "Ayuda para ciclistas en espera" - } - }, "deletion": { "softDeletionTags": { "and": [ @@ -155,24 +173,6 @@ } }, "allowMove": false, - "presets": [ - { - "title": { - "en": "a cyclist waiting aid", - "de": "eine Radfahrer-Wartehilfe", - "es": "un ciclista espera ayuda" - }, - "tags": [ - "highway=cyclist_waiting_aid" - ], - "description": { - "en": "A footrest, handrail or other aid, to improve comfort while waiting at traffic lights", - "de": "Eine Fußstütze, ein Handlauf oder ein anderes Hilfsmittel zur Verbesserung des Komforts beim Warten an der Ampel", - "es": "Reposapiés, pasamanos u otro tipo de ayuda para mejorar la comodidad durante la espera en los semáforos" - }, - "snapToLayer": [ - "cycleways_and_roads" - ] - } - ] -} \ No newline at end of file + "credits": "Robin van der Linde", + "credits:uid": 5093765 +} diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 2f70f080c..e5b01677a 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -1599,4 +1599,4 @@ ] }, "allowMove": true -} \ No newline at end of file +} diff --git a/assets/layers/ghostsign/ghostsign.json b/assets/layers/ghostsign/ghostsign.json index 77fa8cf37..1bacd8c97 100644 --- a/assets/layers/ghostsign/ghostsign.json +++ b/assets/layers/ghostsign/ghostsign.json @@ -1,13 +1,9 @@ { "id": "ghostsign", - "title": { - "render": { - "en": "Ghost Sign", - "de": "Geisterzeichen", - "es": "Letrero fantasma", - "ca": "Rètols fantasma", - "cs": "Nápisy na zdech" - } + "name": { + "en": "Ghost Signs", + "de": "Geisterzeichen", + "es": "Letreros fantasma" }, "description": { "en": "Layer showing disused signs on buildings", @@ -16,11 +12,6 @@ "ca": "Capa que mostra rètols en desús dels edificis", "cs": "Vrstva zobrazující nepoužívané nápisy na budovách" }, - "name": { - "en": "Ghost Signs", - "de": "Geisterzeichen", - "es": "Letreros fantasma" - }, "source": { "osmTags": { "and": [ @@ -30,11 +21,53 @@ } }, "minzoom": 10, - "#allowMove": "Normally, a ghost sign is snapped to a wall, so moving won't be possible in most cases, but might still be useful e.g. to snap to a building", - "allowMove": { - "enableImproveAccuracy": true, - "enableRelocation": false + "title": { + "render": { + "en": "Ghost Sign", + "de": "Geisterzeichen", + "es": "Letrero fantasma", + "ca": "Rètols fantasma", + "cs": "Nápisy na zdech" + } }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "./assets/themes/advertising/wall_painting.svg" + } + ] + } + ], + "lineRendering": [ + { + "color": "blue", + "width": 2 + } + ], + "presets": [ + { + "tags": [ + "historic=advertising", + "advertising=wall_painting" + ], + "title": { + "en": "a ghost sign", + "de": "ein Geisterzeichen", + "es": "un letrero fantasma", + "ca": "un rètol fantasma", + "cs": "nápis na zdi" + }, + "snapToLayer": [ + "walls_and_buildings" + ], + "maxSnapDistance": 5 + } + ], "tagRenderings": [ "images", "advertising.historic", @@ -96,42 +129,9 @@ } } ], - "lineRendering": [ - { - "color": "blue", - "width": 2 - } - ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "./assets/themes/advertising/wall_painting.svg" - } - ] - } - ], - "presets": [ - { - "tags": [ - "historic=advertising", - "advertising=wall_painting" - ], - "title": { - "en": "a ghost sign", - "de": "ein Geisterzeichen", - "es": "un letrero fantasma", - "ca": "un rètol fantasma", - "cs": "nápis na zdi" - }, - "snapToLayer": [ - "walls_and_buildings" - ], - "maxSnapDistance": 5 - } - ] + "allowMove": { + "enableImproveAccuracy": true, + "enableRelocation": false + }, + "#allowMove": "Normally, a ghost sign is snapped to a wall, so moving won't be possible in most cases, but might still be useful e.g. to snap to a building" } diff --git a/assets/layers/insect_hotel/insect_hotel.json b/assets/layers/insect_hotel/insect_hotel.json index f2f68d076..b920a48b3 100644 --- a/assets/layers/insect_hotel/insect_hotel.json +++ b/assets/layers/insect_hotel/insect_hotel.json @@ -17,6 +17,19 @@ "en": "Insect Hotel", "nl": "Insectenhotel" }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "./assets/layers/insect_hotel/insect_hotel.svg" + } + ] + } + ], "presets": [ { "title": { @@ -31,22 +44,9 @@ "tagRenderings": [ "images" ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "./assets/layers/insect_hotel/insect_hotel.svg" - } - ] - } - ], + "deletion": true, "allowMove": { "enableImproveAccuracy": true, "enableRelocation": true - }, - "deletion": true -} \ No newline at end of file + } +} diff --git a/assets/layers/item_with_image/item_with_image.json b/assets/layers/item_with_image/item_with_image.json index 8247711bc..68cd93872 100644 --- a/assets/layers/item_with_image/item_with_image.json +++ b/assets/layers/item_with_image/item_with_image.json @@ -71,4 +71,4 @@ "images" ], "allowMove": false -} \ 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 bb8b00fc2..dcda70893 100644 --- a/assets/layers/nsi_brand/nsi_brand.json +++ b/assets/layers/nsi_brand/nsi_brand.json @@ -1,10 +1,9 @@ { - "#dont-translate": "*", "id": "nsi_brand", - "source": "special:library", "description": { "en": "Exposes part of the NSI to reuse in other themes, e.g. for rendering" }, + "source": "special:library", "pointRendering": null, "tagRenderings": [ { @@ -569060,5 +569059,6 @@ ] } ], - "allowMove": false + "allowMove": false, + "#dont-translate": "*" } diff --git a/assets/layers/nsi_operator/nsi_operator.json b/assets/layers/nsi_operator/nsi_operator.json index 9de0c8bb2..0d3d3f082 100644 --- a/assets/layers/nsi_operator/nsi_operator.json +++ b/assets/layers/nsi_operator/nsi_operator.json @@ -1,10 +1,9 @@ { - "#dont-translate": "*", "id": "nsi_operator", - "source": "special:library", "description": { "en": "Exposes part of the NSI to reuse in other themes, e.g. for rendering" }, + "source": "special:library", "pointRendering": null, "tagRenderings": [ { @@ -604541,5 +604540,6 @@ ] } ], - "allowMove": false + "allowMove": false, + "#dont-translate": "*" } diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 2cbaeb2f0..de5ae2626 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -366,4 +366,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json index 23cb8e9df..8d4906d81 100644 --- a/assets/layers/postboxes/postboxes.json +++ b/assets/layers/postboxes/postboxes.json @@ -48,21 +48,6 @@ "cs": "Poštovní schránka" } }, - "keywords": { - "en": [ - "post", - "post box", - "letter", - "letterbox" - ], - "nl": [ - "brieven", - "post", - "brief", - "brievenbus", - "pakjes" - ] - }, "pointRendering": [ { "iconSize": { @@ -176,5 +161,20 @@ "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false + }, + "keywords": { + "en": [ + "post", + "post box", + "letter", + "letterbox" + ], + "nl": [ + "brieven", + "post", + "brief", + "brievenbus", + "pakjes" + ] } } diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index a7dbb58fb..d5c98a3f0 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -1794,4 +1794,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/search/search.json b/assets/layers/search/search.json index 902ee466c..8c7f9d419 100644 --- a/assets/layers/search/search.json +++ b/assets/layers/search/search.json @@ -8,24 +8,6 @@ }, "source": "special", "title": "{display_name}", - "tagRenderings": [ - { - "id": "intro", - "render": { - "en": "Search result", - "de": "Suchergebnis", - "cs": "Výsledek hledání", - "es": "Resultado de búsqueda" - } - }, - { - "id": "osm", - "render": { - "*": "On OpenStreetMap" - } - }, - "all_tags" - ], "pointRendering": [ { "location": [ @@ -68,5 +50,23 @@ "label": "{display_name}", "labelCssClasses": "bg-white rounded p-2 no-wrap" } + ], + "tagRenderings": [ + { + "id": "intro", + "render": { + "en": "Search result", + "de": "Suchergebnis", + "cs": "Výsledek hledání", + "es": "Resultado de búsqueda" + } + }, + { + "id": "osm", + "render": { + "*": "On OpenStreetMap" + } + }, + "all_tags" ] } diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 3accb9c0e..449d601c0 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -460,4 +460,4 @@ "enableImproveAccuracy": true, "enableRelocation": false } -} \ No newline at end of file +} diff --git a/assets/layers/tactile_map/tactile_map.json b/assets/layers/tactile_map/tactile_map.json index fdb1eb837..0f52d3b0b 100644 --- a/assets/layers/tactile_map/tactile_map.json +++ b/assets/layers/tactile_map/tactile_map.json @@ -11,29 +11,11 @@ "source": { "osmTags": "information=tactile_map" }, + "minzoom": 10, "title": { "en": "Tactile Map", "de": "Taktile Karte" }, - "presets": [ - { - "tags": [ - "tourism=information", - "information=tactile_map" - ], - "title": { - "en": "a tactile map", - "de": "eine taktile Karte" - }, - "description": { - "en": "A tactile map that can be read using touch. Unlike a tactile model, this is relatively flat and does not feature three-dimensional buildings and such.", - "de": "Eine taktile Karte, die durch Berühren gelesen werden kann. Im Gegensatz zu einem taktilen Modell ist diese Karte relativ flach und enthält keine dreidimensionalen Gebäude oder ähnliches." - } - } - ], - "deletion": true, - "allowMove": true, - "minzoom": 10, "pointRendering": [ { "marker": [ @@ -51,6 +33,22 @@ ] } ], + "presets": [ + { + "tags": [ + "tourism=information", + "information=tactile_map" + ], + "title": { + "en": "a tactile map", + "de": "eine taktile Karte" + }, + "description": { + "en": "A tactile map that can be read using touch. Unlike a tactile model, this is relatively flat and does not feature three-dimensional buildings and such.", + "de": "Eine taktile Karte, die durch Berühren gelesen werden kann. Im Gegensatz zu einem taktilen Modell ist diese Karte relativ flach und enthält keine dreidimensionalen Gebäude oder ähnliches." + } + } + ], "tagRenderings": [ "images", { @@ -162,5 +160,7 @@ } }, "website" - ] -} \ No newline at end of file + ], + "deletion": true, + "allowMove": true +} diff --git a/assets/layers/tactile_model/tactile_model.json b/assets/layers/tactile_model/tactile_model.json index 127e72f63..5146ac2de 100644 --- a/assets/layers/tactile_model/tactile_model.json +++ b/assets/layers/tactile_model/tactile_model.json @@ -11,10 +11,24 @@ "source": { "osmTags": "information=tactile_model" }, + "minzoom": 10, "title": { "en": "Tactile Model", "de": "Taktiles Modell" }, + "pointRendering": [ + { + "marker": [ + { + "icon": "./assets/layers/tactile_model/tactile_model.svg" + } + ], + "location": [ + "point", + "centroid" + ] + } + ], "presets": [ { "tags": [ @@ -31,22 +45,6 @@ } } ], - "deletion": true, - "allowMove": true, - "minzoom": 10, - "pointRendering": [ - { - "marker": [ - { - "icon": "./assets/layers/tactile_model/tactile_model.svg" - } - ], - "location": [ - "point", - "centroid" - ] - } - ], "tagRenderings": [ "images", { @@ -176,5 +174,7 @@ } }, "website" - ] -} \ No newline at end of file + ], + "deletion": true, + "allowMove": true +} diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json index 3ac7b4395..c60a20dd4 100644 --- a/assets/layers/vending_machine/vending_machine.json +++ b/assets/layers/vending_machine/vending_machine.json @@ -26,10 +26,10 @@ ] } }, - "minzoom": 13, "calculatedTags": [ "_vending_count=feat.properties.vending.split(';').length" ], + "minzoom": 13, "title": { "render": { "en": "Vending machine", @@ -1498,4 +1498,4 @@ "enableImproveAccuracy": true, "enableRelocation": true } -} \ 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 ced6f1579..3cb62040e 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -485,4 +485,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 7710aa5c1..386b486c3 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -323,4 +323,4 @@ "enableImproveAccuracy": true, "enableRelocation": true } -} \ No newline at end of file +}