",
+ "nl": "Een telescoop of verrekijker die op een vaste plaats gemonteerd staat waar iedereen door mag kijken. 
"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -121,41 +180,6 @@
"id": "binocular-direction"
}
],
- "presets": [
- {
- "tags": [
- "amenity=binoculars"
- ],
- "title": {
- "en": "a binocular",
- "nl": "een verrekijker",
- "de": "ein Fernglas",
- "ru": "бинокль",
- "ca": "uns prismàtics",
- "da": "en kikkert",
- "es": "unos prismáticos",
- "fr": "des jumelles",
- "cs": "dalekohled"
- },
- "description": {
- "en": "A telescope or pair of binoculars mounted on a pole, available to the public to look around. 
(meant to charge electrical bikes)",
+ "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact {name}
",
+ "condition": "name~*",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "room=administration",
+ "room=auditorium",
+ "room=bedroom",
+ "room=chapel",
+ "room=class",
+ "room=computer",
+ "room=conference",
+ "room=crypt",
+ "room=kitchen",
+ "room=laboratory",
+ "room=library",
+ "room=locker",
+ "room=nursery",
+ "room=office",
+ "room=prison_cell",
+ "room=restaurant",
+ "room=security_check",
+ "room=sport",
+ "room=storage",
+ "room=technical",
+ "room=toilet",
+ "room=toilets",
+ "room=waiting"
+ ]
+ },
+ "then": "{name}
"
+ }
+ ]
+ },
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": {
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "room=administration",
+ "room=auditorium",
+ "room=bedroom",
+ "room=chapel",
+ "room=class",
+ "room=computer",
+ "room=conference",
+ "room=crypt",
+ "room=kitchen",
+ "room=laboratory",
+ "room=library",
+ "room=locker",
+ "room=nursery",
+ "room=office",
+ "room=prison_cell",
+ "room=restaurant",
+ "room=security_check",
+ "room=sport",
+ "room=storage",
+ "room=technical",
+ "room=toilets",
+ "room=waiting"
+ ]
+ },
+ "then": "./assets/layers/indoors/room_{room}.svg"
+ },
+ {
+ "if": "room=toilet",
+ "then": "./assets/layers/indoors/room_toilets.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "15,15",
+ "anchor": "bottom"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#d3d7d588",
+ "width": "8",
+ "offset": "-4",
+ "fill": "no"
+ },
+ {
+ "color": "#4f5551",
+ "fill": "no",
+ "width": "2"
+ }
+ ],
"tagRenderings": [
"images",
"level",
@@ -473,105 +573,5 @@
}
}
}
- ],
- "pointRendering": [
- {
- "label": {
- "render": "{name}
",
- "condition": "name~*",
- "mappings": [
- {
- "if": {
- "or": [
- "room=administration",
- "room=auditorium",
- "room=bedroom",
- "room=chapel",
- "room=class",
- "room=computer",
- "room=conference",
- "room=crypt",
- "room=kitchen",
- "room=laboratory",
- "room=library",
- "room=locker",
- "room=nursery",
- "room=office",
- "room=prison_cell",
- "room=restaurant",
- "room=security_check",
- "room=sport",
- "room=storage",
- "room=technical",
- "room=toilet",
- "room=toilets",
- "room=waiting"
- ]
- },
- "then": "{name}
"
- }
- ]
- },
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": {
- "mappings": [
- {
- "if": {
- "or": [
- "room=administration",
- "room=auditorium",
- "room=bedroom",
- "room=chapel",
- "room=class",
- "room=computer",
- "room=conference",
- "room=crypt",
- "room=kitchen",
- "room=laboratory",
- "room=library",
- "room=locker",
- "room=nursery",
- "room=office",
- "room=prison_cell",
- "room=restaurant",
- "room=security_check",
- "room=sport",
- "room=storage",
- "room=technical",
- "room=toilets",
- "room=waiting"
- ]
- },
- "then": "./assets/layers/indoors/room_{room}.svg"
- },
- {
- "if": "room=toilet",
- "then": "./assets/layers/indoors/room_toilets.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "15,15",
- "anchor": "bottom"
- }
- ],
- "lineRendering": [
- {
- "color": "#d3d7d588",
- "width": "8",
- "offset": "-4",
- "fill": "no"
- },
- {
- "color": "#4f5551",
- "fill": "no",
- "width": "2"
- }
]
}
diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json
index 2bea375a1..90ce2612b 100644
--- a/assets/layers/information_board/information_board.json
+++ b/assets/layers/information_board/information_board.json
@@ -12,7 +12,15 @@
"pl": "Tablice informacyjne",
"cs": "Informační tabule"
},
- "minzoom": 12,
+ "description": {
+ "en": "A layer showing touristical, road side information boards (e.g. giving information about the landscape, a building, a feature, a map, …)",
+ "nl": "Deze laag toont informatieborden in de publieke ruimte die uitleg geven over een bezienswaardigheid (bv. uitleg over het landschap, een ruine, een kaart van de omgeving, ...)",
+ "de": "Eine Ebene mit touristischen, straßenseitigen Informationstafeln (z. B. mit Informationen über die Landschaft, ein Gebäude, ein Merkmal, eine Karte, …)",
+ "es": "Una capa que muestra paneles informativos turísticos (ej. informan sobre el paisaje, una construcción, una característica, un mapa, ...)",
+ "ca": "Una capa que mostra panells informatius turístics (p.e. informen sobre el paissatge, una construcció, una característica, un mapa, …)",
+ "pl": "Warstwa pokazujące przydrożne tablice informacyjne dla turystów (np. informujące o krajobrazie, budynku, obiekcie, mapa, ...)",
+ "cs": "Vrstva zobrazující turistické informační tabule u silnice (např. informace o krajině, budově, objektu, mapě, ...)"
+ },
"source": {
"osmTags": {
"and": [
@@ -20,6 +28,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"nl": "Informatiebord",
@@ -34,8 +43,24 @@
"cs": "Informační tabule"
}
},
- "tagRenderings": [
- "images"
+ "pointRendering": [
+ {
+ "iconSize": "40,40",
+ "location": [
+ "point"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "./assets/layers/information_board/board.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#00f"
+ }
],
"presets": [
{
@@ -57,6 +82,9 @@
}
}
],
+ "tagRenderings": [
+ "images"
+ ],
"deletion": {
"softDeletionTags": {
"and": [
@@ -71,33 +99,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
- },
- "description": {
- "en": "A layer showing touristical, road side information boards (e.g. giving information about the landscape, a building, a feature, a map, …)",
- "nl": "Deze laag toont informatieborden in de publieke ruimte die uitleg geven over een bezienswaardigheid (bv. uitleg over het landschap, een ruine, een kaart van de omgeving, ...)",
- "de": "Eine Ebene mit touristischen, straßenseitigen Informationstafeln (z. B. mit Informationen über die Landschaft, ein Gebäude, ein Merkmal, eine Karte, …)",
- "es": "Una capa que muestra paneles informativos turísticos (ej. informan sobre el paisaje, una construcción, una característica, un mapa, ...)",
- "ca": "Una capa que mostra panells informatius turístics (p.e. informen sobre el paissatge, una construcció, una característica, un mapa, …)",
- "pl": "Warstwa pokazujące przydrożne tablice informacyjne dla turystów (np. informujące o krajobrazie, budynku, obiekcie, mapa, ...)",
- "cs": "Vrstva zobrazující turistické informační tabule u silnice (např. informace o krajině, budově, objektu, mapě, ...)"
- },
- "pointRendering": [
- {
- "iconSize": "40,40",
- "location": [
- "point"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "./assets/layers/information_board/board.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#00f"
- }
- ]
+ }
}
diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
index 4eab2ef2d..a2200d543 100644
--- a/assets/layers/kerbs/kerbs.json
+++ b/assets/layers/kerbs/kerbs.json
@@ -38,6 +38,74 @@
"cs": "Obrubník"
}
},
+ "pointRendering": [
+ {
+ "location": [
+ "point"
+ ],
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/layers/kerbs/KerbIcon.svg",
+ "mappings": [
+ {
+ "if": "kerb=raised",
+ "then": "./assets/layers/kerbs/raised.svg"
+ },
+ {
+ "if": "kerb=lowered",
+ "then": "./assets/layers/kerbs/lowered.svg"
+ },
+ {
+ "if": "kerb=flush",
+ "then": "./assets/layers/kerbs/flush.svg"
+ },
+ {
+ "if": "kerb=no",
+ "then": "./assets/layers/kerbs/no.svg"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#f44e42",
+ "fill": "no",
+ "width": "8"
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a kerb",
+ "nl": "een stoeprand",
+ "de": "einen Bordstein",
+ "fr": "une bordure",
+ "ru": "бордюр",
+ "pl": "krawężnik",
+ "ca": "una vorada",
+ "cs": "obrubník"
+ },
+ "tags": [
+ "barrier=kerb"
+ ],
+ "description": {
+ "en": "Kerb in a footway",
+ "nl": "Stoeprand in een voetpad",
+ "de": "Bordstein in einem Fußweg",
+ "fr": "Bordure dans un trottoir",
+ "cs": "Obrubník na chodníku"
+ },
+ "snapToLayer": [
+ "cycleways_and_roads",
+ "kerbs"
+ ],
+ "maxSnapDistance": 10
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -242,35 +310,6 @@
]
}
],
- "presets": [
- {
- "title": {
- "en": "a kerb",
- "nl": "een stoeprand",
- "de": "einen Bordstein",
- "fr": "une bordure",
- "ru": "бордюр",
- "pl": "krawężnik",
- "ca": "una vorada",
- "cs": "obrubník"
- },
- "tags": [
- "barrier=kerb"
- ],
- "description": {
- "en": "Kerb in a footway",
- "nl": "Stoeprand in een voetpad",
- "de": "Bordstein in einem Fußweg",
- "fr": "Bordure dans un trottoir",
- "cs": "Obrubník na chodníku"
- },
- "snapToLayer": [
- "cycleways_and_roads",
- "kerbs"
- ],
- "maxSnapDistance": 10
- }
- ],
"filter": [
{
"id": "kerb-type",
@@ -419,44 +458,5 @@
"kerb:height"
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point"
- ],
- "marker": [
- {
- "icon": {
- "render": "./assets/layers/kerbs/KerbIcon.svg",
- "mappings": [
- {
- "if": "kerb=raised",
- "then": "./assets/layers/kerbs/raised.svg"
- },
- {
- "if": "kerb=lowered",
- "then": "./assets/layers/kerbs/lowered.svg"
- },
- {
- "if": "kerb=flush",
- "then": "./assets/layers/kerbs/flush.svg"
- },
- {
- "if": "kerb=no",
- "then": "./assets/layers/kerbs/no.svg"
- }
- ]
- }
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#f44e42",
- "fill": "no",
- "width": "8"
- }
]
}
diff --git a/assets/layers/kindergarten_childcare/kindergarten_childcare.json b/assets/layers/kindergarten_childcare/kindergarten_childcare.json
index 339ba1445..da586630c 100644
--- a/assets/layers/kindergarten_childcare/kindergarten_childcare.json
+++ b/assets/layers/kindergarten_childcare/kindergarten_childcare.json
@@ -9,7 +9,6 @@
"cs": "Mateřské školky a péče o děti"
},
"description": "Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other",
- "minzoom": 12,
"source": {
"osmTags": {
"or": [
@@ -19,6 +18,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"mappings": [
{
@@ -43,6 +43,81 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "label": {
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": "{name}
"
+ }
+ ]
+ },
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "mappings": [
+ {
+ "if": "amenity=kindergarten",
+ "then": "./assets/layers/kindergarten_childcare/kindergarten.svg"
+ },
+ {
+ "if": "amenity=childcare",
+ "then": "./assets/layers/kindergarten_childcare/childcare.svg"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#62fc6c",
+ "width": 1
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a kindergarten",
+ "nl": "een kleuterschool",
+ "de": "einen Kindergarten",
+ "ru": "детский сад",
+ "ca": "una llar d'infants",
+ "pl": "przedszkole",
+ "cs": "mateřská školka"
+ },
+ "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.",
+ "tags": [
+ "amenity=kindergarten",
+ "isced:level=0",
+ "isced:2011:level=early_childhood"
+ ]
+ },
+ {
+ "title": {
+ "en": "a childcare",
+ "nl": "een kinderopvang",
+ "de": "eine Kinderkrippe",
+ "ca": "una guarderia",
+ "pl": "żłobek",
+ "cs": "péče o děti"
+ },
+ "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.",
+ "tags": [
+ "amenity=kindergarten"
+ ]
+ }
+ ],
"tagRenderings": [
{
"id": "childcare-type",
@@ -147,84 +222,9 @@
}
}
],
- "presets": [
- {
- "title": {
- "en": "a kindergarten",
- "nl": "een kleuterschool",
- "de": "einen Kindergarten",
- "ru": "детский сад",
- "ca": "una llar d'infants",
- "pl": "przedszkole",
- "cs": "mateřská školka"
- },
- "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.",
- "tags": [
- "amenity=kindergarten",
- "isced:level=0",
- "isced:2011:level=early_childhood"
- ]
- },
- {
- "title": {
- "en": "a childcare",
- "nl": "een kinderopvang",
- "de": "eine Kinderkrippe",
- "ca": "una guarderia",
- "pl": "żłobek",
- "cs": "péče o děti"
- },
- "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.",
- "tags": [
- "amenity=kindergarten"
- ]
- }
- ],
+ "deletion": true,
"allowMove": {
"enableRelocation": true,
"enableImproveAccuracy": true
- },
- "deletion": true,
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "mappings": [
- {
- "if": "amenity=kindergarten",
- "then": "./assets/layers/kindergarten_childcare/kindergarten.svg"
- },
- {
- "if": "amenity=childcare",
- "then": "./assets/layers/kindergarten_childcare/childcare.svg"
- }
- ]
- }
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#62fc6c",
- "width": 1
- }
- ]
+ }
}
diff --git a/assets/layers/last_click/last_click.json b/assets/layers/last_click/last_click.json
index 0a29282d0..1712bd3f3 100644
--- a/assets/layers/last_click/last_click.json
+++ b/assets/layers/last_click/last_click.json
@@ -1,5 +1,6 @@
{
"id": "last_click",
+ "name": null,
"description": "This layer defines how to render the 'last click'-location. By default, it will show a marker with the possibility to add a new point (if there are some presets) and/or to add a new note (if the 'note' layer attribute is set). If none are possible, this layer won't show up",
"source": "special",
"isShown": {
@@ -8,9 +9,6 @@
"has_note_layer=yes"
]
},
- "name": null,
- "titleIcons": [],
- "popupInFloatover": true,
"title": {
"mappings": [
{
@@ -56,39 +54,8 @@
}
]
},
- "tagRenderings": [
- {
- "id": "add_new",
- "condition": "has_presets=yes",
- "render": {
- "*": "{add_new_point()}"
- }
- },
- {
- "id": "add_note",
- "condition": "has_note_layer=yes",
- "render": {
- "*": "{open_note()}"
- }
- }
- ],
- "filter": [
- {
- "id": "action",
- "options": [
- {
- "default": true,
- "question": "only_if_action_is_possible",
- "osmTags": {
- "or": [
- "has_note_layer=yes",
- "has_presets=yes"
- ]
- }
- }
- ]
- }
- ],
+ "popupInFloatover": true,
+ "titleIcons": [],
"pointRendering": [
{
"marker": [
@@ -185,5 +152,38 @@
}
}
],
- "lineRendering": []
+ "lineRendering": [],
+ "tagRenderings": [
+ {
+ "id": "add_new",
+ "condition": "has_presets=yes",
+ "render": {
+ "*": "{add_new_point()}"
+ }
+ },
+ {
+ "id": "add_note",
+ "condition": "has_note_layer=yes",
+ "render": {
+ "*": "{open_note()}"
+ }
+ }
+ ],
+ "filter": [
+ {
+ "id": "action",
+ "options": [
+ {
+ "default": true,
+ "question": "only_if_action_is_possible",
+ "osmTags": {
+ "or": [
+ "has_note_layer=yes",
+ "has_presets=yes"
+ ]
+ }
+ }
+ ]
+ }
+ ]
}
diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index cf4ea604d..1c68c68bc 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -13,7 +13,17 @@
"pl": "Mapy",
"cs": "Mapy"
},
- "minzoom": 12,
+ "description": {
+ "en": "A map, meant for tourists which is permanently installed in the public space",
+ "nl": "Een permantent geinstalleerde kaart",
+ "it": "Una mappa, destinata ai turisti e che è sistemata in maniera permanente in uno spazio pubblico",
+ "fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public",
+ "de": "Eine Karte, die für Touristen gedacht ist und dauerhaft im öffentlichen Raum aufgestellt ist",
+ "es": "Un mapa, pensado para turistas y que está instalado de manera permanente en un espacio público",
+ "pl": "Mapa, przeznaczona dla turystów, która jest zainstalowana w przestrzeni publicznej na stałe",
+ "ca": "Un mapa",
+ "cs": "Mapa určená pro turisty, která je trvale instalována na veřejném prostranství"
+ },
"source": {
"osmTags": {
"or": [
@@ -22,6 +32,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Map",
@@ -37,17 +48,89 @@
"cs": "Mapa"
}
},
- "description": {
- "en": "A map, meant for tourists which is permanently installed in the public space",
- "nl": "Een permantent geinstalleerde kaart",
- "it": "Una mappa, destinata ai turisti e che è sistemata in maniera permanente in uno spazio pubblico",
- "fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public",
- "de": "Eine Karte, die für Touristen gedacht ist und dauerhaft im öffentlichen Raum aufgestellt ist",
- "es": "Un mapa, pensado para turistas y que está instalado de manera permanente en un espacio público",
- "pl": "Mapa, przeznaczona dla turystów, która jest zainstalowana w przestrzeni publicznej na stałe",
- "ca": "Un mapa",
- "cs": "Mapa určená pro turisty, která je trvale instalována na veřejném prostranství"
- },
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/layers/map/map.svg",
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap",
+ "map_source:attribution=sticker"
+ ]
+ },
+ "then": "./assets/layers/map/map-stickered.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap",
+ "map_source:attribution=yes"
+ ]
+ },
+ "then": "./assets/layers/map/osm-logo-white-bg.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "map_source=OpenStreetMap"
+ ]
+ },
+ "then": "./assets/layers/map/osm-logo-buggy-attr.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "50,50",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#00f",
+ "width": "8"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "tourism=information",
+ "information=map"
+ ],
+ "title": {
+ "en": "a map",
+ "nl": "een kaart",
+ "it": "una mappa",
+ "ru": "Карта",
+ "fr": "une carte",
+ "de": "eine Karte",
+ "ca": "un mapa",
+ "es": "un mapa",
+ "pl": "mapa",
+ "cs": "mapa"
+ },
+ "description": {
+ "en": "Add a missing map",
+ "nl": "Voeg een ontbrekende kaart toe",
+ "it": "Aggiungi una mappa mancante",
+ "fr": "Ajouter une carte manquante",
+ "de": "Fehlende Karte hinzufügen",
+ "ru": "Добавить отсутствующую карту",
+ "es": "Añadir un mapa que falta",
+ "ca": "Afegeix un mapa que falta",
+ "pl": "Dodaj brakującą mapę",
+ "cs": "Přidat chybějící mapu"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -328,38 +411,6 @@
}
}
],
- "presets": [
- {
- "tags": [
- "tourism=information",
- "information=map"
- ],
- "title": {
- "en": "a map",
- "nl": "een kaart",
- "it": "una mappa",
- "ru": "Карта",
- "fr": "une carte",
- "de": "eine Karte",
- "ca": "un mapa",
- "es": "un mapa",
- "pl": "mapa",
- "cs": "mapa"
- },
- "description": {
- "en": "Add a missing map",
- "nl": "Voeg een ontbrekende kaart toe",
- "it": "Aggiungi una mappa mancante",
- "fr": "Ajouter une carte manquante",
- "de": "Fehlende Karte hinzufügen",
- "ru": "Добавить отсутствующую карту",
- "es": "Añadir un mapa que falta",
- "ca": "Afegeix un mapa que falta",
- "pl": "Dodaj brakującą mapę",
- "cs": "Přidat chybějící mapu"
- }
- }
- ],
"deletion": {
"softDeletionTags": {
"and": [
@@ -372,56 +423,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
- },
- "pointRendering": [
- {
- "marker": [
- {
- "icon": {
- "render": "./assets/layers/map/map.svg",
- "mappings": [
- {
- "if": {
- "and": [
- "map_source=OpenStreetMap",
- "map_source:attribution=sticker"
- ]
- },
- "then": "./assets/layers/map/map-stickered.svg"
- },
- {
- "if": {
- "and": [
- "map_source=OpenStreetMap",
- "map_source:attribution=yes"
- ]
- },
- "then": "./assets/layers/map/osm-logo-white-bg.svg"
- },
- {
- "if": {
- "and": [
- "map_source=OpenStreetMap"
- ]
- },
- "then": "./assets/layers/map/osm-logo-buggy-attr.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "50,50",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center"
- }
- ],
- "lineRendering": [
- {
- "color": "#00f",
- "width": "8"
- }
- ]
+ }
}
diff --git a/assets/layers/maproulette/maproulette.json b/assets/layers/maproulette/maproulette.json
index f604260bd..9c5a24c71 100644
--- a/assets/layers/maproulette/maproulette.json
+++ b/assets/layers/maproulette/maproulette.json
@@ -1,9 +1,12 @@
{
"id": "maproulette",
- "source": {
- "geoJson": "https://maproulette.org/api/v2/tasks/box/{x_min}/{y_min}/{x_max}/{y_max}",
- "geoJsonZoomLevel": 16,
- "osmTags": "title~*"
+ "name": {
+ "en": "MapRoulette Tasks",
+ "de": "MapRoulette-Aufgaben",
+ "nl": "MapRoulette Taken",
+ "pl": "Zadania MapRoulette",
+ "ca": "Tasques de MapRoulette",
+ "cs": "Úkoly MapRoulette"
},
"description": {
"en": "Layer showing all tasks in MapRoulette",
@@ -13,6 +16,80 @@
"pl": "Warstwa pokazująca wszystkie zadania w MapRoulette",
"cs": "Vrstva zobrazující všechny úlohy v MapRoulette"
},
+ "source": {
+ "geoJson": "https://maproulette.org/api/v2/tasks/box/{x_min}/{y_min}/{x_max}/{y_max}",
+ "geoJsonZoomLevel": 16,
+ "osmTags": "title~*"
+ },
+ "minzoom": 15,
+ "title": {
+ "render": {
+ "en": "MapRoulette Item: {parentName}",
+ "de": "MapRoulette-Element: {parentName}",
+ "nl": "MapRoulette Item: {parentName}",
+ "pl": "Obiekt MapRoulette: {parentName}",
+ "cs": "Položka MapRoulette: {parentName}"
+ }
+ },
+ "titleIcons": [
+ {
+ "id": "maproulette",
+ "render": "
"
+ }
+ ],
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "pin",
+ "color": {
+ "render": "#00",
+ "mappings": [
+ {
+ "if": "status=0",
+ "then": "#959DFF"
+ },
+ {
+ "if": "status=1",
+ "then": "#65D2DA"
+ },
+ {
+ "if": "status=2",
+ "then": "#F7BB59"
+ },
+ {
+ "if": "status=3",
+ "then": "#F7BB59"
+ },
+ {
+ "if": "status=4",
+ "then": "#737373"
+ },
+ {
+ "if": "status=5",
+ "then": "#CCB186"
+ },
+ {
+ "if": "status=6",
+ "then": "#FF5E63"
+ },
+ {
+ "if": "status=9",
+ "then": "#FF349C"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "40,40",
+ "anchor": "bottom"
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "status",
@@ -166,30 +243,6 @@
}
}
],
- "minzoom": 15,
- "name": {
- "en": "MapRoulette Tasks",
- "de": "MapRoulette-Aufgaben",
- "nl": "MapRoulette Taken",
- "pl": "Zadania MapRoulette",
- "ca": "Tasques de MapRoulette",
- "cs": "Úkoly MapRoulette"
- },
- "title": {
- "render": {
- "en": "MapRoulette Item: {parentName}",
- "de": "MapRoulette-Element: {parentName}",
- "nl": "MapRoulette Item: {parentName}",
- "pl": "Obiekt MapRoulette: {parentName}",
- "cs": "Položka MapRoulette: {parentName}"
- }
- },
- "titleIcons": [
- {
- "id": "maproulette",
- "render": ""
- }
- ],
"filter": [
{
"id": "status",
@@ -336,58 +389,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "pin",
- "color": {
- "render": "#00",
- "mappings": [
- {
- "if": "status=0",
- "then": "#959DFF"
- },
- {
- "if": "status=1",
- "then": "#65D2DA"
- },
- {
- "if": "status=2",
- "then": "#F7BB59"
- },
- {
- "if": "status=3",
- "then": "#F7BB59"
- },
- {
- "if": "status=4",
- "then": "#737373"
- },
- {
- "if": "status=5",
- "then": "#CCB186"
- },
- {
- "if": "status=6",
- "then": "#FF5E63"
- },
- {
- "if": "status=9",
- "then": "#FF349C"
- }
- ]
- }
- }
- ],
- "iconSize": "40,40",
- "anchor": "bottom"
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/maproulette_challenge/maproulette_challenge.json b/assets/layers/maproulette_challenge/maproulette_challenge.json
index fc79029e3..2f192ebd8 100644
--- a/assets/layers/maproulette_challenge/maproulette_challenge.json
+++ b/assets/layers/maproulette_challenge/maproulette_challenge.json
@@ -28,6 +28,78 @@
"render": ""
}
],
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "color": {
+ "mappings": [
+ {
+ "if": "mr_taskStatus=Created",
+ "then": "#959DFF"
+ },
+ {
+ "if": "mr_taskStatus=Fixed",
+ "then": "#65D2DA"
+ },
+ {
+ "if": "mr_taskStatus=False positive",
+ "then": "#F7BB59"
+ },
+ {
+ "if": "mr_taskStatus=Skipped",
+ "then": "#F7BB59"
+ },
+ {
+ "if": "mr_taskStatus=Deleted",
+ "then": "#737373"
+ },
+ {
+ "if": "mr_taskStatus=Already fixed",
+ "then": "#CCB186"
+ },
+ {
+ "if": "mr_taskStatus=Too hard",
+ "then": "#FF5E63"
+ },
+ {
+ "if": "mr_taskStatus=Disabled",
+ "then": "#FF349C"
+ }
+ ]
+ },
+ "icon": {
+ "render": "./assets/layers/maproulette/logomark.svg",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "mr_taskStatus=Created",
+ "mr_taskStatus=Fixed",
+ "mr_taskStatus=False positive",
+ "mr_taskStatus=Skipped",
+ "mr_taskStatus=Deleted",
+ "mr_taskStatus=Already fixed",
+ "mr_taskStatus=Already fixed",
+ "mr_taskStatus=Disabled",
+ "mr_taskStatus=Too hard"
+ ]
+ },
+ "then": "pin"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "40,40",
+ "anchor": "bottom"
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "details",
@@ -217,77 +289,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "color": {
- "mappings": [
- {
- "if": "mr_taskStatus=Created",
- "then": "#959DFF"
- },
- {
- "if": "mr_taskStatus=Fixed",
- "then": "#65D2DA"
- },
- {
- "if": "mr_taskStatus=False positive",
- "then": "#F7BB59"
- },
- {
- "if": "mr_taskStatus=Skipped",
- "then": "#F7BB59"
- },
- {
- "if": "mr_taskStatus=Deleted",
- "then": "#737373"
- },
- {
- "if": "mr_taskStatus=Already fixed",
- "then": "#CCB186"
- },
- {
- "if": "mr_taskStatus=Too hard",
- "then": "#FF5E63"
- },
- {
- "if": "mr_taskStatus=Disabled",
- "then": "#FF349C"
- }
- ]
- },
- "icon": {
- "render": "./assets/layers/maproulette/logomark.svg",
- "mappings": [
- {
- "if": {
- "or": [
- "mr_taskStatus=Created",
- "mr_taskStatus=Fixed",
- "mr_taskStatus=False positive",
- "mr_taskStatus=Skipped",
- "mr_taskStatus=Deleted",
- "mr_taskStatus=Already fixed",
- "mr_taskStatus=Already fixed",
- "mr_taskStatus=Disabled",
- "mr_taskStatus=Too hard"
- ]
- },
- "then": "pin"
- }
- ]
- }
- }
- ],
- "iconSize": "40,40",
- "anchor": "bottom"
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json
index 40d35324f..6ce88e50b 100644
--- a/assets/layers/maxspeed/maxspeed.json
+++ b/assets/layers/maxspeed/maxspeed.json
@@ -10,6 +10,15 @@
"fr": "Vitesse maximale",
"cs": "Maximální rychlost"
},
+ "description": {
+ "en": "Shows the allowed speed for every road",
+ "de": "Zeigt die zulässige Geschwindigkeit für jede Straße an",
+ "nl": "Toont de toegestane snelheid voor elke weg",
+ "cs": "Zobrazuje povolenou rychlost pro každou silnici",
+ "ca": "Mostra la velocitat permesa per a cada carretera",
+ "fr": "Affiche les vitesses autorisées sur toutes les routes",
+ "pl": "Pokazuje dozwoloną prędkość na każdej drodze"
+ },
"source": {
"osmTags": {
"and": [
@@ -55,15 +64,47 @@
}
]
},
- "description": {
- "en": "Shows the allowed speed for every road",
- "de": "Zeigt die zulässige Geschwindigkeit für jede Straße an",
- "nl": "Toont de toegestane snelheid voor elke weg",
- "cs": "Zobrazuje povolenou rychlost pro každou silnici",
- "ca": "Mostra la velocitat permesa per a cada carretera",
- "fr": "Affiche les vitesses autorisées sur toutes les routes",
- "pl": "Pokazuje dozwoloną prędkość na każdej drodze"
- },
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": {
+ "render": null,
+ "mappings": [
+ {
+ "if": "maxspeed~[1-9]0|1[0-4]0",
+ "then": "./assets/themes/maxspeed/maxspeed_{maxspeed} mph.svg"
+ },
+ {
+ "if": "maxspeed~[1-9]0|1[0-4]0 mph",
+ "then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "32,32",
+ "location": [
+ "point",
+ "projected_centerpoint"
+ ],
+ "anchor": "center"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": {
+ "render": "#000000",
+ "mappings": [
+ {
+ "if": "maxspeed=",
+ "then": "#ff0000"
+ }
+ ]
+ },
+ "width": "3"
+ }
+ ],
"tagRenderings": [
{
"render": {
@@ -182,46 +223,5 @@
"maxspeed"
]
}
- ],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": {
- "render": null,
- "mappings": [
- {
- "if": "maxspeed~[1-9]0|1[0-4]0",
- "then": "./assets/themes/maxspeed/maxspeed_{maxspeed} mph.svg"
- },
- {
- "if": "maxspeed~[1-9]0|1[0-4]0 mph",
- "then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "32,32",
- "location": [
- "point",
- "projected_centerpoint"
- ],
- "anchor": "center"
- }
- ],
- "lineRendering": [
- {
- "color": {
- "render": "#000000",
- "mappings": [
- {
- "if": "maxspeed=",
- "then": "#ff0000"
- }
- ]
- },
- "width": "3"
- }
]
}
diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json
index 724d1defd..c49171f44 100644
--- a/assets/layers/memorial/memorial.json
+++ b/assets/layers/memorial/memorial.json
@@ -12,6 +12,24 @@
"cs": "Pamětní deska"
}
},
+ "pointRendering": [
+ {
+ "location": [
+ "centroid",
+ "point"
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/memorial/plaque.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "inscription",
@@ -37,23 +55,5 @@
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
- },
- "pointRendering": [
- {
- "location": [
- "centroid",
- "point"
- ],
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/memorial/plaque.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ }
}
diff --git a/assets/layers/named_streets/named_streets.json b/assets/layers/named_streets/named_streets.json
index 49fef0c78..9c2a3c1ba 100644
--- a/assets/layers/named_streets/named_streets.json
+++ b/assets/layers/named_streets/named_streets.json
@@ -1,7 +1,6 @@
{
"id": "named_streets",
"description": "Hidden layer with all streets which have a name. Useful to detect addresses",
- "minzoom": 18,
"source": {
"osmTags": {
"and": [
@@ -10,6 +9,7 @@
]
}
},
+ "minzoom": 18,
"shownByDefault": false,
"pointRendering": [],
"lineRendering": [
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index 2a0d22572..76196cf8b 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -8,7 +8,13 @@
"ca": "Reserva Natural",
"cs": "Přírodní rezervace"
},
- "minzoom": 12,
+ "description": {
+ "en": "A nature reserve is an area where nature can take its course",
+ "nl": "Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. Typisch zijn deze in beheer van Natuurpunt of het Agentschap Natuur en Bos of zijn deze erkend door de overheid.",
+ "de": "Ein Naturschutzgebiet ist ein Gebiet, das der Natur überlassen wurde",
+ "ca": "Una reserva natural és una zona on la natura pot seguir el seu curs",
+ "cs": "Přírodní rezervace je území, kde se příroda může rozvíjet"
+ },
"source": {
"osmTags": {
"and": [
@@ -26,6 +32,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"nl": "Natuurgebied",
@@ -48,13 +55,49 @@
}
]
},
- "description": {
- "en": "A nature reserve is an area where nature can take its course",
- "nl": "Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. Typisch zijn deze in beheer van Natuurpunt of het Agentschap Natuur en Bos of zijn deze erkend door de overheid.",
- "de": "Ein Naturschutzgebiet ist ein Gebiet, das der Natur überlassen wurde",
- "ca": "Una reserva natural és una zona on la natura pot seguir el seu curs",
- "cs": "Přírodní rezervace je území, kde se příroda může rozvíjet"
- },
+ "pointRendering": [
+ {
+ "iconSize": "50,50",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "./assets/layers/nature_reserve/nature_reserve.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#3c3",
+ "width": "1"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "leisure=nature_reserve",
+ "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
+ ],
+ "title": {
+ "en": "a nature reserve",
+ "nl": "een natuurreservaat",
+ "de": "ein Schutzgebiet",
+ "ca": "una reserva natural",
+ "cs": "přírodní rezervace"
+ },
+ "description": {
+ "en": "Add a missing nature reserve",
+ "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt",
+ "de": "Ein fehlendes Naturschutzgebiet hinzufügen",
+ "ca": "Afegeix una reserva natural que falta",
+ "cs": "Přidat chybějící přírodní rezervaci"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -497,28 +540,6 @@
},
"wikipedia"
],
- "presets": [
- {
- "tags": [
- "leisure=nature_reserve",
- "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
- ],
- "title": {
- "en": "a nature reserve",
- "nl": "een natuurreservaat",
- "de": "ein Schutzgebiet",
- "ca": "una reserva natural",
- "cs": "přírodní rezervace"
- },
- "description": {
- "en": "Add a missing nature reserve",
- "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt",
- "de": "Ein fehlendes Naturschutzgebiet hinzufügen",
- "ca": "Afegeix una reserva natural que falta",
- "cs": "Přidat chybějící přírodní rezervaci"
- }
- }
- ],
"filter": [
{
"id": "access",
@@ -574,26 +595,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "iconSize": "50,50",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "./assets/layers/nature_reserve/nature_reserve.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#3c3",
- "width": "1"
- }
]
}
diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
index a37ddf76b..cbf752842 100644
--- a/assets/layers/note/note.json
+++ b/assets/layers/note/note.json
@@ -16,6 +16,15 @@
"maxCacheAge": 0,
"isOsmCache": false
},
+ "calculatedTags": [
+ "_total_comments:=get(feat)('comments').length",
+ "_first_comment:=get(feat)('comments')[0].text",
+ "_opened_by_anonymous_user:=get(feat)('comments')[0].user === undefined",
+ "_first_user:=get(feat)('comments')[0].user",
+ "_last_user:=(() => {const comms = get(feat)('comments'); return comms[comms.length - 1].user})()",
+ "_first_user_id:=get(feat)('comments')[0].uid",
+ "_is_import_note:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.\\(osm.be|org\\)/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()"
+ ],
"minzoom": 10,
"title": {
"render": {
@@ -43,20 +52,45 @@
}
]
},
- "calculatedTags": [
- "_total_comments:=get(feat)('comments').length",
- "_first_comment:=get(feat)('comments')[0].text",
- "_opened_by_anonymous_user:=get(feat)('comments')[0].user === undefined",
- "_first_user:=get(feat)('comments')[0].user",
- "_last_user:=(() => {const comms = get(feat)('comments'); return comms[comms.length - 1].user})()",
- "_first_user_id:=get(feat)('comments')[0].uid",
- "_is_import_note:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.\\(osm.be|org\\)/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()"
- ],
"titleIcons": [
{
"render": "
"
}
],
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": {
+ "render": "note",
+ "mappings": [
+ {
+ "if": "closed_at~*",
+ "then": "resolved"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "40,40",
+ "iconBadges": [
+ {
+ "if": "_total_comments>1",
+ "then": "circle:white;speech_bubble"
+ },
+ {
+ "if": "_is_import_note~*",
+ "then": "addSmall"
+ }
+ ],
+ "anchor": "bottom"
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "conversation",
@@ -352,39 +386,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": {
- "render": "note",
- "mappings": [
- {
- "if": "closed_at~*",
- "then": "resolved"
- }
- ]
- }
- }
- ],
- "iconSize": "40,40",
- "iconBadges": [
- {
- "if": "_total_comments>1",
- "then": "circle:white;speech_bubble"
- },
- {
- "if": "_is_import_note~*",
- "then": "addSmall"
- }
- ],
- "anchor": "bottom"
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json
index b08977f6f..0a71f60e8 100644
--- a/assets/layers/observation_tower/observation_tower.json
+++ b/assets/layers/observation_tower/observation_tower.json
@@ -10,6 +10,22 @@
"pl": "Wieże obserwacyjne",
"cs": "Rozhledny"
},
+ "description": {
+ "en": "Towers with a panoramic view",
+ "nl": "Torens om van het uitzicht te genieten",
+ "de": "Türme zur Aussicht auf die umgebende Landschaft",
+ "es": "Torres con vista panorámica",
+ "pl": "Wieże z panoramicznym widokiem",
+ "ca": "Torres amb vista panoràmica",
+ "cs": "Věže s panoramatickým výhledem"
+ },
+ "source": {
+ "osmTags": {
+ "and": [
+ "tower:type=observation"
+ ]
+ }
+ },
"minzoom": 8,
"title": {
"render": {
@@ -38,15 +54,26 @@
}
]
},
- "description": {
- "en": "Towers with a panoramic view",
- "nl": "Torens om van het uitzicht te genieten",
- "de": "Türme zur Aussicht auf die umgebende Landschaft",
- "es": "Torres con vista panorámica",
- "pl": "Wieże z panoramicznym widokiem",
- "ca": "Torres amb vista panoràmica",
- "cs": "Věže s panoramatickým výhledem"
- },
+ "pointRendering": [
+ {
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/observation_tower/Tower_observation.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
"images",
{
@@ -329,12 +356,9 @@
},
"wikipedia"
],
- "source": {
- "osmTags": {
- "and": [
- "tower:type=observation"
- ]
- }
+ "allowMove": {
+ "enableRelocation": false,
+ "enableImproveAccuraccy": true
},
"units": [
{
@@ -362,29 +386,5 @@
],
"eraseInvalidValues": true
}
- ],
- "allowMove": {
- "enableRelocation": false,
- "enableImproveAccuraccy": true
- },
- "pointRendering": [
- {
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/observation_tower/Tower_observation.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/osm_community_index/osm_community_index.json b/assets/layers/osm_community_index/osm_community_index.json
index f48f1b27f..cde21addc 100644
--- a/assets/layers/osm_community_index/osm_community_index.json
+++ b/assets/layers/osm_community_index/osm_community_index.json
@@ -8,6 +8,23 @@
"pl": "Indeks społeczności OSM",
"cs": "OSM Community Index"
},
+ "description": {
+ "en": "A layer showing the OpenStreetMap Communities",
+ "de": "Eine Ebene aller OpenStreetMap-Communities",
+ "ca": "Una capa que mostra les comunitats d'OpenStreetMap",
+ "fr": "Une couche affichant les communautés OpenStreetMap",
+ "pl": "Warstwa pokazująca społeczności OpenStreetMap",
+ "cs": "Vrstva zobrazující komunity OpenStreetMap"
+ },
+ "source": {
+ "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson",
+ "geoJsonZoomLevel": 6,
+ "osmTags": "resources~*",
+ "isOsmCache": false
+ },
+ "calculatedTags": [
+ "_community_links=Object.values(JSON.parse(feat.properties.resources || '{}')).map(value =>{return value.resolved.nameHTML + '' + value.resolved.descriptionHTML}).join('
')" + ], "title": { "render": { "en": "OSM Community Index", @@ -18,14 +35,29 @@ "cs": "OSM Community Index" } }, - "source": { - "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson", - "geoJsonZoomLevel": 6, - "osmTags": "resources~*", - "isOsmCache": false - }, - "calculatedTags": [ - "_community_links=Object.values(JSON.parse(feat.properties.resources || '{}')).map(value =>{return value.resolved.nameHTML + '
' + value.resolved.descriptionHTML}).join('
')" + "pointRendering": [ + { + "iconSize": "40,40", + "location": [ + "point" + ], + "anchor": "bottom", + "marker": [ + { + "icon": "pin", + "color": "#6BC4F7" + }, + { + "icon": "./assets/layers/osm_community_index/osm.svg" + } + ] + } + ], + "lineRendering": [ + { + "color": "#444444", + "width": "1" + } ], "tagRenderings": [ { @@ -153,37 +185,5 @@ } ] } - ], - "description": { - "en": "A layer showing the OpenStreetMap Communities", - "de": "Eine Ebene aller OpenStreetMap-Communities", - "ca": "Una capa que mostra les comunitats d'OpenStreetMap", - "fr": "Une couche affichant les communautés OpenStreetMap", - "pl": "Warstwa pokazująca społeczności OpenStreetMap", - "cs": "Vrstva zobrazující komunity OpenStreetMap" - }, - "pointRendering": [ - { - "iconSize": "40,40", - "location": [ - "point" - ], - "anchor": "bottom", - "marker": [ - { - "icon": "pin", - "color": "#6BC4F7" - }, - { - "icon": "./assets/layers/osm_community_index/osm.svg" - } - ] - } - ], - "lineRendering": [ - { - "color": "#444444", - "width": "1" - } ] } diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index f6b72b867..812d2b501 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -18,7 +18,6 @@ "pl": "Warstwa pokazująca paczkomaty umożliwiające odbieranie i wysyłanie przesyłek.", "cs": "Vrstva se schránkami na balíky pro vyzvedávání a odesílání balíků." }, - "minzoom": 12, "source": { "osmTags": { "or": [ @@ -32,22 +31,7 @@ ] } }, - "presets": [ - { - "title": { - "en": "a parcel locker", - "nl": "een pakketautomaat", - "de": "ein Paketschließfach", - "ca": "una bústia intel·ligent", - "fr": "un casier à colis", - "pl": "paczkomat", - "cs": "schránky na balíky" - }, - "tags": [ - "amenity=parcel_locker" - ] - } - ], + "minzoom": 12, "title": { "render": { "en": "Parcel Locker", @@ -73,6 +57,48 @@ } ] }, + "pointRendering": [ + { + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "icons.isOpen" + } + ], + "iconSize": "40,40", + "location": [ + "point", + "centroid" + ], + "anchor": "center", + "marker": [ + { + "icon": "square", + "color": "white" + }, + { + "icon": "./assets/layers/parcel_lockers/parcel_lockers.svg" + } + ] + } + ], + "lineRendering": [], + "presets": [ + { + "title": { + "en": "a parcel locker", + "nl": "een pakketautomaat", + "de": "ein Paketschließfach", + "ca": "una bústia intel·ligent", + "fr": "un casier à colis", + "pl": "paczkomat", + "cs": "schránky na balíky" + }, + "tags": [ + "amenity=parcel_locker" + ] + } + ], "tagRenderings": [ "images", { @@ -322,34 +348,8 @@ "filter": [ "open_now" ], + "deletion": true, "allowMove": { "enableImproveAccuracy": true - }, - "deletion": true, - "pointRendering": [ - { - "iconBadges": [ - { - "if": "opening_hours~*", - "then": "icons.isOpen" - } - ], - "iconSize": "40,40", - "location": [ - "point", - "centroid" - ], - "anchor": "center", - "marker": [ - { - "icon": "square", - "color": "white" - }, - { - "icon": "./assets/layers/parcel_lockers/parcel_lockers.svg" - } - ] - } - ], - "lineRendering": [] + } } diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index bd4af6b06..fc5958597 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -11,10 +11,20 @@ "pl": "Parking", "cs": "Parkoviště" }, - "minzoom": 12, + "description": { + "en": "A layer showing car parkings", + "nl": "Deze laag toont autoparkings", + "de": "Eine Ebene mit Parkplätzen", + "es": "Una capa que muestra aparcamientos para coches", + "fr": "Un calque montrant les parkings", + "ca": "Una capa que mostra aparcaments per a cotxes", + "pl": "Warstwa pokazująca parkingi samochodowe", + "cs": "Vrstva zobrazující parkoviště" + }, "source": { "osmTags": "amenity=parking" }, + "minzoom": 12, "title": { "render": { "nl": "Parking voor auto's", @@ -27,16 +37,55 @@ "cs": "Parkování" } }, - "description": { - "en": "A layer showing car parkings", - "nl": "Deze laag toont autoparkings", - "de": "Eine Ebene mit Parkplätzen", - "es": "Una capa que muestra aparcamientos para coches", - "fr": "Un calque montrant les parkings", - "ca": "Una capa que mostra aparcaments per a cotxes", - "pl": "Warstwa pokazująca parkingi samochodowe", - "cs": "Vrstva zobrazující parkoviště" - }, + "pointRendering": [ + { + "iconSize": "36,36", + "location": [ + "point", + "centroid" + ], + "iconBadges": [ + { + "if": { + "or": [ + "capacity:disabled>0", + "capacity:disabled=yes" + ] + }, + "then": "circle:white;./assets/layers/toilet/wheelchair.svg" + } + ], + "anchor": "center", + "marker": [ + { + "icon": "./assets/layers/parking/parking.svg" + } + ] + } + ], + "lineRendering": [ + { + "width": 2, + "color": "#ddcc00" + } + ], + "presets": [ + { + "tags": [ + "amenity=parking" + ], + "title": { + "nl": "een parking voor auto's", + "en": "a car parking", + "de": "einen Parkplatz", + "es": "un aparcamiento de coches", + "fr": "un lieu de stationnement pour voitures", + "ca": "un aparcament per a cotxes", + "pl": "parking samochodowy", + "cs": "parkoviště" + } + } + ], "tagRenderings": [ "images", "level", @@ -272,23 +321,6 @@ } } ], - "presets": [ - { - "tags": [ - "amenity=parking" - ], - "title": { - "nl": "een parking voor auto's", - "en": "a car parking", - "de": "einen Parkplatz", - "es": "un aparcamiento de coches", - "fr": "un lieu de stationnement pour voitures", - "ca": "un aparcament per a cotxes", - "pl": "parking samochodowy", - "cs": "parkoviště" - } - } - ], "deletion": { "softDeletionTags": { "and": [ @@ -301,37 +333,5 @@ "allowMove": { "enableRelocation": false, "enableImproveAccuracy": true - }, - "pointRendering": [ - { - "iconSize": "36,36", - "location": [ - "point", - "centroid" - ], - "iconBadges": [ - { - "if": { - "or": [ - "capacity:disabled>0", - "capacity:disabled=yes" - ] - }, - "then": "circle:white;./assets/layers/toilet/wheelchair.svg" - } - ], - "anchor": "center", - "marker": [ - { - "icon": "./assets/layers/parking/parking.svg" - } - ] - } - ], - "lineRendering": [ - { - "width": 2, - "color": "#ddcc00" - } - ] + } } diff --git a/assets/layers/parking_spaces/parking_spaces.json b/assets/layers/parking_spaces/parking_spaces.json index 018aecd7a..ab10f4bf4 100644 --- a/assets/layers/parking_spaces/parking_spaces.json +++ b/assets/layers/parking_spaces/parking_spaces.json @@ -16,10 +16,59 @@ "ca": "Capa que mostra aparcaments de cotxes individuals.", "cs": "Vrstva zobrazující jednotlivá parkovací místa." }, - "minzoom": 18, "source": { "osmTags": "amenity=parking_space" }, + "minzoom": 18, + "title": { + "render": { + "en": "Parking Space", + "de": "Stellplatz", + "nl": "Parkeerplek", + "ca": "Espai d'aparcament", + "cs": "Parkovací místo" + }, + "mappings": [ + { + "if": "parking_space=disabled", + "then": { + "en": "Disabled Parking Space", + "nl": "Parkeerplek voor gehandicapten", + "de": "Behindertenparkplatz", + "cs": "Parkovací místo pro osoby se zdravotním postižením" + } + } + ] + }, + "pointRendering": [ + { + "marker": [ + { + "icon": { + "render": "./assets/layers/parking_spaces/parking_space.svg", + "mappings": [ + { + "if": "parking_space=disabled", + "then": "./assets/layers/toilet/wheelchair.svg" + } + ] + } + } + ], + "iconSize": "20,20", + "location": [ + "point", + "centroid" + ], + "anchor": "center" + } + ], + "lineRendering": [ + { + "color": "#696969", + "width": "1" + } + ], "tagRenderings": [ "images", { @@ -214,54 +263,5 @@ } ] } - ], - "title": { - "render": { - "en": "Parking Space", - "de": "Stellplatz", - "nl": "Parkeerplek", - "ca": "Espai d'aparcament", - "cs": "Parkovací místo" - }, - "mappings": [ - { - "if": "parking_space=disabled", - "then": { - "en": "Disabled Parking Space", - "nl": "Parkeerplek voor gehandicapten", - "de": "Behindertenparkplatz", - "cs": "Parkovací místo pro osoby se zdravotním postižením" - } - } - ] - }, - "pointRendering": [ - { - "marker": [ - { - "icon": { - "render": "./assets/layers/parking_spaces/parking_space.svg", - "mappings": [ - { - "if": "parking_space=disabled", - "then": "./assets/layers/toilet/wheelchair.svg" - } - ] - } - } - ], - "iconSize": "20,20", - "location": [ - "point", - "centroid" - ], - "anchor": "center" - } - ], - "lineRendering": [ - { - "color": "#696969", - "width": "1" - } ] } diff --git a/assets/layers/parking_ticket_machine/parking_ticket_machine.json b/assets/layers/parking_ticket_machine/parking_ticket_machine.json index 8dee4fda1..bc28714ab 100644 --- a/assets/layers/parking_ticket_machine/parking_ticket_machine.json +++ b/assets/layers/parking_ticket_machine/parking_ticket_machine.json @@ -14,15 +14,6 @@ "ca": "Capa amb màquines de bitllets d'aparcament per pagar l'aparcament.", "cs": "Vrstva s parkovacími automaty pro placení parkovného." }, - "title": { - "render": { - "en": "Parking Ticket Machine", - "nl": "Parkeerkaartautomaat", - "de": "Parkscheinautomat", - "ca": "Màquina de bitllets d'aparcament", - "cs": "Parkovací automat" - } - }, "source": { "osmTags": { "and": [ @@ -32,6 +23,35 @@ } }, "minzoom": 16, + "title": { + "render": { + "en": "Parking Ticket Machine", + "nl": "Parkeerkaartautomaat", + "de": "Parkscheinautomat", + "ca": "Màquina de bitllets d'aparcament", + "cs": "Parkovací automat" + } + }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "iconSize": "20,20", + "anchor": "center", + "marker": [ + { + "icon": "square", + "color": "white" + }, + { + "icon": "./assets/layers/parking_ticket_machine/parking_tickets.svg" + } + ] + } + ], + "lineRendering": [], "presets": [ { "tags": [ @@ -93,25 +113,5 @@ } ] } - ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "iconSize": "20,20", - "anchor": "center", - "marker": [ - { - "icon": "square", - "color": "white" - }, - { - "icon": "./assets/layers/parking_ticket_machine/parking_tickets.svg" - } - ] - } - ], - "lineRendering": [] + ] } diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index 411e830e8..87c84cf43 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -8,7 +8,14 @@ "ca": "Camins per a vianants", "cs": "Cesty pro chodce" }, - "minzoom": 18, + "description": { + "en": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer", + "nl": "Pad voor voetgangers, in het bijzonder gebruikt voor navigatie binnen gebouwen en om aan toegangen vast te klikken in deze laag", + "de": "Fußgängerwege, insbesondere für die Navigation in Gebäuden und die Aufnahme von Eingängen in diese Ebene", + "fr": "Sentiers piétonniers, particulièrement utilisés pour la navigation intérieure et les entrées d'accrochage à cette couche", + "ca": "Senderes per a vianants, especialment utilitzades per a la navegació interior i les entrades ràpides a aquesta capa", + "cs": "Chodníky pro pěší, používané zejména pro navigaci v interiéru a zachycení vstupů do této vrstvy" + }, "source": { "osmTags": { "or": [ @@ -19,14 +26,7 @@ ] } }, - "description": { - "en": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer", - "nl": "Pad voor voetgangers, in het bijzonder gebruikt voor navigatie binnen gebouwen en om aan toegangen vast te klikken in deze laag", - "de": "Fußgängerwege, insbesondere für die Navigation in Gebäuden und die Aufnahme von Eingängen in diese Ebene", - "fr": "Sentiers piétonniers, particulièrement utilisés pour la navigation intérieure et les entrées d'accrochage à cette couche", - "ca": "Senderes per a vianants, especialment utilitzades per a la navegació interior i les entrades ràpides a aquesta capa", - "cs": "Chodníky pro pěší, používané zejména pro navigaci v interiéru a zachycení vstupů do této vrstvy" - }, + "minzoom": 18, "pointRendering": [ { "location": [ diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index ab6d0cb42..5357ba9a4 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -17,6 +17,14 @@ "ca": "Una capa que mostra les farmàcies, que (probablement) distribueixen medicaments amb recepta", "cs": "Vrstva zobrazující lékárny, které (pravděpodobně) vydávají léky na předpis" }, + "source": { + "osmTags": { + "and": [ + "amenity=pharmacy" + ] + } + }, + "minzoom": 13, "title": { "render": { "en": "{name}", @@ -41,14 +49,51 @@ } ] }, - "source": { - "osmTags": { - "and": [ - "amenity=pharmacy" + "pointRendering": [ + { + "iconSize": "40,40", + "location": [ + "point", + "centroid" + ], + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "icons.isOpen" + } + ], + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
"
+ }
+ ]
+ },
+ "anchor": "bottom",
+ "marker": [
+ {
+ "icon": "./assets/layers/pharmacy/pharmacy.svg"
+ }
]
}
- },
- "minzoom": 13,
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "amenity=pharmacy"
+ ],
+ "title": {
+ "en": "a pharmacy",
+ "nl": "een apotheek",
+ "de": "eine Apotheke",
+ "fr": "une pharmacie",
+ "ca": "una farmàcia",
+ "cs": "lékárna"
+ }
+ }
+ ],
"tagRenderings": [
"images",
"reviews",
@@ -169,51 +214,6 @@
},
"open_now"
],
- "presets": [
- {
- "tags": [
- "amenity=pharmacy"
- ],
- "title": {
- "en": "a pharmacy",
- "nl": "een apotheek",
- "de": "eine Apotheke",
- "fr": "une pharmacie",
- "ca": "una farmàcia",
- "cs": "lékárna"
- }
- }
- ],
"deletion": true,
- "allowMove": true,
- "pointRendering": [
- {
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- }
- ],
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "anchor": "bottom",
- "marker": [
- {
- "icon": "./assets/layers/pharmacy/pharmacy.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ "allowMove": true
}
diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json
index 8a8f6b90c..9d95f68b8 100644
--- a/assets/layers/physiotherapist/physiotherapist.json
+++ b/assets/layers/physiotherapist/physiotherapist.json
@@ -17,6 +17,7 @@
"source": {
"osmTags": "healthcare=physiotherapist"
},
+ "minzoom": 13,
"title": {
"render": {
"en": "Physiotherapist {name}",
@@ -26,7 +27,41 @@
"cs": "Fyzioterapeut {name}"
}
},
- "minzoom": 13,
+ "pointRendering": [
+ {
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/physiotherapist/doctors.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "title": {
+ "en": "a physiotherapists office",
+ "de": "Praxis eines Physiotherapeuten",
+ "nl": "een fysiotherapeutenpraktijk",
+ "fr": "un cabinet de kinésithérapeutes",
+ "ca": "una consulta fisioterapèutica",
+ "cs": "ordinace fyzioterapeuta"
+ },
+ "tags": [
+ "healthcare=physiotherapist"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -54,44 +89,9 @@
"email",
"website"
],
- "presets": [
- {
- "title": {
- "en": "a physiotherapists office",
- "de": "Praxis eines Physiotherapeuten",
- "nl": "een fysiotherapeutenpraktijk",
- "fr": "un cabinet de kinésithérapeutes",
- "ca": "una consulta fisioterapèutica",
- "cs": "ordinace fyzioterapeuta"
- },
- "tags": [
- "healthcare=physiotherapist"
- ]
- }
- ],
"filter": [
"open_now"
],
"deletion": true,
- "allowMove": true,
- "pointRendering": [
- {
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/physiotherapist/doctors.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ "allowMove": true
}
diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json
index ace635314..170f2caf3 100644
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@@ -11,10 +11,21 @@
"es": "Mesas de pícnic",
"cs": "Piknikové stoly"
},
- "minzoom": 12,
+ "description": {
+ "en": "The layer showing picnic tables",
+ "nl": "Deze laag toont picknicktafels",
+ "it": "Il livello che mostra i tavoli da picnic",
+ "fr": "La couche montrant les tables de pique-nique",
+ "ru": "Слой, отображающий столы для пикника",
+ "de": "Die Ebene zeigt Picknicktische an",
+ "es": "Una capa que muestra mesas de pícnic",
+ "ca": "La capa mostra taules de pícnic",
+ "cs": "Vrstva zobrazující piknikové stoly"
+ },
"source": {
"osmTags": "leisure=picnic_table"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Picnic table",
@@ -28,17 +39,44 @@
"cs": "Piknikový stůl"
}
},
- "description": {
- "en": "The layer showing picnic tables",
- "nl": "Deze laag toont picknicktafels",
- "it": "Il livello che mostra i tavoli da picnic",
- "fr": "La couche montrant les tables de pique-nique",
- "ru": "Слой, отображающий столы для пикника",
- "de": "Die Ebene zeigt Picknicktische an",
- "es": "Una capa que muestra mesas de pícnic",
- "ca": "La capa mostra taules de pícnic",
- "cs": "Vrstva zobrazující piknikové stoly"
- },
+ "pointRendering": [
+ {
+ "iconSize": "35,35",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "#e6cf39"
+ },
+ {
+ "icon": "./assets/layers/picnic_table/picnic_table.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "leisure=picnic_table"
+ ],
+ "title": {
+ "en": "a picnic table",
+ "nl": "een picknicktafel",
+ "it": "una tavolo da picnic",
+ "ru": "стол для пикника",
+ "de": "einen Picknick-Tisch",
+ "fr": "une table de pique-nique",
+ "es": "una mesa de pícnic",
+ "ca": "una taula de pícnic",
+ "cs": "piknikový stůl"
+ }
+ }
+ ],
"tagRenderings": [
"images",
"level",
@@ -113,24 +151,6 @@
"id": "picnic_table-material"
}
],
- "presets": [
- {
- "tags": [
- "leisure=picnic_table"
- ],
- "title": {
- "en": "a picnic table",
- "nl": "een picknicktafel",
- "it": "una tavolo da picnic",
- "ru": "стол для пикника",
- "de": "einen Picknick-Tisch",
- "fr": "une table de pique-nique",
- "es": "una mesa de pícnic",
- "ca": "una taula de pícnic",
- "cs": "piknikový stůl"
- }
- }
- ],
"deletion": {
"softDeletionTags": {
"and": [
@@ -143,25 +163,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
- },
- "pointRendering": [
- {
- "iconSize": "35,35",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "#e6cf39"
- },
- {
- "icon": "./assets/layers/picnic_table/picnic_table.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ }
}
diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json
index 7bc37de70..5a81c3feb 100644
--- a/assets/layers/play_forest/play_forest.json
+++ b/assets/layers/play_forest/play_forest.json
@@ -3,7 +3,9 @@
"name": {
"nl": "Speelbossen"
},
- "minzoom": 13,
+ "description": {
+ "nl": "Een speelbos is een vrij toegankelijke zone in een bos"
+ },
"source": {
"osmTags": {
"and": [
@@ -11,6 +13,7 @@
]
}
},
+ "minzoom": 13,
"title": {
"render": {
"nl": "Speelbos"
@@ -30,9 +33,40 @@
}
]
},
- "description": {
- "nl": "Een speelbos is een vrij toegankelijke zone in een bos"
- },
+ "pointRendering": [
+ {
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "./assets/layers/play_forest/icon.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#007055",
+ "width": "2"
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "*": "Speelbos"
+ },
+ "tags": [
+ "leisure=playground",
+ "playground=forest",
+ "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
+ ],
+ "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.
"
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -92,39 +126,5 @@
"render": "{reviews(name, play_forest)}"
}
],
- "hideFromOverview": false,
- "presets": [
- {
- "title": {
- "*": "Speelbos"
- },
- "tags": [
- "leisure=playground",
- "playground=forest",
- "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
- ],
- "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden."
- }
- ],
- "pointRendering": [
- {
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "./assets/layers/play_forest/icon.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#007055",
- "width": "2"
- }
- ]
+ "hideFromOverview": false
}
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index 922dcf099..c29fcdee5 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -11,18 +11,6 @@
"pa_PK": "کھید دے میدان",
"cs": "Dětská hřiště"
},
- "minzoom": 13,
- "source": {
- "osmTags": {
- "and": [
- "leisure=playground",
- "playground!=forest"
- ]
- }
- },
- "calculatedTags": [
- "_size_classification=Number(feat.properties._surface) < 10 ? 'small' : (Number(feat.properties._surface) < 100 ? 'medium' : 'large') "
- ],
"description": {
"nl": "Speeltuinen",
"en": "Playgrounds",
@@ -34,6 +22,18 @@
"pa_PK": "کھید دے میدان",
"cs": "Dětská hřiště"
},
+ "source": {
+ "osmTags": {
+ "and": [
+ "leisure=playground",
+ "playground!=forest"
+ ]
+ }
+ },
+ "calculatedTags": [
+ "_size_classification=Number(feat.properties._surface) < 10 ? 'small' : (Number(feat.properties._surface) < 100 ? 'medium' : 'large') "
+ ],
+ "minzoom": 13,
"title": {
"render": {
"nl": "Speeltuin",
@@ -62,6 +62,74 @@
}
]
},
+ "pointRendering": [
+ {
+ "iconBadges": [
+ {
+ "if": {
+ "and": [
+ "opening_hours!=24/7",
+ "opening_hours~*"
+ ]
+ },
+ "then": "icons.isOpen"
+ }
+ ],
+ "iconSize": {
+ "render": "40,40,center",
+ "mappings": [
+ {
+ "if": "id~node/.*",
+ "then": "40,40,center"
+ },
+ {
+ "if": "_size_classification=small",
+ "then": "25,25,center"
+ },
+ {
+ "if": "_size_classification=medium",
+ "then": "40,40,center"
+ },
+ {
+ "if": "_size_classification=large",
+ "then": "60,60,center"
+ }
+ ]
+ },
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/themes/playgrounds/playground.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#5dbaa9",
+ "width": "1"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "leisure=playground"
+ ],
+ "title": {
+ "nl": "een speeltuin",
+ "en": "a playground",
+ "ru": "Детская площадка",
+ "fr": "une terrain de jeux",
+ "it": "una campetto",
+ "de": "einen Spielplatz",
+ "ca": "un parc infantil",
+ "cs": "hřiště"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -607,23 +675,6 @@
"render": "{reviews(name, playground)}"
}
],
- "presets": [
- {
- "tags": [
- "leisure=playground"
- ],
- "title": {
- "nl": "een speeltuin",
- "en": "a playground",
- "ru": "Детская площадка",
- "fr": "une terrain de jeux",
- "it": "una campetto",
- "de": "einen Spielplatz",
- "ca": "un parc infantil",
- "cs": "hřiště"
- }
- }
- ],
"deletion": {
"nonDeleteMappings": [
{
@@ -643,56 +694,5 @@
"leisure="
]
}
- },
- "pointRendering": [
- {
- "iconBadges": [
- {
- "if": {
- "and": [
- "opening_hours!=24/7",
- "opening_hours~*"
- ]
- },
- "then": "icons.isOpen"
- }
- ],
- "iconSize": {
- "render": "40,40,center",
- "mappings": [
- {
- "if": "id~node/.*",
- "then": "40,40,center"
- },
- {
- "if": "_size_classification=small",
- "then": "25,25,center"
- },
- {
- "if": "_size_classification=medium",
- "then": "40,40,center"
- },
- {
- "if": "_size_classification=large",
- "then": "60,60,center"
- }
- ]
- },
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "./assets/themes/playgrounds/playground.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#5dbaa9",
- "width": "1"
- }
- ]
+ }
}
diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json
index 4c14ed1a9..ea67f8518 100644
--- a/assets/layers/postboxes/postboxes.json
+++ b/assets/layers/postboxes/postboxes.json
@@ -14,10 +14,23 @@
"fr": "Boîtes à lettres",
"cs": "Poštovní schránky"
},
- "minzoom": 12,
+ "description": {
+ "en": "The layer showing postboxes.",
+ "de": "Die Ebene zeigt Briefkästen.",
+ "zh_Hant": "這圖層顯示郵筒。",
+ "id": "Layer yang memperlihatkan kotak pos.",
+ "hu": "Postaládákat megjelenítő réteg.",
+ "nl": "Deze laag toont brievenbussen.",
+ "es": "La capa que mostrando buzones de correo.",
+ "fr": "Le calque montrant les boîtes à lettres.",
+ "ca": "La capa que mostra bústies de correus.",
+ "cs": "Vrstva zobrazující poštovní schránky.",
+ "pl": "Warstwa pokazująca skrzynki pocztowe."
+ },
"source": {
"osmTags": "amenity=post_box"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Postbox",
@@ -34,54 +47,6 @@
"cs": "Poštovní schránka"
}
},
- "description": {
- "en": "The layer showing postboxes.",
- "de": "Die Ebene zeigt Briefkästen.",
- "zh_Hant": "這圖層顯示郵筒。",
- "id": "Layer yang memperlihatkan kotak pos.",
- "hu": "Postaládákat megjelenítő réteg.",
- "nl": "Deze laag toont brievenbussen.",
- "es": "La capa que mostrando buzones de correo.",
- "fr": "Le calque montrant les boîtes à lettres.",
- "ca": "La capa que mostra bústies de correus.",
- "cs": "Vrstva zobrazující poštovní schránky.",
- "pl": "Warstwa pokazująca skrzynki pocztowe."
- },
- "tagRenderings": [
- "images",
- {
- "id": "minimap",
- "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
- }
- ],
- "presets": [
- {
- "tags": [
- "amenity=post_box"
- ],
- "title": {
- "en": "a postbox",
- "de": "ein Briefkasten",
- "ru": "почтовый ящик",
- "zh_Hant": "郵筒",
- "id": "kotak pos",
- "hu": "postaláda",
- "nl": "een brievenbus",
- "ca": "una bústia",
- "es": "un buzón de correo",
- "fr": "une boîte à lettres",
- "cs": "poštovní schránka"
- }
- }
- ],
- "deletion": {
- "softDeletionTags": {
- "and": [
- "amenity=",
- "razed:amenity=post_box"
- ]
- }
- },
"pointRendering": [
{
"iconSize": "40,40",
@@ -102,5 +67,40 @@
"color": "#DADADA",
"width": "1"
}
- ]
+ ],
+ "presets": [
+ {
+ "tags": [
+ "amenity=post_box"
+ ],
+ "title": {
+ "en": "a postbox",
+ "de": "ein Briefkasten",
+ "ru": "почтовый ящик",
+ "zh_Hant": "郵筒",
+ "id": "kotak pos",
+ "hu": "postaláda",
+ "nl": "een brievenbus",
+ "ca": "una bústia",
+ "es": "un buzón de correo",
+ "fr": "une boîte à lettres",
+ "cs": "poštovní schránka"
+ }
+ }
+ ],
+ "tagRenderings": [
+ "images",
+ {
+ "id": "minimap",
+ "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
+ }
+ ],
+ "deletion": {
+ "softDeletionTags": {
+ "and": [
+ "amenity=",
+ "razed:amenity=post_box"
+ ]
+ }
+ }
}
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index bb1af7c21..826b68ca2 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -14,7 +14,19 @@
"nb_NO": "Postkontor",
"cs": "Pošty"
},
- "minzoom": 12,
+ "description": {
+ "en": "A layer showing post offices.",
+ "de": "Eine Ebene mit Postämtern.",
+ "zh_Hant": "圖層顯示郵局。",
+ "id": "Layer yang menunjukkan kantor pos.",
+ "hu": "Postákat megjelenítő réteg.",
+ "nl": "Een laag die postkantoren toont.",
+ "es": "Una capa que muestra oficinas postales.",
+ "fr": "Un claque montrant les bureaux de poste.",
+ "nb_NO": "Et lag som viser postkontor.",
+ "ca": "Una capa que mostra oficines postals.",
+ "cs": "Vrstva zobrazující pošty."
+ },
"source": {
"osmTags": {
"or": [
@@ -23,6 +35,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Post Office",
@@ -69,19 +82,62 @@
}
]
},
- "description": {
- "en": "A layer showing post offices.",
- "de": "Eine Ebene mit Postämtern.",
- "zh_Hant": "圖層顯示郵局。",
- "id": "Layer yang menunjukkan kantor pos.",
- "hu": "Postákat megjelenítő réteg.",
- "nl": "Een laag die postkantoren toont.",
- "es": "Una capa que muestra oficinas postales.",
- "fr": "Un claque montrant les bureaux de poste.",
- "nb_NO": "Et lag som viser postkontor.",
- "ca": "Una capa que mostra oficines postals.",
- "cs": "Vrstva zobrazující pošty."
- },
+ "pointRendering": [
+ {
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ },
+ {
+ "if": "shop~*",
+ "then": "./assets/themes/shops/shop.svg"
+ }
+ ],
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "square",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/postoffices/post_office.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#DADADA",
+ "width": "1"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "amenity=post_office"
+ ],
+ "title": {
+ "en": "a post office",
+ "de": "eine Poststelle",
+ "ru": "Почтовое отделение",
+ "zh_Hant": "郵局",
+ "id": "Kantor Pos",
+ "hu": "Posta",
+ "nl": "een postkantoor",
+ "ca": "una oficina de correus",
+ "es": "una oficina de correo",
+ "nb_NO": "et postkontor",
+ "fr": "un bureau de poste",
+ "cs": "pošta"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -495,63 +551,7 @@
]
}
],
- "presets": [
- {
- "tags": [
- "amenity=post_office"
- ],
- "title": {
- "en": "a post office",
- "de": "eine Poststelle",
- "ru": "Почтовое отделение",
- "zh_Hant": "郵局",
- "id": "Kantor Pos",
- "hu": "Posta",
- "nl": "een postkantoor",
- "ca": "una oficina de correus",
- "es": "una oficina de correo",
- "nb_NO": "et postkontor",
- "fr": "un bureau de poste",
- "cs": "pošta"
- }
- }
- ],
"filter": [
"open_now"
- ],
- "pointRendering": [
- {
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- },
- {
- "if": "shop~*",
- "then": "./assets/themes/shops/shop.svg"
- }
- ],
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "square",
- "color": "white"
- },
- {
- "icon": "./assets/layers/postoffices/post_office.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#DADADA",
- "width": "1"
- }
]
}
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 43dcf8397..72025489a 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -55,6 +55,37 @@
}
]
},
+ "pointRendering": [
+ {
+ "label": {
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": "{name}
"
+ }
+ ]
+ },
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "#ffffff"
+ },
+ {
+ "icon": "./assets/themes/bookcases/bookcase.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#0000ff",
+ "width": "8"
+ }
+ ],
"presets": [
{
"title": {
@@ -524,16 +555,6 @@
"id": "public_bookcase-website"
}
],
- "allowMove": true,
- "deletion": {
- "softDeletionTags": {
- "and": [
- "disused:amenity=public_bookcase",
- "amenity="
- ]
- },
- "neededChangesets": 5
- },
"filter": [
{
"id": "kid-books",
@@ -608,35 +629,14 @@
},
"has_image"
],
- "pointRendering": [
- {
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "circle",
- "color": "#ffffff"
- },
- {
- "icon": "./assets/themes/bookcases/bookcase.svg"
- }
+ "deletion": {
+ "softDeletionTags": {
+ "and": [
+ "disused:amenity=public_bookcase",
+ "amenity="
]
- }
- ],
- "lineRendering": [
- {
- "color": "#0000ff",
- "width": "8"
- }
- ]
+ },
+ "neededChangesets": 5
+ },
+ "allowMove": true
}
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 954460f30..2c4bb5dba 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2,8 +2,8 @@
"id": "questions",
"description": "Special library layer which does not need a '.questions'-prefix before being imported",
"source": "special:library",
- "lineRendering": null,
"pointRendering": null,
+ "lineRendering": null,
"tagRenderings": [
{
"id": "questions",
diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json
index 4dedd556d..2be319b5c 100644
--- a/assets/layers/railway_platforms/railway_platforms.json
+++ b/assets/layers/railway_platforms/railway_platforms.json
@@ -16,6 +16,14 @@
"ca": "Trobeu totes les andanes de l'estació i les rutes de tren que les fan servir.",
"cs": "Najděte všechna nástupiště ve stanici a vlakové trasy, které je používají."
},
+ "source": {
+ "osmTags": {
+ "or": [
+ "railway=platform"
+ ]
+ }
+ },
+ "minzoom": 18,
"title": {
"render": {
"en": "Platform",
@@ -39,14 +47,32 @@
}
]
},
- "source": {
- "osmTags": {
- "or": [
- "railway=platform"
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "label": {
+ "mappings": [
+ {
+ "if": "ref~*",
+ "then": "{ref}
"
+ }
+ ]
+ },
+ "marker": [
+ {
+ "icon": "./assets/themes/stations/rail-light.svg"
+ }
]
}
- },
- "minzoom": 18,
+ ],
+ "lineRendering": [
+ {
+ "color": "gray"
+ }
+ ],
"tagRenderings": [
{
"id": "ref",
@@ -80,31 +106,5 @@
}
},
"level"
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "label": {
- "mappings": [
- {
- "if": "ref~*",
- "then": "{ref}
"
- }
- ]
- },
- "marker": [
- {
- "icon": "./assets/themes/stations/rail-light.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "gray"
- }
]
}
diff --git a/assets/layers/rainbow_crossings/rainbow_crossings.json b/assets/layers/rainbow_crossings/rainbow_crossings.json
index e4039ea20..ba7d92e27 100644
--- a/assets/layers/rainbow_crossings/rainbow_crossings.json
+++ b/assets/layers/rainbow_crossings/rainbow_crossings.json
@@ -41,6 +41,37 @@
"cs": "Přechod"
}
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/themes/rainbow_crossings/crossing.svg",
+ "mappings": [
+ {
+ "if": "surface:colour=rainbow",
+ "then": "./assets/themes/rainbow_crossings/logo.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "red",
+ "width": "5",
+ "dashArray": "10 2",
+ "lineCap": "square"
+ }
+ ],
"presets": [
{
"title": {
@@ -120,36 +151,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": {
- "render": "./assets/themes/rainbow_crossings/crossing.svg",
- "mappings": [
- {
- "if": "surface:colour=rainbow",
- "then": "./assets/themes/rainbow_crossings/logo.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center"
- }
- ],
- "lineRendering": [
- {
- "color": "red",
- "width": "5",
- "dashArray": "10 2",
- "lineCap": "square"
- }
]
}
diff --git a/assets/layers/range/range.json b/assets/layers/range/range.json
index aa985b8be..ae92cb021 100644
--- a/assets/layers/range/range.json
+++ b/assets/layers/range/range.json
@@ -1,10 +1,10 @@
{
"id": "range",
- "description": "Meta-layer, simply showing a bbox in red",
- "title": null,
- "source": "special",
"name": null,
+ "description": "Meta-layer, simply showing a bbox in red",
+ "source": "special",
"shownByDefault": false,
+ "title": null,
"pointRendering": [],
"lineRendering": [
{
diff --git a/assets/layers/reception_desk/reception_desk.json b/assets/layers/reception_desk/reception_desk.json
index 3eb1fc431..b8e017a87 100644
--- a/assets/layers/reception_desk/reception_desk.json
+++ b/assets/layers/reception_desk/reception_desk.json
@@ -14,6 +14,9 @@
"ca": "Una capa que mostra on es troben els mostradors de recepció i que demana informació d'accessibilitat",
"cs": "Vrstva, která ukazuje, kde se nacházejí recepce, a která se ptá na některé informace o přístupnosti"
},
+ "source": {
+ "osmTags": "amenity=reception_desk"
+ },
"title": {
"render": {
"en": "Reception desk",
@@ -23,9 +26,40 @@
"cs": "Recepční pult"
}
},
- "source": {
- "osmTags": "amenity=reception_desk"
- },
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconSize": "40,40",
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/reception_desk/reception_desk.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "amenity=reception_desk"
+ ],
+ "title": {
+ "en": "a reception desk",
+ "fr": "un bureau d'accueil",
+ "de": "einen Empfangstresen",
+ "ca": "una recepció",
+ "cs": "recepční pult"
+ }
+ }
+ ],
"tagRenderings": [
"images",
"level",
@@ -62,20 +96,6 @@
},
"induction-loop"
],
- "presets": [
- {
- "tags": [
- "amenity=reception_desk"
- ],
- "title": {
- "en": "a reception desk",
- "fr": "un bureau d'accueil",
- "de": "einen Empfangstresen",
- "ca": "una recepció",
- "cs": "recepční pult"
- }
- }
- ],
"units": [
{
"appliesToKey": [
@@ -117,25 +137,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconSize": "40,40",
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/reception_desk/reception_desk.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 0899b9e7c..ab0859032 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -82,6 +82,455 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconBadges": [
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:batteries=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/batteries.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:beverage_cartons=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/beverage_cartons.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:cans=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/cans.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:clothes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/clothes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:cooking_oil=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/cooking_oil.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:engine_oil=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/engine_oil.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:fluorescent_tubes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/fluorescent_tubes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:glass=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/glass.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:glass_bottles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/glass_bottles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ {
+ "or": [
+ "recycling:green_waste=yes",
+ "recycling:organic=yes"
+ ]
+ }
+ ]
+ },
+ "then": "./assets/layers/recycling/garden_waste.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:light_bulbs=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/light_bulbs.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:newspaper=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/newspaper.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:paper=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/paper.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:plastic_bottles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic_bottles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:plastic_packaging=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic_packaging.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:plastic=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:printer_cartridges=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/printer_cartridges.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:scrap_metal=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/scrap_metal.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:shoes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/shoes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ {
+ "or": [
+ "recycling:small_appliances=yes",
+ "recycling:small_electrical_appliances=yes"
+ ]
+ }
+ ]
+ },
+ "then": "./assets/layers/recycling/small_electrical_appliances.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:waste=yes"
+ ]
+ },
+ "then": "./assets/layers/waste_disposal/waste_disposal.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:needles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/needles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount>1",
+ "recycling:bicycles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/bicycles.svg"
+ }
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/recycling/recycling-14.svg",
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:batteries=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/batteries.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:beverage_cartons=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/beverage_cartons.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:cans=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/cans.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:clothes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/clothes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:cooking_oil=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/cooking_oil.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:engine_oil=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/engine_oil.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:fluorescent_tubes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/fluorescent_tubes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:glass=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/glass.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:glass_bottles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/glass_bottles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ {
+ "or": [
+ "recycling:green_waste=yes",
+ "recycling:organic=yes"
+ ]
+ }
+ ]
+ },
+ "then": "./assets/layers/recycling/garden_waste.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:light_bulbs=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/light_bulbs.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:newspaper=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/newspaper.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:paper=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/paper.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:plastic_bottles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic_bottles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:plastic_packaging=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic_packaging.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:plastic=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/plastic.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:printer_cartridges=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/printer_cartridges.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:scrap_metal=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/scrap_metal.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:shoes=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/shoes.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ {
+ "or": [
+ "recycling:small_appliances=yes",
+ "recycling:small_electric_appliances=yes"
+ ]
+ }
+ ]
+ },
+ "then": "./assets/layers/recycling/small_electrical_appliances.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:waste=yes"
+ ]
+ },
+ "then": "./assets/layers/waste_disposal/waste_disposal.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_waste_amount=1",
+ "recycling:needles=yes"
+ ]
+ },
+ "then": "./assets/layers/recycling/needles.svg"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"presets": [
{
"title": {
@@ -1206,454 +1655,5 @@
"allowMove": {
"enableRelocation": true,
"enableImproveAccuracy": true
- },
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:batteries=yes"
- ]
- },
- "then": "./assets/layers/recycling/batteries.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:beverage_cartons=yes"
- ]
- },
- "then": "./assets/layers/recycling/beverage_cartons.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:cans=yes"
- ]
- },
- "then": "./assets/layers/recycling/cans.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:clothes=yes"
- ]
- },
- "then": "./assets/layers/recycling/clothes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:cooking_oil=yes"
- ]
- },
- "then": "./assets/layers/recycling/cooking_oil.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:engine_oil=yes"
- ]
- },
- "then": "./assets/layers/recycling/engine_oil.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:fluorescent_tubes=yes"
- ]
- },
- "then": "./assets/layers/recycling/fluorescent_tubes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:glass=yes"
- ]
- },
- "then": "./assets/layers/recycling/glass.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:glass_bottles=yes"
- ]
- },
- "then": "./assets/layers/recycling/glass_bottles.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- {
- "or": [
- "recycling:green_waste=yes",
- "recycling:organic=yes"
- ]
- }
- ]
- },
- "then": "./assets/layers/recycling/garden_waste.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:light_bulbs=yes"
- ]
- },
- "then": "./assets/layers/recycling/light_bulbs.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:newspaper=yes"
- ]
- },
- "then": "./assets/layers/recycling/newspaper.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:paper=yes"
- ]
- },
- "then": "./assets/layers/recycling/paper.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:plastic_bottles=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic_bottles.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:plastic_packaging=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic_packaging.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:plastic=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:printer_cartridges=yes"
- ]
- },
- "then": "./assets/layers/recycling/printer_cartridges.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:scrap_metal=yes"
- ]
- },
- "then": "./assets/layers/recycling/scrap_metal.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:shoes=yes"
- ]
- },
- "then": "./assets/layers/recycling/shoes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- {
- "or": [
- "recycling:small_appliances=yes",
- "recycling:small_electrical_appliances=yes"
- ]
- }
- ]
- },
- "then": "./assets/layers/recycling/small_electrical_appliances.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:waste=yes"
- ]
- },
- "then": "./assets/layers/waste_disposal/waste_disposal.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:needles=yes"
- ]
- },
- "then": "./assets/layers/recycling/needles.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount>1",
- "recycling:bicycles=yes"
- ]
- },
- "then": "./assets/layers/recycling/bicycles.svg"
- }
- ],
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "render": "./assets/layers/recycling/recycling-14.svg",
- "mappings": [
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:batteries=yes"
- ]
- },
- "then": "./assets/layers/recycling/batteries.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:beverage_cartons=yes"
- ]
- },
- "then": "./assets/layers/recycling/beverage_cartons.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:cans=yes"
- ]
- },
- "then": "./assets/layers/recycling/cans.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:clothes=yes"
- ]
- },
- "then": "./assets/layers/recycling/clothes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:cooking_oil=yes"
- ]
- },
- "then": "./assets/layers/recycling/cooking_oil.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:engine_oil=yes"
- ]
- },
- "then": "./assets/layers/recycling/engine_oil.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:fluorescent_tubes=yes"
- ]
- },
- "then": "./assets/layers/recycling/fluorescent_tubes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:glass=yes"
- ]
- },
- "then": "./assets/layers/recycling/glass.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:glass_bottles=yes"
- ]
- },
- "then": "./assets/layers/recycling/glass_bottles.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- {
- "or": [
- "recycling:green_waste=yes",
- "recycling:organic=yes"
- ]
- }
- ]
- },
- "then": "./assets/layers/recycling/garden_waste.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:light_bulbs=yes"
- ]
- },
- "then": "./assets/layers/recycling/light_bulbs.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:newspaper=yes"
- ]
- },
- "then": "./assets/layers/recycling/newspaper.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:paper=yes"
- ]
- },
- "then": "./assets/layers/recycling/paper.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:plastic_bottles=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic_bottles.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:plastic_packaging=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic_packaging.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:plastic=yes"
- ]
- },
- "then": "./assets/layers/recycling/plastic.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:printer_cartridges=yes"
- ]
- },
- "then": "./assets/layers/recycling/printer_cartridges.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:scrap_metal=yes"
- ]
- },
- "then": "./assets/layers/recycling/scrap_metal.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:shoes=yes"
- ]
- },
- "then": "./assets/layers/recycling/shoes.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- {
- "or": [
- "recycling:small_appliances=yes",
- "recycling:small_electric_appliances=yes"
- ]
- }
- ]
- },
- "then": "./assets/layers/recycling/small_electrical_appliances.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:waste=yes"
- ]
- },
- "then": "./assets/layers/waste_disposal/waste_disposal.svg"
- },
- {
- "if": {
- "and": [
- "_waste_amount=1",
- "recycling:needles=yes"
- ]
- },
- "then": "./assets/layers/recycling/needles.svg"
- }
- ]
- }
- }
- ]
- }
- ],
- "lineRendering": []
+ }
}
diff --git a/assets/layers/route_marker/route_marker.json b/assets/layers/route_marker/route_marker.json
index e954a89fb..379c9b310 100644
--- a/assets/layers/route_marker/route_marker.json
+++ b/assets/layers/route_marker/route_marker.json
@@ -10,29 +10,6 @@
"osmTags": "information=route_marker"
},
"minzoom": 14,
- "presets": [
- {
- "title": {
- "en": "a route marker"
- },
- "tags": [
- "tourism=information",
- "information=route_marker"
- ],
- "description": {
- "en": "A route marker is a small marker often found along official hiking/cycling/riding/skiing routes to indicate the direction of the route."
- },
- "exampleImages": [
- "./assets/layers/route_marker/bicycle_route_marker.jpg",
- "./assets/layers/route_marker/walking_route_marker.jpg"
- ]
- }
- ],
- "deletion": true,
- "allowMove": {
- "enableImproveAccuracy": true,
- "enableRelocation": false
- },
"title": {
"render": {
"en": "Route marker"
@@ -51,6 +28,24 @@
]
}
],
+ "presets": [
+ {
+ "title": {
+ "en": "a route marker"
+ },
+ "tags": [
+ "tourism=information",
+ "information=route_marker"
+ ],
+ "description": {
+ "en": "A route marker is a small marker often found along official hiking/cycling/riding/skiing routes to indicate the direction of the route."
+ },
+ "exampleImages": [
+ "./assets/layers/route_marker/bicycle_route_marker.jpg",
+ "./assets/layers/route_marker/walking_route_marker.jpg"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -97,5 +92,10 @@
}
]
}
- ]
+ ],
+ "deletion": true,
+ "allowMove": {
+ "enableImproveAccuracy": true,
+ "enableRelocation": false
+ }
}
diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index 4da2dba23..f7d15b347 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -9,6 +9,19 @@
"cs": "Základní a střední školy"
},
"description": "Schools giving primary and secondary education and post-secondary, non-tertiary education. Note that this level of education does not imply an age of the pupiles",
+ "source": {
+ "osmTags": "amenity=school"
+ },
+ "calculatedTags": [
+ "_enclosing=enclosingFeatures(feat)('school').map(f => f.feat.properties.id)",
+ "_is_enclosed=feat.properties._enclosing != '[]'"
+ ],
+ "isShown": {
+ "or": [
+ "building=",
+ "_is_enclosed!=true"
+ ]
+ },
"minzoom": 12,
"title": {
"render": {
@@ -21,16 +34,55 @@
"cs": "Škola {name}"
}
},
- "calculatedTags": [
- "_enclosing=enclosingFeatures(feat)('school').map(f => f.feat.properties.id)",
- "_is_enclosed=feat.properties._enclosing != '[]'"
+ "pointRendering": [
+ {
+ "label": {
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": "{name}
"
+ }
+ ]
+ },
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/school/school.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#fcd862",
+ "width": 1
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "amenity=school",
+ "fixme=Added with MapComplete, the precise geometry should still be drawn"
+ ],
+ "title": {
+ "en": "a primary or secondary school",
+ "nl": "een lagere of middelbare school",
+ "de": "eine Grundschule oder weiterführende Schule",
+ "fr": "une école primaire ou secondaire",
+ "ca": "una escola de primària o secundària",
+ "cs": "základní nebo střední škola"
+ }
+ }
],
- "isShown": {
- "or": [
- "building=",
- "_is_enclosed!=true"
- ]
- },
"tagRenderings": [
{
"render": {
@@ -409,57 +461,5 @@
}
}
}
- ],
- "presets": [
- {
- "tags": [
- "amenity=school",
- "fixme=Added with MapComplete, the precise geometry should still be drawn"
- ],
- "title": {
- "en": "a primary or secondary school",
- "nl": "een lagere of middelbare school",
- "de": "eine Grundschule oder weiterführende Schule",
- "fr": "une école primaire ou secondaire",
- "ca": "una escola de primària o secundària",
- "cs": "základní nebo střední škola"
- }
- }
- ],
- "source": {
- "osmTags": "amenity=school"
- },
- "pointRendering": [
- {
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/school/school.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#fcd862",
- "width": 1
- }
]
}
diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json
index ae69b841f..5b2f7a77a 100644
--- a/assets/layers/shelter/shelter.json
+++ b/assets/layers/shelter/shelter.json
@@ -30,6 +30,20 @@
"cs": "Přístřešek"
}
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/layers/shelter/shelter.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "shelter-type",
@@ -106,19 +120,5 @@
"type": "string"
}
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "./assets/layers/shelter/shelter.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 2445c5831..ffafde01d 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -13,7 +13,19 @@
"pa_PK": "دکان",
"cs": "Obchod"
},
- "minzoom": 12,
+ "description": {
+ "en": "A shop",
+ "fr": "Un magasin",
+ "ja": "ショップ",
+ "nl": "Een winkel",
+ "ru": "Магазин",
+ "de": "Ein Geschäft",
+ "eo": "Butiko",
+ "hu": "Egy bolt",
+ "es": "Una tienda",
+ "ca": "Una botiga",
+ "cs": "Obchod"
+ },
"source": {
"osmTags": {
"and": [
@@ -28,6 +40,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Shop",
@@ -83,19 +96,115 @@
}
]
},
- "description": {
- "en": "A shop",
- "fr": "Un magasin",
- "ja": "ショップ",
- "nl": "Een winkel",
- "ru": "Магазин",
- "de": "Ein Geschäft",
- "eo": "Butiko",
- "hu": "Egy bolt",
- "es": "Una tienda",
- "ca": "Una botiga",
- "cs": "Obchod"
- },
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "builtin": "id_presets.shop_rendering",
+ "override": {
+ "render": "./assets/layers/id_presets/maki-shop.svg",
+ "+mappings": [
+ {
+ "#": "Layer icon rendering",
+ "if": "id=",
+ "then": "./assets/layers/id_presets/maki-shop.svg"
+ },
+ {
+ "if": {
+ "or": [
+ "shop=vacant",
+ "shop=disused",
+ "disused:shop=yes"
+ ]
+ },
+ "then": "./assets/layers/shops/shop-disused.svg"
+ },
+ {
+ "if": "craft=shoemaker",
+ "then": "./assets/layers/id_presets/temaki-hammer_shoe.svg"
+ },
+ {
+ "if": "craft=key_cutter",
+ "then": "./assets/layers/id_presets/fas-key.svg"
+ }
+ ]
+ }
+ }
+ }
+ ],
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ },
+ {
+ "if": {
+ "or": [
+ "organic=yes",
+ "organic=only"
+ ]
+ },
+ "then": "./assets/layers/food/organic.svg"
+ }
+ ],
+ "label": {
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": "{name}
"
+ }
+ ]
+ },
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#00f",
+ "width": "8"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "shop=yes"
+ ],
+ "title": {
+ "en": "a shop",
+ "fr": "une magasin",
+ "ru": "Магазин",
+ "ja": "店",
+ "nl": "een winkel",
+ "de": "ein Geschäft",
+ "eo": "Butiko",
+ "es": "una tienda",
+ "ca": "una botiga",
+ "cs": "obchod"
+ },
+ "description": {
+ "en": "Add a new shop",
+ "fr": "Ajouter un nouveau magasin",
+ "ru": "Добавить новый магазин",
+ "ja": "新しい店を追加する",
+ "nl": "Voeg een nieuwe winkel toe",
+ "de": "Ein neues Geschäft hinzufügen",
+ "eo": "Enmeti novan butikon",
+ "es": "Añadir una nueva tienda",
+ "ca": "Afegir una botiga nova",
+ "cs": "Přidat nový obchod"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -422,60 +531,6 @@
"questions",
"reviews"
],
- "presets": [
- {
- "tags": [
- "shop=yes"
- ],
- "title": {
- "en": "a shop",
- "fr": "une magasin",
- "ru": "Магазин",
- "ja": "店",
- "nl": "een winkel",
- "de": "ein Geschäft",
- "eo": "Butiko",
- "es": "una tienda",
- "ca": "una botiga",
- "cs": "obchod"
- },
- "description": {
- "en": "Add a new shop",
- "fr": "Ajouter un nouveau magasin",
- "ru": "Добавить новый магазин",
- "ja": "新しい店を追加する",
- "nl": "Voeg een nieuwe winkel toe",
- "de": "Ein neues Geschäft hinzufügen",
- "eo": "Enmeti novan butikon",
- "es": "Añadir una nueva tienda",
- "ca": "Afegir una botiga nova",
- "cs": "Přidat nový obchod"
- }
- }
- ],
- "deletion": {
- "softDeletionTags": {
- "and": [
- "shop=",
- "disused:shop:={shop}"
- ]
- },
- "extraDeleteReasons": [
- {
- "explanation": {
- "nl": "{title()} is permanent gestopt",
- "en": "{title()} has closed down permanently",
- "de": "{title()} wurde dauerhaft geschlossen",
- "es": "{title()} ha cerrado permanentemente",
- "fr": "{title()} a fermé définitivement",
- "ca": "{title()} ha tancat permanentment",
- "cs": "{title()} je trvale uzavřen"
- },
- "changesetMessage": "shop_closed"
- }
- ]
- },
- "allowMove": true,
"filter": [
"open_now",
{
@@ -550,82 +605,27 @@
"gluten_free",
"lactose_free"
],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": "circle",
- "color": "white"
+ "deletion": {
+ "softDeletionTags": {
+ "and": [
+ "shop=",
+ "disused:shop:={shop}"
+ ]
+ },
+ "extraDeleteReasons": [
+ {
+ "explanation": {
+ "nl": "{title()} is permanent gestopt",
+ "en": "{title()} has closed down permanently",
+ "de": "{title()} wurde dauerhaft geschlossen",
+ "es": "{title()} ha cerrado permanentemente",
+ "fr": "{title()} a fermé définitivement",
+ "ca": "{title()} ha tancat permanentment",
+ "cs": "{title()} je trvale uzavřen"
},
- {
- "icon": {
- "builtin": "id_presets.shop_rendering",
- "override": {
- "render": "./assets/layers/id_presets/maki-shop.svg",
- "+mappings": [
- {
- "#": "Layer icon rendering",
- "if": "id=",
- "then": "./assets/layers/id_presets/maki-shop.svg"
- },
- {
- "if": {
- "or": [
- "shop=vacant",
- "shop=disused",
- "disused:shop=yes"
- ]
- },
- "then": "./assets/layers/shops/shop-disused.svg"
- },
- {
- "if": "craft=shoemaker",
- "then": "./assets/layers/id_presets/temaki-hammer_shoe.svg"
- },
- {
- "if": "craft=key_cutter",
- "then": "./assets/layers/id_presets/fas-key.svg"
- }
- ]
- }
- }
- }
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- },
- {
- "if": {
- "or": [
- "organic=yes",
- "organic=only"
- ]
- },
- "then": "./assets/layers/food/organic.svg"
- }
- ],
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center"
- }
- ],
- "lineRendering": [
- {
- "color": "#00f",
- "width": "8"
- }
- ]
+ "changesetMessage": "shop_closed"
+ }
+ ]
+ },
+ "allowMove": true
}
diff --git a/assets/layers/shower/shower.json b/assets/layers/shower/shower.json
index 6ea1b7386..759004606 100644
--- a/assets/layers/shower/shower.json
+++ b/assets/layers/shower/shower.json
@@ -7,10 +7,17 @@
"ca": "Dutxa",
"cs": "Sprcha"
},
- "minzoom": 12,
+ "description": {
+ "en": "A layer showing (public) showers",
+ "de": "Eine Ebene mit (öffentlichen) Duschen",
+ "fr": "Une couche affichant les douches (publiques)",
+ "ca": "Una capa que mostra dutxes (públiques)",
+ "cs": "Vrstva zobrazující (veřejné) sprchy"
+ },
"source": {
"osmTags": "amenity=shower"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Shower",
@@ -20,6 +27,30 @@
"cs": "Sprcha"
}
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ }
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/shower/shower.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"presets": [
{
"title": {
@@ -241,36 +272,5 @@
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
- },
- "description": {
- "en": "A layer showing (public) showers",
- "de": "Eine Ebene mit (öffentlichen) Duschen",
- "fr": "Une couche affichant les douches (publiques)",
- "ca": "Una capa que mostra dutxes (públiques)",
- "cs": "Vrstva zobrazující (veřejné) sprchy"
- },
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- }
- ],
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/shower/shower.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ }
}
diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json
index 66754e906..3b617b0a3 100644
--- a/assets/layers/slow_roads/slow_roads.json
+++ b/assets/layers/slow_roads/slow_roads.json
@@ -3,7 +3,12 @@
"name": {
"nl": "Paadjes, trage wegen en autoluwe straten"
},
- "minzoom": 16,
+ "description": {
+ "en": "All carfree roads",
+ "nl": "Alle verkeersvrije wegen",
+ "de": "Alle autofreien Straßen",
+ "ca": "Totes les carreteres sense cotxe"
+ },
"source": {
"osmTags": {
"and": [
@@ -22,6 +27,7 @@
]
}
},
+ "minzoom": 16,
"title": {
"render": {
"nl": "Trage weg"
@@ -63,6 +69,51 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/layers/slow_roads/slow_road.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#eaba2a",
+ "width": "7",
+ "dashArray": {
+ "render": "",
+ "mappings": [
+ {
+ "if": "highway=cycleway",
+ "then": ""
+ },
+ {
+ "if": "highway=path",
+ "then": "0 12"
+ },
+ {
+ "if": {
+ "or": [
+ "highway=footway",
+ "highway=pedestrian"
+ ]
+ },
+ "then": "12 18"
+ },
+ {
+ "if": "highway=living_street",
+ "then": "12 12 0 12"
+ }
+ ]
+ }
+ }
+ ],
+ "presets": [],
"tagRenderings": [
"images",
{
@@ -260,56 +311,5 @@
}
]
}
- ],
- "presets": [],
- "description": {
- "en": "All carfree roads",
- "nl": "Alle verkeersvrije wegen",
- "de": "Alle autofreien Straßen",
- "ca": "Totes les carreteres sense cotxe"
- },
- "pointRendering": [
- {
- "location": [
- "point"
- ],
- "marker": [
- {
- "icon": "./assets/layers/slow_roads/slow_road.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#eaba2a",
- "width": "7",
- "dashArray": {
- "render": "",
- "mappings": [
- {
- "if": "highway=cycleway",
- "then": ""
- },
- {
- "if": "highway=path",
- "then": "0 12"
- },
- {
- "if": {
- "or": [
- "highway=footway",
- "highway=pedestrian"
- ]
- },
- "then": "12 18"
- },
- {
- "if": "highway=living_street",
- "then": "12 12 0 12"
- }
- ]
- }
- }
]
}
diff --git a/assets/layers/speed_camera/speed_camera.json b/assets/layers/speed_camera/speed_camera.json
index e75928aef..046cc7d16 100644
--- a/assets/layers/speed_camera/speed_camera.json
+++ b/assets/layers/speed_camera/speed_camera.json
@@ -16,6 +16,10 @@
"ca": "Capa que mostra càmeres de velocitat",
"cs": "Vrstva zobrazující rychlostní radary"
},
+ "source": {
+ "osmTags": "highway=speed_camera"
+ },
+ "minzoom": 12,
"title": {
"render": {
"en": "Speed Camera",
@@ -26,10 +30,43 @@
"cs": "Rychlostní radar"
}
},
- "minzoom": 12,
- "source": {
- "osmTags": "highway=speed_camera"
- },
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "square",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/speed_camera/speed_camera.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "highway=speed_camera"
+ ],
+ "title": {
+ "en": "a speed camera",
+ "de": "einen Blitzer",
+ "nl": "een flitspaal",
+ "es": "una cámara de velocidad",
+ "ca": "una càmera de velocitat",
+ "cs": "rychlostní radar"
+ },
+ "snapToLayer": [
+ "maxspeed"
+ ],
+ "maxSnapDistance": 10
+ }
+ ],
"tagRenderings": [
{
"id": "maxspeed",
@@ -77,25 +114,6 @@
"condition": "ref~*"
}
],
- "presets": [
- {
- "tags": [
- "highway=speed_camera"
- ],
- "title": {
- "en": "a speed camera",
- "de": "einen Blitzer",
- "nl": "een flitspaal",
- "es": "una cámara de velocidad",
- "ca": "una càmera de velocitat",
- "cs": "rychlostní radar"
- },
- "snapToLayer": [
- "maxspeed"
- ],
- "maxSnapDistance": 10
- }
- ],
"units": [
{
"appliesToKey": [
@@ -157,23 +175,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "square",
- "color": "white"
- },
- {
- "icon": "./assets/layers/speed_camera/speed_camera.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/speed_display/speed_display.json b/assets/layers/speed_display/speed_display.json
index 3df3601aa..a29fed538 100644
--- a/assets/layers/speed_display/speed_display.json
+++ b/assets/layers/speed_display/speed_display.json
@@ -14,6 +14,10 @@
"ca": "Capa que mostra radars pedagògics que alerten als conductors de la seva velocitat.",
"cs": "Vrstva zobrazující ukazatele rychlosti, které řidiče upozorňují na jejich rychlost."
},
+ "source": {
+ "osmTags": "highway=speed_display"
+ },
+ "minzoom": 12,
"title": {
"render": {
"en": "Speed Display",
@@ -22,10 +26,34 @@
"cs": "Ukazatel rychlosti"
}
},
- "minzoom": 12,
- "source": {
- "osmTags": "highway=speed_display"
- },
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/layers/speed_display/speed_display.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "title": {
+ "en": "a speed display",
+ "de": "eine Geschwindigkeitsanzeige",
+ "nl": "een snelheidsdisplay",
+ "ca": "un radar pedagògic",
+ "cs": "ukazatel rychlosti"
+ },
+ "tags": [
+ "highway=speed_display"
+ ]
+ }
+ ],
"tagRenderings": [
{
"id": "maxspeed",
@@ -85,20 +113,6 @@
}
}
],
- "presets": [
- {
- "title": {
- "en": "a speed display",
- "de": "eine Geschwindigkeitsanzeige",
- "nl": "een snelheidsdisplay",
- "ca": "un radar pedagògic",
- "cs": "ukazatel rychlosti"
- },
- "tags": [
- "highway=speed_display"
- ]
- }
- ],
"units": [
{
"appliesToKey": [
@@ -160,19 +174,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "./assets/layers/speed_display/speed_display.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/split_point/split_point.json b/assets/layers/split_point/split_point.json
index 26927e552..c43c0921d 100644
--- a/assets/layers/split_point/split_point.json
+++ b/assets/layers/split_point/split_point.json
@@ -1,9 +1,9 @@
{
"id": "split_point",
- "description": "Layer rendering the little scissors for the minimap in the 'splitRoadWizard'",
- "minzoom": 1,
- "source": "special",
"name": "Split point",
+ "description": "Layer rendering the little scissors for the minimap in the 'splitRoadWizard'",
+ "source": "special",
+ "minzoom": 1,
"title": "Split point",
"pointRendering": [
{
diff --git a/assets/layers/split_road/split_road.json b/assets/layers/split_road/split_road.json
index 25c36b9ee..13a6d3cfc 100644
--- a/assets/layers/split_road/split_road.json
+++ b/assets/layers/split_road/split_road.json
@@ -1,9 +1,9 @@
{
"id": "split_road",
- "description": "Layer rendering the way to split in the 'splitRoadWizard'. This one is used instead of the variable rendering by the themes themselves, as they might not always be very visible",
- "minzoom": 1,
- "source": "special",
"name": null,
+ "description": "Layer rendering the way to split in the 'splitRoadWizard'. This one is used instead of the variable rendering by the themes themselves, as they might not always be very visible",
+ "source": "special",
+ "minzoom": 1,
"title": null,
"pointRendering": [
{
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index 2953cb590..3ac8d36a4 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -11,7 +11,16 @@
"es": "Pistas de deportes",
"cs": "Sportovní hřiště"
},
- "minzoom": 12,
+ "description": {
+ "nl": "Een sportterrein",
+ "fr": "Un terrain de sport",
+ "en": "A sport pitch",
+ "it": "Un campo sportivo",
+ "ru": "Спортивная площадка",
+ "de": "Ein Sportplatz",
+ "es": "Una pista de deportes",
+ "cs": "Sportovní hřiště"
+ },
"source": {
"osmTags": {
"and": [
@@ -22,6 +31,7 @@
"calculatedTags": [
"_size_classification=Number(feat.properties._surface) < 200 ? 'small' : (Number(feat.properties._surface) < 750 ? 'medium' : 'large') "
],
+ "minzoom": 12,
"title": {
"render": {
"nl": "Sportterrein",
@@ -35,16 +45,128 @@
"cs": "Sportovní hřiště"
}
},
- "description": {
- "nl": "Een sportterrein",
- "fr": "Un terrain de sport",
- "en": "A sport pitch",
- "it": "Un campo sportivo",
- "ru": "Спортивная площадка",
- "de": "Ein Sportplatz",
- "es": "Una pista de deportes",
- "cs": "Sportovní hřiště"
- },
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/sport_pitch/sport_pitch.svg",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "sport=baseball",
+ "sport=basketball",
+ "sport=beachvolleyball",
+ "sport=boules",
+ "sport=skateboard",
+ "sport=soccer",
+ "sport=table_tennis",
+ "sport=tennis",
+ "sport=volleyball",
+ "sport=equestrian"
+ ]
+ },
+ "then": "./assets/layers/sport_pitch/{sport}.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconBadges": [
+ {
+ "if": {
+ "and": [
+ "opening_hours!=24/7",
+ "opening_hours~*"
+ ]
+ },
+ "then": "icons.isOpen"
+ },
+ {
+ "if": {
+ "or": [
+ "access=customers",
+ "access=private",
+ "access=no"
+ ]
+ },
+ "then": "circle:white;./assets/layers/sport_pitch/lock.svg"
+ }
+ ],
+ "iconSize": {
+ "render": "25,25,center",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "_size_classification=medium",
+ "id~node/.*"
+ ]
+ },
+ "then": "32,32,center"
+ },
+ {
+ "if": "_size_classification=small",
+ "then": "25,25,center"
+ },
+ {
+ "if": "_size_classification=large",
+ "then": "40,40,center"
+ }
+ ]
+ },
+ "location": [
+ "point",
+ "centroid"
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#00cc00",
+ "width": "1",
+ "fill": "false"
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "nl": "een ping-pong tafel",
+ "fr": "une table de ping-pong",
+ "en": "a tabletennis table",
+ "it": "una tavolo da tennistavolo",
+ "ru": "Стол для настольного тенниса",
+ "de": "eine Tischtennisplatte",
+ "cs": "stůl na stolní tenis"
+ },
+ "tags": [
+ "leisure=pitch",
+ "sport=table_tennis"
+ ]
+ },
+ {
+ "title": {
+ "nl": "een sportterrein",
+ "fr": "une terrain de sport",
+ "en": "a sport pitch",
+ "ru": "Спортивная площадка",
+ "it": "una campo sportivo",
+ "de": "einen Sportplatz",
+ "es": "una pista de deportes",
+ "ca": "una pista d'esports",
+ "cs": "sportovní hřiště"
+ },
+ "tags": [
+ "leisure=pitch",
+ "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -587,40 +709,6 @@
"render": "{reviews(name, sportpitch)}"
}
],
- "presets": [
- {
- "title": {
- "nl": "een ping-pong tafel",
- "fr": "une table de ping-pong",
- "en": "a tabletennis table",
- "it": "una tavolo da tennistavolo",
- "ru": "Стол для настольного тенниса",
- "de": "eine Tischtennisplatte",
- "cs": "stůl na stolní tenis"
- },
- "tags": [
- "leisure=pitch",
- "sport=table_tennis"
- ]
- },
- {
- "title": {
- "nl": "een sportterrein",
- "fr": "une terrain de sport",
- "en": "a sport pitch",
- "ru": "Спортивная площадка",
- "it": "una campo sportivo",
- "de": "einen Sportplatz",
- "es": "una pista de deportes",
- "ca": "una pista d'esports",
- "cs": "sportovní hřiště"
- },
- "tags": [
- "leisure=pitch",
- "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
- ]
- }
- ],
"filter": [
{
"id": "accessibility",
@@ -707,93 +795,5 @@
]
},
"open_now"
- ],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "render": "./assets/layers/sport_pitch/sport_pitch.svg",
- "mappings": [
- {
- "if": {
- "or": [
- "sport=baseball",
- "sport=basketball",
- "sport=beachvolleyball",
- "sport=boules",
- "sport=skateboard",
- "sport=soccer",
- "sport=table_tennis",
- "sport=tennis",
- "sport=volleyball",
- "sport=equestrian"
- ]
- },
- "then": "./assets/layers/sport_pitch/{sport}.svg"
- }
- ]
- }
- }
- ],
- "iconBadges": [
- {
- "if": {
- "and": [
- "opening_hours!=24/7",
- "opening_hours~*"
- ]
- },
- "then": "icons.isOpen"
- },
- {
- "if": {
- "or": [
- "access=customers",
- "access=private",
- "access=no"
- ]
- },
- "then": "circle:white;./assets/layers/sport_pitch/lock.svg"
- }
- ],
- "iconSize": {
- "render": "25,25,center",
- "mappings": [
- {
- "if": {
- "or": [
- "_size_classification=medium",
- "id~node/.*"
- ]
- },
- "then": "32,32,center"
- },
- {
- "if": "_size_classification=small",
- "then": "25,25,center"
- },
- {
- "if": "_size_classification=large",
- "then": "40,40,center"
- }
- ]
- },
- "location": [
- "point",
- "centroid"
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#00cc00",
- "width": "1",
- "fill": "false"
- }
]
}
diff --git a/assets/layers/sports_centre/sports_centre.json b/assets/layers/sports_centre/sports_centre.json
index 7bf968314..ff1cbb60c 100644
--- a/assets/layers/sports_centre/sports_centre.json
+++ b/assets/layers/sports_centre/sports_centre.json
@@ -12,10 +12,10 @@
"ca": "En aquesta capa es poden trobar centres esportius interiors i exteriors",
"cs": "Na této vrstvě najdete krytá a venkovní sportovní centra"
},
- "minzoom": 12,
"source": {
"osmTags": "leisure=sports_centre"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Sports centre",
@@ -30,33 +30,6 @@
}
]
},
- "tagRenderings": [
- "images",
- "opening_hours",
- "phone",
- "website",
- "email",
- "wheelchair-access"
- ],
- "presets": [
- {
- "title": {
- "en": "a sports centre",
- "de": "ein Sportzentrum",
- "ca": "un centre esportiu",
- "cs": "sportovní centra"
- },
- "tags": [
- "leisure=sports_centre"
- ]
- }
- ],
- "allowMove": {
- "enableImproveAccuracy": true
- },
- "filter": [
- "open_now"
- ],
"pointRendering": [
{
"iconBadges": [
@@ -85,5 +58,32 @@
"color": "darkgreen",
"fill": "no"
}
- ]
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a sports centre",
+ "de": "ein Sportzentrum",
+ "ca": "un centre esportiu",
+ "cs": "sportovní centra"
+ },
+ "tags": [
+ "leisure=sports_centre"
+ ]
+ }
+ ],
+ "tagRenderings": [
+ "images",
+ "opening_hours",
+ "phone",
+ "website",
+ "email",
+ "wheelchair-access"
+ ],
+ "filter": [
+ "open_now"
+ ],
+ "allowMove": {
+ "enableImproveAccuracy": true
+ }
}
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index 709208fde..cb7561a70 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -14,6 +14,10 @@
"ca": "Capa que mostra escales i escales mecàniques",
"cs": "Vrstva zobrazující schody a eskalátory"
},
+ "source": {
+ "osmTags": "highway=steps"
+ },
+ "minzoom": 17,
"title": {
"render": {
"en": "Stairs",
@@ -35,10 +39,14 @@
}
]
},
- "minzoom": 17,
- "source": {
- "osmTags": "highway=steps"
- },
+ "pointRendering": [],
+ "lineRendering": [
+ {
+ "color": "gray",
+ "width": 10,
+ "dashArray": "6 12"
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -260,13 +268,5 @@
}
]
}
- ],
- "pointRendering": [],
- "lineRendering": [
- {
- "color": "gray",
- "width": 10,
- "dashArray": "6 12"
- }
]
}
diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json
index 070c7d730..673064166 100644
--- a/assets/layers/street_lamps/street_lamps.json
+++ b/assets/layers/street_lamps/street_lamps.json
@@ -8,6 +8,14 @@
"ca": "Fanals",
"cs": "Pouliční Lampy"
},
+ "description": {
+ "en": "A layer showing street lights",
+ "nl": "Een laag die alle straatlantaarns toont",
+ "de": "Eine Ebene mit Straßenbeleuchtung",
+ "es": "Una capa que muestra luces callejeras",
+ "ca": "Una capa que mostra els llums del carrer",
+ "cs": "Vrstva zobrazující pouliční osvětlení"
+ },
"source": {
"osmTags": "highway=street_lamp"
},
@@ -35,6 +43,28 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconBadges": [
+ {
+ "if": "light:colour~*",
+ "then": "circle:{light:colour}"
+ }
+ ],
+ "iconSize": "40,40",
+ "anchor": "bottom",
+ "marker": [
+ {
+ "icon": "./assets/layers/street_lamps/street_lamp.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"presets": [
{
"title": {
@@ -534,35 +564,5 @@
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
- },
- "description": {
- "en": "A layer showing street lights",
- "nl": "Een laag die alle straatlantaarns toont",
- "de": "Eine Ebene mit Straßenbeleuchtung",
- "es": "Una capa que muestra luces callejeras",
- "ca": "Una capa que mostra els llums del carrer",
- "cs": "Vrstva zobrazující pouliční osvětlení"
- },
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": "light:colour~*",
- "then": "circle:{light:colour}"
- }
- ],
- "iconSize": "40,40",
- "anchor": "bottom",
- "marker": [
- {
- "icon": "./assets/layers/street_lamps/street_lamp.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ }
}
diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json
index 5e548dc33..049962d33 100644
--- a/assets/layers/surveillance_camera/surveillance_camera.json
+++ b/assets/layers/surveillance_camera/surveillance_camera.json
@@ -11,7 +11,15 @@
"es": "Cámaras de vigilancia",
"cs": "Bezpečnostní kamery"
},
- "minzoom": 12,
+ "description": {
+ "en": "This layer shows surveillance cameras and allows a contributor to update information and add new cameras",
+ "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen",
+ "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen",
+ "es": "Esta capa muestra las cámaras de vigilancia y permite a quien colabora, actualizar la información y agregar nuevas cámaras",
+ "fr": "Cette couche affiche les caméras de surveillance et permet au contributeur de mettre à jour les informations et ajouter de nouvelles caméras",
+ "ca": "Aquesta capa mostra les càmeres de vigilància i permet a qui col·labora, actualitzar la informació i afegir noves càmeres",
+ "cs": "Tato vrstva zobrazuje sledovací kamery a umožňuje přispěvateli aktualizovat informace a přidávat nové kamery"
+ },
"source": {
"osmTags": {
"and": [
@@ -26,6 +34,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Surveillance Camera",
@@ -40,6 +49,163 @@
"cs": "Bezpečnostní kamera"
}
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/themes/surveillance/logo.svg",
+ "mappings": [
+ {
+ "if": "surveillance:type=ALPR",
+ "then": "./assets/layers/surveillance_camera/ALPR.svg"
+ },
+ {
+ "if": "camera:type=dome",
+ "then": "./assets/themes/surveillance/dome.svg"
+ },
+ {
+ "if": "_direction:leftright=right",
+ "then": "./assets/themes/surveillance/cam_right.svg"
+ },
+ {
+ "if": "_direction:leftright=left",
+ "then": "./assets/themes/surveillance/cam_left.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": {
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "camera:type=fixed",
+ "surveillance:type=camera",
+ "_direction:leftright~*"
+ ]
+ },
+ "then": "100,35,center"
+ }
+ ],
+ "render": "35,35,center"
+ },
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "rotation": {
+ "#": "Note: {camera:direction} is substituted by a number, giving the string 'calc(123deg + 90deg)' ; it is this string that is used as css property, which interprets the calc",
+ "render": "calc({_direction:numerical}deg + 90deg)",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "camera:type=dome",
+ "surveillance:type=ALPR"
+ ]
+ },
+ "then": "0"
+ },
+ {
+ "if": "_direction:leftright=right",
+ "then": "calc({_direction:numerical}deg - 90deg)"
+ }
+ ]
+ }
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#f00",
+ "width": "8"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "man_made=surveillance",
+ "surveillance:type=camera"
+ ],
+ "title": {
+ "en": "a surveillance camera",
+ "nl": "een bewakingscamera",
+ "de": "eine Überwachungskamera",
+ "es": "una cámara de vigilancia",
+ "fr": "une caméra de surveillance",
+ "ca": "una càmera de vigilància",
+ "cs": "bezpečnostní kamera"
+ }
+ },
+ {
+ "tags": [
+ "man_made=surveillance",
+ "surveillance:type=camera",
+ "camera:mount=wall"
+ ],
+ "title": {
+ "en": "a surveillance camera mounted on a wall",
+ "nl": "een bewakingscamera gemonteerd op een muur",
+ "de": "eine an einer Wand montierte Überwachungskamera",
+ "es": "una cámara de vigilancia montada en una pared",
+ "fr": "une caméra de surveillance fixée au mur",
+ "ca": "una càmera de vigilància muntada en una paret",
+ "cs": "sledovací kamera namontovaná na zdi"
+ },
+ "snapToLayer": [
+ "walls_and_buildings"
+ ]
+ },
+ {
+ "tags": [
+ "man_made=surveillance",
+ "surveillance:type=ALPR"
+ ],
+ "title": {
+ "en": "an ALPR camera (Automatic Number Plate Reader)",
+ "ca": "una càmera ALPR (lector automàtic de matrícules, per les seves sigles en anglès)",
+ "de": "Eine Kamera zur automatischen Nummernschilderkennung",
+ "cs": "kamera ALPR (automatická čtečka registračních značek)"
+ },
+ "description": {
+ "en": "An ALPR typically has two lenses and an array of infrared lights.",
+ "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.",
+ "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern.",
+ "cs": "ALPR má obvykle dvě čočky a pole infračervených světel."
+ },
+ "exampleImages": [
+ "./assets/layers/surveillance_camera/ALPR_Example.jpg",
+ "./assets/layers/surveillance_camera/ALPR_Example2.jpg"
+ ]
+ },
+ {
+ "tags": [
+ "man_made=surveillance",
+ "surveillance:type=ALPR",
+ "camera:mount=wall"
+ ],
+ "title": {
+ "en": "an ALPR camera (Automatic Number Plate Reader) mounted on a wall",
+ "ca": "una càmera ALPR (lector automàtic de matrícules) muntada a la paret",
+ "de": "eine Kamera zur Nummernschilderkennung, die an einer Wand befestigt ist",
+ "cs": "kamera ALPR (Automatická čtečka registračních značek) namontovaná na zdi"
+ },
+ "description": {
+ "en": "An ALPR typically has two lenses and an array of infrared lights.",
+ "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.",
+ "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern.",
+ "cs": "ALPR má obvykle dvě čočky a pole infračervených světel."
+ },
+ "exampleImages": [
+ "./assets/layers/surveillance_camera/ALPR_Example.jpg",
+ "./assets/layers/surveillance_camera/ALPR_Example2.jpg"
+ ],
+ "snapToLayer": [
+ "walls_and_buildings"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -642,171 +808,5 @@
"id": "camera:mount"
}
],
- "presets": [
- {
- "tags": [
- "man_made=surveillance",
- "surveillance:type=camera"
- ],
- "title": {
- "en": "a surveillance camera",
- "nl": "een bewakingscamera",
- "de": "eine Überwachungskamera",
- "es": "una cámara de vigilancia",
- "fr": "une caméra de surveillance",
- "ca": "una càmera de vigilància",
- "cs": "bezpečnostní kamera"
- }
- },
- {
- "tags": [
- "man_made=surveillance",
- "surveillance:type=camera",
- "camera:mount=wall"
- ],
- "title": {
- "en": "a surveillance camera mounted on a wall",
- "nl": "een bewakingscamera gemonteerd op een muur",
- "de": "eine an einer Wand montierte Überwachungskamera",
- "es": "una cámara de vigilancia montada en una pared",
- "fr": "une caméra de surveillance fixée au mur",
- "ca": "una càmera de vigilància muntada en una paret",
- "cs": "sledovací kamera namontovaná na zdi"
- },
- "snapToLayer": [
- "walls_and_buildings"
- ]
- },
- {
- "tags": [
- "man_made=surveillance",
- "surveillance:type=ALPR"
- ],
- "title": {
- "en": "an ALPR camera (Automatic Number Plate Reader)",
- "ca": "una càmera ALPR (lector automàtic de matrícules, per les seves sigles en anglès)",
- "de": "Eine Kamera zur automatischen Nummernschilderkennung",
- "cs": "kamera ALPR (automatická čtečka registračních značek)"
- },
- "description": {
- "en": "An ALPR typically has two lenses and an array of infrared lights.",
- "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.",
- "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern.",
- "cs": "ALPR má obvykle dvě čočky a pole infračervených světel."
- },
- "exampleImages": [
- "./assets/layers/surveillance_camera/ALPR_Example.jpg",
- "./assets/layers/surveillance_camera/ALPR_Example2.jpg"
- ]
- },
- {
- "tags": [
- "man_made=surveillance",
- "surveillance:type=ALPR",
- "camera:mount=wall"
- ],
- "title": {
- "en": "an ALPR camera (Automatic Number Plate Reader) mounted on a wall",
- "ca": "una càmera ALPR (lector automàtic de matrícules) muntada a la paret",
- "de": "eine Kamera zur Nummernschilderkennung, die an einer Wand befestigt ist",
- "cs": "kamera ALPR (Automatická čtečka registračních značek) namontovaná na zdi"
- },
- "description": {
- "en": "An ALPR typically has two lenses and an array of infrared lights.",
- "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.",
- "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern.",
- "cs": "ALPR má obvykle dvě čočky a pole infračervených světel."
- },
- "exampleImages": [
- "./assets/layers/surveillance_camera/ALPR_Example.jpg",
- "./assets/layers/surveillance_camera/ALPR_Example2.jpg"
- ],
- "snapToLayer": [
- "walls_and_buildings"
- ]
- }
- ],
- "deletion": true,
- "pointRendering": [
- {
- "marker": [
- {
- "icon": {
- "render": "./assets/themes/surveillance/logo.svg",
- "mappings": [
- {
- "if": "surveillance:type=ALPR",
- "then": "./assets/layers/surveillance_camera/ALPR.svg"
- },
- {
- "if": "camera:type=dome",
- "then": "./assets/themes/surveillance/dome.svg"
- },
- {
- "if": "_direction:leftright=right",
- "then": "./assets/themes/surveillance/cam_right.svg"
- },
- {
- "if": "_direction:leftright=left",
- "then": "./assets/themes/surveillance/cam_left.svg"
- }
- ]
- }
- }
- ],
- "iconSize": {
- "mappings": [
- {
- "if": {
- "and": [
- "camera:type=fixed",
- "surveillance:type=camera",
- "_direction:leftright~*"
- ]
- },
- "then": "100,35,center"
- }
- ],
- "render": "35,35,center"
- },
- "location": [
- "point",
- "centroid"
- ],
- "rotation": {
- "#": "Note: {camera:direction} is substituted by a number, giving the string 'calc(123deg + 90deg)' ; it is this string that is used as css property, which interprets the calc",
- "render": "calc({_direction:numerical}deg + 90deg)",
- "mappings": [
- {
- "if": {
- "or": [
- "camera:type=dome",
- "surveillance:type=ALPR"
- ]
- },
- "then": "0"
- },
- {
- "if": "_direction:leftright=right",
- "then": "calc({_direction:numerical}deg - 90deg)"
- }
- ]
- }
- }
- ],
- "lineRendering": [
- {
- "color": "#f00",
- "width": "8"
- }
- ],
- "description": {
- "en": "This layer shows surveillance cameras and allows a contributor to update information and add new cameras",
- "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen",
- "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen",
- "es": "Esta capa muestra las cámaras de vigilancia y permite a quien colabora, actualizar la información y agregar nuevas cámaras",
- "fr": "Cette couche affiche les caméras de surveillance et permet au contributeur de mettre à jour les informations et ajouter de nouvelles caméras",
- "ca": "Aquesta capa mostra les càmeres de vigilància i permet a qui col·labora, actualitzar la informació i afegir noves càmeres",
- "cs": "Tato vrstva zobrazuje sledovací kamery a umožňuje přispěvateli aktualizovat informace a přidávat nové kamery"
- }
+ "deletion": true
}
diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json
index db4899cf1..69aae353d 100644
--- a/assets/layers/tertiary_education/tertiary_education.json
+++ b/assets/layers/tertiary_education/tertiary_education.json
@@ -76,6 +76,64 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconSize": "40,40",
+ "label": {
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": "{name}
"
+ }
+ ]
+ },
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/school/college.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#22f1f4",
+ "width": 1
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a university",
+ "nl": "een universiteit",
+ "de": "eine Universität",
+ "fr": "une université",
+ "da": "et universitet",
+ "ca": "una universitat",
+ "cs": "univerzita"
+ },
+ "description": {
+ "en": "An institute where tertiary education is given (at the level equivalent of a bachelors degree or higher). A single point per campus is enough - buildings and faculties should not be mapped with different university points.",
+ "nl": "Een onderwijsinstelling waar tertiair onderwijs wordt gegeven - dit is onderwijs waarvan het niveau overeenkomt met een bachelor of hoger is. Eén enkel punt per campus is genoeg - gebouwen en faculteiten worden hier niet op aangeduid.",
+ "de": "Eine Einrichtung, an der tertiäre Bildung vermittelt wird (auf dem Niveau eines Bachelor-Abschlusses oder höher). Ein einziger Punkt pro Campus ist ausreichend - Gebäude und Fakultäten sollten nicht mit Universitätspunkten gekennzeichnet werden.",
+ "fr": "Un institut où l'on dispense un enseignement supérieur (au niveau équivalent à un bachelor ou plus). Un simple point par campus est suffisant - les bâtiments et les facultés ne doivent pas être cartographiés avec différents points d'université.",
+ "ca": "Un institut on s'imparteix ensenyament terciari (al nivell equivalent de batxillerat o superior). N'hi ha prou amb un únic punt per campus: els edificis i les facultats no s'han de cartografiar amb diferents punts universitaris.",
+ "cs": "Institut, kde se poskytuje terciární vzdělání (na úrovni odpovídající bakalářskému titulu nebo vyšší). Stačí jeden bod na kampus - budovy a fakulty by neměly být mapovány s různými univerzitními body."
+ },
+ "tags": [
+ "amenity=university",
+ "fixme=Added with MapComplete, geometry to be drawn"
+ ]
+ }
+ ],
"tagRenderings": [
{
"id": "institution-kind",
@@ -179,63 +237,5 @@
"website",
"email",
"phone"
- ],
- "presets": [
- {
- "title": {
- "en": "a university",
- "nl": "een universiteit",
- "de": "eine Universität",
- "fr": "une université",
- "da": "et universitet",
- "ca": "una universitat",
- "cs": "univerzita"
- },
- "description": {
- "en": "An institute where tertiary education is given (at the level equivalent of a bachelors degree or higher). A single point per campus is enough - buildings and faculties should not be mapped with different university points.",
- "nl": "Een onderwijsinstelling waar tertiair onderwijs wordt gegeven - dit is onderwijs waarvan het niveau overeenkomt met een bachelor of hoger is. Eén enkel punt per campus is genoeg - gebouwen en faculteiten worden hier niet op aangeduid.",
- "de": "Eine Einrichtung, an der tertiäre Bildung vermittelt wird (auf dem Niveau eines Bachelor-Abschlusses oder höher). Ein einziger Punkt pro Campus ist ausreichend - Gebäude und Fakultäten sollten nicht mit Universitätspunkten gekennzeichnet werden.",
- "fr": "Un institut où l'on dispense un enseignement supérieur (au niveau équivalent à un bachelor ou plus). Un simple point par campus est suffisant - les bâtiments et les facultés ne doivent pas être cartographiés avec différents points d'université.",
- "ca": "Un institut on s'imparteix ensenyament terciari (al nivell equivalent de batxillerat o superior). N'hi ha prou amb un únic punt per campus: els edificis i les facultats no s'han de cartografiar amb diferents punts universitaris.",
- "cs": "Institut, kde se poskytuje terciární vzdělání (na úrovni odpovídající bakalářskému titulu nebo vyšší). Stačí jeden bod na kampus - budovy a fakulty by neměly být mapovány s různými univerzitními body."
- },
- "tags": [
- "amenity=university",
- "fixme=Added with MapComplete, geometry to be drawn"
- ]
- }
- ],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconSize": "40,40",
- "label": {
- "mappings": [
- {
- "if": "name~*",
- "then": "{name}
"
- }
- ]
- },
- "anchor": "center",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/school/college.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#22f1f4",
- "width": 1
- }
]
}
diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json
index 4865fe5ae..aa9318126 100644
--- a/assets/layers/ticket_machine/ticket_machine.json
+++ b/assets/layers/ticket_machine/ticket_machine.json
@@ -32,6 +32,41 @@
"cs": "Automat na jízdenky"
}
},
+ "pointRendering": [
+ {
+ "iconSize": "20,20",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "square",
+ "color": "lightblue"
+ },
+ {
+ "icon": "./assets/themes/stations/public_transport_tickets.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "amenity=vending_machine",
+ "vending=public_transport_tickets"
+ ],
+ "title": {
+ "en": "a ticket machine",
+ "de": "einen Fahrkartenautomat",
+ "nl": "een kaartautomaat",
+ "ca": "una màquina de bitllets",
+ "cs": "automat na jízdenky"
+ }
+ }
+ ],
"tagRenderings": [
"images",
"level",
@@ -83,41 +118,6 @@
"denominations-coins",
"denominations-notes"
],
- "presets": [
- {
- "tags": [
- "amenity=vending_machine",
- "vending=public_transport_tickets"
- ],
- "title": {
- "en": "a ticket machine",
- "de": "einen Fahrkartenautomat",
- "nl": "een kaartautomaat",
- "ca": "una màquina de bitllets",
- "cs": "automat na jízdenky"
- }
- }
- ],
- "allowMove": true,
"deletion": true,
- "pointRendering": [
- {
- "iconSize": "20,20",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "square",
- "color": "lightblue"
- },
- {
- "icon": "./assets/themes/stations/public_transport_tickets.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ "allowMove": true
}
diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json
index db069ad39..c8dd109a6 100644
--- a/assets/layers/ticket_validator/ticket_validator.json
+++ b/assets/layers/ticket_validator/ticket_validator.json
@@ -24,6 +24,45 @@
"cs": "Validátor jízdenek"
}
},
+ "pointRendering": [
+ {
+ "iconSize": "20,20",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "square",
+ "color": "green"
+ },
+ {
+ "icon": "./assets/themes/stations/public_transport_tickets.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "amenity=ticket_validator"
+ ],
+ "title": {
+ "en": "a ticket validator",
+ "de": "einen Fahrkartenentwerter",
+ "ca": "un validador de bitllets",
+ "cs": "validátor jízdenek"
+ },
+ "description": {
+ "en": "A ticket validator to validate a public transport ticket. This can be either a digital reader, reading a card or ticket, or a machine stamping or punching a ticket.",
+ "de": "Ein Fahrkartenentwerter zur Entwertung einer Fahrkarte für öffentliche Verkehrsmittel. Dabei kann es sich entweder um ein digitales Lesegerät handeln, das eine Karte oder einen Fahrschein liest, oder um eine Maschine, die einen Fahrschein stempelt oder locht.",
+ "ca": "Un validador de bitllets per validar un bitllet de transport públic. Pot ser un lector digital, llegir una targeta o un bitllet, o una màquina que estampa o perfora un bitllet.",
+ "cs": "Ověřovač jízdenek k ověření platnosti jízdenky na veřejnou dopravu. Může to být buď digitální čtečka, která čte kartu nebo jízdenku, nebo stroj, který jízdenku orazítkuje nebo vyrazí."
+ }
+ }
+ ],
"tagRenderings": [
"images",
"level",
@@ -120,45 +159,6 @@
}
}
],
- "presets": [
- {
- "tags": [
- "amenity=ticket_validator"
- ],
- "title": {
- "en": "a ticket validator",
- "de": "einen Fahrkartenentwerter",
- "ca": "un validador de bitllets",
- "cs": "validátor jízdenek"
- },
- "description": {
- "en": "A ticket validator to validate a public transport ticket. This can be either a digital reader, reading a card or ticket, or a machine stamping or punching a ticket.",
- "de": "Ein Fahrkartenentwerter zur Entwertung einer Fahrkarte für öffentliche Verkehrsmittel. Dabei kann es sich entweder um ein digitales Lesegerät handeln, das eine Karte oder einen Fahrschein liest, oder um eine Maschine, die einen Fahrschein stempelt oder locht.",
- "ca": "Un validador de bitllets per validar un bitllet de transport públic. Pot ser un lector digital, llegir una targeta o un bitllet, o una màquina que estampa o perfora un bitllet.",
- "cs": "Ověřovač jízdenek k ověření platnosti jízdenky na veřejnou dopravu. Může to být buď digitální čtečka, která čte kartu nebo jízdenku, nebo stroj, který jízdenku orazítkuje nebo vyrazí."
- }
- }
- ],
- "allowMove": true,
"deletion": true,
- "pointRendering": [
- {
- "iconSize": "20,20",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "square",
- "color": "green"
- },
- {
- "icon": "./assets/themes/stations/public_transport_tickets.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ "allowMove": true
}
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 3d990784b..22bb4f1fb 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -13,10 +13,20 @@
"pa_PK": "ٹوئیلٹاں",
"cs": "Toalety"
},
- "minzoom": 12,
+ "description": {
+ "en": "A layer showing (public) toilets",
+ "nl": "Een laag die publieke toiletten toont",
+ "de": "Eine Ebene mit (öffentlichen) Toiletten",
+ "es": "Una capa que muestra baños (públicos)",
+ "fr": "Un calque montrant les toilettes (publiques)",
+ "da": "Et lag, der viser (offentlige) toiletter",
+ "ca": "Una capa que mostra banys (publics)",
+ "cs": "Vrstva zobrazující (veřejné) toalety"
+ },
"source": {
"osmTags": "amenity=toilets"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Toilet",
@@ -32,6 +42,52 @@
"cs": "Toaleta"
}
},
+ "pointRendering": [
+ {
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ }
+ ],
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/toilet/toilets.svg",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "wheelchair=yes",
+ "wheelchair=designated"
+ ]
+ },
+ "then": "./assets/layers/toilet/wheelchair.svg"
+ },
+ {
+ "if": {
+ "or": [
+ "toilets:position=urinals",
+ "toilets:position=urinal"
+ ]
+ },
+ "then": "./assets/layers/toilet/urinal.svg"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"presets": [
{
"title": {
@@ -783,16 +839,6 @@
"enableRelocation": false,
"enableImproveAccuracy": true
},
- "description": {
- "en": "A layer showing (public) toilets",
- "nl": "Een laag die publieke toiletten toont",
- "de": "Eine Ebene mit (öffentlichen) Toiletten",
- "es": "Una capa que muestra baños (públicos)",
- "fr": "Un calque montrant les toilettes (publiques)",
- "da": "Et lag, der viser (offentlige) toiletter",
- "ca": "Una capa que mostra banys (publics)",
- "cs": "Vrstva zobrazující (veřejné) toalety"
- },
"units": [
{
"appliesToKey": [
@@ -834,51 +880,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- }
- ],
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "render": "./assets/layers/toilet/toilets.svg",
- "mappings": [
- {
- "if": {
- "or": [
- "wheelchair=yes",
- "wheelchair=designated"
- ]
- },
- "then": "./assets/layers/toilet/wheelchair.svg"
- },
- {
- "if": {
- "or": [
- "toilets:position=urinals",
- "toilets:position=urinal"
- ]
- },
- "then": "./assets/layers/toilet/urinal.svg"
- }
- ]
- }
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
index 950d5b2cd..011c92881 100644
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -7,10 +7,17 @@
"ca": "Lavabos a altres instal·lacions",
"cs": "Toalety u ostatního vybavení"
},
- "minzoom": 12,
+ "description": {
+ "en": "A layer showing (public) toilets located at different places.",
+ "de": "Eine Ebene mit (öffentlichen) Toiletten an verschiedenen Orten.",
+ "nl": "Een laag die (publiek toegankelijke) toiletten toont in verschillende andere voorzieningen.",
+ "ca": "Una capa que mostra banys (públics) ubicats en diferents llocs.",
+ "cs": "Vrstva zobrazující (veřejné) toalety umístěné na různých místech."
+ },
"source": {
"osmTags": "toilets=yes"
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Toilet at amenity",
@@ -32,6 +39,96 @@
}
]
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/toilet/toilets.svg",
+ "mappings": [
+ {
+ "if": {
+ "or": [
+ "toilets:wheelchair=yes",
+ "toilets:wheelchair=designated"
+ ]
+ },
+ "then": "./assets/layers/toilet/wheelchair.svg"
+ },
+ {
+ "if": {
+ "or": [
+ "toilets:position=urinals",
+ "toilets:position=urinal"
+ ]
+ },
+ "then": "./assets/layers/toilet/urinal.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ },
+ {
+ "if": "shop~*",
+ "then": "./assets/themes/shops/shop.svg"
+ },
+ {
+ "if": "amenity=restaurant",
+ "then": "circle:white;./assets/layers/food/restaurant.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "amenity=fast_food",
+ "cuisine=friture"
+ ]
+ },
+ "then": "circle:white;./assets/layers/food/fries.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "amenity=fast_food",
+ "cuisine!=friture"
+ ]
+ },
+ "then": "circle:white;./assets/layers/food/fastfood.svg"
+ },
+ {
+ "if": {
+ "or": [
+ "amenity=bar",
+ "amenity=pub",
+ "amenity=biergarten"
+ ]
+ },
+ "then": "circle:white;./assets/layers/cafe_pub/pub.svg"
+ },
+ {
+ "if": "amenity=cafe",
+ "then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
+ },
+ {
+ "if": "amenity=nightclub",
+ "then": "circle:white;./assets/layers/cafe_pub/nightclub.svg"
+ }
+ ],
+ "location": [
+ "point",
+ "centroid"
+ ]
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
"images",
"level",
@@ -381,13 +478,6 @@
},
"neededChangesets": 1
},
- "description": {
- "en": "A layer showing (public) toilets located at different places.",
- "de": "Eine Ebene mit (öffentlichen) Toiletten an verschiedenen Orten.",
- "nl": "Een laag die (publiek toegankelijke) toiletten toont in verschillende andere voorzieningen.",
- "ca": "Una capa que mostra banys (públics) ubicats en diferents llocs.",
- "cs": "Vrstva zobrazující (veřejné) toalety umístěné na různých místech."
- },
"units": [
{
"appliesToKey": [
@@ -427,95 +517,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "render": "./assets/layers/toilet/toilets.svg",
- "mappings": [
- {
- "if": {
- "or": [
- "toilets:wheelchair=yes",
- "toilets:wheelchair=designated"
- ]
- },
- "then": "./assets/layers/toilet/wheelchair.svg"
- },
- {
- "if": {
- "or": [
- "toilets:position=urinals",
- "toilets:position=urinal"
- ]
- },
- "then": "./assets/layers/toilet/urinal.svg"
- }
- ]
- }
- }
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- },
- {
- "if": "shop~*",
- "then": "./assets/themes/shops/shop.svg"
- },
- {
- "if": "amenity=restaurant",
- "then": "circle:white;./assets/layers/food/restaurant.svg"
- },
- {
- "if": {
- "and": [
- "amenity=fast_food",
- "cuisine=friture"
- ]
- },
- "then": "circle:white;./assets/layers/food/fries.svg"
- },
- {
- "if": {
- "and": [
- "amenity=fast_food",
- "cuisine!=friture"
- ]
- },
- "then": "circle:white;./assets/layers/food/fastfood.svg"
- },
- {
- "if": {
- "or": [
- "amenity=bar",
- "amenity=pub",
- "amenity=biergarten"
- ]
- },
- "then": "circle:white;./assets/layers/cafe_pub/pub.svg"
- },
- {
- "if": "amenity=cafe",
- "then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
- },
- {
- "if": "amenity=nightclub",
- "then": "circle:white;./assets/layers/cafe_pub/nightclub.svg"
- }
- ],
- "location": [
- "point",
- "centroid"
- ]
- }
- ],
- "lineRendering": []
+ ]
}
diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json
index 84013c9b7..50972d578 100644
--- a/assets/layers/trail/trail.json
+++ b/assets/layers/trail/trail.json
@@ -10,7 +10,9 @@
"da": "Stier",
"cs": "Stezky"
},
- "minzoom": 12,
+ "description": {
+ "nl": "Aangeduide wandeltochten"
+ },
"source": {
"osmTags": {
"and": [
@@ -25,6 +27,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"en": "Trail",
@@ -43,6 +46,47 @@
}
]
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/layers/trail/trail.svg",
+ "mappings": [
+ {
+ "if": "wheelchair=yes",
+ "then": "./assets/layers/trail/wheelchair.svg"
+ },
+ {
+ "if": "pushchair=yes",
+ "then": "./assets/layers/trail/pushchair.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "35,35",
+ "location": [
+ "point"
+ ],
+ "anchor": "center"
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": {
+ "render": "#335D9F",
+ "mappings": [
+ {
+ "if": "colour~*",
+ "then": "{colour}"
+ }
+ ]
+ },
+ "width": "3",
+ "dashArray": "5 5"
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -215,49 +259,5 @@
],
"id": "pushchair access"
}
- ],
- "description": {
- "nl": "Aangeduide wandeltochten"
- },
- "pointRendering": [
- {
- "marker": [
- {
- "icon": {
- "render": "./assets/layers/trail/trail.svg",
- "mappings": [
- {
- "if": "wheelchair=yes",
- "then": "./assets/layers/trail/wheelchair.svg"
- },
- {
- "if": "pushchair=yes",
- "then": "./assets/layers/trail/pushchair.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "35,35",
- "location": [
- "point"
- ],
- "anchor": "center"
- }
- ],
- "lineRendering": [
- {
- "color": {
- "render": "#335D9F",
- "mappings": [
- {
- "if": "colour~*",
- "then": "{colour}"
- }
- ]
- },
- "width": "3",
- "dashArray": "5 5"
- }
]
}
diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json
index a3e4e4a81..45163fdb4 100644
--- a/assets/layers/transit_routes/transit_routes.json
+++ b/assets/layers/transit_routes/transit_routes.json
@@ -24,6 +24,9 @@
]
}
},
+ "calculatedTags": [
+ "_numeric_id=feat.properties.id.split('/')[1]"
+ ],
"minzoom": 15,
"title": {
"render": {
@@ -48,6 +51,32 @@
}
]
},
+ "titleIcons": [
+ {
+ "condition": {
+ "and": [
+ "id~relation/[0-9]+",
+ "_numeric_id~*"
+ ]
+ },
+ "render": "
"
+ },
+ "icons.defaults"
+ ],
+ "pointRendering": [],
+ "lineRendering": [
+ {
+ "color": {
+ "render": "#ff0000",
+ "mappings": [
+ {
+ "if": "colour~*",
+ "then": "{colour}"
+ }
+ ]
+ }
+ }
+ ],
"tagRenderings": [
{
"id": "name",
@@ -208,35 +237,6 @@
}
}
],
- "pointRendering": [],
- "lineRendering": [
- {
- "color": {
- "render": "#ff0000",
- "mappings": [
- {
- "if": "colour~*",
- "then": "{colour}"
- }
- ]
- }
- }
- ],
- "titleIcons": [
- {
- "condition": {
- "and": [
- "id~relation/[0-9]+",
- "_numeric_id~*"
- ]
- },
- "render": ""
- },
- "icons.defaults"
- ],
- "calculatedTags": [
- "_numeric_id=feat.properties.id.split('/')[1]"
- ],
"cs": {
"0": {
"color": {
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index 8c266e999..3ab512ab9 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -46,6 +46,24 @@
}
]
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "label": "{name}
",
+ "marker": [
+ {
+ "icon": {
+ "render": "./assets/layers/transit_stops/bus_stop.svg",
+ "mappings": []
+ }
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"tagRenderings": [
{
"id": "stop_name",
@@ -464,23 +482,5 @@
},
"tactile_paving"
],
- "allowMove": false,
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "label": "{name}
",
- "marker": [
- {
- "icon": {
- "render": "./assets/layers/transit_stops/bus_stop.svg",
- "mappings": []
- }
- }
- ]
- }
- ],
- "lineRendering": []
+ "allowMove": false
}
diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index 5c5dd319a..85e6bbabd 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -13,7 +13,16 @@
"pt_BR": "Árvore",
"cs": "Strom"
},
- "minzoom": 16,
+ "description": {
+ "en": "A layer showing trees",
+ "nl": "Een laag die bomen toont",
+ "es": "Una capa que muestra árboles",
+ "de": "Eine Ebene, die Bäume zeigt",
+ "fr": "Une couche montrant les arbres",
+ "da": "Et lag, der viser træer",
+ "ca": "Una capa que mostra arbres",
+ "cs": "Vrstva zobrazující stromy"
+ },
"source": {
"osmTags": {
"and": [
@@ -21,6 +30,7 @@
]
}
},
+ "minzoom": 16,
"title": {
"render": {
"nl": "Boom",
@@ -72,6 +82,141 @@
}
]
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "#ffffff"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/tree_node/unknown.svg",
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "leaf_type=broadleaved"
+ ]
+ },
+ "then": "./assets/layers/tree_node/broadleaved.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "leaf_type=needleleaved"
+ ]
+ },
+ "then": "./assets/layers/tree_node/needleleaved.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "iconSize": "40,40",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "anchor": "bottom"
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "natural=tree",
+ "leaf_type=broadleaved"
+ ],
+ "title": {
+ "nl": "een loofboom",
+ "en": "a broadleaved tree",
+ "it": "una albero latifoglia",
+ "fr": "une arbre feuillu",
+ "ru": "Лиственное дерево",
+ "de": "ein Laubbaum",
+ "es": "árbol de hoja ancha",
+ "da": "et løvtræ",
+ "pt": "uma árvore de folhas largas",
+ "ca": "un arbre de fulla ampla",
+ "cs": "listnatý strom"
+ },
+ "description": {
+ "nl": "Een boom van een soort die blaadjes heeft, bijvoorbeeld eik of populier.",
+ "en": "A tree of a species with leaves, such as oak or populus.",
+ "it": "Un albero di una specie con foglie larghe come la quercia o il pioppo.",
+ "fr": "Un arbre d'une espèce avec de larges feuilles, comme le chêne ou le peuplier.",
+ "de": "Ein Baum mit Blättern, z. B. Eiche oder Buche.",
+ "es": "Un árbol de hojas como el Roble o el Álamo.",
+ "pt": "Uma árvore de uma espécie com folhas, como carvalho ou populus.",
+ "ca": "Arbre d'una espècie amb fulles, com el roure o el pollancre.",
+ "cs": "Strom s listy, například dub nebo topol."
+ }
+ },
+ {
+ "tags": [
+ "natural=tree",
+ "leaf_type=needleleaved"
+ ],
+ "title": {
+ "nl": "een naaldboom",
+ "en": "a needleleaved tree",
+ "it": "una albero aghifoglia",
+ "ru": "Хвойное дерево",
+ "fr": "une arbre résineux",
+ "de": "ein Nadelbaum",
+ "es": "Árbol tipo Conífera",
+ "da": "et nåletræ",
+ "pt": "uma árvore com folhas de agulha",
+ "ca": "un arbre amb fulles d'agulla",
+ "cs": "jehličnatý strom"
+ },
+ "description": {
+ "nl": "Een boom van een soort met naalden, bijvoorbeeld den of spar.",
+ "en": "A tree of a species with needles, such as pine or spruce.",
+ "it": "Un albero di una specie con aghi come il pino o l’abete.",
+ "ru": "Дерево с хвоей (иглами), например, сосна или ель.",
+ "fr": "Une espèce d’arbre avec des épines comme le pin ou l’épicéa.",
+ "de": "Ein Baum mit Nadeln, z. B. Kiefer oder Fichte.",
+ "es": "Un árbol de hojas agujas, como el Pino o el Abeto.",
+ "da": "Et træ af en art med nåle, såsom fyr eller gran.",
+ "ca": "Arbre d'una espècie amb agulles, com el pi o l'avet.",
+ "cs": "Strom s jehlicemi, například borovice nebo smrk."
+ }
+ },
+ {
+ "tags": [
+ "natural=tree"
+ ],
+ "title": {
+ "nl": "een boom",
+ "en": "a tree",
+ "it": "una albero",
+ "ru": "Дерево",
+ "fr": "une arbre",
+ "id": "Pohon",
+ "de": "ein Baum",
+ "ca": "un arbre",
+ "es": "un árbol",
+ "da": "et træ",
+ "pt": "uma árvore",
+ "pt_BR": "uma árvore",
+ "cs": "strom"
+ },
+ "description": {
+ "nl": "Wanneer je niet zeker bent of het nu een loof- of naaldboom is.",
+ "en": "If you're not sure whether it's a broadleaved or needleleaved tree.",
+ "it": "Qualora non si sia sicuri se si tratta di un albero latifoglia o aghifoglia.",
+ "fr": "Si vous n'êtes pas sûr(e) de savoir s'il s'agit d'un arbre à feuilles larges ou à aiguilles.",
+ "ru": "Если вы не уверены в том, лиственное это дерево или хвойное.",
+ "de": "Wenn Sie nicht sicher sind, ob es sich um einen Laubbaum oder einen Nadelbaum handelt.",
+ "es": "Si no estás seguro de si es un árbol de hoja ancha o de hoja de aguja.",
+ "da": "Hvis du ikke er sikker på, om det er et løv- eller nåletræ.",
+ "ca": "Si no esteu segur de si es tracta d'un arbre amb fulles amples o amb fulles d'agulles.",
+ "cs": "Pokud si nejste jisti, zda se jedná o listnatý nebo jehličnatý strom."
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -798,156 +943,11 @@
"id": "tree_node-wikidata"
}
],
- "presets": [
- {
- "tags": [
- "natural=tree",
- "leaf_type=broadleaved"
- ],
- "title": {
- "nl": "een loofboom",
- "en": "a broadleaved tree",
- "it": "una albero latifoglia",
- "fr": "une arbre feuillu",
- "ru": "Лиственное дерево",
- "de": "ein Laubbaum",
- "es": "árbol de hoja ancha",
- "da": "et løvtræ",
- "pt": "uma árvore de folhas largas",
- "ca": "un arbre de fulla ampla",
- "cs": "listnatý strom"
- },
- "description": {
- "nl": "Een boom van een soort die blaadjes heeft, bijvoorbeeld eik of populier.",
- "en": "A tree of a species with leaves, such as oak or populus.",
- "it": "Un albero di una specie con foglie larghe come la quercia o il pioppo.",
- "fr": "Un arbre d'une espèce avec de larges feuilles, comme le chêne ou le peuplier.",
- "de": "Ein Baum mit Blättern, z. B. Eiche oder Buche.",
- "es": "Un árbol de hojas como el Roble o el Álamo.",
- "pt": "Uma árvore de uma espécie com folhas, como carvalho ou populus.",
- "ca": "Arbre d'una espècie amb fulles, com el roure o el pollancre.",
- "cs": "Strom s listy, například dub nebo topol."
- }
- },
- {
- "tags": [
- "natural=tree",
- "leaf_type=needleleaved"
- ],
- "title": {
- "nl": "een naaldboom",
- "en": "a needleleaved tree",
- "it": "una albero aghifoglia",
- "ru": "Хвойное дерево",
- "fr": "une arbre résineux",
- "de": "ein Nadelbaum",
- "es": "Árbol tipo Conífera",
- "da": "et nåletræ",
- "pt": "uma árvore com folhas de agulha",
- "ca": "un arbre amb fulles d'agulla",
- "cs": "jehličnatý strom"
- },
- "description": {
- "nl": "Een boom van een soort met naalden, bijvoorbeeld den of spar.",
- "en": "A tree of a species with needles, such as pine or spruce.",
- "it": "Un albero di una specie con aghi come il pino o l’abete.",
- "ru": "Дерево с хвоей (иглами), например, сосна или ель.",
- "fr": "Une espèce d’arbre avec des épines comme le pin ou l’épicéa.",
- "de": "Ein Baum mit Nadeln, z. B. Kiefer oder Fichte.",
- "es": "Un árbol de hojas agujas, como el Pino o el Abeto.",
- "da": "Et træ af en art med nåle, såsom fyr eller gran.",
- "ca": "Arbre d'una espècie amb agulles, com el pi o l'avet.",
- "cs": "Strom s jehlicemi, například borovice nebo smrk."
- }
- },
- {
- "tags": [
- "natural=tree"
- ],
- "title": {
- "nl": "een boom",
- "en": "a tree",
- "it": "una albero",
- "ru": "Дерево",
- "fr": "une arbre",
- "id": "Pohon",
- "de": "ein Baum",
- "ca": "un arbre",
- "es": "un árbol",
- "da": "et træ",
- "pt": "uma árvore",
- "pt_BR": "uma árvore",
- "cs": "strom"
- },
- "description": {
- "nl": "Wanneer je niet zeker bent of het nu een loof- of naaldboom is.",
- "en": "If you're not sure whether it's a broadleaved or needleleaved tree.",
- "it": "Qualora non si sia sicuri se si tratta di un albero latifoglia o aghifoglia.",
- "fr": "Si vous n'êtes pas sûr(e) de savoir s'il s'agit d'un arbre à feuilles larges ou à aiguilles.",
- "ru": "Если вы не уверены в том, лиственное это дерево или хвойное.",
- "de": "Wenn Sie nicht sicher sind, ob es sich um einen Laubbaum oder einen Nadelbaum handelt.",
- "es": "Si no estás seguro de si es un árbol de hoja ancha o de hoja de aguja.",
- "da": "Hvis du ikke er sikker på, om det er et løv- eller nåletræ.",
- "ca": "Si no esteu segur de si es tracta d'un arbre amb fulles amples o amb fulles d'agulles.",
- "cs": "Pokud si nejste jisti, zda se jedná o listnatý nebo jehličnatý strom."
- }
- }
- ],
- "allowMove": {
- "enableRelocation": false,
- "enableImproveAccuraccy": true
- },
"deletion": {
"minNeededChangesets": 5
},
- "description": {
- "en": "A layer showing trees",
- "nl": "Een laag die bomen toont",
- "es": "Una capa que muestra árboles",
- "de": "Eine Ebene, die Bäume zeigt",
- "fr": "Une couche montrant les arbres",
- "da": "Et lag, der viser træer",
- "ca": "Una capa que mostra arbres",
- "cs": "Vrstva zobrazující stromy"
- },
- "pointRendering": [
- {
- "marker": [
- {
- "icon": "circle",
- "color": "#ffffff"
- },
- {
- "icon": {
- "render": "./assets/layers/tree_node/unknown.svg",
- "mappings": [
- {
- "if": {
- "and": [
- "leaf_type=broadleaved"
- ]
- },
- "then": "./assets/layers/tree_node/broadleaved.svg"
- },
- {
- "if": {
- "and": [
- "leaf_type=needleleaved"
- ]
- },
- "then": "./assets/layers/tree_node/needleleaved.svg"
- }
- ]
- }
- }
- ],
- "iconSize": "40,40",
- "location": [
- "point",
- "centroid"
- ],
- "anchor": "bottom"
- }
- ],
- "lineRendering": []
+ "allowMove": {
+ "enableRelocation": false,
+ "enableImproveAccuraccy": true
+ }
}
diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index 8b62866b0..082cc5ab0 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -8,6 +8,15 @@
"ca": "Una capa especial que no està pensada per mostrar-se en un mapa, però que s'utilitza per configurar la configuració de l'usuari",
"cs": "Speciální vrstva, která není určena k zobrazení na mapě, ale slouží k nastavení uživatelských nastavení"
},
+ "source": "special",
+ "calculatedTags": [
+ "_mastodon_candidate_md=feat.properties._description.match(/\\[[^\\]]*\\]\\((.*(mastodon|en.osm.town).*)\\).*/)?.at(1)",
+ "_d=feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? ''",
+ "_mastodon_candidate_a=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ",
+ "_mastodon_link=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.getAttribute(\"rel\")?.indexOf('me') >= 0)[0]?.href})(feat) ",
+ "_mastodon_candidate=feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a",
+ "__current_background:='initial_value'"
+ ],
"title": {
"render": {
"en": "Settings",
@@ -19,15 +28,8 @@
"cs": "Nastavení"
}
},
- "source": "special",
- "calculatedTags": [
- "_mastodon_candidate_md=feat.properties._description.match(/\\[[^\\]]*\\]\\((.*(mastodon|en.osm.town).*)\\).*/)?.at(1)",
- "_d=feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? ''",
- "_mastodon_candidate_a=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ",
- "_mastodon_link=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.getAttribute(\"rel\")?.indexOf('me') >= 0)[0]?.href})(feat) ",
- "_mastodon_candidate=feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a",
- "__current_background:='initial_value'"
- ],
+ "pointRendering": null,
+ "lineRendering": null,
"tagRenderings": [
{
"id": "profile",
@@ -723,7 +725,5 @@
"condition": "mapcomplete-show_debug=yes",
"render": "{all_tags()}"
}
- ],
- "lineRendering": null,
- "pointRendering": null
+ ]
}
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index 3942d96d1..456a16943 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -24,6 +24,9 @@
]
}
},
+ "calculatedTags": [
+ "_vending_count=feat.properties.vending.split(';').length"
+ ],
"title": {
"render": {
"en": "Vending machine",
@@ -58,6 +61,301 @@
}
]
},
+ "pointRendering": [
+ {
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": {
+ "render": "./assets/layers/vending_machine/vending_machine.svg",
+ "mappings": [
+ {
+ "if": "vending=drinks",
+ "then": "./assets/layers/id_presets/temaki-bottles.svg"
+ },
+ {
+ "if": "vending=sweets",
+ "then": "./assets/layers/id_presets/maki-confectionery.svg"
+ },
+ {
+ "if": "vending=food",
+ "then": "./assets/layers/vending_machine/utensils.svg"
+ },
+ {
+ "if": "vending=cigarettes",
+ "then": "./assets/layers/vending_machine/smoking.svg"
+ },
+ {
+ "if": "vending=coffee",
+ "then": "./assets/layers/vending_machine/mug-saucer.svg"
+ },
+ {
+ "if": "vending=water",
+ "then": "./assets/layers/id_presets/temaki-water_bottle.svg"
+ },
+ {
+ "if": "vending=newspapers",
+ "then": "./assets/layers/id_presets/fas-newspaper.svg"
+ },
+ {
+ "if": "vending=milk",
+ "then": "./assets/layers/vending_machine/cow.svg"
+ },
+ {
+ "if": "vending=bread",
+ "then": "./assets/layers/id_presets/maki-bakery.svg"
+ },
+ {
+ "if": "vending=eggs",
+ "then": "./assets/layers/vending_machine/egg.svg"
+ },
+ {
+ "if": "vending=cheese",
+ "then": "./assets/layers/id_presets/fas-cheese.svg"
+ },
+ {
+ "if": "vending=honey",
+ "then": "./assets/layers/vending_machine/honey.svg"
+ },
+ {
+ "if": "vending=potatoes",
+ "then": "./assets/layers/vending_machine/potato.svg"
+ },
+ {
+ "if": "vending=meat",
+ "then": "./assets/layers/id_presets/temaki-meat.svg"
+ },
+ {
+ "if": "vending=fruit",
+ "then": "./assets/layers/vending_machine/fruits.svg"
+ },
+ {
+ "if": "vending=strawberries",
+ "then": "./assets/layers/vending_machine/strawberry.svg"
+ },
+ {
+ "if": "vending=flowers",
+ "then": "./assets/layers/id_presets/maki-florist.svg"
+ },
+ {
+ "if": "vending=condoms",
+ "then": "./assets/layers/vending_machine/condom.svg"
+ }
+ ]
+ }
+ }
+ ],
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*drinks.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/temaki-bottles.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*sweets.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/maki-confectionery.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*food.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/utensils.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*cigarettes.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/smoking.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*coffee.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/mug-saucer.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*water.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/temaki-water_bottle.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*newspapers.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/fas-newspaper.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*milk.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/cow.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*bread.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/maki-bakery.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*eggs.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/egg.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*cheese.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/fas-cheese.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*honey.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/honey.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*potatoes.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/potato.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*meat.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/temaki-meat.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*fruit.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/fruits.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*strawberries.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/vending_machine/strawberry.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*flowers.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*parking_tickets.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/parking_ticket_machine/parking_tickets.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*elongated_coin.*"
+ ]
+ },
+ "then": "circle:white;./assets/themes/elongated_coin/penny.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*public_transport_tickets.*"
+ ]
+ },
+ "then": "circle:white;./assets/themes/stations/public_transport_tickets.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "title": {
+ "en": "a vending machine",
+ "nl": "een verkoopautomaat",
+ "de": "ein Verkaufsautomat",
+ "fr": "un distributeur",
+ "ca": "una màquina expenedora",
+ "cs": "prodejní automat"
+ },
+ "tags": [
+ "amenity=vending_machine"
+ ]
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -488,303 +786,6 @@
},
"website"
],
- "calculatedTags": [
- "_vending_count=feat.properties.vending.split(';').length"
- ],
- "presets": [
- {
- "title": {
- "en": "a vending machine",
- "nl": "een verkoopautomaat",
- "de": "ein Verkaufsautomat",
- "fr": "un distributeur",
- "ca": "una màquina expenedora",
- "cs": "prodejní automat"
- },
- "tags": [
- "amenity=vending_machine"
- ]
- }
- ],
- "pointRendering": [
- {
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": {
- "render": "./assets/layers/vending_machine/vending_machine.svg",
- "mappings": [
- {
- "if": "vending=drinks",
- "then": "./assets/layers/id_presets/temaki-bottles.svg"
- },
- {
- "if": "vending=sweets",
- "then": "./assets/layers/id_presets/maki-confectionery.svg"
- },
- {
- "if": "vending=food",
- "then": "./assets/layers/vending_machine/utensils.svg"
- },
- {
- "if": "vending=cigarettes",
- "then": "./assets/layers/vending_machine/smoking.svg"
- },
- {
- "if": "vending=coffee",
- "then": "./assets/layers/vending_machine/mug-saucer.svg"
- },
- {
- "if": "vending=water",
- "then": "./assets/layers/id_presets/temaki-water_bottle.svg"
- },
- {
- "if": "vending=newspapers",
- "then": "./assets/layers/id_presets/fas-newspaper.svg"
- },
- {
- "if": "vending=milk",
- "then": "./assets/layers/vending_machine/cow.svg"
- },
- {
- "if": "vending=bread",
- "then": "./assets/layers/id_presets/maki-bakery.svg"
- },
- {
- "if": "vending=eggs",
- "then": "./assets/layers/vending_machine/egg.svg"
- },
- {
- "if": "vending=cheese",
- "then": "./assets/layers/id_presets/fas-cheese.svg"
- },
- {
- "if": "vending=honey",
- "then": "./assets/layers/vending_machine/honey.svg"
- },
- {
- "if": "vending=potatoes",
- "then": "./assets/layers/vending_machine/potato.svg"
- },
- {
- "if": "vending=meat",
- "then": "./assets/layers/id_presets/temaki-meat.svg"
- },
- {
- "if": "vending=fruit",
- "then": "./assets/layers/vending_machine/fruits.svg"
- },
- {
- "if": "vending=strawberries",
- "then": "./assets/layers/vending_machine/strawberry.svg"
- },
- {
- "if": "vending=flowers",
- "then": "./assets/layers/id_presets/maki-florist.svg"
- },
- {
- "if": "vending=condoms",
- "then": "./assets/layers/vending_machine/condom.svg"
- }
- ]
- }
- }
- ],
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*drinks.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/temaki-bottles.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*sweets.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/maki-confectionery.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*food.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/utensils.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*cigarettes.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/smoking.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*coffee.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/mug-saucer.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*water.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/temaki-water_bottle.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*newspapers.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/fas-newspaper.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*milk.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/cow.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*bread.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/maki-bakery.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*eggs.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/egg.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*cheese.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/fas-cheese.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*honey.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/honey.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*potatoes.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/potato.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*meat.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/temaki-meat.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*fruit.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/fruits.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*strawberries.*"
- ]
- },
- "then": "circle:white;./assets/layers/vending_machine/strawberry.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*flowers.*"
- ]
- },
- "then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*parking_tickets.*"
- ]
- },
- "then": "circle:white;./assets/layers/parking_ticket_machine/parking_tickets.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*elongated_coin.*"
- ]
- },
- "then": "circle:white;./assets/themes/elongated_coin/penny.svg"
- },
- {
- "if": {
- "and": [
- "_vending_count>1",
- "vending~.*public_transport_tickets.*"
- ]
- },
- "then": "circle:white;./assets/themes/stations/public_transport_tickets.svg"
- }
- ]
- }
- ],
"filter": [
"open_now",
{
@@ -1081,10 +1082,9 @@
]
}
],
+ "deletion": true,
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": true
- },
- "deletion": true,
- "lineRendering": []
+ }
}
diff --git a/assets/layers/veterinary/veterinary.json b/assets/layers/veterinary/veterinary.json
index 2591aa31b..fb6c6a2c5 100644
--- a/assets/layers/veterinary/veterinary.json
+++ b/assets/layers/veterinary/veterinary.json
@@ -1,42 +1,5 @@
{
"id": "veterinary",
- "description": "A layer showing veterinarians",
- "source": {
- "osmTags": {
- "or": [
- "amenity=veterinary"
- ]
- }
- },
- "minzoom": 10,
- "presets": [
- {
- "title": {
- "en": "a veterianarian",
- "da": "en dyrlæge",
- "de": "ein Tierarzt",
- "es": "un veterinario",
- "nl": "een dierenarts",
- "fr": "un vétérinaire",
- "ca": "un veterinari",
- "cs": "veterinář"
- },
- "tags": [
- "amenity=veterinary",
- "pet=dog"
- ],
- "description": {
- "en": "a veterianarian, that treats dogs",
- "da": "En dyrlæge, der behandler hunde",
- "de": "ein Tierarzt, der Hunde behandelt",
- "es": "un veterinario, que trata a perros",
- "nl": "een dierenarts die honden verzorgt",
- "fr": "un vétérinaire, qui soigne les chiens",
- "ca": "un veterinari, que tracta gossos",
- "cs": "veterinář, který léčí psy"
- }
- }
- ],
"name": {
"en": "veterinary",
"da": "dyrlæge",
@@ -47,6 +10,15 @@
"ca": "Veterinari",
"cs": "veterinář"
},
+ "description": "A layer showing veterinarians",
+ "source": {
+ "osmTags": {
+ "or": [
+ "amenity=veterinary"
+ ]
+ }
+ },
+ "minzoom": 10,
"title": {
"render": {
"en": "Veterinary",
@@ -67,38 +39,6 @@
}
]
},
- "tagRenderings": [
- "website",
- "reviews",
- "phone",
- "opening_hours",
- {
- "question": {
- "en": "What is the name of this veterinarian?",
- "da": "Hvad hedder denne dyrlæ?",
- "de": "Wie lautet der Name dieses Tierarztes?",
- "es": "¿Cual es el nombre de este veterinario?",
- "nl": "Wat is de naam van deze dierenartspraktijk?",
- "fr": "Quel est le nom de ce vétérinaire ?",
- "ca": "Qui és el nom d'aquest veterinari?",
- "cs": "Jak se jmenuje tento veterinář?"
- },
- "render": {
- "en": "The name of this veterinarian is {name}",
- "de": "Denne dyrlæ hedder {name}",
- "es": "El nombre de este veterinario es {name}",
- "nl": "Deze dierenartspraktijk heet {name}",
- "da": "Navnet på denne dyrlæge er {name}",
- "fr": "Le nom de ce vétérinaire est {name}",
- "ca": "El nom d'aquest veterinari és {name}",
- "cs": "Jméno tohoto veterináře je {name}"
- },
- "freeform": {
- "key": "name"
- },
- "id": "vetName"
- }
- ],
"pointRendering": [
{
"location": [
@@ -133,5 +73,65 @@
"color": "#ff0",
"width": 5
}
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a veterianarian",
+ "da": "en dyrlæge",
+ "de": "ein Tierarzt",
+ "es": "un veterinario",
+ "nl": "een dierenarts",
+ "fr": "un vétérinaire",
+ "ca": "un veterinari",
+ "cs": "veterinář"
+ },
+ "tags": [
+ "amenity=veterinary",
+ "pet=dog"
+ ],
+ "description": {
+ "en": "a veterianarian, that treats dogs",
+ "da": "En dyrlæge, der behandler hunde",
+ "de": "ein Tierarzt, der Hunde behandelt",
+ "es": "un veterinario, que trata a perros",
+ "nl": "een dierenarts die honden verzorgt",
+ "fr": "un vétérinaire, qui soigne les chiens",
+ "ca": "un veterinari, que tracta gossos",
+ "cs": "veterinář, který léčí psy"
+ }
+ }
+ ],
+ "tagRenderings": [
+ "website",
+ "reviews",
+ "phone",
+ "opening_hours",
+ {
+ "question": {
+ "en": "What is the name of this veterinarian?",
+ "da": "Hvad hedder denne dyrlæ?",
+ "de": "Wie lautet der Name dieses Tierarztes?",
+ "es": "¿Cual es el nombre de este veterinario?",
+ "nl": "Wat is de naam van deze dierenartspraktijk?",
+ "fr": "Quel est le nom de ce vétérinaire ?",
+ "ca": "Qui és el nom d'aquest veterinari?",
+ "cs": "Jak se jmenuje tento veterinář?"
+ },
+ "render": {
+ "en": "The name of this veterinarian is {name}",
+ "de": "Denne dyrlæ hedder {name}",
+ "es": "El nombre de este veterinario es {name}",
+ "nl": "Deze dierenartspraktijk heet {name}",
+ "da": "Navnet på denne dyrlæge er {name}",
+ "fr": "Le nom de ce vétérinaire est {name}",
+ "ca": "El nom d'aquest veterinari és {name}",
+ "cs": "Jméno tohoto veterináře je {name}"
+ },
+ "freeform": {
+ "key": "name"
+ },
+ "id": "vetName"
+ }
]
}
diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json
index c7f0b8ad6..40e2dce63 100644
--- a/assets/layers/viewpoint/viewpoint.json
+++ b/assets/layers/viewpoint/viewpoint.json
@@ -28,7 +28,41 @@
"osmTags": "tourism=viewpoint"
},
"minzoom": 14,
- "wayhandling": 2,
+ "title": {
+ "render": {
+ "en": "Viewpoint",
+ "nl": "Uitzicht",
+ "de": "Aussichtspunkt",
+ "fr": "Point de vue",
+ "ru": "Смотровая площадка",
+ "it": "Punto panoramico",
+ "id": "Sudut pandang",
+ "eo": "Vidpunkto",
+ "ca": "Mirador",
+ "da": "Udsigtspunkt",
+ "cs": "Vyhlídka"
+ }
+ },
+ "pointRendering": [
+ {
+ "iconSize": "20,20",
+ "location": [
+ "point"
+ ],
+ "anchor": "center",
+ "marker": [
+ {
+ "icon": "./assets/layers/viewpoint/viewpoint.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#ffffff",
+ "width": "5"
+ }
+ ],
"presets": [
{
"title": {
@@ -47,21 +81,6 @@
]
}
],
- "title": {
- "render": {
- "en": "Viewpoint",
- "nl": "Uitzicht",
- "de": "Aussichtspunkt",
- "fr": "Point de vue",
- "ru": "Смотровая площадка",
- "it": "Punto panoramico",
- "id": "Sudut pandang",
- "eo": "Vidpunkto",
- "ca": "Mirador",
- "da": "Udsigtspunkt",
- "cs": "Vyhlídka"
- }
- },
"tagRenderings": [
"images",
{
@@ -85,24 +104,5 @@
"id": "viewpoint-description"
}
],
- "pointRendering": [
- {
- "iconSize": "20,20",
- "location": [
- "point"
- ],
- "anchor": "center",
- "marker": [
- {
- "icon": "./assets/layers/viewpoint/viewpoint.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#ffffff",
- "width": "5"
- }
- ]
+ "wayhandling": 2
}
diff --git a/assets/layers/village_green/village_green.json b/assets/layers/village_green/village_green.json
index b65373283..4b79bd6a0 100644
--- a/assets/layers/village_green/village_green.json
+++ b/assets/layers/village_green/village_green.json
@@ -3,6 +3,13 @@
"name": {
"nl": "Speelweide"
},
+ "description": {
+ "en": "A layer showing village-green (which are communal green areas, but not quite parks)",
+ "nl": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)",
+ "de": "Eine Ebene mit Dorfangern (kommunale Grünflächen, aber nicht wirklich Parks)",
+ "ca": "Una capa que mostra “village-green” (que són zones verdes comunals, però no parcs del tot)",
+ "cs": "Vrstva zobrazující městskou zeleň (což jsou společné zelené plochy, ale ne tak docela parky)"
+ },
"source": {
"osmTags": "landuse=village_green"
},
@@ -20,24 +27,6 @@
}
]
},
- "tagRenderings": [
- "images",
- {
- "id": "village_green-explanation",
- "render": "Dit is een klein stukje openbaar groen waar je mag spelen, picnicken, zitten, ..."
- },
- {
- "id": "village_green-reviews",
- "render": "{reviews(name, landuse=village_green )}"
- }
- ],
- "description": {
- "en": "A layer showing village-green (which are communal green areas, but not quite parks)",
- "nl": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)",
- "de": "Eine Ebene mit Dorfangern (kommunale Grünflächen, aber nicht wirklich Parks)",
- "ca": "Una capa que mostra “village-green” (que són zones verdes comunals, però no parcs del tot)",
- "cs": "Vrstva zobrazující městskou zeleň (což jsou společné zelené plochy, ale ne tak docela parky)"
- },
"pointRendering": [
{
"iconSize": "40,40",
@@ -58,5 +47,16 @@
"color": "#937f20",
"width": "1"
}
+ ],
+ "tagRenderings": [
+ "images",
+ {
+ "id": "village_green-explanation",
+ "render": "Dit is een klein stukje openbaar groen waar je mag spelen, picnicken, zitten, ..."
+ },
+ {
+ "id": "village_green-reviews",
+ "render": "{reviews(name, landuse=village_green )}"
+ }
]
}
diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json
index a5b22bbce..a68f472c7 100644
--- a/assets/layers/visitor_information_centre/visitor_information_centre.json
+++ b/assets/layers/visitor_information_centre/visitor_information_centre.json
@@ -10,7 +10,14 @@
"ca": "Centre d'Informació al Visitant",
"cs": "Turistické informační centrum"
},
- "minzoom": 12,
+ "description": {
+ "en": "A visitor center offers information about a specific attraction or place of interest where it is located.",
+ "nl": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.",
+ "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet.",
+ "es": "Un centro de visitantes ofrece información sobre una atracción específica o lugar de interese donde se sitúa.",
+ "ca": "Un centre de visitants ofereix informació sobre una atracció o lloc d'interès específic on es troba.",
+ "cs": "Turistické centrum nabízí informace o konkrétní atrakci nebo zajímavém místě, kde se nachází."
+ },
"source": {
"osmTags": {
"and": [
@@ -23,6 +30,7 @@
]
}
},
+ "minzoom": 12,
"title": {
"render": {
"nl": "{name}",
@@ -70,16 +78,6 @@
}
]
},
- "description": {
- "en": "A visitor center offers information about a specific attraction or place of interest where it is located.",
- "nl": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.",
- "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet.",
- "es": "Un centro de visitantes ofrece información sobre una atracción específica o lugar de interese donde se sitúa.",
- "ca": "Un centre de visitants ofereix informació sobre una atracció o lloc d'interès específic on es troba.",
- "cs": "Turistické centrum nabízí informace o konkrétní atrakci nebo zajímavém místě, kde se nachází."
- },
- "tagRenderings": [],
- "presets": [],
"pointRendering": [
{
"iconSize": "40,40",
@@ -95,5 +93,7 @@
]
}
],
- "lineRendering": []
+ "lineRendering": [],
+ "presets": [],
+ "tagRenderings": []
}
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 76871b4d5..9745070f3 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -1,18 +1,5 @@
{
"id": "walls_and_buildings",
- "minzoom": 18,
- "title": {
- "render": {
- "en": "Wall or building",
- "nl": "Muur of gebouw",
- "de": "Wand oder Gebäude",
- "es": "Pared o edificio",
- "fr": "Mur ou bâtiment",
- "da": "Mur eller bygning",
- "ca": "Paret o edifici",
- "cs": "Zeď nebo budova"
- }
- },
"description": {
"en": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.",
"nl": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.",
@@ -33,8 +20,6 @@
]
}
},
- "passAllFeatures": true,
- "shownByDefault": false,
"calculatedTags": [
"_entrance_properties=overlapWith(feat)('entrance')?.map(e => e.feat.properties)?.filter(p => p !== undefined && p.indoor !== 'door')",
"_entrance_properties_with_width=get(feat)('_entrance_properties')?.filter(p => p['width'] !== undefined)",
@@ -44,49 +29,34 @@
"_biggest_width_properties= /* Can be a list! */ get(feat)('_entrance_properties').filter(p => p.width === get(feat)('_biggest_width'))",
"_biggest_width_id=get(feat)('_biggest_width_properties').id"
],
- "units": [
+ "minzoom": 18,
+ "shownByDefault": false,
+ "title": {
+ "render": {
+ "en": "Wall or building",
+ "nl": "Muur of gebouw",
+ "de": "Wand oder Gebäude",
+ "es": "Pared o edificio",
+ "fr": "Mur ou bâtiment",
+ "da": "Mur eller bygning",
+ "ca": "Paret o edifici",
+ "cs": "Zeď nebo budova"
+ }
+ },
+ "pointRendering": [],
+ "lineRendering": [
{
- "appliesToKey": [
- "width",
- "_biggest_width"
- ],
- "defaultUnit": "cm",
- "applicableUnits": [
- {
- "useIfNoUnitGiven": true,
- "canonicalDenomination": "m",
- "alternativeDenomination": [
- "meter"
- ],
- "human": {
- "en": "meter",
- "fr": "mètre",
- "de": "Meter",
- "da": "meter",
- "nl": "meter",
- "ca": "metre",
- "cs": "metr"
- }
- },
- {
- "canonicalDenomination": "cm",
- "alternativeDenomination": [
- "centimeter",
- "cms"
- ],
- "human": {
- "en": "centimeter",
- "fr": "centimètre",
- "de": "Zentimeter",
- "da": "centimeter",
- "nl": "centimeter",
- "ca": "centimetre",
- "cs": "centimetr"
- }
- }
- ]
+ "color": "#fff",
+ "fill": "no",
+ "width": "3"
+ },
+ {
+ "color": "#333",
+ "fill": "no",
+ "width": "2"
}
],
+ "passAllFeatures": true,
"tagRenderings": [
{
"id": "entrance_info",
@@ -151,17 +121,47 @@
"condition": "_biggest_width_id~*"
}
],
- "pointRendering": [],
- "lineRendering": [
+ "units": [
{
- "color": "#fff",
- "fill": "no",
- "width": "3"
- },
- {
- "color": "#333",
- "fill": "no",
- "width": "2"
+ "appliesToKey": [
+ "width",
+ "_biggest_width"
+ ],
+ "defaultUnit": "cm",
+ "applicableUnits": [
+ {
+ "useIfNoUnitGiven": true,
+ "canonicalDenomination": "m",
+ "alternativeDenomination": [
+ "meter"
+ ],
+ "human": {
+ "en": "meter",
+ "fr": "mètre",
+ "de": "Meter",
+ "da": "meter",
+ "nl": "meter",
+ "ca": "metre",
+ "cs": "metr"
+ }
+ },
+ {
+ "canonicalDenomination": "cm",
+ "alternativeDenomination": [
+ "centimeter",
+ "cms"
+ ],
+ "human": {
+ "en": "centimeter",
+ "fr": "centimètre",
+ "de": "Zentimeter",
+ "da": "centimeter",
+ "nl": "centimeter",
+ "ca": "centimetre",
+ "cs": "centimetr"
+ }
+ }
+ ]
}
]
}
diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index d5e6e3739..2c572b62e 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -13,7 +13,18 @@
"fr": "Poubelle",
"cs": "Odpadkový koš"
},
- "minzoom": 17,
+ "description": {
+ "en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
+ "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien.",
+ "de": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können.",
+ "hu": "Ez egy nyilvános szemétkosár vagy kuka, ahová kidobhatod a szemetedet.",
+ "it": "Questo è un cestino dei rifiuti pubblico, un bidone della spazzatura, dove puoi buttare via la tua spazzatura",
+ "es": "Esta es una papelera pública, donde puedes tirar tu basura.",
+ "da": "Dette er en offentlig affaldskurv, en skraldespand, hvor du kan smide dit affald.",
+ "fr": "C'est une poubelle dans laquelle vous pouvez jeter vos mégots.",
+ "ca": "Es tracta d'una paperera pública, una paperera, on pots llençar la teva paperera.",
+ "cs": "Jedná se o veřejný odpadkový koš, odpadkový koš, kam můžete vyhodit odpadky."
+ },
"source": {
"osmTags": {
"and": [
@@ -21,6 +32,7 @@
]
}
},
+ "minzoom": 17,
"title": {
"render": {
"en": "Waste Basket",
@@ -35,18 +47,49 @@
"cs": "Odpadkový koš"
}
},
- "description": {
- "en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
- "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien.",
- "de": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können.",
- "hu": "Ez egy nyilvános szemétkosár vagy kuka, ahová kidobhatod a szemetedet.",
- "it": "Questo è un cestino dei rifiuti pubblico, un bidone della spazzatura, dove puoi buttare via la tua spazzatura",
- "es": "Esta es una papelera pública, donde puedes tirar tu basura.",
- "da": "Dette er en offentlig affaldskurv, en skraldespand, hvor du kan smide dit affald.",
- "fr": "C'est une poubelle dans laquelle vous pouvez jeter vos mégots.",
- "ca": "Es tracta d'una paperera pública, una paperera, on pots llençar la teva paperera.",
- "cs": "Jedná se o veřejný odpadkový koš, odpadkový koš, kam můžete vyhodit odpadky."
- },
+ "pointRendering": [
+ {
+ "iconSize": "40,40",
+ "anchor": "center",
+ "location": [
+ "point"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/themes/waste_basket/waste_basket.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [
+ {
+ "color": "#00f",
+ "width": "8"
+ }
+ ],
+ "presets": [
+ {
+ "tags": [
+ "amenity=waste_basket"
+ ],
+ "title": {
+ "en": "a waste basket",
+ "nl": "een vuilnisbak",
+ "ru": "Контейнер для мусора",
+ "de": "einen Abfalleimer",
+ "eo": "Rubujo",
+ "it": "un cestino dei rifiuti",
+ "id": "sebuah keranjang sampah",
+ "da": "en affaldskurv",
+ "ca": "una paperera",
+ "fr": "une poubelle",
+ "cs": "odpadkový koš"
+ },
+ "presiceInput": {
+ "preferredBackground": "photo"
+ }
+ }
+ ],
"tagRenderings": [
"images",
{
@@ -256,29 +299,6 @@
]
}
],
- "presets": [
- {
- "tags": [
- "amenity=waste_basket"
- ],
- "title": {
- "en": "a waste basket",
- "nl": "een vuilnisbak",
- "ru": "Контейнер для мусора",
- "de": "einen Abfalleimer",
- "eo": "Rubujo",
- "it": "un cestino dei rifiuti",
- "id": "sebuah keranjang sampah",
- "da": "en affaldskurv",
- "ca": "una paperera",
- "fr": "une poubelle",
- "cs": "odpadkový koš"
- },
- "presiceInput": {
- "preferredBackground": "photo"
- }
- }
- ],
"filter": [
{
"id": "waste-type",
@@ -413,26 +433,6 @@
"enableRelocation": false,
"enableImproveAccuracy": true
},
- "pointRendering": [
- {
- "iconSize": "40,40",
- "anchor": "center",
- "location": [
- "point"
- ],
- "marker": [
- {
- "icon": "./assets/themes/waste_basket/waste_basket.svg"
- }
- ]
- }
- ],
- "lineRendering": [
- {
- "color": "#00f",
- "width": "8"
- }
- ],
"cs": {
"0": {
"iconSize": {
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index 0ea3114e1..a088f949a 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -38,6 +38,25 @@
"cs": "Nakládání s odpady"
}
},
+ "pointRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconSize": "20,20",
+ "marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
+ {
+ "icon": "./assets/layers/waste_disposal/waste_disposal.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
"presets": [
{
"title": {
@@ -234,11 +253,6 @@
]
}
],
- "allowMove": {
- "enableImproveAccuracy": true,
- "enableRelocation": true
- },
- "deletion": true,
"filter": [
{
"#": "ignore-possible-duplicate",
@@ -260,23 +274,9 @@
]
}
],
- "pointRendering": [
- {
- "location": [
- "point",
- "centroid"
- ],
- "iconSize": "20,20",
- "marker": [
- {
- "icon": "circle",
- "color": "white"
- },
- {
- "icon": "./assets/layers/waste_disposal/waste_disposal.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ "deletion": true,
+ "allowMove": {
+ "enableImproveAccuracy": true,
+ "enableRelocation": true
+ }
}
diff --git a/assets/layers/windturbine/windturbine.json b/assets/layers/windturbine/windturbine.json
index 8947472bf..82e2787cc 100644
--- a/assets/layers/windturbine/windturbine.json
+++ b/assets/layers/windturbine/windturbine.json
@@ -61,6 +61,50 @@
}
]
},
+ "pointRendering": [
+ {
+ "label": {
+ "mappings": [
+ {
+ "if": "generator:output:electricity~^[0-9]+.*[W]$",
+ "then": "{generator:output:electricity}
"
+ }
+ ]
+ },
+ "iconSize": "40, 40",
+ "anchor": "bottom",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "marker": [
+ {
+ "icon": "./assets/themes/openwindpowermap/wind_turbine.svg"
+ }
+ ]
+ }
+ ],
+ "lineRendering": [],
+ "presets": [
+ {
+ "tags": [
+ "power=generator",
+ "generator:source=wind"
+ ],
+ "title": {
+ "en": "a wind turbine",
+ "nl": "een windturbine",
+ "fr": "une éolienne",
+ "de": "ein Windrad",
+ "it": "una pala eolica",
+ "zh_Hant": "風機",
+ "hu": "Szélerőmű",
+ "da": "en vindmølle",
+ "ca": "una turbina eòlica",
+ "cs": "větrná turbína"
+ }
+ }
+ ],
"tagRenderings": [
{
"id": "turbine-output",
@@ -254,26 +298,6 @@
},
"images"
],
- "presets": [
- {
- "tags": [
- "power=generator",
- "generator:source=wind"
- ],
- "title": {
- "en": "a wind turbine",
- "nl": "een windturbine",
- "fr": "une éolienne",
- "de": "ein Windrad",
- "it": "una pala eolica",
- "zh_Hant": "風機",
- "hu": "Szélerőmű",
- "da": "en vindmølle",
- "ca": "una turbina eòlica",
- "cs": "větrná turbína"
- }
- }
- ],
"units": [
{
"appliesToKey": [
@@ -401,29 +425,5 @@
}
]
}
- ],
- "pointRendering": [
- {
- "label": {
- "mappings": [
- {
- "if": "generator:output:electricity~^[0-9]+.*[W]$",
- "then": "{generator:output:electricity}
"
- }
- ]
- },
- "iconSize": "40, 40",
- "anchor": "bottom",
- "location": [
- "point",
- "centroid"
- ],
- "marker": [
- {
- "icon": "./assets/themes/openwindpowermap/wind_turbine.svg"
- }
- ]
- }
- ],
- "lineRendering": []
+ ]
}