diff --git a/assets/SocialImageSmall.png b/assets/SocialImageSmall.png new file mode 100644 index 000000000..073068cc2 Binary files /dev/null and b/assets/SocialImageSmall.png differ diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index a2ea92e9d..3c990d486 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -212,8 +212,7 @@ }, "condition": { "and": [ - "indoor=yes", - "access!~private" + "indoor=yes" ] }, "freeform": { diff --git a/assets/license_info.json b/assets/license_info.json index aed65a671..9c64317f6 100644 --- a/assets/license_info.json +++ b/assets/license_info.json @@ -1,4 +1,12 @@ [ + { + "authors": [ + "pietervdvn" + ], + "path": "SocialImageSmall.png", + "license": "CC-BY-SA 4.0", + "sources": [] + }, { "authors": [ "Pieter Vander Vennet" diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json index 88b818861..ce3b9feaf 100644 --- a/assets/themes/charging_stations/charging_stations.json +++ b/assets/themes/charging_stations/charging_stations.json @@ -101,7 +101,8 @@ }, { "#": "capacity", - "render": "{capacity} vehicles can be charged here", + "render": "{capacity} vehicles can be charged here at the same time", + "question": "How much vehicles can be charged here at the same time?", "freeform": { "key": "capacity", "type": "pnat" diff --git a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png new file mode 100644 index 000000000..a38fe5a86 Binary files /dev/null and b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png differ diff --git a/assets/themes/speelplekken/license_info.json b/assets/themes/speelplekken/license_info.json index 3fafe6da9..02d8a04a3 100644 --- a/assets/themes/speelplekken/license_info.json +++ b/assets/themes/speelplekken/license_info.json @@ -1,4 +1,14 @@ [ + { + "authors": [ + "Departement Omgeving, Vlaamse Overheid" + ], + "path": "Departement_Omgeving_Vlaanderen.png", + "license": "Logo; All rights reserved", + "sources": [ + "https://omgeving.vlaanderen.be/" + ] + }, { "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " @@ -42,5 +52,15 @@ "https://createlli.com/", "https://www.provincieantwerpen.be/" ] + }, + { + "authors": [ + "Provincie Antwerpen" + ], + "path": "provincie_antwerpen_CMYK.jpg", + "license": "Logo; All rights reserved", + "sources": [ + "https://www.antwerpen.be/" + ] } ] \ No newline at end of file diff --git a/assets/themes/speelplekken/provincie_antwerpen_CMYK.jpg b/assets/themes/speelplekken/provincie_antwerpen_CMYK.jpg new file mode 100644 index 000000000..9a974e48b Binary files /dev/null and b/assets/themes/speelplekken/provincie_antwerpen_CMYK.jpg differ diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json index 85215c26f..b729935c1 100644 --- a/assets/themes/speelplekken/speelplekken.json +++ b/assets/themes/speelplekken/speelplekken.json @@ -117,7 +117,7 @@ "builtin": "slow_roads", "override": { "calculatedTags": [ - "_part_of_walking_routes=feat.memberships().map(r => \"\" + r.relation.tags.name + \"\").join(', ')", + "_part_of_walking_routes=Array.from(new Set(feat.memberships().map(r => \"\" + r.relation.tags.name + \"\"))).join(', ')", "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" ], "source": { @@ -249,6 +249,14 @@ { "render": "Maakt deel uit van {_part_of_walking_routes}", "condition": "_part_of_walking_routes~*" + }, + { + "render": "Een kinder-reportage vinden jullie hier", + "freeform": { + "key": "video", + "type": "url" + }, + "question": "Wat is de link naar de video-reportage?" } ], "overrideAll": { diff --git a/assets/themes/speelplekken/speelplekken_temp.json b/assets/themes/speelplekken/speelplekken_temp.json new file mode 100644 index 000000000..6eb636b7d --- /dev/null +++ b/assets/themes/speelplekken/speelplekken_temp.json @@ -0,0 +1,267 @@ +{ + "id": "speelplekken_temp", + "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": "MapComplete", + "icon": "./assets/themes/speelplekken/logo.svg", + "hideFromOverview": true, + "lockLocation": true, + "version": "0", + "startLat": 51.17174, + "startLon": 4.449462, + "startZoom": 12, + "widenFactor": 0.05, + "socialImage": "", + "defaultBackgroundId": "CartoDB.Positron", + "layers": [ + { + "id": "shadow", + "source": { + "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete/master/assets/themes/speelplekken/shadow.geojson", + "osmTags": "shadow=yes" + }, + "color": "#444444", + "width": { + "render": "1" + } + }, + { + "builtin": "play_forest", + "override": { + "source": { + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + }, + "icon": "./assets/themes/speelplekken/speelbos.svg", + "minzoom": 12 + }, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ] + }, + { + "builtin": "playground", + "override": { + "icon": "./assets/themes/speelplekken/speeltuin.svg", + "minzoom": 14, + "source": { + "geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + }, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ] + } + }, + { + "builtin": "village_green", + "override": { + "icon": "./assets/themes/speelplekken/speelweide.svg", + "minzoom": 14, + "source": { + "geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + }, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ] + } + }, + { + "builtin": "grass_in_parks", + "override": { + "icon": "./assets/themes/speelplekken/speelweide.svg", + "minzoom": 14, + "source": { + "geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + }, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ] + } + }, + { + "builtin": "sport_pitch", + "override": { + "minzoom": 15, + "source": { + "geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + }, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ] + } + }, + { + "builtin": "slow_roads", + "override": { + "calculatedTags": [ + "_part_of_walking_routes=Array.from(new Set(feat.memberships().map(r => \"\" + r.relation.tags.name + \"\"))).join(', ')", + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + ], + "minzoom": 9, + "source": { + "geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson", + "geoJsonZoomLevel": 14, + "isOsmCache": true + } + } + }, + { + "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" + ], + "color": { + "render": "#6d6", + "mappings": [ + { + "if": "color~*", + "then": "{color}" + }, + { + "if": "colour~*", + "then": "{colour}" + } + ] + }, + "width": { + "render": "9" + } + } + ], + "clustering": { + "maxZoom": 16, + "minNeededElements": 100 + }, + "roamingRenderings": [ + { + "render": "Maakt deel uit van {_part_of_walking_routes}", + "condition": "_part_of_walking_routes~*" + } + + ], + "overrideAll": { + "isShown": { + "render": "yes", + "mappings": [ + { + "if": "_is_shadowed=yes", + "then": "no" + } + ] + } + } +}