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

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-09 17:33:53 +02:00
commit 1055e3c47b
37 changed files with 596 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/artwork/artwork.json
View file

@ -84,7 +84,8 @@
"id": "Beragam karya seni",
"pt": "Diversas obras de arte",
"hu": "Szobrok, mellszobrok, graffitik és egyéb műalkotások nyílt világtérképe",
"da": "Forskellige kunstværker"
"da": "Forskellige kunstværker",
"ca": "Un mapa obert d'estàtues, busts, grafitis i altres obres d'art del tot el món"
},
"minzoom": 12,
"presets": [

12
assets/layers/cycleways_and_roads/cycleways_and_roads.json
View file

@ -40,7 +40,8 @@
"title": {
"render": {
"en": "Way",
"nl": "Weg"
"nl": "Weg",
"de": "Weg"
},
"mappings": [
{
@ -83,7 +84,8 @@
},
"then": {
"nl": "Weg met fietssugestiestrook {name}",
"en": "Road with shared lane {name}"
"en": "Road with shared lane {name}",
"de": "Straße mit gemeinsam genutzter Fahrspur {name}"
}
},
{
@ -106,7 +108,8 @@
},
"then": {
"nl": "Weg met fietsstrook {name}",
"en": "Road with bike lane {name}"
"en": "Road with bike lane {name}",
"de": "Straße mit Fahrradstreifen {name}"
}
},
{
@ -129,7 +132,8 @@
},
"then": {
"nl": "Weg met fietspad naast de weg {name}",
"en": "Road with cycleway next to the road {name}"
"en": "Road with cycleway next to the road {name}",
"de": "Straße mit Radweg neben der Straße {name}"
}
},
{

96
assets/layers/kerbs/kerbs.json
View file

@ -2,11 +2,13 @@
"id": "kerbs",
"name": {
"en": "Kerbs",
"nl": "Stoepranden"
"nl": "Stoepranden",
"de": "Bordsteine"
},
"description": {
"en": "A layer showing kerbs.",
"nl": "Een laag met stoepranden."
"nl": "Een laag met stoepranden.",
"de": "Eine Ebene, die Bordsteine zeigt."
},
"source": {
"osmTags": "barrier=kerb"
@ -15,7 +17,8 @@
"title": {
"render": {
"en": "Kerb",
"nl": "Stoeprand"
"nl": "Stoeprand",
"de": "Bordstein"
}
},
"mapRendering": [
@ -56,14 +59,16 @@
"id": "kerb-type",
"question": {
"en": "What is the height of this kerb?",
"nl": "Hoe hoog is deze stoeprand?"
"nl": "Hoe hoog is deze stoeprand?",
"de": "Wie hoch ist der Bordstein?"
},
"mappings": [
{
"if": "kerb=raised",
"then": {
"en": "This kerb is raised (>3 cm)",
"nl": "Deze stoeprand is hoog (>3 cm)"
"nl": "Deze stoeprand is hoog (>3 cm)",
"de": "Der Bordstein ist erhöht (>3 cm)"
},
"icon": {
"path": "./assets/layers/kerbs/raised.svg",
@ -74,7 +79,8 @@
"if": "kerb=lowered",
"then": {
"en": "This kerb is lowered (~3 cm)",
"nl": "Deze stoeprand is verlaagd (~3 cm)"
"nl": "Deze stoeprand is verlaagd (~3 cm)",
"de": "Der Bordstein ist abgesenkt (~3 cm)"
},
"icon": {
"path": "./assets/layers/kerbs/lowered.svg",
@ -85,7 +91,8 @@
"if": "kerb=flush",
"then": {
"en": "This kerb is flush (~0cm)",
"nl": "Deze stoeprand is vlak (~0cm)"
"nl": "Deze stoeprand is vlak (~0cm)",
"de": "Der Bordstein ist bündig (~0cm)"
},
"icon": {
"path": "./assets/layers/kerbs/flush.svg",
@ -96,7 +103,8 @@
"if": "kerb=no",
"then": {
"en": "There is no kerb here",
"nl": "Er is hier geen stoeprand"
"nl": "Er is hier geen stoeprand",
"de": "Hier gibt es keinen Bordstein"
},
"hideInAnswer": true,
"icon": {
@ -108,7 +116,8 @@
"if": "kerb=yes",
"then": {
"en": "There is a kerb of unknown height",
"nl": "Er is een stoeprand met onbekende hoogte"
"nl": "Er is een stoeprand met onbekende hoogte",
"de": "Es gibt einen Bordstein mit unbekannter Höhe"
},
"hideInAnswer": true
}
@ -118,25 +127,29 @@
{
"id": "tactile-paving",
"question": {
"en": "Is there tactile paving at this kerb?"
"en": "Is there tactile paving at this kerb?",
"de": "Gibt es am Bordstein ein taktiles Pflaster?"
},
"mappings": [
{
"if": "tactile_paving=yes",
"then": {
"en": "This kerb has tactile paving."
"en": "This kerb has tactile paving.",
"de": "Der Bordstein hat ein taktiles Pflaster."
}
},
{
"if": "tactile_paving=no",
"then": {
"en": "This kerb does not have tactile paving."
"en": "This kerb does not have tactile paving.",
"de": "Der Bordstein hat kein taktiles Pflaster."
}
},
{
"if": "tactile_paving=incorrect",
"then": {
"en": "This kerb has tactile paving, but it is incorrect"
"en": "This kerb has tactile paving, but it is incorrect",
"de": "Der Bordstein hat ein taktiles Pflaster, das aber falsch ist"
},
"hideInAnswer": true
}
@ -147,17 +160,20 @@
"id": "kerb-height",
"question": {
"en": "What is the height of this kerb?",
"nl": "Hoe hoog is deze stoeprand?"
"nl": "Hoe hoog is deze stoeprand?",
"de": "Wie hoch ist der Bordstein?"
},
"render": {
"en": "Kerb height: {{kerb:height}}",
"nl": "Stoeprandhoogte: {{kerb:height}}"
"nl": "Stoeprandhoogte: {{kerb:height}}",
"de": "Bordsteinhöhe: {{kerb:height}}"
},
"freeform": {
"key": "kerb:height",
"placeholder": {
"en": "Height of the kerb",
"nl": "Hoogte van de stoeprand"
"nl": "Hoogte van de stoeprand",
"de": "Höhe des Bordsteins"
},
"type": "pnat"
}
@ -167,14 +183,16 @@
{
"title": {
"en": "a kerb",
"nl": "een stoeprand"
"nl": "een stoeprand",
"de": "einen Bordstein"
},
"tags": [
"barrier=kerb"
],
"description": {
"en": "Kerb in a footway",
"nl": "Stoeprand in een voetpad"
"nl": "Stoeprand in een voetpad",
"de": "Bordstein in einem Fußweg"
},
"preciseInput": {
"maxSnapDistance": 10,
@ -193,42 +211,48 @@
{
"question": {
"en": "All types of kerbs",
"nl": "Alle typen stoepranden"
"nl": "Alle typen stoepranden",
"de": "Alle Arten von Bordsteinen"
}
},
{
"osmTags": "kerb=raised",
"question": {
"en": "Raised kerb (>3 cm)",
"nl": "Hoge stoeprand (>3 cm)"
"nl": "Hoge stoeprand (>3 cm)",
"de": "Erhöhter Bordstein (>3 cm)"
}
},
{
"osmTags": "kerb=lowered",
"question": {
"en": "Lowered kerb (~3 cm)",
"nl": "Verlaagde stoeprand (~3 cm)"
"nl": "Verlaagde stoeprand (~3 cm)",
"de": "Abgesenkter Bordstein (~3 cm)"
}
},
{
"osmTags": "kerb=flush",
"question": {
"en": "Flush kerb (~0cm)",
"nl": "Vlakke stoeprand (~0cm)"
"nl": "Vlakke stoeprand (~0cm)",
"de": "Bündiger Bordstein (~0cm)"
}
},
{
"osmTags": "kerb=no",
"question": {
"en": "No kerb",
"nl": "Geen stoeprand"
"nl": "Geen stoeprand",
"de": "Kein Bordstein"
}
},
{
"osmTags": "kerb=",
"question": {
"en": "Kerb with unknown height",
"nl": "Stoeprand met onbekende hoogte"
"nl": "Stoeprand met onbekende hoogte",
"de": "Bordstein mit unbekannter Höhe"
}
}
]
@ -238,25 +262,29 @@
"options": [
{
"question": {
"en": "Kerbs with or without tactile paving"
"en": "Kerbs with or without tactile paving",
"de": "Bordsteine mit oder ohne taktilem Pflaster"
}
},
{
"osmTags": "tactile_paving=yes",
"question": {
"en": "Kerb with tactile paving"
"en": "Kerb with tactile paving",
"de": "Bordstein mit taktilem Pflaster"
}
},
{
"osmTags": "tactile_paving=no",
"question": {
"en": "Kerb without tactile paving"
"en": "Kerb without tactile paving",
"de": "Bordstein ohne taktilem Pflaster"
}
},
{
"osmTags": "tactile_paving=",
"question": {
"en": "Kerb wihout information about tactile paving"
"en": "Kerb wihout information about tactile paving",
"de": "Bordstein ohne Informationen über taktiles Pflaster"
}
}
]
@ -273,11 +301,13 @@
],
"human": {
"en": "centimeters",
"nl": "centimeter"
"nl": "centimeter",
"de": "Zentimeter"
},
"humanSingular": {
"en": "centimeter",
"nl": "centimeter"
"nl": "centimeter",
"de": "Zentimeter"
},
"default": true
},
@ -289,11 +319,13 @@
],
"human": {
"en": "meters",
"nl": "meter"
"nl": "meter",
"de": "Meter"
},
"humanSingular": {
"en": "meter",
"nl": "meter"
"nl": "meter",
"de": "Meter"
}
}
],

50
assets/layers/recycling/recycling.json
View file

@ -469,7 +469,8 @@
"nl": "Dit is een recyclingcontainer",
"de": "Dies ist ein Recycling-Container",
"es": "Esto es un contenedor de reciclaje",
"it": "Questo è un contenitore per il riciclo di rifiuti"
"it": "Questo è un contenitore per il riciclo di rifiuti",
"ca": "Açò és un contenidor de reciclatge"
}
},
{
@ -479,7 +480,8 @@
"nl": "Dit is een recyclingcentrum",
"de": "Dies ist ein Wertstoffhof",
"es": "Esto es un centro de reciclaje",
"it": "Questo è un centro per la raccola e riciclo di rifiuti"
"it": "Questo è un centro per la raccola e riciclo di rifiuti",
"ca": "Açò és un centre de reciclatge"
}
},
{
@ -529,7 +531,8 @@
"nl": "Dit recyclagecentrum heet <b>{name}</b>",
"de": "Dieser Wertstoffhof heißt <b>{name}</b>",
"es": "Este centro de reciclaje se llama <b>{name}</b>",
"it": "Questo centro raccolta e riciclo rifiuti si chiama <b>{name}</b>"
"it": "Questo centro raccolta e riciclo rifiuti si chiama <b>{name}</b>",
"ca": "Aquest centre de reciclatge s'anomena <b>{name}</b>"
},
"freeform": {
"key": "name"
@ -586,7 +589,8 @@
"nl": "Deze container is buiten",
"de": "Der Container befindet sich im Freien",
"es": "Este contenedor se sitúa en el exterior",
"it": "Questo contenitore è all'aperto"
"it": "Questo contenitore è all'aperto",
"ca": "Aquest contenidor està situat a l'aire lliure"
}
}
]
@ -624,7 +628,8 @@
"en": "Beverage cartons can be recycled here",
"nl": "Drankpakken kunnen hier gerecycled worden",
"de": "Getränkekartons können hier recycelt werden",
"it": "Cartoni per bevande"
"it": "Cartoni per bevande",
"ca": "Ací es poden reciclar els cartons de begudes"
},
"icon": {
"path": "./assets/layers/recycling/beverage_cartons.svg",
@ -639,7 +644,8 @@
"nl": "Blikken kunnen hier gerecycled worden",
"de": "Dosen können hier recycelt werden",
"es": "Aquí se pueden reciclar latas",
"it": "Lattine"
"it": "Lattine",
"ca": "Ací es poden reciclar llaunes"
},
"icon": {
"path": "./assets/layers/recycling/cans.svg",
@ -713,7 +719,8 @@
"nl": "Organisch afval kan hier gerecycled worden",
"de": "Bio-Abfall kann hier recycelt werden",
"es": "Aquí se pueden reciclar residuos orgánicos",
"it": "Umido"
"it": "Umido",
"ca": "Ací es poden reciclar residus orgànics"
},
"hideInAnswer": true,
"icon": {
@ -729,7 +736,8 @@
"nl": "Glazen flessen kunnen hier gerecycled worden",
"de": "Glasflaschen können hier recycelt werden",
"es": "Aquí se pueden reciclar botellas de cristal",
"it": "Bottiglie di vetro"
"it": "Bottiglie di vetro",
"ca": "Ací es poden reciclar ampolles de vidre"
},
"icon": {
"path": "./assets/layers/recycling/glass_bottles.svg",
@ -744,7 +752,8 @@
"nl": "Glas kan hier gerecycled worden",
"de": "Glas kann hier recycelt werden",
"es": "Aquí se puede reciclar cristal",
"it": "Vetro"
"it": "Vetro",
"ca": "Ací es pot reciclar vidre"
},
"icon": {
"path": "./assets/layers/recycling/glass.svg",
@ -759,7 +768,8 @@
"nl": "Kranten kunnen hier gerecycled worden",
"de": "Zeitungen können hier recycelt werden",
"es": "Aquí se pueden reciclar periódicos",
"it": "Giornali"
"it": "Giornali",
"ca": "Ací es poden reciclar diaris"
},
"icon": {
"path": "./assets/layers/recycling/newspaper.svg",
@ -774,7 +784,8 @@
"nl": "Papier kan hier gerecycled worden",
"de": "Papier kann hier recycelt werden",
"es": "Aquí se puede reciclar papel",
"it": "Carta"
"it": "Carta",
"ca": "Ací es pot reciclar paper"
},
"icon": {
"path": "./assets/layers/recycling/paper.svg",
@ -789,7 +800,8 @@
"nl": "Plastic flessen kunnen hier gerecycled worden",
"de": "Plastikflaschen können hier recycelt werden",
"es": "Aquí se pueden reciclar botellas de plástico",
"it": "Bottiglie di platica"
"it": "Bottiglie di platica",
"ca": "Ací es poden reciclar ampolles de plàstic"
},
"icon": {
"path": "./assets/layers/recycling/plastic_bottles.svg",
@ -804,7 +816,8 @@
"nl": "Plastic verpakking kan hier gerecycled worden",
"de": "Kunststoffverpackungen können hier recycelt werden",
"es": "Aquí se pueden reciclar embalajes plásticos",
"it": "Confezioni di plastica"
"it": "Confezioni di plastica",
"ca": "Ací es poden reciclar envasos de plàstic"
},
"icon": {
"path": "./assets/layers/recycling/plastic_packaging.svg",
@ -819,7 +832,8 @@
"nl": "Plastic kan hier gerecycled worden",
"de": "Kunststoff kann hier recycelt werden",
"es": "Aquí se puede reciclar plástico",
"it": "Plastica"
"it": "Plastica",
"ca": "Ací es pot reciclar plàstic"
},
"icon": {
"path": "./assets/layers/recycling/plastic.svg",
@ -902,7 +916,8 @@
"en": "Residual waste can be recycled here",
"nl": "Restafval kan hier gerecycled worden",
"de": "Restmüll kann hier recycelt werden",
"it": "Secco"
"it": "Secco",
"ca": "Ací es pot reciclar el rebuig"
},
"icon": {
"path": "./assets/layers/waste_disposal/waste_disposal.svg",
@ -918,8 +933,9 @@
"en": "This recycling facility is operated by {operator}",
"nl": "Deze recyclingfaciliteit wordt beheerd door {operator}",
"de": "Diese Recyclinganlage wird betrieben von {operator}",
"es": "Esta facilidad de reciclado la opera {operator}",
"it": "Questa struttura di raccola e riciclo è gestita da {operator}"
"es": "Esta infraestructura de reciclado la opera {operator}",
"it": "Questa struttura di raccola e riciclo è gestita da {operator}",
"ca": "Aquesta infraestuctura de reciclatge està operada per {operator}"
},
"question": {
"en": "What company operates this recycling facility?",

12
assets/layers/school/school.json
View file

@ -322,7 +322,8 @@
"inline": true,
"placeholder": {
"en": "Language in lowercase English",
"nl": "Taal in lowercase Engel"
"nl": "Taal in lowercase Engel",
"de": "Sprache in Englisch in Kleinbuchstaben"
},
"addExtraTags": [
"fixme=Freeform tag `school:language` used, to be doublechecked"
@ -342,21 +343,24 @@
"if": "school:language=french",
"then": {
"en": "French is the main language of {name}",
"nl": "Frans is de voertaal van {name}"
"nl": "Frans is de voertaal van {name}",
"de": "Französisch ist die Hauptsprache von {name}"
}
},
{
"if": "school:language=dutch",
"then": {
"en": "Dutch is the main language of {name}",
"nl": "Nederlands is de voertaal van {name}"
"nl": "Nederlands is de voertaal van {name}",
"de": "Niederländisch ist die Hauptsprache von {name}"
}
},
{
"if": "school:language=german",
"then": {
"en": "German is the main language of {name}",
"nl": "Duits is de voertaal van {name}"
"nl": "Duits is de voertaal van {name}",
"de": "Deutsch ist die Hauptsprache von {name}"
}
},
{

7
assets/layers/sport_pitch/equestrian.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<svg xmlns="http://www.w3.org/2000/svg" width="375px" height="375px" viewBox="0 0 375 375" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:evenodd;fill:rgb(48.627451%,72.156864%,18.431373%);fill-opacity:1;" d="m 240,270 c -10.51214,0 -17.06362,5.31218 -21.09208,8.22243 L 200,295 l -13.40899,9.13092 4.81906,-4.41221 c -2.45204,1.98626 -8.43462,9.4328 -9.5545,12.00606 -0.80851,1.8688 -2.80916,16.5391 -2.8094,18.50388 L 180,345 h 100.00002 v -28.12499 l 0.95383,-24.02418 C 279.36417,275.26526 275,275 260,275 Z"/>
<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 224.78416,27.867714 C 207.83633,20.892181 205,30 201.4908,33.483328 c -3.13355,3.110444 -4.18514,6.793339 -4.92975,13.162944 C 195,60 200,60 212.17552,64.021358 c 8.42757,2.783478 13.09879,0.933943 17.36376,-3.873285 3.30497,-3.725168 5.40227,-4.73171 6.11084,-11.873509 0.8525,-8.592508 0.044,-15.916436 -10.86596,-20.40685 z M 190,65 c -9.52441,-0.917061 -12.07747,2.762778 -15,5 l -5,10 -10,20 c -5,5 -7.02649,20.45319 0,25 l 11.46579,6.14143 c -13.95723,6.14722 -25.90358,8.69174 -40.41254,12.50155 -8.92858,2.34449 -19.88001,3.37632 -28.56099,7.76485 -9.014982,4.55739 -14.786174,10.31022 -19.927371,17.45223 -9.072982,1.05932 -32.906871,14.0154 -42.052984,31.2902 -3.839032,7.65623 -19.072351,74.0743 -3.955093,80.72348 5.708983,1.27809 15.640201,-0.70601 15.599701,-13.86338 -0.108001,-35.02595 0.339952,-65.14068 25.79507,-79.45023 C 78.825248,201.92336 80.834978,208.68765 90,225 l -20,40 -16.32953,39.88548 c -2.522365,5.62883 -3.243613,13.4183 5.077871,19.11488 C 64.372524,326.54946 73.614821,320.68296 75,315 L 98.669339,262.36113 117.54355,243.09234 141.10638,216.635 c 28.64298,4.09511 70.89542,-1.80723 100.97701,-26.39969 h 28.16814 l -11.82569,23.9346 C 250,220 255.27742,230.99587 260.8042,233.88839 270,240 277.18878,230.56171 280,225 l 18.46458,-40.05047 c 0.90355,-11.60271 -2.04845,-13.5154 -9.80084,-17.04381 -11.12002,-1.78157 1.65674,0.0402 0,0 v -0.1326 c -13.56808,-2.82951 -25.38466,-1.28029 -37.30881,0 7.75126,-22.2122 23.68226,-38.18561 43.3733,-36.63364 13.04658,10.51921 29.18544,30.02218 28.45642,28.99055 -1.37763,-1.9495 0.55254,2.10376 2.17266,3.91304 2.13859,2.37925 5.19256,3.73586 8.39458,3.73005 6.21306,0 11.24811,-5.02833 11.24811,-11.23109 -0.002,-1.19274 -1.78451,-15.41319 -2.16003,-16.5454 l -8.47284,-29.82576 -0.30859,0.0877 c -1.75045,-4.985 -5.20489,-9.19557 -9.75592,-11.890135 L 332,85 c 1.14686,-1.622582 2,-3 1,-5 -2,-2 -6,-1 -9,1 l -14,9 c -12.49469,-3.56121 -33.58022,-3.171563 -55.22958,6.252257 -3.15809,1.41264 -18.18315,7.408833 -28.06798,12.733063 -0.14174,-0.36321 -0.13182,-0.62598 -0.30664,-1.00807 L 216.9494,91.939125 210,75 c -1.75586,-3.835199 -2.84028,-5.186845 -7.17863,-6.731979 -0.50012,-0.05264 -5.7694,-2.017607 -6.27893,-2.020137 z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

11
assets/layers/sport_pitch/license_info.json
View file

@ -43,6 +43,17 @@
"https://www.provincieantwerpen.be/"
]
},
{
"path": "equestrian.svg",
"license": "CC0",
"authors": [
"Hufkratzer"
],
"sources": [
"https://github.com/pietervdvn/MapComplete/issues/920",
" https://gist.githubusercontent.com/Hufkratzer/81abcfe749ce8f99257e38f58633dd72/raw/8fa614a983807724f7110793b57344cc70dc34bc/equestrian.svg"
]
},
{
"path": "lock.svg",
"license": "CC-BY-SA 4.0",

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

@ -506,7 +506,8 @@
"sport=soccer",
"sport=table_tennis",
"sport=tennis",
"sport=volleyball"
"sport=volleyball",
"sport=equestrian"
]
},
"then": "circle:white;./assets/layers/sport_pitch/{sport}.svg"