From f319a0c289502b03ab0f17b373190ec5d74860c1 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Tue, 29 Nov 2022 20:45:57 +0100 Subject: [PATCH] Add filter, questions and rendering for organic --- assets/layers/filters/filters.json | 16 ++++ assets/layers/food/food.json | 72 +++++++++++++++- assets/layers/food/license_info.json | 10 +++ assets/layers/food/organic.svg | 20 +++++ assets/layers/shops/shops.json | 49 ++++++++++- assets/themes/fritures/Vegetarian-mark.svg | 6 -- assets/themes/fritures/license_info.json | 10 --- langs/layers/en.json | 49 +++++++++++ langs/layers/nl.json | 14 ++++ langs/themes/ca.json | 16 ---- langs/themes/de.json | 95 ---------------------- langs/themes/pa_PK.json | 7 -- 12 files changed, 228 insertions(+), 136 deletions(-) create mode 100644 assets/layers/food/organic.svg delete mode 100644 assets/themes/fritures/Vegetarian-mark.svg diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index a08182d02..97e293595 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -152,6 +152,22 @@ } } ] + }, + { + "id": "has_organic", + "options": [ + { + "osmTags": { + "or": [ + "organic=yes", + "organic=only" + ] + }, + "question": { + "en": "Has organic options" + } + } + ] } ] } \ No newline at end of file diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index c152e270c..3b3bbfd40 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -606,6 +606,33 @@ "condition": "cuisine!=friture", "id": "halal (no friture)" }, + { + "id": "organic (no friture)", + "question": { + "en": "Does this restaurant offer organic food?" + }, + "mappings": [ + { + "if": "organic=no", + "then": { + "en": "There are no organic options available" + } + }, + { + "if": "organic=yes", + "then": { + "en": "There is an organic menu" + } + }, + { + "if": "organic=only", + "then": { + "en": "Only organic options are available" + } + } + ], + "condition": "cuisine!=friture" + }, { "id": "friture-vegetarian", "question": { @@ -684,6 +711,37 @@ ], "condition": "cuisine=friture" }, + { + "id": "friture-organic", + "question": { + "en": "Does this fries shop offer organic snacks?", + "nl": "Heeft deze frituur biologische snacks?" + }, + "mappings": [ + { + "if": "organic=yes", + "then": { + "en": "Organic snacks are available", + "nl": "Er zijn biologische snacks aanwezig" + } + }, + { + "if": "organic=no", + "then": { + "en": "No organic snacks are available", + "nl": "Geen biologische snacks beschikbaar" + } + }, + { + "if": "organic=only", + "then": { + "en": "Only organic snacks are available", + "nl": "Enkel biologische snacks zijn beschikbaar" + } + } + ], + "condition": "cuisine=friture" + }, { "id": "friture-oil", "question": { @@ -836,6 +894,7 @@ } ] }, + "has_organic", "accepts_cash", "accepts_cards" ], @@ -913,7 +972,18 @@ ] }, "then": { - "render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg" + "render": "circle:white;./assets/layers/food/Vegetarian-mark.svg" + } + }, + { + "if": { + "or": [ + "organic=yes", + "organic=only" + ] + }, + "then": { + "render": "./assets/layers/food/organic.svg" } } ], diff --git a/assets/layers/food/license_info.json b/assets/layers/food/license_info.json index 28b271377..0cedfea1a 100644 --- a/assets/layers/food/license_info.json +++ b/assets/layers/food/license_info.json @@ -29,6 +29,16 @@ "https://www.flaticon.com/free-icon/french-fries_1144288" ] }, + { + "path": "organic.svg", + "license": "CC0", + "authors": [ + "European Commission" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Organic-Logo.svg" + ] + }, { "path": "restaurant.svg", "license": "CC0", diff --git a/assets/layers/food/organic.svg b/assets/layers/food/organic.svg new file mode 100644 index 000000000..f430f5d42 --- /dev/null +++ b/assets/layers/food/organic.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 5c603db45..553205d45 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -206,6 +206,43 @@ "internet", "internet-fee", "internet-ssid", + { + "id": "organic", + "question": { + "en": "Does this shop offer organic products?" + }, + "mappings": [ + { + "if": "organic=yes", + "then": { + "en": "This shop offers organic products" + } + }, + { + "if": "organic=only", + "then": { + "en": "This shop only offers organic products" + } + }, + { + "if": "organic=no", + "then": { + "en": "This shop does not offer organic products" + } + } + ], + "condition": { + "or": [ + "shop=supermarket", + "shop=convenience", + "shop=farm", + "shop=greengrocer", + "shop=health_food", + "shop=clothes", + "shop=shoes" + ] + } + }, "questions", "reviews" ], @@ -269,6 +306,15 @@ { "if": "opening_hours~*", "then": "isOpen" + }, + { + "if": { + "or": [ + "organic=yes", + "organic=only" + ] + }, + "then": "./assets/layers/food/organic.svg" } ], "label": { @@ -341,6 +387,7 @@ ] }, "accepts_cash", - "accepts_cards" + "accepts_cards", + "has_organic" ] } \ No newline at end of file diff --git a/assets/themes/fritures/Vegetarian-mark.svg b/assets/themes/fritures/Vegetarian-mark.svg deleted file mode 100644 index 9ec14b57a..000000000 --- a/assets/themes/fritures/Vegetarian-mark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/assets/themes/fritures/license_info.json b/assets/themes/fritures/license_info.json index 738550ba9..485698d14 100644 --- a/assets/themes/fritures/license_info.json +++ b/assets/themes/fritures/license_info.json @@ -1,14 +1,4 @@ [ - { - "path": "Vegetarian-mark.svg", - "license": "PD", - "authors": [ - "European Vegetarian Union" - ], - "sources": [ - "https://commons.wikimedia.org/wiki/File:Vegetarian-mark.svg" - ] - }, { "path": "fries.svg", "license": "CC-BY", diff --git a/langs/layers/en.json b/langs/layers/en.json index 24956f5d6..e440f47bd 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3723,6 +3723,13 @@ "question": "No information about tactile paving" } } + }, + "6": { + "options": { + "0": { + "question": "Has organic options" + } + } } } }, @@ -4116,6 +4123,20 @@ }, "question": "Does this fries shop use vegetable or animal oil for cooking?" }, + "friture-organic": { + "mappings": { + "0": { + "then": "Organic snacks are available" + }, + "1": { + "then": "No organic snacks are available" + }, + "2": { + "then": "Only organic snacks are available" + } + }, + "question": "Does this fries shop offer organic snacks?" + }, "friture-take-your-container": { "mappings": { "0": { @@ -4174,6 +4195,20 @@ } }, "question": "Does this restaurant offer a halal menu?" + }, + "organic (no friture)": { + "mappings": { + "0": { + "then": "There are no organic options available" + }, + "1": { + "then": "There is an organic menu" + }, + "2": { + "then": "Only organic options are available" + } + }, + "question": "Does this restaurant offer organic food?" } }, "title": { @@ -6450,6 +6485,20 @@ "render": "This is a {shop}" } }, + "organic": { + "mappings": { + "0": { + "then": "This shop offers organic products" + }, + "1": { + "then": "This shop only offers organic products" + }, + "2": { + "then": "This shop does not offer organic products" + } + }, + "question": "Does this shop offer organic products?" + }, "shops-name": { "question": "What is the name of this shop?", "render": "This shop is called {name}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 2f06bd76b..4dc0be931 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3910,6 +3910,20 @@ }, "question": "Bakt deze frituur met dierlijk vet of met plantaardige olie?" }, + "friture-organic": { + "mappings": { + "0": { + "then": "Er zijn biologische snacks aanwezig" + }, + "1": { + "then": "Geen biologische snacks beschikbaar" + }, + "2": { + "then": "Enkel biologische snacks zijn beschikbaar" + } + }, + "question": "Heeft deze frituur biologische snacks?" + }, "friture-take-your-container": { "mappings": { "0": { diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 45b37d16c..a0efc912d 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -423,22 +423,6 @@ "indoors": { "title": "Indoors" }, - "mapcomplete-changes": { - "layers": { - "0": { - "filter": { - "0": { - "options": { - "0": { - "question": "El nom de la petició conté {search}" - } - } - } - }, - "name": "Centres del conjunt de canvis" - } - } - }, "maproulette": { "title": "Tasques de MapRoulette" }, diff --git a/langs/themes/de.json b/langs/themes/de.json index 5d9170e0b..817dbae46 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -741,101 +741,6 @@ "description": "Eine Karte mit Bordsteinen und Überwegen.", "title": "Bordsteine und Überwege" }, - "mapcomplete-changes": { - "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "layers": { - "0": { - "description": "Zeigt alle MapComplete-Änderungen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themename enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Erstellt vom Mitwirkenden {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nicht von Mitwirkendem {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Erstellt vor {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Erstellt nach {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Benutzersprache (ISO-Code) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Erstellt mit host {search}" - } - } - } - }, - "name": "Zentrum der Änderungssätze", - "tagRenderings": { - "contributor": { - "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "render": "Änderung vorgenommen von {user}" - }, - "host": { - "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "render": "Geändert über {host}" - }, - "locale": { - "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?", - "render": "Benutzergebietsschema ist {locale}" - }, - "show_changeset_id": { - "render": "Änderungssatz {id}" - }, - "theme-id": { - "question": "Welches Thema wurde für diese Änderung verwendet?", - "render": "Geändert mit Thema {theme}" - } - }, - "title": { - "render": "Änderungssatz für {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Weitere Statistiken finden Sie unter hier" - } - } - } - } - }, - "shortDescription": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden", - "title": "Mit MapComplete vorgenommene Änderungen" - }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/pa_PK.json b/langs/themes/pa_PK.json index 7bc799a74..479f898cf 100644 --- a/langs/themes/pa_PK.json +++ b/langs/themes/pa_PK.json @@ -160,13 +160,6 @@ "indoors": { "title": "اندروں" }, - "mapcomplete-changes": { - "layers": { - "0": { - "name": "تبدیلیاں دے کیندر" - } - } - }, "maproulette": { "title": "میپ‌رولیٹ دے کم" },