Themes: add more questions about drinking water
This commit is contained in:
parent
d0ebd0e233
commit
9fabab3588
9 changed files with 224 additions and 20 deletions
18
assets/layers/drinking_water/bottle.svg
Normal file
18
assets/layers/drinking_water/bottle.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg fill="#000000" height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
viewBox="0 0 474 474" xml:space="preserve">
|
||||
<g>
|
||||
<path d="M318.002,137.333l-39.004-75.667C275.974,55.8,268.1,51,261.5,51h-49c-6.6,0-14.474,4.8-17.498,10.667l-39.004,75.667
|
||||
c-2.149,4.169-4.015,10.296-4.918,15.667h171.84C322.017,147.63,320.151,141.503,318.002,137.333z"/>
|
||||
<path d="M150.5,462c0,6.6,5.4,12,12,12h149c6.6,0,12-5.4,12-12V341.5h-173V462z"/>
|
||||
<path d="M209.5,42h55c6.6,0,12-5.4,12-12V12c0-6.6-5.4-12-12-12h-55c-6.6,0-12,5.4-12,12v18C197.5,36.6,202.9,42,209.5,42z"/>
|
||||
<path d="M327,216c1.925,0,3.5-5.4,3.5-12v-22c0-3.579-0.466-6.796-1.197-9H144.697c-0.731,2.204-1.197,5.421-1.197,9v22
|
||||
c0,6.6,1.575,12,3.5,12s3.5,1.913,3.5,4.25s-1.575,4.25-3.5,4.25s-3.5,5.4-3.5,12v22c0,6.6,1.575,12,3.5,12s3.5,1.913,3.5,4.25
|
||||
S148.925,279,147,279s-3.5,5.4-3.5,12v22c0,3.314,0.398,6.323,1.036,8.5h184.928c0.639-2.177,1.036-5.186,1.036-8.5v-22
|
||||
c0-6.6-1.575-12-3.5-12s-3.5-1.913-3.5-4.25s1.575-4.25,3.5-4.25s3.5-5.4,3.5-12v-22c0-6.6-1.575-12-3.5-12s-3.5-1.913-3.5-4.25
|
||||
S325.075,216,327,216z M234.125,294.973c-20.875,0-37.797-16.922-37.797-37.797S234.125,193,234.125,193
|
||||
s37.797,43.301,37.797,64.176S255,294.973,234.125,294.973z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
2
assets/layers/drinking_water/bottle.svg.license
Normal file
2
assets/layers/drinking_water/bottle.svg.license
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
SPDX-FileCopyrightText: Unkown
|
||||
SPDX-License-Identifier: CC0
|
||||
18
assets/layers/drinking_water/bubbler.svg
Normal file
18
assets/layers/drinking_water/bubbler.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"><svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 82.376 100" enable-background="new 0 0 82.376 100" xml:space="preserve"><path d="M52.074,20.308c5.59,0,10.131-4.541,10.155-10.152C62.205,4.563,57.664,0.021,52.074,0
|
||||
c-5.615,0.021-10.156,4.563-10.153,10.156C41.918,15.767,46.459,20.308,52.074,20.308L52.074,20.308z"></path><path d="M28.78,12.165c5.746-2.962,13.778,2.471,13.846,8.416v19.333l9.178,10.154c4.218,4.726-2.458,11.231-7.115,6.515
|
||||
l-10.37-11.458c-0.669-0.637-1.152-1.395-1.141-3.149v-9.233L15.04,42.517v49.145C15.045,102.762,0.011,102.76,0,91.769V33.503
|
||||
c0.011-3.246,1.297-6.405,4.506-8.253L28.78,12.165L28.78,12.165z"></path><path d="M66.41,62.012h15.966V32.96l-32.147-0.055c-4.107-0.001-5.652,4.657-3.094,7.605L66.41,62.012L66.41,62.012z"></path><path d="M57.178,31.604c0.675-0.007,1.23-0.563,1.249-1.249c-0.019-0.686-0.574-1.241-1.249-1.25
|
||||
c-0.694,0.01-1.249,0.564-1.249,1.25C55.929,31.041,56.483,31.597,57.178,31.604L57.178,31.604z"></path><path d="M57.178,30.355"></path><path d="M60.491,31.82c0.684-0.008,1.238-0.563,1.249-1.247c-0.011-0.685-0.565-1.241-1.249-1.25c-0.687,0.01-1.242,0.566-1.25,1.25
|
||||
C59.249,31.257,59.805,31.812,60.491,31.82L60.491,31.82z"></path><path d="M60.491,30.574"></path><path d="M60.708,28.13c0.68,0.016,1.234-0.54,1.249-1.197c-0.015-0.711-0.569-1.264-1.249-1.25c-0.689-0.015-1.244,0.539-1.249,1.25
|
||||
C59.464,27.59,60.019,28.146,60.708,28.13L60.708,28.13z"></path><path d="M60.708,26.934"></path><path d="M57.396,27.91c0.684,0.008,1.238-0.549,1.25-1.248c-0.012-0.67-0.566-1.225-1.25-1.25c-0.686,0.025-1.241,0.58-1.248,1.25
|
||||
C56.155,27.361,56.711,27.918,57.396,27.91L57.396,27.91z"></path><path d="M57.396,26.662"></path><path d="M58.482,24.545c0.705-0.026,1.289-0.609,1.304-1.304c-0.015-0.743-0.599-1.327-1.304-1.303
|
||||
c-0.732-0.024-1.314,0.56-1.305,1.303C57.168,23.936,57.75,24.519,58.482,24.545L58.482,24.545z"></path><path d="M58.482,23.241"></path><path d="M62.501,25.197c0.723-0.028,1.307-0.61,1.303-1.306c0.004-0.743-0.58-1.327-1.303-1.3c-0.715-0.026-1.298,0.557-1.303,1.3
|
||||
C61.203,24.587,61.786,25.169,62.501,25.197L62.501,25.197z"></path><path d="M62.501,23.892"></path><path d="M61.091,21.828c0.735-0.015,1.348-0.625,1.356-1.355c-0.009-0.781-0.621-1.394-1.356-1.414
|
||||
c-0.775,0.02-1.386,0.633-1.359,1.414C59.705,21.204,60.315,21.813,61.091,21.828L61.091,21.828z"></path><path d="M61.091,20.473"></path><path d="M65.757,24.001c0.744-0.015,1.354-0.628,1.358-1.358c-0.004-0.781-0.614-1.392-1.358-1.41
|
||||
c-0.767,0.019-1.38,0.629-1.356,1.41C64.377,23.373,64.99,23.987,65.757,24.001L65.757,24.001z"></path><path d="M65.757,22.644"></path><path d="M64.238,20.635c0.774-0.017,1.387-0.627,1.414-1.359c-0.027-0.778-0.64-1.392-1.414-1.41
|
||||
c-0.734,0.019-1.35,0.632-1.357,1.41C62.889,20.008,63.504,20.619,64.238,20.635L64.238,20.635z"></path><path d="M64.238,19.276"></path><path d="M67.931,20.635c0.846-0.01,1.521-0.687,1.521-1.521c0-0.828-0.675-1.504-1.521-1.521c-0.819,0.018-1.494,0.693-1.521,1.521
|
||||
C66.437,19.948,67.111,20.625,67.931,20.635L67.931,20.635z"></path><path d="M67.931,19.115"></path><path d="M69.125,25.306c0.819-0.012,1.494-0.688,1.519-1.52c-0.024-0.831-0.699-1.507-1.519-1.521
|
||||
c-0.846,0.015-1.519,0.69-1.519,1.521C67.606,24.618,68.279,25.293,69.125,25.306L69.125,25.306z"></path><path d="M69.125,23.786"></path><path d="M71.404,22.428c0.889-0.02,1.597-0.727,1.577-1.577c0.02-0.897-0.688-1.605-1.577-1.627
|
||||
c-0.859,0.022-1.568,0.73-1.572,1.627C69.836,21.701,70.545,22.408,71.404,22.428L71.404,22.428z"></path><path d="M71.404,20.851"></path><path d="M74.446,25.468c0.915,0.006,1.659-0.738,1.685-1.63c-0.025-0.943-0.77-1.685-1.685-1.681
|
||||
c-0.921-0.004-1.664,0.738-1.683,1.681C72.782,24.73,73.525,25.474,74.446,25.468L74.446,25.468z"></path><path d="M74.446,23.838"></path><path d="M71.568,28.399c0.925,0.006,1.666-0.736,1.686-1.628c-0.02-0.942-0.761-1.689-1.686-1.683
|
||||
c-0.912-0.006-1.656,0.741-1.626,1.683C69.912,27.663,70.656,28.405,71.568,28.399L71.568,28.399z"></path><path d="M71.568,26.771"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
2
assets/layers/drinking_water/bubbler.svg.license
Normal file
2
assets/layers/drinking_water/bubbler.svg.license
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
SPDX-FileCopyrightText: AIGA
|
||||
SPDX-License-Identifier: CC0-1.0
|
||||
|
|
@ -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. <div class='subtle'> Per exemple les aixetes d'aigua amb aigua de pluja per aprofitar i regar les plantes properes</div>",
|
||||
"cs": "Jedná se o vodovodní kohoutek nebo vodní čerpadlo s nepitnou vodou.<div class='subtle'>Příkladem jsou vodovodní kohoutky s dešťovou vodou pro zalévání rostlin v okolí</div>"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
]
|
||||
}
|
||||
]
|
||||
73
assets/layers/drinking_water/tap.svg
Normal file
73
assets/layers/drinking_water/tap.svg
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
version="1.1"
|
||||
width="255.66626"
|
||||
height="237.48238"
|
||||
id="svg2"
|
||||
inkscape:version="1.3.1 (1:1.3.1+202311172155+91b66b0783)"
|
||||
sodipodi:docname="tap.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<metadata
|
||||
id="metadata22">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs20">
|
||||
<inkscape:perspective
|
||||
sodipodi:type="inkscape:persp3d"
|
||||
inkscape:vp_x="0 : -25.017624 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_z="600 : -25.017624 : 1"
|
||||
inkscape:persp3d-origin="300 : -112.51762 : 1"
|
||||
id="perspective24" />
|
||||
<inkscape:perspective
|
||||
id="perspective4417"
|
||||
inkscape:persp3d-origin="0.5 : -287.18429 : 1"
|
||||
inkscape:vp_z="1 : -287.01762 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_x="0 : -287.01762 : 1"
|
||||
sodipodi:type="inkscape:persp3d" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="995"
|
||||
id="namedview18"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.3757615"
|
||||
inkscape:cx="118.48832"
|
||||
inkscape:cy="112.17456"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg2"
|
||||
inkscape:showpageshadow="0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1" />
|
||||
<path
|
||||
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate"
|
||||
d="m 130.85922,0.00198911 c -7.5726,-0.12704 -13.62649,5.86286999 -16.19543,8.89080999 l -47.50163,-1.41908 -0.45904,23.8757499 48.92071,-1.92008 c 0.87811,1.09025 2.18743,2.36572 3.96541,3.50637 l 0.74163,39.73956 H 93.7514 c 0.16847,-0.33722 -1.69824,9.11586 -3.04733,11.64596 -1.34909,2.52988 -1.368597,16.006961 -28.691187,20.054861 -27.32322,4.04785 -34.366163,5.90643 -48.196573,18.55589 -13.82978,12.64952 -13.6491,36.27328 -13.6491,36.27328 L 0,188.21563 41.32432,187.88171 c 0,0 -1.21054,-4.87794 -1.21054,-9.60054 0,-4.72247 -1.386495,-16.34901 3.167475,-25.62534 4.55398,-9.27634 10.882401,-6.14303 18.978211,-7.82964 l 175.514274,-3.39564 c 0,0 2.94683,0.32094 3.93643,1.28285 0.92877,0.90277 1.30836,3.65878 1.30836,3.65878 v 30.69852 h 12.64773 l -0.16721,-124.973861 -11.97952,0.16699 0.48595,36.10628 c -1.01213,2.36131 -3.71491,2.37924 -3.71491,2.37924 l -63.39018,0.16704 c 0,0 -6.55829,0.66502 -10.26861,-3.21417 -3.71032,-3.87919 -3.04733,-15.02695 -3.04733,-15.02695 h -22.14849 l 1.56994,-40.94625 c 1.00229,-0.79886 1.84131,-1.6162 2.505,-2.37936 l 49.004,1.04365 -0.45904,-23.8344099 -47.62688,2.12886 c -2.72771,-3.16073 -8.39659,-8.56263999 -15.56981,-8.68226999 z M 18.19948,194.30829 c -5.93312,17.25329 -15.89776,20.57384 -13.14873,31.682 1.43868,5.81337 6.39567,11.81612 13.81631,11.47847 7.42128,-0.33692 15.19407,-3.04332 15.19407,-15.86164 0,-12.81822 -15.86165,-27.29883 -15.86165,-27.29883 z"
|
||||
id="path4390"
|
||||
sodipodi:nodetypes="ccccccccccccccssccaccccccccsccccccccccscsc" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.7 KiB |
2
assets/layers/drinking_water/tap.svg.license
Normal file
2
assets/layers/drinking_water/tap.svg.license
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
SPDX-FileCopyrightText: Krzysztof Franek
|
||||
SPDX-License-Identifier: CC0-1.0
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
Loading…
Reference in a new issue