From 3a0078d46e50def45942a8a05dc5ce2ec9fa6145 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 2 Nov 2020 23:17:20 +0100 Subject: [PATCH] Add images to all the themes --- assets/layers/bike_cafe/bike_cafes.json | 1 + .../bike_monitoring_station.json | 5 ++-- assets/layers/bird_hide/birdhides.json | 1 + .../cycling_themed_objects.json | 3 +- assets/layers/ghost_bike/ghost_bike.json | 1 + .../information_board/information_board.json | 2 +- assets/layers/maps/maps.json | 1 + .../layers/nature_reserve/nature_reserve.json | 1 + assets/themes/benches/benches.json | 2 ++ assets/themes/buurtnatuur/buurtnatuur.json | 30 +++++++++++++++++-- .../charging_stations/charging_stations.json | 1 + assets/themes/cyclestreets/cyclestreets.json | 15 ++++++++-- assets/themes/fritures/fritures.json | 1 + assets/themes/fruit_trees/fruit_trees.json | 2 +- assets/themes/shops/shops.json | 1 + 15 files changed, 56 insertions(+), 11 deletions(-) diff --git a/assets/layers/bike_cafe/bike_cafes.json b/assets/layers/bike_cafe/bike_cafes.json index f3fe69b127..fa145b4e6a 100644 --- a/assets/layers/bike_cafe/bike_cafes.json +++ b/assets/layers/bike_cafe/bike_cafes.json @@ -44,6 +44,7 @@ }, "description": {}, "tagRenderings": [ + "images", { "question": { "en": "What is the name of this bike cafe?", diff --git a/assets/layers/bike_monitoring_station/bike_monitoring_station.json b/assets/layers/bike_monitoring_station/bike_monitoring_station.json index 063a9e8038..80f9ce36ea 100644 --- a/assets/layers/bike_monitoring_station/bike_monitoring_station.json +++ b/assets/layers/bike_monitoring_station/bike_monitoring_station.json @@ -1,4 +1,4 @@ -{ + { "id": "bike_monitoring_station", "name": { "en": "Monitoring stations" @@ -33,7 +33,8 @@ ] }, "description": {}, - "tagRenderings": [ + "tagRenderings": [ "images", + { "render": "{live({url},{url:format},hour)} cyclists last hour
{live({url},{url:format},day)} cyclists today
{live({url},{url:format},year)} cyclists this year
", "condition": { diff --git a/assets/layers/bird_hide/birdhides.json b/assets/layers/bird_hide/birdhides.json index ddc1e604eb..c365293d50 100644 --- a/assets/layers/bird_hide/birdhides.json +++ b/assets/layers/bird_hide/birdhides.json @@ -56,6 +56,7 @@ "nl": "Een vogelkijkhut" }, "tagRenderings": [ + "images", { "question": { "nl": "Is dit een kijkwand of kijkhut?" diff --git a/assets/layers/cycling_themed_object/cycling_themed_objects.json b/assets/layers/cycling_themed_object/cycling_themed_objects.json index e53ae02e1c..2f4be6eab1 100644 --- a/assets/layers/cycling_themed_object/cycling_themed_objects.json +++ b/assets/layers/cycling_themed_object/cycling_themed_objects.json @@ -29,7 +29,8 @@ ] }, "description": {}, - "tagRenderings": [ + "tagRenderings": [ "images", + { "render": "{website}", "freeform": { diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index 9374a6f5db..fce6998033 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -43,6 +43,7 @@ } ], "tagRenderings": [ + "images", { "render": { "en": "A ghost bike is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.", diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json index c1299d38a2..7114cd8483 100644 --- a/assets/layers/information_board/information_board.json +++ b/assets/layers/information_board/information_board.json @@ -17,7 +17,7 @@ } }, "description": {}, - "tagRenderings": [], + "tagRenderings": [ "images"], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/information_board/board.svg" diff --git a/assets/layers/maps/maps.json b/assets/layers/maps/maps.json index a05eca0e50..41dba46bd7 100644 --- a/assets/layers/maps/maps.json +++ b/assets/layers/maps/maps.json @@ -22,6 +22,7 @@ "nl": "Een permantent geinstalleerde kaart" }, "tagRenderings": [ + "images", { "question": { "en": "On which data is this map based?", diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index 7db0483540..c825380c0e 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -41,6 +41,7 @@ "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." }, "tagRenderings": [ + "images", { "#": "Access tag", "render": { diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json index cc1e7767ea..8945da34c3 100644 --- a/assets/themes/benches/benches.json +++ b/assets/themes/benches/benches.json @@ -52,6 +52,7 @@ }, "description": {}, "tagRenderings": [ + "images", { "render": { "en": "Backrest", @@ -370,6 +371,7 @@ }, "description": {}, "tagRenderings": [ + "images", { "render": { "en": "{name}", diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 9291c2bdff..4a9d2db53a 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -67,7 +67,9 @@ "description": { "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." }, - "tagRenderings": [], + "tagRenderings": [ + "images" + ], "hideUnderlayingFeaturesMinPercentage": 10, "icon": { "render": "./assets/themes/buurtnatuur/nature_reserve.svg", @@ -169,7 +171,9 @@ "description": { "nl": "Een park is een publiek toegankelijke, groene ruimte binnen de stad. Ze is typisch ingericht voor recreatief gebruik, met (verharde) wandelpaden, zitbanken, vuilnisbakken, een gezellig vijvertje, ..." }, - "tagRenderings": [], + "tagRenderings": [ + "images" + ], "hideUnderlayingFeaturesMinPercentage": 10, "icon": { "render": "./assets/themes/buurtnatuur/park.svg", @@ -259,7 +263,9 @@ "description": { "nl": "Een bos is een verzameling bomen, al dan niet als productiehout." }, - "tagRenderings": [], + "tagRenderings": [ + "images" + ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/buurtnatuur/forest.svg", @@ -484,6 +490,24 @@ "then": { "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" } + }, + { + "if": { + "and": [ + "operator:type=private" + ] + }, + "then": "Beheer door een privépersoon", + "hideInAnswer": true + }, + { + "if": { + "and": [ + "operator:type=private", + "operator=" + ] + }, + "then": "Beheer door een privépersoon" } ], "condition": { diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json index 9db9fea315..7ec1ee9445 100644 --- a/assets/themes/charging_stations/charging_stations.json +++ b/assets/themes/charging_stations/charging_stations.json @@ -41,6 +41,7 @@ "en": "A charging station" }, "tagRenderings": [ + "images", { "#": "Type", "mappings": [ diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index dc8b2e66b7..6c61bb6b6f 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -108,7 +108,10 @@ "title": "{name}", "icon": "./assets/themes/cyclestreets/F111.svg", "color": "#0000ff", - "width": "10" + "width": "10", + "tagRenderings": [ + "images" + ] }, { "id": "toekomstige_fietsstraat", @@ -136,7 +139,10 @@ }, "icon": "./assets/themes/cyclestreets/F113.svg", "color": "#09f9dd", - "width": "5" + "width": "5", + "tagRenderings": [ + "images" + ] }, { "id": "all_streets", @@ -174,7 +180,10 @@ "if": "proposed:cyclestreet=yes" } ] - } + }, + "tagRenderings": [ + "images" + ] } ] } \ No newline at end of file diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json index c7fc56aaf1..01b27f1c40 100644 --- a/assets/themes/fritures/fritures.json +++ b/assets/themes/fritures/fritures.json @@ -53,6 +53,7 @@ }, "description": {}, "tagRenderings": [ + "images", { "render": { "nl": "{name}", diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index e9eb8c7ace..a38f122fa2 100644 --- a/assets/themes/fruit_trees/fruit_trees.json +++ b/assets/themes/fruit_trees/fruit_trees.json @@ -38,7 +38,7 @@ } }, "description": {}, - "tagRenderings": [], + "tagRenderings": ["images"], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/buurtnatuur/forest.svg" diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json index 4d6ab6cded..65ab6f2c63 100644 --- a/assets/themes/shops/shops.json +++ b/assets/themes/shops/shops.json @@ -72,6 +72,7 @@ "fr": "Un magasin" }, "tagRenderings": [ + "images", { "render": { "en": "This shop sells {shop}",