diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index 8082ed4e4f..a19ada050c 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -436,17 +436,22 @@
"question": {
"nl": "Alle natuurgebieden"
}
- },{
+ },
+ {
"question": {
"nl": "Honden mogen vrij rondlopen"
},
"osmTags": "dog=yes"
- },{
+ },
+ {
"question": {
"nl": "Honden welkom aan de leiband"
},
"osmTags": {
- "or": ["dog=yes","dog=leashed"]
+ "or": [
+ "dog=yes",
+ "dog=leashed"
+ ]
}
}
]
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index edad73927b..234e9d379f 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -71,7 +71,9 @@
"ru": "Книжный шкаф",
"it": "Microbiblioteca"
},
- "tags": ["amenity=public_bookcase"],
+ "tags": [
+ "amenity=public_bookcase"
+ ],
"preciseInput": {
"preferredBackground": "photo"
}
@@ -105,7 +107,10 @@
"mappings": [
{
"if": {
- "and": ["noname=yes", "name="]
+ "and": [
+ "noname=yes",
+ "name="
+ ]
},
"then": {
"en": "This bookcase doesn't have a name",
@@ -311,12 +316,18 @@
"it": "Fa parte della rete 'Little Free Library'"
},
"if": {
- "and": ["brand=Little Free Library", "nobrand="]
+ "and": [
+ "brand=Little Free Library",
+ "nobrand="
+ ]
}
},
{
"if": {
- "and": ["nobrand=yes", "brand="]
+ "and": [
+ "nobrand=yes",
+ "brand="
+ ]
},
"then": {
"en": "This public bookcase is not part of a bigger network",
@@ -357,7 +368,11 @@
"it": "Questa microbiblioteca non fa parte di una rete"
},
"if": {
- "and": ["nobrand=yes", "brand=", "ref="]
+ "and": [
+ "nobrand=yes",
+ "brand=",
+ "ref="
+ ]
}
}
]
@@ -409,7 +424,10 @@
],
"deletion": {
"softDeletionTags": {
- "and": ["disused:amenity=public_bookcase", "amenity="]
+ "and": [
+ "disused:amenity=public_bookcase",
+ "amenity="
+ ]
},
"neededChangesets": 5
},
@@ -445,10 +463,13 @@
{
"question": "Buiten?",
"osmTags": {
- "or": ["indoor=no", "indoor="]
+ "or": [
+ "indoor=no",
+ "indoor="
+ ]
}
}
]
}
]
-}
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 039be5ca76..fb2d15d9e6 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -690,6 +690,17 @@
}
}
},
+ "birdhide": {
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Wheelchair accessible"
+ }
+ }
+ }
+ }
+ },
"crossings": {
"name": "Crossings",
"description": "Crossings for pedestrians and cyclists",
@@ -1746,89 +1757,27 @@
"trail": {
"name": "Trails",
"title": {
- "render": "Trails"
+ "render": "Trail"
},
"tagRenderings": {
- "5": {
- "render": "Surface: {surface}",
+ "1": {
+ "render": "The trail is {_length:km} kilometers long"
+ },
+ "4": {
"mappings": {
"0": {
- "then": "Surface: paved"
+ "then": "Blue trail"
},
"1": {
- "then": "Surface: asphalt"
+ "then": "Red trail"
},
"2": {
- "then": "Surface: concrete"
+ "then": "Green trail"
},
"3": {
- "then": "Surface: paving stones"
- },
- "4": {
- "then": "Surface: cobblestone"
- },
- "5": {
- "then": "Surface: stepping stones"
- },
- "6": {
- "then": "Surface: unpaved"
- },
- "7": {
- "then": "Surface: gravel"
- },
- "8": {
- "then": "Surface: rock"
- },
- "9": {
- "then": "Surface: pebblestone"
- },
- "10": {
- "then": "Surface: earth"
- },
- "11": {
- "then": "Surface: grass"
- },
- "12": {
- "then": "Surface: mud"
- },
- "13": {
- "then": "Surface: sand"
+ "then": "Yellow trail"
}
- },
- "question": "What type of surface does the trail have?"
- },
- "6": {
- "mappings": {
- "0": {
- "then": "The trail is flat"
- },
- "1": {
- "then": "The trail is slightly elevated"
- },
- "2": {
- "then": "The trail is elevated"
- },
- "3": {
- "then": "The trail is slightly steep"
- },
- "4": {
- "then": "The trail is steep"
- },
- "5": {
- "then": "The trail is very steep"
- },
- "6": {
- "then": "The trail is extremely steep"
- }
- },
- "question": "What's the incline of the trail?"
- },
- "7": {
- "render": "The trail is {distance}km long"
- },
- "8": {
- "render": "The trail is {width}m wide",
- "question": "How wide is the trail (m)?"
+ }
}
}
},
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 016e2277b9..642021cc00 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -715,6 +715,9 @@
"then": "Vogelkijkhut"
},
"2": {
+ "then": "Vogelkijktoren"
+ },
+ "3": {
"then": "Vogelkijkhut"
}
}
@@ -770,6 +773,22 @@
"title": "Vogelkijkwand",
"description": "Een vogelkijkwand waarachter men kan staan om vogels te kijken"
}
+ },
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Rolstoeltoegankelijk"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Enkel overdekte kijkhutten"
+ }
+ }
+ }
}
},
"crossings": {
@@ -1289,6 +1308,28 @@
"title": "Natuurreservaat",
"description": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
}
+ },
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Vrij te bezoeken"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Alle natuurgebieden"
+ },
+ "1": {
+ "question": "Honden mogen vrij rondlopen"
+ },
+ "2": {
+ "question": "Honden welkom aan de leiband"
+ }
+ }
+ }
}
},
"parking": {
@@ -2025,38 +2066,21 @@
}
},
"trail": {
- "name": "Paden",
+ "name": "Wandeltochten",
"title": {
- "render": "Paden"
+ "render": "Wandeltocht"
},
"tagRenderings": {
"1": {
- "render": "De toegankelijkheid van dit gebied is: {access:description}",
- "question": "Is dit gebied toegankelijk?",
- "mappings": {
- "0": {
- "then": "Vrij toegankelijk"
- },
- "1": {
- "then": "Niet toegankelijk"
- },
- "2": {
- "then": "Niet toegankelijk, want privégebied"
- },
- "3": {
- "then": "Toegankelijk, ondanks dat het privegebied is"
- },
- "4": {
- "then": "Enkel toegankelijk met een gids of tijdens een activiteit"
- },
- "5": {
- "then": "Toegankelijk mits betaling"
- }
- }
+ "render": "Deze wandeling is {_length:km} kilometer lang"
},
"2": {
+ "question": "Wat is de naam van deze wandeling?",
+ "render": "Deze wandeling heet {name}"
+ },
+ "3": {
"render": "Beheer door {operator}",
- "question": "Wie beheert dit pad?",
+ "question": "Wie beheert deze wandeltocht?",
"mappings": {
"0": {
"then": "![](\"./assets/themes/buurtnatuur/Natuurpunt.jpg\")
Dit gebied wordt beheerd door Natuurpunt"
@@ -2066,117 +2090,48 @@
}
}
},
- "3": {
- "question": "Is dit pad toegankelijk met de rolstoel?",
- "mappings": {
- "0": {
- "then": "Dit pad is toegankelijk met de rolstoel"
- },
- "1": {
- "then": "Dit pad is niet toegankelijk met de rolstoel"
- }
- }
- },
"4": {
- "question": "Is dit pad toegankelijk met de buggy?",
+ "question": "Welke kleur heeft deze wandeling?",
+ "render": "Deze wandeling heeft kleur {colour}",
"mappings": {
"0": {
- "then": "Dit pad is toegankelijk met de buggy"
+ "then": "Blauwe wandeling"
},
"1": {
- "then": "Dit pad is niet toegankelijk met de buggy"
+ "then": "Rode wandeling"
+ },
+ "2": {
+ "then": "Groene wandeling"
+ },
+ "3": {
+ "then": "Gele wandeling"
}
}
},
"5": {
- "render": "Ondergrond bestaat uit {surface}",
+ "question": "Is deze wandeling toegankelijk met de rolstoel?",
"mappings": {
"0": {
- "then": "Het pad is aangelegd"
+ "then": "deze wandeltocht is toegankelijk met de rolstoel"
},
"1": {
- "then": "Ondergrond bestaat uit asfalt"
- },
- "2": {
- "then": "Ondergrond bestaat uit cement"
- },
- "3": {
- "then": "Ondergrond bestaat uit plavei"
- },
- "4": {
- "then": "Ondergrond bestaat uit kasseien"
- },
- "5": {
- "then": "Ondergrond bestaat uit stenen pad"
- },
- "6": {
- "then": "Dit pad is niet aangelegd"
- },
- "7": {
- "then": "Ondergrond bestaat uit grind"
- },
- "8": {
- "then": "Ondergrond bestaat uit gesteente"
- },
- "9": {
- "then": "Ondergrond bestaat uit kiezels"
- },
- "10": {
- "then": "Ondergrond bestaat uit aarde"
- },
- "11": {
- "then": "Ondergrond bestaat uit gras"
- },
- "12": {
- "then": "Ondergrond bestaat uit modder"
- },
- "13": {
- "then": "Ondergrond bestaat uit zand"
+ "then": "deze wandeltocht is niet toegankelijk met de rolstoel"
}
- },
- "question": "Waaruit bestaat de ondergrond van het pad?"
+ }
},
"6": {
+ "question": "Is deze wandeltocht toegankelijk met de buggy?",
"mappings": {
"0": {
- "then": "Het pad is plat"
+ "then": "deze wandeltocht is toegankelijk met de buggy"
},
"1": {
- "then": "Het pad is zo goed als plat"
- },
- "2": {
- "then": "Het pad stijgt en/of daalt "
- },
- "3": {
- "then": "Het pad is lichtjes steil"
- },
- "4": {
- "then": "Het pad is steil"
- },
- "5": {
- "then": "Het pad is zeer steil"
- },
- "6": {
- "then": "Het pad is extreem steil"
+ "then": "deze wandeltocht is niet toegankelijk met de buggy"
}
- },
- "question": "Hoe hard stijgt en/of daalt het pad?"
- },
- "7": {
- "render": "De lengte van het pad bedraagt {distance}km"
- },
- "8": {
- "render": "De breedte van het pad bedraagt {width}m",
- "question": "Hoe breed is het pad (m)?"
+ }
}
},
- "description": "Paden waarlangs kan gewandeld worden",
- "presets": {
- "0": {
- "title": "Paden",
- "description": "Voeg een ontbrekend, erkend pad toe."
- }
- }
+ "description": "Aangeduide wandeltochten"
},
"tree_node": {
"name": "Boom",
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 1cb68941fa..6e4c68c78d 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1541,9 +1541,9 @@
"description": "Een kaart met openbare toiletten"
},
"trails": {
- "title": "Paden",
- "shortDescription": "Deze kaart toont all verschillende paden",
- "description": "Deze kaart toont all verschillende paden"
+ "title": "Wandeltochten",
+ "shortDescription": "Deze kaart toont verschillende wandeltochten",
+ "description": "Deze kaart toont alle verschillende wandeltochten"
},
"trees": {
"title": "Bomen",