From 38a1ea6c41d41ede140732a1b65cd188f6710df2 Mon Sep 17 00:00:00 2001 From: Joost Date: Thu, 25 Mar 2021 19:17:28 +0100 Subject: [PATCH 1/3] add facade gardens --- Customizations/AllKnownLayouts.ts | 4 +- assets/themes/facadegardens/bloei.svg | 94 +++++ assets/themes/facadegardens/bodembedekker.svg | 77 +++++ assets/themes/facadegardens/eetbaar.svg | 34 ++ .../themes/facadegardens/facadegardens.json | 324 ++++++++++++++++++ assets/themes/facadegardens/gevelton.svg | 40 +++ assets/themes/facadegardens/geveltuin.svg | 50 +++ assets/themes/facadegardens/halfzon.svg | 32 ++ assets/themes/facadegardens/klimplant.svg | 76 ++++ assets/themes/facadegardens/schaduw.svg | 29 ++ assets/themes/facadegardens/struik.svg | 42 +++ assets/themes/facadegardens/zon.svg | 40 +++ 12 files changed, 841 insertions(+), 1 deletion(-) create mode 100644 assets/themes/facadegardens/bloei.svg create mode 100644 assets/themes/facadegardens/bodembedekker.svg create mode 100644 assets/themes/facadegardens/eetbaar.svg create mode 100644 assets/themes/facadegardens/facadegardens.json create mode 100644 assets/themes/facadegardens/gevelton.svg create mode 100644 assets/themes/facadegardens/geveltuin.svg create mode 100644 assets/themes/facadegardens/halfzon.svg create mode 100644 assets/themes/facadegardens/klimplant.svg create mode 100644 assets/themes/facadegardens/schaduw.svg create mode 100644 assets/themes/facadegardens/struik.svg create mode 100644 assets/themes/facadegardens/zon.svg diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts index d26e676..488c21c 100644 --- a/Customizations/AllKnownLayouts.ts +++ b/Customizations/AllKnownLayouts.ts @@ -26,6 +26,7 @@ import * as play_forests from "../assets/themes/play_forests/play_forests.json" import * as speelplekken from "../assets/themes/speelplekken/speelplekken.json" import * as sport_pitches from "../assets/themes/sport_pitches/sport_pitches.json" import * as grb from "../assets/themes/grb.json" +import * as facadegardens from "../assets/themes/facadegardens/facadegardens.json" import LayerConfig from "./JSON/LayerConfig"; import LayoutConfig from "./JSON/LayoutConfig"; import AllKnownLayers from "./AllKnownLayers"; @@ -61,7 +62,8 @@ export class AllKnownLayouts { new LayoutConfig(play_forests), new LayoutConfig(speelplekken), new LayoutConfig(sport_pitches), - new LayoutConfig(grb) + new LayoutConfig(grb), + new LayoutConfig(facadegardens) ]; public static allSets: Map = AllKnownLayouts.AllLayouts(); diff --git a/assets/themes/facadegardens/bloei.svg b/assets/themes/facadegardens/bloei.svg new file mode 100644 index 0000000..eb15b82 --- /dev/null +++ b/assets/themes/facadegardens/bloei.svg @@ -0,0 +1,94 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/assets/themes/facadegardens/bodembedekker.svg b/assets/themes/facadegardens/bodembedekker.svg new file mode 100644 index 0000000..be19487 --- /dev/null +++ b/assets/themes/facadegardens/bodembedekker.svg @@ -0,0 +1,77 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/themes/facadegardens/eetbaar.svg b/assets/themes/facadegardens/eetbaar.svg new file mode 100644 index 0000000..c22f770 --- /dev/null +++ b/assets/themes/facadegardens/eetbaar.svg @@ -0,0 +1,34 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json new file mode 100644 index 0000000..0e30b50 --- /dev/null +++ b/assets/themes/facadegardens/facadegardens.json @@ -0,0 +1,324 @@ +{ + "id": "facadegardens", + "title": { + "nl": "Straatgeveltuintjes", + "en": "Facade gardens" + }, + "shortDescription": { + "nl": "Deze kaart toont geveltuintjes met foto's en bruikbare info over oriëntatie, zonlicht en planttypes.", + "en": "This map shows facade gardens with pictures and useful info about orientation, sunshine and plant types." + }, + "description": { + "nl": "Ontharde voortuintjes, groene gevels en bomen ín de stad brengen naast rust ook een mooiere stad, een grotere biodiversiteit, een verkoelend effect en een betere luchtkwaliteit.
Klimaan VZW en 'Mechelen Klimaatneutraal' willen met het project Klim(t)aan je Gevel bestaande en nieuwe geveltuintjes in kaart brengen als voorbeeld voor mensen zelf een tuintje willen aanleggen of voor stadwandelaars die houden van de natuur.
Meer info over het project op klimaan.be.", + "en": "Facade gardens, green facades and trees in the city not only bring peace and quiet, but also a more beautiful city, greater biodiversity, a cooling effect and better air quality.
Klimaan VZW and Mechelen Klimaatneutraal want to map existing and new facade gardens as an example for people who want to build their own garden or for city walkers who love nature.
More info about the project at klimaan.be." + }, + "language": [ + "nl","en" + ], + "maintainer": "joost schouppe; stla", + "icon": "./assets/themes/facadegardens/geveltuin.svg", + "version": "0", + "startLat": 51.02768, + "startLon": 4.480705, + "startZoom": 15, + "widenFactor": 0.05, + "socialImage": "", + "layers": [ + { + "id": "facadegardens", + "name": { + "nl": "Geveltuintjes", + "en": "Facade gardens" + }, + "minzoom": 12, + "overpassTags": { + "and": [ + "leisure=garden", + "garden:type=facade_garden" + ] + }, + "title": { + "render": { + "nl": "Geveltuintje", + "en": "Facade garden" + } + }, + "description": { + "nl": "Geveltuintjes", + "en": "Facade gardens" + }, + "iconOverlays": [ + { + "if": "plant~.*vine.*", + "then": "circle:white;./assets/themes/facadegardens/klimplant.svg", + "badge": true + }, + { + "if": "plant~.*groundcover.*", + "then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg", + "badge": true + }, + { + "if": "edible=true", + "then": "circle:white;./assets/themes/facadegardens/eetbaar.svg", + "badge": true + }, + { + "if": "rain_barel=yes", + "then": "circle:white;./assets/themes/facadegardens/gevelton.svg", + "badge": true + }, + { + "if": "plant~.*shrub.*", + "then": "circle:white;./assets/themes/facadegardens/struik.svg", + "badge": true + }, + { + "if": "plant~.*flower.*", + "then": "circle:white;./assets/themes/facadegardens/bloei.svg", + "badge": true + } + ], + "tagRenderings": [ + "images", + { + "render": { + "nl": "Oriëntatie: {direction} (waarbij 0=N en 90=O)", + "en": "Orientation: {direction} (where 0=N and 90=O)" + }, + "question": { + "nl": "Hoe is de tuin georiënteerd?", + "en": "What is the orientation of the garden?" + }, + "freeform": { + "type": "direction", + "key": "direction" + } + }, + { + "mappings": [ + { + "if": { + "and": [ + "direct_sunlight=yes" + ] + }, + "then": { + "nl": "Het is een volle zon tuintje", + "en": "The garden is in full sun" + } + }, + { + "if": { + "and": [ + "direct_sunlight=partial" + ] + }, + "then": { + "nl": "Het is een halfschaduw tuintje", + "en": "The garden is in partial shade" + } + }, + { + "if": { + "and": [ + "direct_sunlight=no" + ] + }, + "then": { + "nl": "Het is een schaduw tuintje", + "en": "The sun is in the shade" + } + } + ], + "question": { + "nl": "Ligt de tuin in zon/half schaduw of schaduw?", + "en": "Is the garden shaded or sunny?" + } + }, + { + "question": { + "nl": "Is er een regenton voorzien bij het tuintje?", + "en": "Is there a water barrel installed for the garden?" + }, + "mappings": [ + { + "if": { + "and": [ + "rain_barrel=yes" + ] + }, + "then": { + "nl": "Er is een regenton", + "en": "There is a rain barrel" + } + }, + { + "if": { + "and": [ + "rain_barrel=no" + ] + }, + "then": { + "nl": "Er is geen regenton", + "en": "There is no rain barrel" + } + } + ] + }, + { + "render": { + "nl": "Aanlegdatum van de tuin: {start_date}", + "en": "Construction date of the garden: {start_date}" + }, + "question": { + "nl": "Wanneer werd de tuin aangelegd? (vul gewoon een jaartal in)", + "en": "When was the garden constructed? (a year is sufficient)" + }, + "freeform": { + "key": "start_date", + "type": "text" + } + }, + { + "mappings": [ + { + "if": { + "and": [ + "edible=yes" + ] + }, + "then": { + "nl": "Er staan eetbare planten", + "en": "There are edible plants" + } + }, + { + "if": { + "and": [ + "edible=no" + ] + }, + "then": { + "nl": "Er staan geen eetbare planten", + "en": "There are no edible plants" + } + } + ], + "question": { + "nl": "Staan er eetbare planten?", + "en": "Are there any edible plants?" + } + }, + { + "question": { + "nl": "Wat voor planten staan hier?", + "en": "What kinds of plants grow here?" + }, + "mappings": [ + { + "if": "plant=vine", + "then": { + "nl": "Er staat een klimplant", + "en": "There are vines" + } + }, + { + "if": "plant=flower", + "then": { + "nl": "Er staan bloeiende planten", + "en": "There are flowering plants" + } + }, + { + "if": "plant=shrub", + "then": { + "nl": "Er staan struiken", + "en": "There are shrubs" + } + }, + { + "if": "plant=groundcover", + "then": { + "nl": "Er staan bodembedekkers", + "en": "There are groundcovering plants" + } + } + ], + "multiAnswer": true + }, + { + "render": { + "nl": "Meer details: {description}", + "en": "More details: {description}" + }, + "question": { + "nl": "Aanvullende omschrijving van de tuin (indien nodig, en voor zover nog niet omschreven hierboven)", + "en": "Extra describing info about the garden (if needed and not yet described above)" + }, + "freeform": { + "key": "description", + "type": "text" + } + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { + "render": "circle:white;./assets/themes/facadegardens/geveltuin.svg", + "mappings": [ + { + "if": { + "and": [ + "direct_sunlight=yes" + ] + }, + "then": "circle:white;./assets/themes/facadegardens/zon.svg" + }, + { + "if": { + "and": [ + "direct_sunlight=partial" + ] + }, + "then": "circle:white;./assets/themes/facadegardens/halfzon.svg" + }, + { + "if": { + "and": [ + "direct_sunlight=no" + ] + }, + "then": "circle:white;./assets/themes/facadegardens/schaduw.svg" + } + ] + }, + "width": { + "render": "8" + }, + "iconSize": { + "render": "50,50,center" + }, + "color": { + "render": "#00f" + }, + "presets": [ + { + "tags": [ + "leisure=garden", + "garden:type=facade_garden" + ], + "title": { + "nl": "geveltuintje", + "en": "facade garden" + }, + "description": { + "nl": "Voeg geveltuintje toe", + "en": "Add a facade garden" + } + } + ], + "wayHandling": 1 + } + ], + "roamingRenderings": [] +} diff --git a/assets/themes/facadegardens/gevelton.svg b/assets/themes/facadegardens/gevelton.svg new file mode 100644 index 0000000..9503e21 --- /dev/null +++ b/assets/themes/facadegardens/gevelton.svg @@ -0,0 +1,40 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + diff --git a/assets/themes/facadegardens/geveltuin.svg b/assets/themes/facadegardens/geveltuin.svg new file mode 100644 index 0000000..a3459e5 --- /dev/null +++ b/assets/themes/facadegardens/geveltuin.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/assets/themes/facadegardens/halfzon.svg b/assets/themes/facadegardens/halfzon.svg new file mode 100644 index 0000000..64509c2 --- /dev/null +++ b/assets/themes/facadegardens/halfzon.svg @@ -0,0 +1,32 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + + diff --git a/assets/themes/facadegardens/klimplant.svg b/assets/themes/facadegardens/klimplant.svg new file mode 100644 index 0000000..b2bd327 --- /dev/null +++ b/assets/themes/facadegardens/klimplant.svg @@ -0,0 +1,76 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + + + + + + diff --git a/assets/themes/facadegardens/schaduw.svg b/assets/themes/facadegardens/schaduw.svg new file mode 100644 index 0000000..ceeae1d --- /dev/null +++ b/assets/themes/facadegardens/schaduw.svg @@ -0,0 +1,29 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + diff --git a/assets/themes/facadegardens/struik.svg b/assets/themes/facadegardens/struik.svg new file mode 100644 index 0000000..a485bb2 --- /dev/null +++ b/assets/themes/facadegardens/struik.svg @@ -0,0 +1,42 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + diff --git a/assets/themes/facadegardens/zon.svg b/assets/themes/facadegardens/zon.svg new file mode 100644 index 0000000..0417594 --- /dev/null +++ b/assets/themes/facadegardens/zon.svg @@ -0,0 +1,40 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + + + + + From b35fbb460f619a6b3986237d57f40cba7a7179b2 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 26 Mar 2021 00:19:45 +0100 Subject: [PATCH 2/3] Version bump --- Models/Constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/Constants.ts b/Models/Constants.ts index 2c55c47..38a2bf1 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.6.0"; + public static vNumber = "0.6.2"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { From 504dc54ec75fd9fa3228b99de8d84986c4399ff8 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 26 Mar 2021 00:47:14 +0100 Subject: [PATCH 3/3] Fix facade gardens build --- .../themes/facadegardens/facadegardens.json | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json index 0e30b50..ff165df 100644 --- a/assets/themes/facadegardens/facadegardens.json +++ b/assets/themes/facadegardens/facadegardens.json @@ -2,18 +2,19 @@ "id": "facadegardens", "title": { "nl": "Straatgeveltuintjes", - "en": "Facade gardens" + "en": "Facade gardens" }, "shortDescription": { "nl": "Deze kaart toont geveltuintjes met foto's en bruikbare info over oriëntatie, zonlicht en planttypes.", - "en": "This map shows facade gardens with pictures and useful info about orientation, sunshine and plant types." + "en": "This map shows facade gardens with pictures and useful info about orientation, sunshine and plant types." }, "description": { "nl": "Ontharde voortuintjes, groene gevels en bomen ín de stad brengen naast rust ook een mooiere stad, een grotere biodiversiteit, een verkoelend effect en een betere luchtkwaliteit.
Klimaan VZW en 'Mechelen Klimaatneutraal' willen met het project Klim(t)aan je Gevel bestaande en nieuwe geveltuintjes in kaart brengen als voorbeeld voor mensen zelf een tuintje willen aanleggen of voor stadwandelaars die houden van de natuur.
Meer info over het project op klimaan.be.", - "en": "Facade gardens, green facades and trees in the city not only bring peace and quiet, but also a more beautiful city, greater biodiversity, a cooling effect and better air quality.
Klimaan VZW and Mechelen Klimaatneutraal want to map existing and new facade gardens as an example for people who want to build their own garden or for city walkers who love nature.
More info about the project at klimaan.be." + "en": "Facade gardens, green facades and trees in the city not only bring peace and quiet, but also a more beautiful city, greater biodiversity, a cooling effect and better air quality.
Klimaan VZW and Mechelen Klimaatneutraal want to map existing and new facade gardens as an example for people who want to build their own garden or for city walkers who love nature.
More info about the project at klimaan.be." }, "language": [ - "nl","en" + "nl", + "en" ], "maintainer": "joost schouppe; stla", "icon": "./assets/themes/facadegardens/geveltuin.svg", @@ -28,24 +29,26 @@ "id": "facadegardens", "name": { "nl": "Geveltuintjes", - "en": "Facade gardens" + "en": "Facade gardens" }, "minzoom": 12, - "overpassTags": { - "and": [ - "leisure=garden", - "garden:type=facade_garden" - ] + "source": { + "osmTags": { + "and": [ + "leisure=garden", + "garden:type=facade_garden" + ] + } }, "title": { "render": { "nl": "Geveltuintje", - "en": "Facade garden" + "en": "Facade garden" } }, "description": { "nl": "Geveltuintjes", - "en": "Facade gardens" + "en": "Facade gardens" }, "iconOverlays": [ { @@ -68,7 +71,7 @@ "then": "circle:white;./assets/themes/facadegardens/gevelton.svg", "badge": true }, - { + { "if": "plant~.*shrub.*", "then": "circle:white;./assets/themes/facadegardens/struik.svg", "badge": true @@ -77,7 +80,7 @@ "if": "plant~.*flower.*", "then": "circle:white;./assets/themes/facadegardens/bloei.svg", "badge": true - } + } ], "tagRenderings": [ "images", @@ -85,11 +88,11 @@ "render": { "nl": "Oriëntatie: {direction} (waarbij 0=N en 90=O)", "en": "Orientation: {direction} (where 0=N and 90=O)" - }, + }, "question": { "nl": "Hoe is de tuin georiënteerd?", "en": "What is the orientation of the garden?" - }, + }, "freeform": { "type": "direction", "key": "direction" @@ -133,13 +136,13 @@ ], "question": { "nl": "Ligt de tuin in zon/half schaduw of schaduw?", - "en": "Is the garden shaded or sunny?" + "en": "Is the garden shaded or sunny?" } }, { "question": { "nl": "Is er een regenton voorzien bij het tuintje?", - "en": "Is there a water barrel installed for the garden?" + "en": "Is there a water barrel installed for the garden?" }, "mappings": [ { @@ -150,7 +153,7 @@ }, "then": { "nl": "Er is een regenton", - "en": "There is a rain barrel" + "en": "There is a rain barrel" } }, { @@ -161,7 +164,7 @@ }, "then": { "nl": "Er is geen regenton", - "en": "There is no rain barrel" + "en": "There is no rain barrel" } } ] @@ -169,18 +172,18 @@ { "render": { "nl": "Aanlegdatum van de tuin: {start_date}", - "en": "Construction date of the garden: {start_date}" + "en": "Construction date of the garden: {start_date}" }, "question": { "nl": "Wanneer werd de tuin aangelegd? (vul gewoon een jaartal in)", - "en": "When was the garden constructed? (a year is sufficient)" + "en": "When was the garden constructed? (a year is sufficient)" }, "freeform": { "key": "start_date", "type": "text" } }, - { + { "mappings": [ { "if": { @@ -190,7 +193,7 @@ }, "then": { "nl": "Er staan eetbare planten", - "en": "There are edible plants" + "en": "There are edible plants" } }, { @@ -201,60 +204,60 @@ }, "then": { "nl": "Er staan geen eetbare planten", - "en": "There are no edible plants" + "en": "There are no edible plants" } } ], "question": { "nl": "Staan er eetbare planten?", - "en": "Are there any edible plants?" + "en": "Are there any edible plants?" } }, { "question": { "nl": "Wat voor planten staan hier?", - "en": "What kinds of plants grow here?" + "en": "What kinds of plants grow here?" }, "mappings": [ { "if": "plant=vine", "then": { "nl": "Er staat een klimplant", - "en": "There are vines" + "en": "There are vines" } }, { "if": "plant=flower", "then": { "nl": "Er staan bloeiende planten", - "en": "There are flowering plants" + "en": "There are flowering plants" } }, { "if": "plant=shrub", "then": { "nl": "Er staan struiken", - "en": "There are shrubs" + "en": "There are shrubs" } }, { "if": "plant=groundcover", "then": { "nl": "Er staan bodembedekkers", - "en": "There are groundcovering plants" + "en": "There are groundcovering plants" } } ], "multiAnswer": true }, - { + { "render": { "nl": "Meer details: {description}", - "en": "More details: {description}" + "en": "More details: {description}" }, "question": { "nl": "Aanvullende omschrijving van de tuin (indien nodig, en voor zover nog niet omschreven hierboven)", - "en": "Extra describing info about the garden (if needed and not yet described above)" + "en": "Extra describing info about the garden (if needed and not yet described above)" }, "freeform": { "key": "description", @@ -309,11 +312,11 @@ ], "title": { "nl": "geveltuintje", - "en": "facade garden" + "en": "facade garden" }, "description": { "nl": "Voeg geveltuintje toe", - "en": "Add a facade garden" + "en": "Add a facade garden" } } ],