contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-12-03 04:44:59 +01:00
commit d959b6b40b
290 changed files with 37178 additions and 2200 deletions
Download patch file Download diff file Expand all files Collapse all files

6
assets/layers/bike_parking/bike_parking.json
View file

@ -88,7 +88,7 @@
"title": {
"en": "a bike parking",
"nl": "een fietsparking",
"fr": "une parking à vélo",
"fr": "un parking à vélo",
"gl": "Aparcadoiro de bicicletas",
"de": "einen Fahrrad-Parkplatz",
"hu": "Kerékpártároló",
@ -157,7 +157,7 @@
{
"if": "bicycle_parking=stands",
"then": {
"en": "Staple racks",
"en": "Stands",
"nl": "Nietjes",
"fr": "Arceaux",
"gl": "De roda (Stands)",
@ -178,7 +178,7 @@
{
"if": "bicycle_parking=wall_loops",
"then": {
"en": "Wheel rack/loops",
"en": "Wheelbenders / rack",
"nl": "Wielrek/lussen",
"fr": "Pinces-roues",
"gl": "Aros",

136
assets/layers/charging_station/charging_station.json
View file

@ -329,15 +329,80 @@
"class": "medium"
},
"hideInAnswer": {
"or": [
"_country!=be",
"and": [
"_country!=af",
"_country!=al",
"_country!=dz",
"_country!=as",
"_country!=ad",
"_country!=ao",
"_country!=am",
"_country!=aw",
"_country!=az",
"_country!=by",
"_country!=bt",
"_country!=ba",
"_country!=bg",
"_country!=cv",
"_country!=td",
"_country!=cl",
"_country!=hr",
"_country!=dk",
"_country!=eg",
"_country!=ee",
"_country!=et",
"_country!=fo",
"_country!=fr",
"_country!=ma",
"_country!=tn",
"_country!=pl",
"_country!=cs",
"_country!=pf",
"_country!=ge",
"_country!=gr",
"_country!=gl",
"_country!=gn",
"_country!=gw",
"_country!=is",
"_country!=id",
"_country!=ir",
"_country!=jo",
"_country!=kz",
"_country!=kg",
"_country!=la",
"_country!=lv",
"_country!=lr",
"_country!=ly",
"_country!=lt",
"_country!=lu",
"_country!=mo",
"_country!=mr",
"_country!=md",
"_country!=mc",
"_country!=mn",
"_country!=me",
"_country!=mz",
"_country!=nl",
"_country!=nc",
"_country!=ne",
"_country!=kp",
"_country!=mk",
"_country!=pt",
"_country!=qa",
"_country!=ro",
"_country!=ru",
"_country!=rw",
"_country!=sm",
"_country!=sk",
"_country!=mo"
"_country!=si",
"_country!=kr",
"_country!=es",
"_country!=sr",
"_country!=tj",
"_country!=th",
"_country!=tl",
"_country!=tr",
"_country!=tm",
"_country!=ua",
"_country!=uy",
"_country!=uz",
"_country!=vn"
]
}
},
@ -378,6 +443,52 @@
"icon": {
"path": "./assets/layers/charging_station/TypeE.svg",
"class": "medium"
},
"hideInAnswer": {
"and": [
"_country!=be",
"_country!=bj",
"_country!=bf",
"_country!=bi",
"_country!=cm",
"_country!=cf",
"_country!=td",
"_country!=km",
"_country!=cz",
"_country!=dk",
"_country!=dj",
"_country!=gq",
"_country!=et",
"_country!=fo",
"_country!=fr",
"_country!=gf",
"_country!=pf",
"_country!=gl",
"_country!=gp",
"_country!=gw",
"_country!=la",
"_country!=lr",
"_country!=mg",
"_country!=ml",
"_country!=mq",
"_country!=mr",
"_country!=mu",
"_country!=mc",
"_country!=mn",
"_country!=ma",
"_country!=ne",
"_country!=pl",
"_country!=pt",
"_country!=rw",
"_country!=mf",
"_country!=pm",
"_country!=sn",
"_country!=sk",
"_country!=sy",
"_country!=tl",
"_country!=tn",
"_country!=uz"
]
}
},
{
@ -1031,7 +1142,7 @@
]
},
{
"or": [
"and": [
"_country!=us"
]
}
@ -5102,16 +5213,15 @@
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes",
"socket:typee=1"
"bicycle=yes"
],
"title": {
"en": "a charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)",
"nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (speciaal bedoeld voor fietsen)",
"en": "a charging station for electrical bikes",
"nl": "een oplaadpunt voor elektrische fietsen",
"ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal<img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (destinat a carregar bicicletes elèctriques)",
"cs": "nabíjecí stanice pro elektrokola s běžnou evropskou zástrčkou <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (určeno k nabíjení elektrických kol)",
"da": "en ladestation til elektriske cykler med et normalt europæisk vægstik <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (beregnet til opladning af elektriske cykler)",
"de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (zum Laden von Elektrofahrrädern)",
"de": "eine Ladestation für Elektrofahrräder",
"es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (pensado para cargar bicicletas eléctricas)"
}
},

55
assets/layers/charging_station/charging_station.protojson
View file

@ -735,30 +735,32 @@
"point",
"centroid"
],
"marker": [{
"icon": "pin",
"color": "#fff"
},{
"icon": {
"render":"./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
"marker": [
{
"icon": "pin",
"color": "#fff"
},
{
"icon": {
"render": "./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "./assets/themes/charging_stations/bicycle.svg"
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
}
}
}],
],
"iconBadges": [
{
"if": {
@ -802,12 +804,11 @@
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes",
"socket:typee=1"
"bicycle=yes"
],
"title": {
"en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>",
"nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>"
"en": "charging station for electrical bikes",
"nl": "oplaadpunt voor elektrische fietsen"
}
},
{
@ -949,4 +950,4 @@
},
"neededChangesets": 10
}
}
}

2
assets/layers/charging_station/csvToJson.ts
View file

@ -91,7 +91,7 @@ function run(file, protojson) {
if (e.countryWhiteList.length > 0) {
// This is a 'hideInAnswer', thus _reverse_ logic!
const countries = e.countryWhiteList.map(country => "_country!=" + country) //HideInAnswer if it is in the wrong country
json["hideInAnswer"] = {or: countries}
json["hideInAnswer"] = {and: countries} // Should be and, as we want to hide if it does not match any of the countries
} else if (e.countryBlackList.length > 0) {
const countries = e.countryBlackList.map(country => "_country=" + country) //HideInAnswer if it is in the wrong country
json["hideInAnswer"] = {or: countries}

4
assets/layers/charging_station/types.csv
View file

@ -1,6 +1,6 @@
key,image,description:en,countryWhiteList,countryBlackList,commonVoltages,commonCurrents,commonOutputs,description:nl,associatedVehicleTypes,neverAssociatedWith,extraVisualisationCondition
socket:schuko,CEE7_4F.svg,<b>Schuko wall plug</b> without ground pin (CEE7/4 type F),be;fr;ma;tn;pl;cs;sk;mo,,230,16,3.6 kW,<b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F),*,,
socket:typee,TypeE.svg,<b>European wall plug</b> with ground pin (CEE7/4 type E),,,230,16,3 kW;22 kW;,<b>Europese stekker</b> met aardingspin (CEE7/4 type E),*,,
socket:schuko,CEE7_4F.svg,<b>Schuko wall plug</b> without ground pin (CEE7/4 type F),af;al;dz;as;ad;ao;am;aw;az;by;bt;ba;bg;cv;td;cl;hr;dk;eg;ee;et;fo;fr;pf;ge;gr;gl;gn;gw;is;id;ir;jo;kz;kg;la;lv;lr;ly;lt;lu;mo;mr;md;mc;mn;me;mz;nl;nc;ne;kp;mk;pt;qa;ro;ru;rw;sm;sk;si;kr;es;sr;tj;th;tl;tr;tm;ua;uy;uz;vn,,230,16,3.6 kW,<b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F),*,,
socket:typee,TypeE.svg,<b>European wall plug</b> with ground pin (CEE7/4 type E),be;bj;bf;bi;cm;cf;td;km;cz;dk;dj;gq;et;fo;fr;gf;pf;gl;gp;gw;la;lr;mg;ml;mq;mr;mu;mc;mn;ma;ne;pl;pt;rw;mf;pm;sn;sk;sy;tl;tn;uz,,230,16,3 kW;22 kW;,<b>Europese stekker</b> met aardingspin (CEE7/4 type E),*,,
socket:chademo,Chademo_type4.svg,<b>Chademo</b>,,,500,120,50 kW,<b>Chademo</b>,car;motorcar;hgv;bus,bicycle;scooter,
socket:type1_cable,Type1_J1772.svg,<b>Type 1 with cable</b> (J1772),,,200;240,32,3.7 kW;7 kW,<b>Type 1 met kabel</b> (J1772),car;motorcar;hgv;bus,bicycle;scooter,
socket:type1,Type1_J1772.svg,<b>Type 1 <i>without</i> cable</b> (J1772),,,200;240,32,3.7 kW;6.6 kW;7 kW;7.2 kW,<b>Type 1 <i>zonder</i> kabel</b> (J1772),car;motorcar;hgv;bus,bicycle;scooter,

1 key image description:en countryWhiteList countryBlackList commonVoltages commonCurrents commonOutputs description:nl associatedVehicleTypes neverAssociatedWith extraVisualisationCondition
2 socket:schuko CEE7_4F.svg <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) be;fr;ma;tn;pl;cs;sk;mo af;al;dz;as;ad;ao;am;aw;az;by;bt;ba;bg;cv;td;cl;hr;dk;eg;ee;et;fo;fr;pf;ge;gr;gl;gn;gw;is;id;ir;jo;kz;kg;la;lv;lr;ly;lt;lu;mo;mr;md;mc;mn;me;mz;nl;nc;ne;kp;mk;pt;qa;ro;ru;rw;sm;sk;si;kr;es;sr;tj;th;tl;tr;tm;ua;uy;uz;vn 230 16 3.6 kW <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F) *
3 socket:typee TypeE.svg <b>European wall plug</b> with ground pin (CEE7/4 type E) be;bj;bf;bi;cm;cf;td;km;cz;dk;dj;gq;et;fo;fr;gf;pf;gl;gp;gw;la;lr;mg;ml;mq;mr;mu;mc;mn;ma;ne;pl;pt;rw;mf;pm;sn;sk;sy;tl;tn;uz 230 16 3 kW;22 kW; <b>Europese stekker</b> met aardingspin (CEE7/4 type E) *
4 socket:chademo Chademo_type4.svg <b>Chademo</b> 500 120 50 kW <b>Chademo</b> car;motorcar;hgv;bus bicycle;scooter
5 socket:type1_cable Type1_J1772.svg <b>Type 1 with cable</b> (J1772) 200;240 32 3.7 kW;7 kW <b>Type 1 met kabel</b> (J1772) car;motorcar;hgv;bus bicycle;scooter
6 socket:type1 Type1_J1772.svg <b>Type 1 <i>without</i> cable</b> (J1772) 200;240 32 3.7 kW;6.6 kW;7 kW;7.2 kW <b>Type 1 <i>zonder</i> kabel</b> (J1772) car;motorcar;hgv;bus bicycle;scooter

1
assets/layers/climbing_area/climbing_area.json
View file

@ -343,6 +343,7 @@
},
"id": "Rock type (crag/rock/cliff only)"
},
"reviews",
{
"id": "default_climbing_questions",
"builtin": [

1
assets/layers/climbing_gym/climbing_gym.json
View file

@ -129,6 +129,7 @@
},
"payment-options",
"opening_hours",
"reviews",
{
"id": "shoe_rental",
"question": {

18
assets/layers/drinking_water/bottle.svg Normal file
View 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>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
assets/layers/drinking_water/bottle.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Unkown
SPDX-License-Identifier: CC0-1.0

18
assets/layers/drinking_water/bubbler.svg Normal file
View 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>
Side by side

After

Width:  |  Height:  |  Size: 4.1 KiB

2
assets/layers/drinking_water/bubbler.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: AIGA
SPDX-License-Identifier: CC0-1.0

216
assets/layers/drinking_water/drinking_water.json
View file

@ -30,7 +30,8 @@
{
"or": [
"amenity=drinking_water",
"drinking_water=yes"
"drinking_water=yes",
"disused:amenity=drinking_water"
]
},
"man_made!=reservoir_covered",
@ -61,6 +62,11 @@
"cs": "Pitná voda"
}
},
"titleIcons": [
"icons.defaults",
"auto:type",
"auto:seasonal"
],
"pointRendering": [
{
"iconBadges": [
@ -68,10 +74,15 @@
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
"operational_status=closed",
"disused:amenity=drinking_water"
]
},
"then": "close:#c33"
},
{
"if": "tourism=artwork",
"then": "circle:white;./assets/layers/artwork/artwork.svg"
}
],
"iconSize": "40,40",
@ -147,6 +158,10 @@
"mappings": [
{
"if": "operational_status=",
"addExtraTags": [
"disused:amenity=",
"amenity=drinking_water"
],
"then": {
"en": "This drinking water works",
"nl": "Deze drinkwaterfontein werkt",
@ -190,6 +205,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 +290,152 @@
}
}
],
"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": "seasonal",
"question": {
"en": "Is this drinking water point available all year round?"
},
"mappings": [
{
"if": "seasonal=no",
"then": {
"en": "This drinking water point is available all around the year"
}
},
{
"if": "seasonal=summer",
"then": {
"en": "This drinking water point is only available in summer"
}
},
{
"if": "seasonal=spring;summer;autumn",
"icon": "./assets/layers/drinking_water/no_winter.svg",
"then": {
"en": "This drinking water point is closed during the winter"
}
}
]
},
{
"builtin": "opening_hours_24_7",
"override": {
"questionHint": {
"en": "These are the opening hours if the drinking water fountain is operational."
},
"+mappings": [
{
"if": {
"and": [
"seasonal!=no",
{
"or": [
{
"and": [
"seasonal!~.*winter.*",
"_now:date~....-(12|01|02)-.."
]
},
{
"and": [
"seasonal!~.*spring.*",
"_now:date~....-(03|04|05)-.."
]
},
{
"and": [
"seasonal!~.*summer.*",
"_now:date~....-(06|07|08)-.."
]
},
{
"and": [
"seasonal!~.*autumn.*",
"_now:date~....-(09|10|11)-.."
]
}
]
}
]
},
"then": {
"en": "This drinking water fountain is closed this season. As such, the opening hours are not shown."
},
"hideInAnswer": true
}
]
}
},
{
"id": "bench-artwork",
"question": {
"en": "Does this drinking water fountain have an artistic element?",
"nl": "Heeft dit drinkwaterpunt een geintegreerd kunstwerk?"
},
"mappings": [
{
"if": "tourism=artwork",
"addExtraTags": [
"not:tourism:artwork="
],
"then": {
"en": "This drinking water point has an integrated artwork",
"nl": "Dit drinkwaterpunt heeft een geintegreerd kunstwerk"
}
},
{
"if": "not:tourism:artwork=yes",
"then": {
"en": "This drinking water point does not have an integrated artwork",
"nl": "Dit drinkwaterpunt heeft geen geïntegreerd kunstwerk"
},
"addExtraTags": [
"tourism="
]
},
{
"if": "tourism=",
"then": {
"en": "This drinking water point <span class=\"subtle\">probably</span> doesn't have an integrated artwork",
"nl": "Dit drinkwaterpunt heeft <span class=\"subtle\">waarschijnlijk</span> geen geïntegreerd kunstwerk"
},
"hideInAnswer": true
}
],
"questionHint": {
"en": "E.g. it has an integrated statue or other non-trivial, creative work",
"nl": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk"
}
},
{
"builtin": "artwork.*artwork-question",
"override": {
"condition": "tourism=artwork"
}
},
{
"id": "render-closest-drinking-water",
"render": {
@ -293,6 +492,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"
}
}
]
},

46
assets/layers/drinking_water/license_info.json
View file

@ -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,31 @@
"sources": [
"https://osoc.be/editions/2020/cyclofix"
]
},
{
"path": "no_winter.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "tap.svg",
"license": "CC0-1.0",
"authors": [
"Krzysztof Franek"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Water_DIN-style.svg"
]
},
{
"path": "winter.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
}
]

81
assets/layers/drinking_water/no_winter.svg Normal file
View file

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg"
version="1.1"
width="307.91855"
height="343.46448"
viewBox="0 0 307.91855 343.46448"
sodipodi:docname="no_winter.svg"
inkscape:version="1.3.1 (1:1.3.1+202311172155+91b66b0783)"
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">
<defs
id="defs1" />
<sodipodi:namedview
id="namedview1"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="1.2257936"
inkscape:cx="190.48884"
inkscape:cy="271.25284"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg" />
<g
id="g1"
transform="rotate(-0.2875813,162.85132,95.170788)">
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 5.008225,86.10653 302.13815,258.03113"
id="path3"
sodipodi:nodetypes="cc" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 153.09023,0.048073 1.65028,343.280557"
id="path3-7"
sodipodi:nodetypes="cc" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 302.54004,85.82932 5.2907,257.54738"
id="path4"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 5.786561,200.08323 53.987051,25.55191 -3.26951,61.20155"
id="path6" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 56.719332,59.041006 3.20013,59.642774 -55.391241,26.23225"
id="path7" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 201.87442,31.964241 152.44006,65.486554 101.3842,31.580519"
id="path8" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 203.26283,313.48917 -49.04644,-34.08735 -51.44157,33.31792"
id="path9" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 300.19729,199.07429 -53.31225,26.93149 4.84196,61.09726"
id="path10" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 251.37871,59.718988 -4.44648,59.562822 54.83066,27.38467"
id="path11" />
</g>
<path
style="fill:#000000;stroke:#e40000;stroke-width:25;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
d="M 23.115301,297.04602 290.36883,29.792506"
id="path1" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

2
assets/layers/drinking_water/no_winter.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0-1.0

73
assets/layers/drinking_water/tap.svg Normal file
View 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>
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

2
assets/layers/drinking_water/tap.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Krzysztof Franek
SPDX-License-Identifier: CC0-1.0

73
assets/layers/drinking_water/winter.svg Normal file
View file

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg"
version="1.1"
width="307.54224"
height="343.37671"
viewBox="0 0 307.54224 343.37671"
sodipodi:docname="no_winter.svg"
inkscape:version="1.3.1 (1:1.3.1+202311172155+91b66b0783)"
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">
<defs
id="defs1" />
<sodipodi:namedview
id="namedview1"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="1.2257936"
inkscape:cx="190.48884"
inkscape:cy="271.25285"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 5.008225,86.10653 302.13815,258.03113"
id="path3"
sodipodi:nodetypes="cc" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 153.09023,0.048073 1.65028,343.280557"
id="path3-7"
sodipodi:nodetypes="cc" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 302.54004,85.82932 5.2907,257.54738"
id="path4"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 5.786561,200.08323 53.987051,25.55191 -3.26951,61.20155"
id="path6" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 56.719332,59.041006 3.20013,59.642774 -55.391241,26.23225"
id="path7" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="M 201.87442,31.964241 152.44006,65.486554 101.3842,31.580519"
id="path8" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 203.26283,313.48917 -49.04644,-34.08735 -51.44157,33.31792"
id="path9" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 300.19729,199.07429 -53.31225,26.93149 4.84196,61.09726"
id="path10" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-dasharray:none;stroke-opacity:1"
d="m 251.37871,59.718988 -4.44648,59.562822 54.83066,27.38467"
id="path11" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

2
assets/layers/drinking_water/winter.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0-1.0

2
assets/layers/icons/icons.json
View file

@ -27,7 +27,7 @@
{
"#": "ignore-image-in-then",
"if": "wikipedia=",
"then": "<a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank' rel='noopener'><img src='./assets/svg/wikidata.svg' alt='WD'/></a>"
"then": "<a class='h-8' href='https://www.wikidata.org/wiki/{wikidata}' target='_blank' rel='noopener'><img src='./assets/svg/wikidata.svg' alt='WD'/></a>"
}
]
},

7
assets/layers/sport_pitch/sport_pitch.json
View file

@ -455,6 +455,13 @@
"ca": "La superfície és <b>formigó</b>",
"cs": "Povrch je <b>betonový</b>"
}
},
{
"if": "surface=fine_gravel",
"then": {
"en": "The surface is <b>fine gravel</b>",
"nl": "De ondergrond bestaat uit <b>grind</b>"
}
}
],
"id": "sport_pitch-surface"