Merge branch 'develop' into feature/onwheels-icons

This commit is contained in:
Robin van der Linde 2022-07-24 13:08:12 +02:00
commit 622db6efbf
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
49 changed files with 1090 additions and 236 deletions

View file

@ -282,70 +282,9 @@
},
"id": "bike_shop-name"
},
{
"question": {
"en": "What is the website of {name}?",
"nl": "Wat is de website van {name}?",
"fr": "Quel est le site web de {name} ?",
"gl": "Cal é a páxina web de {name}?",
"it": "Qual è il sito web di {name}?",
"ru": "Какой сайт у {name}?",
"id": "URL {name} apa?",
"de": "Wie lautet die Webseite von {name}?",
"pt_BR": "Qual o website de {name}?",
"pt": "Qual o website de {name}?",
"es": "¿Cual es el sitio web de {name}?",
"da": "Hvad er webstedet for {name}?"
},
"render": "<a href='{website}' target='_blank'>{website}</a>",
"freeform": {
"key": "website",
"type": "url"
},
"id": "bike_shop-website"
},
{
"question": {
"en": "What is the phone number of {name}?",
"nl": "Wat is het telefoonnummer van {name}?",
"fr": "Quel est le numéro de téléphone de {name} ?",
"gl": "Cal é o número de teléfono de {name}?",
"it": "Qual è il numero di telefono di {name}?",
"ru": "Какой номер телефона у {name}?",
"de": "Wie lautet die Telefonnummer von {name}?",
"pt_BR": "Qual o número de telefone de {name}?",
"pt": "Qual é o número de telefone de {name}?",
"es": "¿Cual es el número de teléfono de {name}?",
"da": "Hvad er telefonnummeret på {name}?"
},
"render": "<a href='tel:{phone}'>{phone}</a>",
"freeform": {
"key": "phone",
"type": "phone"
},
"id": "bike_shop-phone"
},
{
"question": {
"en": "What is the email address of {name}?",
"nl": "Wat is het email-adres van {name}?",
"fr": "Quelle est l'adresse électronique de {name}?",
"gl": "Cal é o enderezo de correo electrónico de {name}?",
"it": "Qual è lindirizzo email di {name}?",
"ru": "Какой адрес электронной почты у {name}?",
"de": "Wie lautet die E-Mail-Adresse von {name}?",
"pt_BR": "Qual o endereço de email de {name}?",
"pt": "Qual o endereço de email de {name}?",
"es": "¿Cual es la dirección de correo electrónico de {name}?",
"da": "Hvad er e-mailadressen på {name}?"
},
"render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
"freeform": {
"key": "email",
"type": "email"
},
"id": "bike_shop-email"
},
"website",
"phone",
"email",
"opening_hours",
{
"render": {

View file

@ -7,6 +7,9 @@
"osmTags": "highway=elevator"
},
"minzoom": 13,
"description": {
"en": "This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information"
},
"title": {
"en": "Elevator"
},
@ -14,12 +17,23 @@
"images",
{
"id": "operational_status",
"question": {
"en": "Does this elevator work?"
},
"mappings": [
{
"if": "operational_status=broken",
"then": {
"en": "This elevator is broken"
}
},
"icon": "close:red"
},
{
"if": "operational_status=closed",
"then": {
"en": "This elevator is closed <span class='subtle'>e.g. because renovation works are going on</span>"
},
"icon": "invalid:red"
},
{
"if": "operational_status=ok",
@ -86,6 +100,17 @@
"location": [
"point",
"centroid"
],
"iconBadges": [
{
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
]
},
"then": "close:#c33"
}
]
}
],
@ -118,6 +143,7 @@
}
},
{
"default": true,
"canonicalDenomination": "cm",
"alternativeDenomination": [
"centimeter",

View file

@ -337,8 +337,7 @@
"es": "¿Cual es el ancho de esta puerta/entrada?"
},
"freeform": {
"key": "width",
"type": "distance"
"key": "width"
}
},
{
@ -417,6 +416,7 @@
}
},
{
"default": true,
"canonicalDenomination": "cm",
"alternativeDenomination": [
"centimeter",

View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<circle cx="8" cy="8" r="3" fill="#4863A0"/>
</svg>

After

Width:  |  Height:  |  Size: 136 B

View file

@ -0,0 +1,62 @@
{
"id": "governments",
"name": {
"en": "governments"
},
"description": {
"en": "This layer show governmental buildings. It was setup as commissioned layer for the client of OSOC '22"
},
"source": {
"osmTags": {
"or": [
"office=government"
]
}
},
"title": {
"render": {
"en": "Governmental Office {name}"
}
},
"minzoom": 13,
"tagRenderings": [
"images",
"phone",
"email",
"website",
{
"question": {
"en": "What is the name of this Governmental Office?"
},
"render": {
"en": "This Governmental Office is called {name}"
},
"freeform": {
"key": "name"
},
"id": "name"
}
],
"presets": [
{
"title": {
"en": "a Governmental Office"
},
"tags": [
"office=government"
]
}
],
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/governments/government.svg"
},
"iconSize": "40,40,center",
"location": [
"point",
"centroid"
]
}
]
}

View file

@ -0,0 +1,12 @@
[
{
"path": "government.svg",
"license": "CC0",
"authors": [
"OSM Carto"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Office-16.svg"
]
}
]

View file

@ -8,6 +8,9 @@
"en": "Hospital"
}
},
"description": {
"en": "A layer showing hospital grounds"
},
"minzoom": 12,
"source": {
"osmTags": "amenity=hospital"
@ -39,6 +42,10 @@
"point",
"centroid"
]
},
{
"color": "#fcd862",
"width": 1
}
]
}

View file

@ -1,10 +1,13 @@
{
"id": "id_presets",
"description": "Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>",
"description": {
"en": "Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
},
"#dont-translate": "*",
"source": {
"osmTags": "id~*"
},
"title": null,
"mapRendering": null,
"tagRenderings": [
{

View file

@ -3,6 +3,9 @@
"name": {
"en": "indoors"
},
"description": {
"en": "Basic indoor mapping: shows room outlines"
},
"source": {
"osmTags": {
"or": [

View file

@ -16,7 +16,6 @@
]
}
},
"title": {},
"description": {
"en": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer",
"nl": "Pad voor voetgangers, in het bijzonder gebruikt voor navigatie binnen gebouwen en om aan toegangen vast te klikken in deze laag",

View file

@ -3,6 +3,9 @@
"name": {
"en": "pharmacy"
},
"description": {
"en": "A layer showing pharmacies, which (probably) dispense prescription drugs"
},
"title": {
"render": {
"en": "{name}"

View file

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="500" height="500" viewBox="0 0 14 14">
<rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
<path d="m 4,4 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 4,0 4,3 10,3 10,0 z" id="pharmacy" style="fill:#BF0000"/>
</svg>

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 330 B

Before After
Before After

View file

@ -3,6 +3,9 @@
"name": {
"en": "Reception desks"
},
"description": {
"en": "A layer showing where the reception desks are and which asks some accessibility information"
},
"title": {
"render": {
"en": "Reception desk"

View file

@ -5,6 +5,7 @@
"source": {
"osmTags": "id~*"
},
"title": null,
"mapRendering": null,
"tagRenderings": [
{