diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index 2ba7c0358..2a08e2076 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -147,7 +147,7 @@
"hu": "Anyag: {material}",
"it": "Materiale: {material}",
"ru": "Материал: {material}",
- "zh_Hans": "材质: {material}",
+ "zh_Hanå¨s": "材质: {material}",
"zh_Hant": "材質：{material}",
"nb_NO": "Materiale: {material}"
},
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index af74d6954..4f670261c 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -398,7 +398,7 @@
"render": "./assets/themes/buurtnatuur/nature_reserve.svg"
},
"width": {
- "render": "5"
+ "render": "1"
},
"iconSize": {
"render": "50,50,center"
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 06ea04860..206de225c 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -8,6 +8,7 @@
"ru": "Туалеты",
"it": "Servizi igienici"
},
+ "minzoom": 12,
"source": {
"osmTags": "amenity=toilets"
},
@@ -37,7 +38,6 @@
"color": {
"render": "#0000ff"
},
- "minzoom": 12,
"wayHandling": 2,
"presets": [
{
diff --git a/assets/layers/trail/license_info.json b/assets/layers/trail/license_info.json
index 19fcdef96..54c645469 100644
--- a/assets/layers/trail/license_info.json
+++ b/assets/layers/trail/license_info.json
@@ -8,5 +8,21 @@
"sources": [
"https://www.flaticon.com/free-icon/trail_3273172?term=trail&page=1&position=11&page=1&position=11&related_id=3273172&origin=search"
]
+ },
+ {
+ "authors": [
+ "Freepik"
+ ],
+ "path": "pushchair.svg",
+ "license": "CC-BY",
+ "sources": [
+ "https://www.flaticon.com/free-icon/stroller_1032915?term=pushchair&page=1&position=76&page=1&position=76&related_id=1032915&origin=search"
+ ]
+ },
+ {
+ "authors": [],
+ "path": "wheelchair.svg",
+ "license": "CC0",
+ "sources": []
}
]
\ No newline at end of file
diff --git a/assets/layers/trail/pushchair.svg b/assets/layers/trail/pushchair.svg
new file mode 100644
index 000000000..7684a8193
--- /dev/null
+++ b/assets/layers/trail/pushchair.svg
@@ -0,0 +1,58 @@
+
+
+
diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json
index 46a0a3aeb..ffdff1e6b 100644
--- a/assets/layers/trail/trail.json
+++ b/assets/layers/trail/trail.json
@@ -1,7 +1,8 @@
{
"id": "trail",
"name": {
- "nl": "paden"
+ "en": "Trails",
+ "nl": "Paden"
},
"minzoom": 12,
"source": {
@@ -17,36 +18,9 @@
},
"title": {
"render": {
+ "en": "Trails",
"nl": "Paden"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "name:nl~*"
- ]
- },
- "then": {
- "nl": "{name:nl}"
- }
- },
- {
- "if": {
- "and": [
- "name~*"
- ]
- },
- "then": {
- "nl": "{name}"
- }
- }
- ]
- },
- "icon": {
- "render": "./assets/layers/trail/trail.svg"
- },
- "description": {
- "nl": "Paden waarlangs kan gewandeld worden"
+ }
},
"tagRenderings": [
"images",
@@ -164,15 +138,264 @@
"hideInAnswer": true
}
]
+ },
+ {
+ "question": {
+ "nl": "Is dit pad toegankelijk met de rolstoel?"
+ },
+ "mappings": [
+ {
+ "then": {
+ "nl": "Dit pad is toegankelijk met de rolstoel"
+ },
+ "if": "wheelchair=yes"
+ },
+ {
+ "then": {
+ "nl": "Dit pad is niet toegankelijk met de rolstoel"
+ },
+ "if": "wheelchair=no"
+ }
+ ]
+ },
+ {
+ "question": {
+ "nl": "Is dit pad toegankelijk met de buggy?"
+ },
+ "mappings": [
+ {
+ "then": {
+ "nl": "Dit pad is toegankelijk met de buggy"
+ },
+ "if": "pushchair=yes"
+ },
+ {
+ "then": {
+ "nl": "Dit pad is niet toegankelijk met de buggy"
+ },
+ "if": "pushchair=no"
+ }
+ ]
+ },
+ {
+ "render": {
+ "en": "Surface: {surface}",
+ "nl": "Ondergrond bestaat uit {surface}"
+ },
+ "freeform": {
+ "key": "surface",
+ "addExtraTags": []
+ },
+ "mappings": [
+ {
+ "if": "surface=paved",
+ "then": {
+ "en": "Surface: paved",
+ "nl": "Het pad is aangelegd"
+ }
+ },
+ {
+ "if": "surface=asphalt",
+ "then": {
+ "en": "Surface: asphalt",
+ "nl": "Ondergrond bestaat uit asfalt"
+ }
+ },
+ {
+ "if": "surface=concrete",
+ "then": {
+ "en": "Surface: concrete",
+ "nl": "Ondergrond bestaat uit cement"
+ }
+ },
+ {
+ "if": "surface=paving_stones",
+ "then": {
+ "en": "Surface: paving stones",
+ "nl": "Ondergrond bestaat uit plavei"
+ }
+ },
+ {
+ "if": "surface=cobblestone",
+ "then": {
+ "en": "Surface: cobblestone",
+ "nl": "Ondergrond bestaat uit kasseien"
+ }
+ },
+ {
+ "if": "surface=stepping_stones",
+ "then": {
+ "en": "Surface: stepping stones",
+ "nl": "Ondergrond bestaat uit stenen pad"
+ }
+ },
+ {
+ "if": "surface=unpaved",
+ "then": {
+ "en": "Surface: unpaved",
+ "nl": "Dit pad is niet aangelegd"
+ }
+ },
+ {
+ "if": "surface=gravel",
+ "then": {
+ "en": "Surface: gravel",
+ "nl": "Ondergrond bestaat uit grind"
+ }
+ },
+ {
+ "if": "surface=rock",
+ "then": {
+ "en": "Surface: rock",
+ "nl": "Ondergrond bestaat uit gesteente"
+ }
+ },
+ {
+ "if": "surface=pebblestone",
+ "then": {
+ "en": "Surface: pebblestone",
+ "nl": "Ondergrond bestaat uit kiezels"
+ }
+ },
+ {
+ "if": "surface=earth",
+ "then": {
+ "en": "Surface: earth",
+ "nl": "Ondergrond bestaat uit aarde"
+ }
+ },
+ {
+ "if": "surface=grass",
+ "then": {
+ "en": "Surface: grass",
+ "nl": "Ondergrond bestaat uit gras"
+ }
+ },
+ {
+ "if": "surface=mud",
+ "then": {
+ "en": "Surface: mud",
+ "nl": "Ondergrond bestaat uit modder"
+ }
+ },
+ {
+ "if": "surface=sand",
+ "then": {
+ "en": "Surface: sand",
+ "nl": "Ondergrond bestaat uit zand"
+ }
+ }
+
+ ],
+ "question": {
+ "en": "What type of surface does the trail have?",
+ "nl": "Waaruit bestaat de ondergrond van het pad?"
}
+ },
+ {
+ "mappings": [
+ {
+ "if": "incline=very_easy",
+ "then": {
+ "en": "The trail is flat",
+ "nl": "Het pad is plat"
+ }
+ },
+ {
+ "if": "incline=easy",
+ "then": {
+ "en": "The trail is slightly elevated",
+ "nl": "Het pad is zo goed als plat"
+ }
+ },
+ {
+ "if": "incline=moderate",
+ "then": {
+ "en": "The trail is elevated",
+ "nl": "Het pad stijgt en/of daalt "
+ }
+ },
+ {
+ "if": "incline=somewhat_hard",
+ "then": {
+ "en": "The trail is slightly steep",
+ "nl": "Het pad is lichtjes steil"
+ }
+ },
+ {
+ "if": "incline=hard",
+ "then": {
+ "en": "The trail is steep",
+ "nl": "Het pad is steil"
+ }
+ },
+ {
+ "if": "incline=very_hard",
+ "then": {
+ "en": "The trail is very steep",
+ "nl": "Het pad is zeer steil"
+ }
+ },
+ {
+ "if": "incline=extreme",
+ "then": {
+ "en": "The trail is extremely steep",
+ "nl": "Het pad is extreem steil"
+ }
+ }
+ ],
+ "question": {
+ "en": "What's the incline of the trail?",
+ "nl": "Hoe hard stijgt en/of daalt het pad?"
+ }
+},
+ {
+ "render": {
+ "en": "The trail is {distance}km long",
+ "nl": "De lengte van het pad bedraagt {distance}km"
+ },
+ "freeform": {
+ "key": "distance",
+ "type": "float"
+ }
+ },
+ {
+ "render": {
+ "en": "The trail is {width}m wide",
+ "nl": "De breedte van het pad bedraagt {width}m"
+ },
+ "freeform": {
+ "key": "width",
+ "type": "nat"
+ },
+ "question": {
+ "en": "How wide is the trail (m)?",
+ "nl": "Hoe breed is het pad (m)?"
+ }
+ }
],
- "hideUnderlayingFeaturesMinPercentage": 10,
+ "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"
+ }
+ ]
+ },
+ "description": {
+ "nl": "Paden waarlangs kan gewandeld worden"
+ },
"wayHandling": 2,
"width": {
"render": "5"
},
"iconSize": {
- "render": "50,50,center"
+ "render": "35,35,center"
},
"color": {
"render": "#335D9F"
diff --git a/assets/layers/trail/wheelchair.svg b/assets/layers/trail/wheelchair.svg
new file mode 100644
index 000000000..2c3a2ecd7
--- /dev/null
+++ b/assets/layers/trail/wheelchair.svg
@@ -0,0 +1,73 @@
+
+
+
+
\ No newline at end of file
diff --git a/assets/layers/walking_routes/license_info.json b/assets/layers/walking_routes/license_info.json
new file mode 100644
index 000000000..135da9ec3
--- /dev/null
+++ b/assets/layers/walking_routes/license_info.json
@@ -0,0 +1,13 @@
+[
+ {
+ "authors": [
+ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
+ ],
+ "path": "walking_route.svg",
+ "license": "CC-BY-SA 4.0",
+ "sources": [
+ "https://createlli.com/",
+ "https://www.provincieantwerpen.be/"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/themes/speelplekken/walking_route.svg b/assets/layers/walking_routes/walking_route.svg
similarity index 100%
rename from assets/themes/speelplekken/walking_route.svg
rename to assets/layers/walking_routes/walking_route.svg
diff --git a/assets/layers/walking_routes/walking_routes.json b/assets/layers/walking_routes/walking_routes.json
new file mode 100644
index 000000000..fe23157bb
--- /dev/null
+++ b/assets/layers/walking_routes/walking_routes.json
@@ -0,0 +1,113 @@
+{
+ "id": "walking_routes",
+ "icon": "./assets/layers/walking_routes/walking_route.svg",
+ "name": {
+ "nl": "Wandelroutes van provincie Antwerpen"
+ },
+ "minzoom": 12,
+ "description": "Walking routes by 'provincie Antwerpen'",
+ "source": {
+ "osmTags": {
+ "and": [
+ "type=route",
+ "route=foot"
+ ]
+ },
+ "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
+ "geoJsonZoomLevel": 14,
+ "isOsmCache": true
+ },
+ "title": {
+ "render": "Wandeling {name}",
+ "mappings": [
+ {
+ "if": "name~.*wandeling.*",
+ "then": "{name}"
+ }
+ ]
+ },
+ "tagRenderings": [
+ {
+ "render": {
+ "nl": "Deze wandeling is {_length:km}km lang"
+ }
+ },
+ {
+ "mappings": [
+ {
+ "if": "route=iwn",
+ "then": {
+ "nl": "Dit is een internationale wandelroute"
+ }
+ },
+ {
+ "if": "route=nwn",
+ "then": {
+ "nl": "Dit is een nationale wandelroute"
+ }
+ },
+ {
+ "if": "route=rwn",
+ "then": {
+ "nl": "Dit is een regionale wandelroute"
+ }
+ },
+ {
+ "if": "route=lwn",
+ "then": {
+ "nl": "Dit is een lokale wandelroute"
+ }
+ }
+ ]
+ },
+ {
+ "render": {
+ "nl": "Korte beschrijving:
{description}"
+ },
+ "question": "Geef een korte beschrijving van de wandeling (max 255 tekens)",
+ "freeform": {
+ "key": "description",
+ "type": "text"
+ }
+ },
+ {
+ "question": {
+ "nl": "Wie beheert deze wandeling en plaatst dus de signalisatiebordjes?"
+ },
+ "render": "Signalisatie geplaatst door {operator}",
+ "freeform": {
+ "key": "operator"
+ }
+ },
+ {
+ "question": {
+ "nl": "Naar wie kan men emailen bij problemen rond signalisatie?"
+ },
+ "render": {
+ "nl": "Bij problemen met signalisatie kan men emailen naar {operator:email}"
+ },
+ "freeform": {
+ "key": "operator:email",
+ "type": "email"
+ }
+ },
+ "questions",
+ "reviews"
+ ],
+ "color": {
+ "render": "#6d6",
+ "mappings": [
+ {
+ "if": "color~*",
+ "then": "{color}"
+ },
+ {
+ "if": "colour~*",
+ "then": "{colour}"
+ }
+ ]
+ },
+ "width": {
+ "render": "9"
+ }
+ }
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index be68ce900..fe9067575 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -28,7 +28,7 @@
{
"builtin": [
"nature_reserve",
- "trail",
+ "walking_routes",
"visitor_information_centre"
],
"override": {
@@ -41,14 +41,28 @@
}
}
},
- "drinking_water",
- "bench",
- "picnic_table",
- "birdhide",
- "toilet",
- "watermill",
- "information_board",
- "parking"
+ {
+ "builtin": [
+ "birdhide",
+ "toilet",
+ "drinking_water",
+ "picnic_table"
+ ],
+ "override": {
+ "minzoom": "14"
+ }
+ },
+ {
+ "builtin": [
+ "bench",
+ "watermill",
+ "parking"
+ ],
+ "override": {
+ "minzoom": "17"
+ }
+ },
+ "information_board"
],
"roamingRenderings": []
}
\ No newline at end of file
diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json
index f5f1b98d9..9f96a2f29 100644
--- a/assets/themes/speelplekken/speelplekken.json
+++ b/assets/themes/speelplekken/speelplekken.json
@@ -136,116 +136,17 @@
}
},
{
- "id": "walking_routes",
- "icon": "./assets/themes/speelplekken/walking_route.svg",
- "name": {
- "nl": "Wandelroutes van provincie Antwerpen"
- },
- "description": "Walking routes by 'provincie Antwerpen'",
- "source": {
- "osmTags": {
- "and": [
- "type=route",
- "route=foot",
- "operator~[pP]rovincie Antwerpen"
- ]
- },
- "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
- "geoJsonZoomLevel": 14,
- "isOsmCache": true
- },
- "title": {
- "render": "Wandeling {name}",
- "mappings": [
- {
- "if": "name~.*wandeling.*",
- "then": "{name}"
- }
- ]
- },
- "tagRenderings": [
- {
- "render": {
- "nl": "Deze wandeling is {_length:km}km lang"
- }
- },
- {
- "mappings": [
- {
- "if": "route=iwn",
- "then": {
- "nl": "Dit is een internationale wandelroute"
- }
- },
- {
- "if": "route=nwn",
- "then": {
- "nl": "Dit is een nationale wandelroute"
- }
- },
- {
- "if": "route=rwn",
- "then": {
- "nl": "Dit is een regionale wandelroute"
- }
- },
- {
- "if": "route=lwn",
- "then": {
- "nl": "Dit is een lokale wandelroute"
- }
- }
- ]
- },
- {
- "render": {
- "nl": "Korte beschrijving:
{description}"
- },
- "question": "Geef een korte beschrijving van de wandeling (max 255 tekens)",
- "freeform": {
- "key": "description",
- "type": "text"
- }
- },
- {
- "question": {
- "nl": "Wie beheert deze wandeling en plaatst dus de signalisatiebordjes?"
- },
- "render": "Signalisatie geplaatst door {operator}",
- "freeform": {
- "key": "operator"
- }
- },
- {
- "question": {
- "nl": "Naar wie kan men emailen bij problemen rond signalisatie?"
- },
- "render": {
- "nl": "Bij problemen met signalisatie kan men emailen naar {operator:email}"
- },
- "freeform": {
- "key": "operator:email",
- "type": "email"
- }
- },
- "questions",
- "reviews"
+ "builtin": [
+ "walking_routes"
],
- "color": {
- "render": "#6d6",
- "mappings": [
- {
- "if": "color~*",
- "then": "{color}"
- },
- {
- "if": "colour~*",
- "then": "{colour}"
+ "override": {
+ "source": {
+ "osmTags": {
+ "+and": [
+ "operator~[pP]rovincie Antwerpen"
+ ]
}
- ]
- },
- "width": {
- "render": "9"
+ }
}
}
],
diff --git a/assets/themes/speelplekken/speelplekken_temp.json b/assets/themes/speelplekken/speelplekken_temp.json
index f18fbbad1..ebd10cb36 100644
--- a/assets/themes/speelplekken/speelplekken_temp.json
+++ b/assets/themes/speelplekken/speelplekken_temp.json
@@ -119,115 +119,17 @@
}
},
{
- "id": "walking_routes",
- "name": {
- "nl": "Wandelroutes van provincie Antwerpen"
- },
- "description": "Walking routes by 'provincie Antwerpen'",
- "source": {
- "osmTags": {
- "and": [
- "type=route",
- "route=foot",
- "operator~[pP]rovincie Antwerpen"
- ]
- },
- "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
- "geoJsonZoomLevel": 14,
- "isOsmCache": true
- },
- "title": {
- "render": "Wandeling {name}",
- "mappings": [
- {
- "if": "name~.*wandeling.*",
- "then": "{name}"
- }
- ]
- },
- "tagRenderings": [
- {
- "render": {
- "nl": "Deze wandeling is {_length:km}km lang"
- }
- },
- {
- "mappings": [
- {
- "if": "route=iwn",
- "then": {
- "nl": "Dit is een internationale wandelroute"
- }
- },
- {
- "if": "route=nwn",
- "then": {
- "nl": "Dit is een nationale wandelroute"
- }
- },
- {
- "if": "route=rwn",
- "then": {
- "nl": "Dit is een regionale wandelroute"
- }
- },
- {
- "if": "route=lwn",
- "then": {
- "nl": "Dit is een lokale wandelroute"
- }
- }
- ]
- },
- {
- "render": {
- "nl": "Korte beschrijving:
{description}"
- },
- "question": "Geef een korte beschrijving van de wandeling (max 255 tekens)",
- "freeform": {
- "key": "description",
- "type": "text"
- }
- },
- {
- "question": {
- "nl": "Wie beheert deze wandeling en plaatst dus de signalisatiebordjes?"
- },
- "render": "Signalisatie geplaatst door {operator}",
- "freeform": {
- "key": "operator"
- }
- },
- {
- "question": {
- "nl": "Naar wie kan men emailen bij problemen rond signalisatie?"
- },
- "render": {
- "nl": "Bij problemen met signalisatie kan men emailen naar {operator:email}"
- },
- "freeform": {
- "key": "operator:email",
- "type": "email"
- }
- },
- "questions",
- "reviews"
+ "builtin": [
+ "walking_routes"
],
- "color": {
- "render": "#6d6",
- "mappings": [
- {
- "if": "color~*",
- "then": "{color}"
- },
- {
- "if": "colour~*",
- "then": "{colour}"
+ "override": {
+ "source": {
+ "osmTags": {
+ "+and": [
+ "operator~[pP]rovincie Antwerpen"
+ ]
}
- ]
- },
- "width": {
- "render": "9"
+ }
}
}
],