From 9fabab3588a7cdc3d04bcbae19b6868694bbc95f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 29 Nov 2023 02:17:14 +0100 Subject: [PATCH] Themes: add more questions about drinking water --- assets/layers/drinking_water/bottle.svg | 18 +++++ .../layers/drinking_water/bottle.svg.license | 2 + assets/layers/drinking_water/bubbler.svg | 18 +++++ .../layers/drinking_water/bubbler.svg.license | 2 + .../layers/drinking_water/drinking_water.json | 81 ++++++++++++++++++- .../layers/drinking_water/license_info.json | 30 +++++++ assets/layers/drinking_water/tap.svg | 73 +++++++++++++++++ assets/layers/drinking_water/tap.svg.license | 2 + assets/svg/license_info.json | 18 ----- 9 files changed, 224 insertions(+), 20 deletions(-) create mode 100644 assets/layers/drinking_water/bottle.svg create mode 100644 assets/layers/drinking_water/bottle.svg.license create mode 100644 assets/layers/drinking_water/bubbler.svg create mode 100644 assets/layers/drinking_water/bubbler.svg.license create mode 100644 assets/layers/drinking_water/tap.svg create mode 100644 assets/layers/drinking_water/tap.svg.license diff --git a/assets/layers/drinking_water/bottle.svg b/assets/layers/drinking_water/bottle.svg new file mode 100644 index 000000000..2f8217692 --- /dev/null +++ b/assets/layers/drinking_water/bottle.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/assets/layers/drinking_water/bottle.svg.license b/assets/layers/drinking_water/bottle.svg.license new file mode 100644 index 000000000..8e8b5805d --- /dev/null +++ b/assets/layers/drinking_water/bottle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Unkown +SPDX-License-Identifier: CC0 \ No newline at end of file diff --git a/assets/layers/drinking_water/bubbler.svg b/assets/layers/drinking_water/bubbler.svg new file mode 100644 index 000000000..e0d30f29f --- /dev/null +++ b/assets/layers/drinking_water/bubbler.svg @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/assets/layers/drinking_water/bubbler.svg.license b/assets/layers/drinking_water/bubbler.svg.license new file mode 100644 index 000000000..c44973d7b --- /dev/null +++ b/assets/layers/drinking_water/bubbler.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: AIGA +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json index 23dd623aa..796c8628d 100644 --- a/assets/layers/drinking_water/drinking_water.json +++ b/assets/layers/drinking_water/drinking_water.json @@ -30,7 +30,8 @@ { "or": [ "amenity=drinking_water", - "drinking_water=yes" + "drinking_water=yes", + "disused:amenity=drinking_water" ] }, "man_made!=reservoir_covered", @@ -68,7 +69,8 @@ "if": { "or": [ "operational_status=broken", - "operational_status=closed" + "operational_status=closed", + "disused:amenity=drinking_water" ] }, "then": "close:#c33" @@ -147,6 +149,7 @@ "mappings": [ { "if": "operational_status=", + "addExtraTags": ["disused:amenity=","amenity=drinking_water"], "then": { "en": "This drinking water works", "nl": "Deze drinkwaterfontein werkt", @@ -190,6 +193,46 @@ ], "id": "Still in use?" }, + { + "id": "type", + "question": { + "en": "What type of drinking water point is this?", + "nl": "Wat voor soort drinkwaterpunt is dit?" + }, + "mappings": [ + { + "if": "fountain=bubbler", + "icon": "./assets/layers/drinking_water/bubbler.svg", + "then": { + "en": "This is a bubbler fountain. A water jet to drink from is sent upwards, typically controlled by a push button." + }, + "addExtraTags": [ + "man_made=" + ] + }, + { + "if": "fountain=bottle_refill", + "icon": "./assets/layers/drinking_water/bottle.svg", + "then": { + "en": "This is a bottle refill point where the water is sent downwards, typically controlled by a push button or a motion sensor. Drinking directly from the stream might be very hard or impossible." + }, + "addExtraTags": [ + "man_made=", + "bottle=yes" + ] + }, + { + "if": "man_made=water_tap", + "icon": "./assets/layers/drinking_water/tap.svg", + "then": { + "en": "This is a water tap. The water flows downward and the stream is controlled by a valve or push-button." + }, + "addExtraTags": [ + "fountain=" + ] + } + ] + }, { "question": { "en": "How easy is it to fill water bottles?", @@ -235,8 +278,29 @@ } } ], + "condition": "fountain!=bottle_refill", "id": "Bottle refill" }, + { + "id": "fee", + "question": { + "en": "Is this drinking water point free to use?" + }, + "mappings": [ + { + "if": "fee=no", + "then": { + "en": "Free to use" + } + }, + { + "if": "fee=yes", + "then": { + "en":"One needs to pay to use this drinking water point" + } + } + ] + }, { "id": "render-closest-drinking-water", "render": { @@ -293,6 +357,19 @@ "ca": "Es tracta d'una aixeta d'aigua o bomba d'aigua amb aigua no potable.
Per exemple les aixetes d'aigua amb aigua de pluja per aprofitar i regar les plantes properes
", "cs": "Jedná se o vodovodní kohoutek nebo vodní čerpadlo s nepitnou vodou.
Příkladem jsou vodovodní kohoutky s dešťovou vodou pro zalévání rostlin v okolí
" } + }, + { + "if": { + "and": [ + "amenity=", + "man_made=pump", + "historic=yes", + "drinking_water=no" + ] + }, + "then": { + "en":"This is a historic, manual water pump where no drinking water can be found" + } } ] }, diff --git a/assets/layers/drinking_water/license_info.json b/assets/layers/drinking_water/license_info.json index 343f5d945..ce8217e97 100644 --- a/assets/layers/drinking_water/license_info.json +++ b/assets/layers/drinking_water/license_info.json @@ -1,4 +1,24 @@ [ + { + "path": "bottle.svg", + "license": "CC0-1.0", + "authors": [ + "Unkown" + ], + "sources": [ + "https://www.svgrepo.com/svg/83123/water-bottle" + ] + }, + { + "path": "bubbler.svg", + "license": "CC0-1.0", + "authors": [ + "AIGA" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Drinking_Fountain_-_The_Noun_Project.svg" + ] + }, { "path": "drips.svg", "license": "CC-BY-SA-4.0", @@ -12,5 +32,15 @@ "sources": [ "https://osoc.be/editions/2020/cyclofix" ] + }, + { + "path": "tap.svg", + "license": "CC0-1.0", + "authors": [ + "Krzysztof Franek" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Water_DIN-style.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/drinking_water/tap.svg b/assets/layers/drinking_water/tap.svg new file mode 100644 index 000000000..b2459bfb9 --- /dev/null +++ b/assets/layers/drinking_water/tap.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/assets/layers/drinking_water/tap.svg.license b/assets/layers/drinking_water/tap.svg.license new file mode 100644 index 000000000..c27ed8630 --- /dev/null +++ b/assets/layers/drinking_water/tap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Krzysztof Franek +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 8a9e84cc7..d6ea4605a 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -859,24 +859,6 @@ ], "sources": [] }, - { - "path": "no_checkmark.svg", - "license": "TRIVIAL", - "authors": [], - "sources": [] - }, - { - "path": "no_checkmark.svg", - "license": "TRIVIAL", - "authors": [], - "sources": [] - }, - { - "path": "none.svg", - "license": "TRIVIAL", - "authors": [], - "sources": [] - }, { "path": "not_found.svg", "license": "CC-BY-4.0",