Merge develop

This commit is contained in:
Pieter Vander Vennet 2022-07-13 23:12:14 +02:00
commit c916d5fe66
43 changed files with 802 additions and 275 deletions

View file

@ -3,6 +3,9 @@
"name": {
"en": "doctors"
},
"description": {
"en": "This layer shows doctor offices, dentists and other healthcare facilities"
},
"source": {
"osmTags": {
"or": [
@ -38,6 +41,18 @@
"phone",
"email",
"website",
{
"question": {
"en": "What is the name of this doctors place?"
},
"render": {
"en": "This doctors place is called {name}"
},
"freeform": {
"key": "name"
},
"id": "name"
},
{
"condition": "amenity=doctors",
"id": "specialty",
@ -120,13 +135,7 @@
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/doctors/doctors.svg",
"mappings": [
{
"if": "amenity=dentist",
"then": "circle:white;./assets/layers/doctors/dentist.svg"
}
]
"render": "circle:white;./assets/layers/doctors/doctors.svg"
},
"iconSize": "40,40,center",
"location": [

View file

@ -1,9 +1,9 @@
[
{
"path": "dentist.svg",
"license": "cc0",
"license": "CC0",
"authors": [
"osmcarto"
"OSM Carto"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Dentist-14.svg"

View file

@ -164,9 +164,9 @@
"de": "Wie hoch ist der Bordstein?"
},
"render": {
"en": "Kerb height: {{kerb:height}}",
"nl": "Stoeprandhoogte: {{kerb:height}}",
"de": "Bordsteinhöhe: {{kerb:height}}"
"en": "Kerb height: {kerb:height}",
"nl": "Stoeprandhoogte: {kerb:height}",
"de": "Bordsteinhöhe: {kerb:height}"
},
"freeform": {
"key": "kerb:height",

View file

@ -26,7 +26,142 @@
"es": "Una capa que muestra aparcamientos para coches"
},
"tagRenderings": [
"images"
"images",
{
"id": "parking-type",
"mappings": [
{
"if": "parking=surface",
"then": {
"en": "This is a surface parking lot",
"nl": "Dit is een bovengronds parkeerterrein"
}
},
{
"if": "parking=street_side",
"then": {
"en": "This is a parking bay next to a street",
"nl": "Dit is een parkeerplek langs een weg"
}
},
{
"if": "parking=underground",
"then": {
"en": "This is an underground parking garage",
"nl": "Dit is een ondergrondse parkeergarage"
}
},
{
"if": "parking=multi-storey",
"then": {
"en": "This is a multi-storey parking garage",
"nl": "Dit is een bovengrondse parkeergarage met meerdere verdiepingen"
}
},
{
"if": "parking=rooftop",
"then": {
"en": "This is a rooftop parking deck",
"nl": "Dit is een parkeerdek op een dak"
}
},
{
"if": "parking=lane",
"then": {
"en": "This is a lane for parking on the road",
"nl": "Dit is een strook voor parkeren op de weg"
}
},
{
"if": "parking=carports",
"then": {
"en": "This is parking covered by carports",
"nl": "Dit is parking overdekt met carports"
}
},
{
"if": "parking=garage_boxes",
"then": {
"en": "This a parking consisting of garage boxes",
"nl": "Dit is een parking bestaande uit garageboxen"
}
},
{
"if": "parking=layby",
"then": {
"en": "This is a parking on a layby",
"nl": "Dit is een parkeerplek op een layby"
}
},
{
"if": "parking=sheds",
"then": {
"en": "This is a parking consisting of sheds",
"nl": "Dit is een parking bestaande uit schuren"
}
}
],
"question": {
"en": "What kind of parking is this?",
"nl": "Wat voor parking is dit?"
}
},
{
"id": "capacity-disabled",
"freeform": {
"key": "capacity:disabled",
"type": "pnat",
"placeholder": {
"en": "Amount of parking spots reserved for disabled people",
"nl": "Aantal parkeerplaatsen voor gehandicapten"
}
},
"mappings": [
{
"if": "capacity:disabled=yes",
"then": {
"en": "There are disabled parking spots, but it is not known how many",
"nl": "Er zijn parkeerplaatsen voor gehandicapten, maar het is niet bekend hoeveel er zijn"
},
"hideInAnswer": true
},
{
"if": "capacity:disabled=no",
"then": {
"en": "There are no disabled parking spots",
"nl": "Er zijn geen parkeerplaatsen voor gehandicapten"
},
"hideInAnswer": true
}
],
"question": {
"en": "How many disabled parking spots are there at this parking?",
"nl": "Hoeveel parkeerplaatsen voor gehandicapten zijn er op deze parking?"
},
"render": {
"en": "There are {capacity:disabled} disabled parking spots",
"nl": "Er zijn {capacity:disabled} parkeerplaatsen voor gehandicapten"
}
},
{
"id": "capacity",
"freeform": {
"key": "capacity",
"type": "pnat",
"placeholder": {
"en": "Amount of parking spots",
"nl": "Aantal parkeerplaatsen"
}
},
"question": {
"en": "How many parking spots are there at this parking?",
"nl": "Hoeveel parkeerplaatsen zijn er op deze parking?"
},
"render": {
"en": "There are {capacity} parking spots",
"nl": "Er zijn {capacity} parkeerplaatsen"
}
}
],
"presets": [
{
@ -52,7 +187,7 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
},
"mapRendering": [
{

View file

@ -0,0 +1,93 @@
{
"id": "rainbow_crossings",
"name": {
"en": "Crossings with rainbow paintings"
},
"description": {
"en": "A layer showing pedestrian crossings with rainbow paintings"
},
"source": {
"osmTags": "highway=crossing"
},
"minzoom": 17,
"title": {
"render": {
"en": "Crossing"
}
},
"presets": [
{
"title": {
"en": "a crossing"
},
"tags": [
"highway=crossing"
],
"description": {
"en": "Pedestrian crossing"
},
"preciseInput": {
"preferredBackground": [
"photo"
],
"snapToLayer": "cycleways_and_roads",
"maxSnapDistance": 25
}
}
],
"tagRenderings": [
"images",
{
"id": "crossing-with-rainbow",
"question": {
"en": "Does this crossing has rainbow paintings?"
},
"condition": "highway=crossing",
"mappings": [
{
"if": "crossing:marking=rainbow",
"then": {
"en": "This crossing has rainbow paintings"
},
"icon": {
"path": "./assets/themes/rainbow_crossings/logo.svg",
"class": "medium"
}
},
{
"if": "not:crossing:marking=rainbow",
"then": {
"en": "No rainbow paintings here"
},
"icon": "./assets/themes/rainbow_crossings/crossing.svg"
},
{
"if": "crossing:marking!=rainbow",
"then": {
"en": "No rainbow paintings here"
},
"icon": "./assets/themes/rainbow_crossings/crossing.svg",
"hideInAnswer": true
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/rainbow_crossings/crossing.svg",
"mappings": [
{
"if": "crossing:marking=rainbow",
"then": "./assets/themes/rainbow_crossings/logo.svg"
}
]
},
"iconSize": "40,40,center",
"location": [
"point",
"centroid"
]
}
]
}

View file

@ -9,7 +9,7 @@
"source": {
"osmTags": "highway=street_lamp"
},
"minZoom": 16,
"minzoom": 16,
"title": {
"render": {
"en": "Street Lamp",