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

Merge branch 'develop' into feature/velopark

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-02-02 14:40:59 +01:00
commit 8651baee30
14 changed files with 175 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
assets/layers/aerialway/aerialway.json
View file

@ -1,7 +1,9 @@
{
"pointRendering": [
{
"location": ["start"],
"location": [
"start"
],
"marker": [
{
"icon": "square"
@ -9,7 +11,6 @@
],
"iconSize": "12,12"
},
{
"location": [
"point",
@ -97,7 +98,8 @@
"en": "A magic carpet (a conveyor belt on the ground)"
}
},
{"if": "aerialway=zip_line",
{
"if": "aerialway=zip_line",
"then": {
"en": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
}

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

@ -8,7 +8,8 @@
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"de": "Eine Ladestation"
"de": "Eine Ladestation",
"ca": "Una estació de càrrega"
},
"source": {
"osmTags": {
@ -277,7 +278,7 @@
"then": {
"en": "Only customers of the place this station belongs to can use this charging station<br/><span class='subtle'>E.g. a charging station operated by hotel which is only usable by their guests</span>",
"nl": "Enkel <b>klanten van de bijhorende plaats</b> mogen dit oplaadpunt gebruiken<br/><span class='subtle'>Bv. op de parking van een hotel en enkel toegankelijk voor klanten van dit hotel</span>",
"ca": "Sols clientes del lloc al que pertany aquest punt de càrrega poden utilitzar-lo <br/><span class='subtle'>p.e. un punt de càrrega d'un hotel que sols poden utilizar-los els hostes</span>",
"ca": "Sols cliente del lloc al que pertany aquest punt de càrrega poden utilitzar-lo <br/><span class='subtle'>p.e. un punt de càrrega d'un hotel que sols poden utilizar-los els hostes</span>",
"de": "Nur Kunden des Ortes, zu dem diese Station gehört, können diese Ladestation nutzen<br/><span class='subtle'>Z.B. eine von einem Hotel betriebene Ladestation, die nur von dessen Gästen genutzt werden kann</span>"
}
},
@ -2419,14 +2420,16 @@
"question": {
"en": "All vehicle types",
"nl": "Alle voertuigen",
"de": "Ladestationen für alle Fahrzeugtypen"
"de": "Ladestationen für alle Fahrzeugtypen",
"ca": "Tots els tipus de vehicles"
}
},
{
"question": {
"en": "Charging station for bicycles",
"nl": "Oplaadpunten voor fietsen",
"de": "Ladestationen für Fahrräder"
"de": "Ladestationen für Fahrräder",
"ca": "Punt de recàrrega per a bicicletes"
},
"osmTags": "bicycle=yes"
},
@ -2477,7 +2480,8 @@
"question": {
"en": "Has a <div style='display: inline-block'><b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>",
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>",
"ca": "Té un connector <div style='display: inline-block'><b><b>Schuko</b> sense pin de terra (CEE7/4 tipus F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
},
"osmTags": "socket:schuko~*"
},
@ -2485,7 +2489,8 @@
"question": {
"en": "Has a <div style='display: inline-block'><b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div>",
"de": "Verfügt über einen <div style='display: inline-block'><b><b>europäischen Netzstecker</b> mit Erdungsstift (CEE7/4 Typ E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div> Anschluss"
"de": "Verfügt über einen <div style='display: inline-block'><b><b>europäischen Netzstecker</b> mit Erdungsstift (CEE7/4 Typ E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div> Anschluss",
"ca": "Té un connector <div style='display: inline-block'><b><b>endoll de paret Europeu</b> amb un pin de terra (CEE7/4 tipus F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div>"
},
"osmTags": "socket:typee~*"
},
@ -2493,7 +2498,8 @@
"question": {
"en": "Has a <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div>",
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div> Stecker"
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div> Stecker",
"ca": "Té un connector <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div>"
},
"osmTags": "socket:chademo~*"
},

4
assets/layers/shops/shops.json
View file

@ -644,7 +644,9 @@
"disused:shop:={shop}"
]
},
"omitDefaultDeleteReasons": ["disused"],
"omitDefaultDeleteReasons": [
"disused"
],
"nonDeleteMappings": [
{
"if": {

8
assets/layers/ski_piste/ski_piste.json
View file

@ -109,9 +109,11 @@
"source": {
"osmTags": {
"and": [
{"or":
[ "piste:type=downhill",
"piste:type=connection"]
{
"or": [
"piste:type=downhill",
"piste:type=connection"
]
},
"area!=yes"
]

13
assets/themes/onwheels/onwheels.json
View file

@ -81,7 +81,11 @@
{
"=marker": [
{
"icon": "circle:white;./assets/themes/onwheels/entrance.svg"
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/onwheels/entrance.svg"
}
]
}
@ -258,6 +262,7 @@
{
"builtin": "parking_spaces",
"override": {
"id": "parking_spaces_disabled",
"source": {
"osmTags": "parking_space=disabled"
},
@ -412,7 +417,11 @@
{
"=marker": [
{
"icon": "circle:white;./assets/themes/onwheels/elevator.svg"
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/onwheels/elevator.svg"
}
],
"iconSize": "40,40",

2
assets/themes/ski/ski.json
View file

@ -24,7 +24,7 @@
"pointRendering": [
{
"=iconSize": "25,25",
"=label":null
"=label": null
}
]
}