From a50b9fba59e44873662e1e5288a0203044577272 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 14 Mar 2021 01:40:17 +0100 Subject: [PATCH] Cleanup of old themes, add playground-layer, add play forests, add speelplekken stub --- assets/layers/play_forest/icon.svg | 62 +++++ assets/layers/play_forest/play_forest.json | 16 +- assets/layers/playground/playground.json | 236 ++++++++++++++++++ .../public_bookcases/public_bookcases.json | 4 +- assets/themes/cyclestreets/cyclestreets.json | 2 +- assets/themes/play_forests/play_forests.json | 2 +- assets/themes/playgrounds/playgrounds.json | 162 +----------- assets/themes/speelplekken/speelplekken.json | 28 +++ 8 files changed, 344 insertions(+), 168 deletions(-) create mode 100644 assets/layers/play_forest/icon.svg create mode 100644 assets/layers/playground/playground.json create mode 100644 assets/themes/speelplekken/speelplekken.json diff --git a/assets/layers/play_forest/icon.svg b/assets/layers/play_forest/icon.svg new file mode 100644 index 0000000..a4d0147 --- /dev/null +++ b/assets/layers/play_forest/icon.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index e83f164..ecb76d4 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -3,7 +3,7 @@ "name": { "nl": "Speelbossen" }, - "minzoom": 12, + "minzoom": 13, "overpassTags": { "and": [ "playground=forest" @@ -14,6 +14,12 @@ "nl": "Speelbos" }, "mappings": [ + { + "if": "name~Speelbos.*", + "then": { + "nl": "{name}" + } + }, { "if": "name~*", "then": { @@ -59,7 +65,7 @@ ] }, { - "question": "Naar waar kan men emailen indien er problemen zijn met de speelzone?", + "question": "Wie kan men emailen indien er problemen zijn met de speelzone?", "render": "De bevoegde dienst kan bereikt worden via {email}", "freeform": { "key": "email", @@ -67,7 +73,7 @@ } }, { - "question": "Naar waar kan men bellen indien er problemen zijn met de speelzone?", + "question": "Wie kan men bellen indien er problemen zijn met de speelzone?", "render": "De bevoegde dienst kan getelefoneerd worden via {phone}", "freeform": { "key": "phone", @@ -82,7 +88,7 @@ "hideUnderlayingFeaturesMinPercentage": 0, "hideFromOverview": false, "icon": { - "render": "./assets/layers/play_forest/icon.jpg" + "render": "./assets/layers/play_forest/icon.svg" }, "width": { "render": "8" @@ -101,7 +107,7 @@ "playground=forest", "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen" ], - "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de betreffende borden
" + "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de betreffende borden
" } ], "wayHandling": 2 diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json new file mode 100644 index 0000000..5d11f33 --- /dev/null +++ b/assets/layers/playground/playground.json @@ -0,0 +1,236 @@ +{ + "id": "playground", + "name": { + "nl": "Speeltuinen" + }, + "minzoom": 13, + "overpassTags": "leisure=playground", + "description": { + "nl": "Speeltuinen en speelbossen" + }, + "title": { + "render": { + "nl": "Speeltuin" + }, + "mappings": [ + { + "if": { + "and": [ + "playground=forest", + "name~*" + ] + }, + "then": { + "nl": "Speelbos {name}" + } + }, + { + "if": "playground=forest", + "then": { + "nl": "Speelbos" + } + }, + { + "if": "name~*", + "then": { + "nl": "Speeltuin {name}" + } + } + ] + }, + "tagRenderings": [ + "images", + { + "question": { + "nl": "Wat is de ondergrond van deze speeltuin?
Indien er verschillende ondergronden zijn, neem de meest voorkomende" + }, + "render": { + "nl": "De ondergrond is {surface}" + }, + "freeform": { + "key": "surface" + }, + "mappings": [ + { + "if": "surface=grass", + "then": "De ondergrond is gras" + }, + { + "if": "surface=sand", + "then": "De ondergrond is zan" + }, + { + "if": "surface=paving_stones", + "then": "De ondergrond bestaat uit stoeptegels" + }, + { + "if": "surface=asphalt", + "then": "De ondergrond is asfalt" + }, + { + "if": "surface=concrete", + "then": "De ondergrond is beton" + } + ] + }, + { + "render": { + "nl": "Is deze speeltuin 's nachts verlicht?" + }, + "mappings": [ + { + "if": "lit=yes", + "then": "Deze speeltuin is 's nachts verlicht" + }, + { + "if": "lit=no", + "then": "Deze speeltuin is 's nachts niet verlicht" + } + ] + }, + { + "render": { + "nl": "Toegankelijk vanaf {min_age} jaar oud" + }, + "question": { + "nl": "Wat is de minimale leeftijd om op deze speeltuin te mogen?" + }, + "freeform": { + "key": "min_age", + "type": "pnat" + } + }, + { + "render": { + "nl": "Toegankelijk tot {max_age}" + }, + "question": { + "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?" + }, + "freeform": { + "key": "max_age", + "type": "pnat" + } + }, + { + "question": "Wie beheert deze speeltuin?", + "render": "Beheer door {operator}", + "freeform": { + "key": "operator" + } + }, + { + "question": "Is deze speeltuin vrij toegankelijk voor het publiek?", + "mappings": [ + { + "if": "access=", + "then": "Vrij toegankelijk voor het publiek", + "hideInAnswer": true + }, + { + "if": "access=yes", + "then": "Vrij toegankelijk voor het publiek" + }, + { + "if": "access=customers", + "then": "Enkel toegankelijk voor klanten van de bijhorende zaak" + }, + { + "if": "access=students", + "then": "Vrij toegankelijk voor scholieren van de school" + }, + { + "if": "access=private", + "then": "Niet vrij toegankelijk" + } + ] + }, + { + "question": "Wie kan men emailen indien er problemen zijn met de speeltuin?", + "render": "De bevoegde dienst kan bereikt worden via {email}", + "freeform": { + "key": "email", + "type": "email" + } + }, + { + "question": "Wie kan men bellen indien er problemen zijn met de speeltuin?", + "render": "De bevoegde dienst kan getelefoneerd worden via {phone}", + "freeform": { + "key": "phone", + "type": "phone" + } + }, + { + "question": { + "nl": "Is deze speeltuin toegankelijk voor rolstoelgebruikers?" + }, + "mappings": [ + { + "if": "wheelchair=yes", + "then": { + "nl": "Geheel toegankelijk voor rolstoelgebruikers" + } + }, + { + "if": "wheelchair=limited", + "then": { + "nl": "Beperkt toegankelijk voor rolstoelgebruikers" + } + }, + { + "if": "wheelchair=no", + "then": { + "nl": "Niet toegankelijk voor rolstoelgebruikers" + } + } + ] + }, + { + "freeform": { + "key": "opening_hours", + "type": "opening_hours" + }, + "render": "{opening_hours_table(opening_hours)}", + "question": { + "nl": "Op welke uren is deze speeltuin toegankelijk?" + }, + "mappings": [ + { + "if": "opening_hours=sunrise-sunset", + "then": { + "nl": "Van zonsopgang tot zonsondergang" + } + } + ] + }, + "questions", + { + "render": "{reviews(name, playground)}" + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { + "render": "https://upload.wikimedia.org/wikipedia/commons/0/00/Map_icons_by_Scott_de_Jonge_-_playground.svg" + }, + "width": { + "render": "3" + }, + "iconSize": { + "render": "40,40,center" + }, + "color": { + "render": "#0c3" + }, + "presets": [ + { + "tags": [ + "leisure=playground" + ], + "title": { + "nl": "Speeltuin" + } + } + ], + "wayHandling": 2 +} \ No newline at end of file diff --git a/assets/layers/public_bookcases/public_bookcases.json b/assets/layers/public_bookcases/public_bookcases.json index 48be1f4..beb1c5c 100644 --- a/assets/layers/public_bookcases/public_bookcases.json +++ b/assets/layers/public_bookcases/public_bookcases.json @@ -256,7 +256,9 @@ "de": "Teil des Netzwerks 'Little Free Library'", "fr": "Fait partie du réseau 'Little Free Library'" }, - "if": "brand=Little Free Library" + "if":{ + "and": ["brand=Little Free Library","nobrand="] + } }, { "if": { diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index 0026d01..5a953a4 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -54,7 +54,7 @@ "if": { "and": [ "cyclestreet=", - "proposed:cyclestreet=yes" + "proposed:cyclestreet=yes", ] }, "then": { diff --git a/assets/themes/play_forests/play_forests.json b/assets/themes/play_forests/play_forests.json index 1f7c090..c5c8b7b 100644 --- a/assets/themes/play_forests/play_forests.json +++ b/assets/themes/play_forests/play_forests.json @@ -13,7 +13,7 @@ "nl" ], "maintainer": "", - "icon": "./assets/layers/play_forest/icon.jpg", + "icon": "./assets/layers/play_forest/icon.svg", "version": "0", "startLat": 0, "startLon": 0, diff --git a/assets/themes/playgrounds/playgrounds.json b/assets/themes/playgrounds/playgrounds.json index 2959206..297ca64 100644 --- a/assets/themes/playgrounds/playgrounds.json +++ b/assets/themes/playgrounds/playgrounds.json @@ -17,169 +17,11 @@ "version": "0", "startLat": 50.535, "startLon": 4.399, - "startZoom": 10, + "startZoom": 13, "widenFactor": 0.05, "socialImage": "", "layers": [ - { - "id": "playgrounds", - "name": { - "nl": "Speeltuinen" - }, - "minzoom": 14, - "overpassTags": { - "and": [ - "leisure=playground" - ] - }, - "description": { - "nl": "Speeltuinen en speelbossen" - }, - "title": { - "render": { - "nl": "Speeltuin" - }, - "mappings": [ - { - "if": { - "and": [ - "playground=forest", - "name~*" - ] - }, - "then": { - "nl": "Speelbos {name}" - } - }, - { - "if": "playground=forest", - "then": { - "nl": "Speelbos" - } - }, - { - "if": "name~*", - "then": { - "nl": "Speeltuin {name}" - } - } - ] - }, - "tagRenderings": [ - "images", - { - "question": { - "nl": "Is deze speeltuin toegankelijk voor rolstoelgebruikers?" - }, - "mappings": [ - { - "if": { - "and": [ - "wheelchair=yes" - ] - }, - "then": { - "nl": "Geheel toegankelijk voor rolstoelgebruikers" - } - }, - { - "if": { - "and": [ - "wheelchair=limited" - ] - }, - "then": { - "nl": "Beperkt toegankelijk voor rolstoelgebruikers" - } - }, - { - "if": { - "and": [ - "wheelchair=no" - ] - }, - "then": { - "nl": "Niet toegankelijk voor rolstoelgebruikers" - } - } - ] - }, - { - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "render": "{opening_hours_table(opening_hours)}", - "question": { - "nl": "Op welke uren is deze speeltuin toegankelijk?" - }, - "mappings": [ - { - "if": { - "and": [ - "opening_hours=sunrise-sunset" - ] - }, - "then": { - "nl": "Van zonsopgang tot zonsondergang" - } - } - ] - }, - { - "render": { - "nl": "Toegankelijk vanaf {min_age} jaar oud" - }, - "question": { - "nl": "Wat is de minimale leeftijd om op deze speeltuin te mogen?" - }, - "freeform": { - "key": "min_age", - "type": "pnat" - } - }, - { - "render": { - "nl": "Toegankelijk tot {max_age}" - }, - "question": { - "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?" - }, - "freeform": { - "key": "max_age", - "type": "pnat" - } - }, - "questions", - { - "render": "{reviews(leisure=playground)}" - } - ], - "hideUnderlayingFeaturesMinPercentage": 0, - "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/0/00/Map_icons_by_Scott_de_Jonge_-_playground.svg" - }, - "width": { - "render": "3" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#0c3" - }, - "presets": [ - { - "tags": [ - "leisure=playground" - ], - "title": { - "nl": "Speeltuin" - } - } - ], - "wayHandling": 2 - } + "playground" ], "roamingRenderings": [] } \ No newline at end of file diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json new file mode 100644 index 0000000..1ce1b49 --- /dev/null +++ b/assets/themes/speelplekken/speelplekken.json @@ -0,0 +1,28 @@ +{ + "id": "speelplekken", + "title": { + "nl": "Speelplekken in de Antwerpse Zuidrand" + }, + "shortDescription": { + "nl": "Speelplekken in de Antwerpse Zuidrand" + }, + "description": { + "nl": "Speelplekken in de Antwerpse Zuidrand. Een project van Provincie Antwerpen, in samenwerking met Createlli, Sportpret en OpenStreetMap België" + }, + "language": [ + "nl" + ], + "maintainer": "", + "icon": "./assets/layers/play_forest/icon.svg", + "version": "0", + "startLat": 51.16174, + "startLon": 4.449462, + "startZoom": 13, + "widenFactor": 0.05, + "socialImage": "", + "layers": [ + "play_forest", + "playground" + ], + "roamingRenderings": [] +} \ No newline at end of file