From ebf0427b1f8c5b4a9172085812dfd5f0079aff6b Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 7 Sep 2021 01:48:42 +0200 Subject: [PATCH] Create toerisme vlaanderen theme --- assets/layers/bench/bench.json | 2 +- assets/layers/food/food.json | 111 ++++++++++-------- assets/layers/waste_basket/waste_basket.json | 62 ++++++++++ assets/svg/barrier.svg | 10 -- assets/svg/filter.svg | 57 ++++++++- .../toerisme_vlaanderen.json | 38 ++++++ assets/themes/waste_basket/waste_basket.json | 64 +--------- 7 files changed, 221 insertions(+), 123 deletions(-) create mode 100644 assets/layers/waste_basket/waste_basket.json delete mode 100644 assets/svg/barrier.svg create mode 100644 assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index dc8fdb9d69..e984dddaa8 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -17,7 +17,7 @@ "pl": "Ławki", "pt_BR": "Bancos" }, - "minzoom": 14, + "minzoom": 17, "source": { "osmTags": "amenity=bench" }, diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index c762d8f825..4fa94f5d10 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -391,25 +391,29 @@ { "#": "halal (no friture)", "question": { - "nl": "Heeft deze eetgelegenheid een halal optie?" + "nl": "Heeft deze frituur vegetarische snacks?", + "fr": "Cette friterie est-elle équipée de snacks végétariens ?" }, "mappings": [ { "if": "diet:halal=no", "then": { - "nl": "Geen halal opties beschikbaar" + "nl": "Er zijn vegetarische snacks aanwezig", + "fr": "Des collations végétariennes sont disponibles" } }, { "if": "diet:halal=limited", "then": { - "nl": "Beperkte halal opties zijn beschikbaar" + "nl": "Slechts enkele vegetarische snacks", + "fr": "Quelques snacks végétariens seulement" } }, { "if": "diet:halal=yes", "then": { - "nl": "halal opties zijn beschikbaar" + "nl": "Geen vegetarische snacks beschikbaar", + "fr": "Pas d'en-cas végétariens disponibles" } }, { @@ -421,48 +425,6 @@ ], "condition": "cuisine!=friture" }, - { - "question": { - "nl": "Heeft deze frituur vegetarische snacks?", - "fr": "Cette friterie est-elle équipée de snacks végétariens ?" - }, - "mappings": [ - { - "if": { - "and": [ - "diet:vegetarian=yes" - ] - }, - "then": { - "nl": "Er zijn vegetarische snacks aanwezig", - "fr": "Des collations végétariennes sont disponibles" - } - }, - { - "if": { - "and": [ - "diet:vegetarian=limited" - ] - }, - "then": { - "nl": "Slechts enkele vegetarische snacks", - "fr": "Quelques snacks végétariens seulement" - } - }, - { - "if": { - "and": [ - "diet:vegetarian=no" - ] - }, - "then": { - "nl": "Geen vegetarische snacks beschikbaar", - "fr": "Pas d'en-cas végétariens disponibles" - } - } - ], - "condition": "cuisine=friture" - }, { "question": { "nl": "Heeft deze frituur veganistische snacks?", @@ -472,7 +434,7 @@ { "if": { "and": [ - "diet:vegan=yes" + "diet:vegetarian=yes" ] }, "then": { @@ -483,7 +445,7 @@ { "if": { "and": [ - "diet:vegan=limited" + "diet:vegetarian=limited" ] }, "then": { @@ -514,7 +476,7 @@ { "if": { "and": [ - "friture:oil=vegetable" + "diet:vegan=yes" ] }, "then": { @@ -525,13 +487,62 @@ { "if": { "and": [ - "friture:oil=animal" + "diet:vegan=limited" ] }, "then": { "nl": "Dierlijk vet", "fr": "Graisse animale" } + }, + { + "if": { + "and": [ + "diet:vegetarian=no" + ] + }, + "then": { + "nl": "Geen veganistische snacks beschikbaar", + "fr": "Pas d'en-cas végétaliens disponibles" + } + } + ], + "condition": "cuisine=friture" + }, + { + "question": { + "nl": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?", + "fr": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?
", + "en": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?
", + "ja": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
" + }, + "mappings": [ + { + "if": { + "and": [ + "friture:oil=vegetable" + ] + }, + "then": { + "nl": "Je mag je eigen containers meenemen om je bestelling in mee te nemen en zo minder afval te maken", + "fr": "Vous pouvez apporter vos contenants pour votre commande, limitant l’usage de matériaux à usage unique et les déchets", + "en": "You can bring your own containers to get your order, saving on single-use packaging material and thus waste", + "ja": "自分の容器を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます" + } + }, + { + "if": { + "and": [ + "friture:oil=animal" + ] + }, + "then": { + "nl": "Je mag geen eigen containers meenemen om je bestelling in mee te nemen", + "fr": "Apporter ses propres contenants n’est pas permis", + "en": "Bringing your own container is not allowed", + "ja": "独自の容器を持参することはできません", + "ru": "Приносить свою тару не разрешено" + } } ], "condition": "cuisine=friture" diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json new file mode 100644 index 0000000000..bab604f461 --- /dev/null +++ b/assets/layers/waste_basket/waste_basket.json @@ -0,0 +1,62 @@ +{ + "id": "waste_basket", + "name": { + "en": "Waste Basket", + "nl": "Vuilnisbak" + }, + "minzoom": 17, + "source": { + "osmTags": { + "and": [ + "amenity=waste_basket" + ] + } + }, + "title": { + "render": { + "en": "Waste Basket", + "nl": "Vuilnisbak" + } + }, + "description": { + "en": "This is a public waste basket, thrash can, where you can throw away your thrash.", + "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien." + }, + "tagRenderings": [], + "icon": { + "render": "./assets/themes/waste_basket/waste_basket.svg" + }, + "width": { + "render": "8" + }, + "iconSize": { + "render": "40,40,center", + "mappings": [ + { + "if": { + "and": [ + "amenity=waste_basket" + ] + }, + "then": { + "en": "Waste Basket", + "nl": "Vuilnisbak" + } + } + ] + }, + "color": { + "render": "#00f" + }, + "presets": [ + { + "tags": [ + "amenity=waste_basket" + ], + "title": { + "en": "Waste Basket", + "nl": "Vuilnisbak" + } + } + ] +} \ No newline at end of file diff --git a/assets/svg/barrier.svg b/assets/svg/barrier.svg deleted file mode 100644 index 08bb800f50..0000000000 --- a/assets/svg/barrier.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/svg/filter.svg b/assets/svg/filter.svg index a6783b2484..35dc883566 100644 --- a/assets/svg/filter.svg +++ b/assets/svg/filter.svg @@ -1,3 +1,56 @@ - - + + + + + + image/svg+xml + + + + + + + diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json new file mode 100644 index 0000000000..e9a4378739 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -0,0 +1,38 @@ +{ + "id": "toerisme_vlaanderen", + "credits": "Commissioned theme for Toerisme Vlaandere", + "maintainer": "MapComplete", + "version": "0.0.1", + "language": [ + "en", + "nl" + ], + "title": { + "nl": "Toeristisch relevante info" + }, + "shortDescription": { + "nl": "Een kaart om toeristisch relevante info op aan te duiden" + }, + "description": { + "nl": "Op deze kaart kan je info zien voor toeristen en zelf aanpasingen maken, zichtbaar voor iedereen" + }, + "icon": "./assets/svg/star.svg", + "startZoom": 8, + "startLat": 50.8536, + "startLon": 4.4330, + "widenFactor": 0.2, + "layers": [ + { + "builtin": "food", + "override": { + "minzoom": 16 + } + }, + "charging_station", + "toilet", + "bench", + "waste_basket", + "bike_repair_station" + ], + "hideFromOverview": true +} \ No newline at end of file diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json index ca235bcc50..b213d1fe8b 100644 --- a/assets/themes/waste_basket/waste_basket.json +++ b/assets/themes/waste_basket/waste_basket.json @@ -26,66 +26,10 @@ "socialImage": "", "layers": [ { - "id": "waste_basket", - "name": { - "en": "Waste Basket", - "nl": "Vuilnisbak" - }, - "minzoom": 12, - "source": { - "osmTags": { - "and": [ - "amenity=waste_basket" - ] - } - }, - "title": { - "render": { - "en": "Waste Basket", - "nl": "Vuilnisbak" - } - }, - "description": { - "en": "This is a public waste basket, thrash can, where you can throw away your thrash.", - "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien." - }, - "tagRenderings": [], - "icon": { - "render": "./assets/themes/waste_basket/waste_basket.svg" - }, - "width": { - "render": "8" - }, - "iconSize": { - "render": "40,40,center", - "mappings": [ - { - "if": { - "and": [ - "amenity=waste_basket" - ] - }, - "then": { - "en": "Waste Basket", - "nl": "Vuilnisbak" - } - } - ] - }, - "color": { - "render": "#00f" - }, - "presets": [ - { - "tags": [ - "amenity=waste_basket" - ], - "title": { - "en": "Waste Basket", - "nl": "Vuilnisbak" - } - } - ] + "builtin": "waste_basket", + "override": { + "minzoom": 12 + } } ], "roamingRenderings": []