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

Merge branch 'develop' into feature/nsi

Browse source
This commit is contained in:
Robin van der Linde 2024-05-07 11:08:44 +02:00
commit 22c2f5166d
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
116 changed files with 5653 additions and 1538 deletions
Download patch file Download diff file Expand all files Collapse all files

16
assets/layers/bench/bench.json
View file

@ -155,8 +155,8 @@
{
"if": "backrest=yes",
"then": {
"en": "Does have a backrest",
"de": "Die Sitzbank hat eine Rückenlehne",
"en": "This bench does have a backrest",
"de": "Diese Sitzbank hat eine Rückenlehne",
"fr": "Dossier : Oui",
"nl": "Heeft een rugleuning",
"es": "Tiene respaldo",
@ -186,8 +186,8 @@
"two_sided="
],
"then": {
"en": "Does <b>not</b> have a backrest",
"de": "Die Sitzbank hat <b>keine</b> Rückenlehne",
"en": "This bench does <b>not</b> have a backrest",
"de": "Diese Sitzbank hat <b>keine</b> Rückenlehne",
"fr": "Dossier : Non",
"nl": "Heeft <b>geen</b> rugleuning",
"es": "<b>No</b> tiene respaldo",
@ -236,8 +236,8 @@
},
{
"render": {
"en": "{seats} seats",
"de": "Die Sitzbank hat {seats} Sitzplätze",
"en": "This bench has {seats} seats",
"de": "Diese Sitzbank hat {seats} Sitzplätze",
"fr": "{seats} places",
"nl": "{seats} zitplaatsen",
"es": "{seats} asientos",
@ -882,7 +882,7 @@
"bench-questions"
],
"render": {
"en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>",
"en": "This bench has the following inscription:<br/><p><i>{inscription}</i></p>",
"nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>",
"de": "Diese Bank hat folgende Inschrift:<br/><p><i>{inscription}</i></p>",
"fr": "Ce banc a l'inscription suivante :<br/><p><i>{inscription}</i></p>",
@ -931,7 +931,7 @@
{
"if": "inscription=",
"then": {
"en": "This bench does <span class='subtle'>(probably)</span> not have an inscription",
"en": "This bench <span class='subtle'>(probably)</span> does not not have an inscription",
"nl": "Deze bank heeft <span class='subtle'>(waarschijnlijk)</span> geen inscriptie",
"de": "Diese Bank hat <span class='subtle'>(wahrscheinlich)</span> keine Inschrift",
"fr": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription",

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

@ -998,6 +998,16 @@
"weeks",
"months"
]
},
"charge": {
"quantity": "duration",
"inverted": true,
"denominations": [
"days",
"weeks",
"months",
"years"
]
}
}
]

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

@ -5,12 +5,7 @@
"nl": "Oplaadpunten",
"de": "Ladestationen"
},
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"ca": "Una estació de càrrega",
"de": "Eine Ladestation"
},
"minzoom": 10,
"source": {
"osmTags": {
"and": [
@ -25,7 +20,6 @@
]
}
},
"minzoom": 10,
"title": {
"render": {
"en": "Charging station",
@ -71,103 +65,13 @@
}
]
},
"pointRendering": [
{
"location": [
"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"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
}
}
],
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "close:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"anchor": "bottom",
"iconSize": "50,50"
}
],
"lineRendering": [],
"presets": [
{
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes"
],
"title": {
"en": "charging station for electrical bikes",
"nl": "oplaadpunt voor elektrische fietsen",
"de": "Ladestation für Elektrofahrräder"
}
},
{
"tags": [
"amenity=charging_station",
"motorcar=yes",
"bicycle=no"
],
"title": {
"en": "charging station for cars",
"nl": "oplaadstation voor elektrische auto's",
"de": "Ladestation für Autos"
}
}
],
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"ca": "Una estació de càrrega",
"de": "Eine Ladestation"
},
"#": "no-question-hint-check",
"tagRenderings": [
"images",
{
@ -2509,6 +2413,103 @@
}
}
],
"lineRendering": [],
"pointRendering": [
{
"location": [
"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"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
}
}
],
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "close:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"anchor": "bottom",
"iconSize": "50,50"
}
],
"presets": [
{
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes"
],
"title": {
"en": "charging station for electrical bikes",
"nl": "oplaadpunt voor elektrische fietsen",
"de": "Ladestation für Elektrofahrräder"
}
},
{
"tags": [
"amenity=charging_station",
"motorcar=yes",
"bicycle=no"
],
"title": {
"en": "charging station for cars",
"nl": "oplaadstation voor elektrische auto's",
"de": "Ladestation für Autos"
}
}
],
"filter": [
{
"id": "vehicle-type",
@ -2714,19 +2715,6 @@
]
}
],
"deletion": {
"softDeletionTags": {
"and": [
"amenity=",
"disused:amenity=charging_station"
]
},
"neededChangesets": 10
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"units": [
{
"maxstay": {
@ -2885,5 +2873,17 @@
}
}
],
"#": "no-question-hint-check"
}
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"deletion": {
"softDeletionTags": {
"and": [
"amenity=",
"disused:amenity=charging_station"
]
},
"neededChangesets": 10
}
}

9
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -3,14 +3,17 @@
"title": {
"en": "Changes made with MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
"startLat": 0,
"startLon": 0,
"startZoom": 1,
"layers": [
{
"id": "mapcomplete-changes",