Merge branch 'develop' into feature/nsi

This commit is contained in:
Robin van der Linde 2024-04-29 00:24:51 +02:00
commit 572d85a6b5
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
375 changed files with 34341 additions and 44682 deletions

View file

@ -8,7 +8,6 @@
"en": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. ",
"de": "Alle Arten von seil- oder drahtgestütztem Personen- oder Gütertransport, wie Seilbahnen, Gondeln, Sessellifte, Schlepplifte. "
},
"minzoom": 11,
"source": {
"osmTags": {
"and": [
@ -18,6 +17,7 @@
]
}
},
"minzoom": 11,
"title": {
"render": {
"en": "Aerialway {name}",

View file

@ -889,6 +889,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -934,7 +934,7 @@
"en": "This bench does <span class='subtle'>(probably)</span> 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",
"fr": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription",
"es": "Este banco <span class='subtle'>(probablemente)</span> no tiene inscripción",
"ca": "Aquest banc <span class='subtle'>(probablement)</span> no té cap inscripció",
"cs": "Tato lavička <span class='subtle'>(pravděpodobně)</span> nemá nápis",
@ -1020,7 +1020,8 @@
"cs": "Tato lavička <span class=\"subtle\">pravděpodobně</span> nemá integrované umělecké dílo",
"pt_BR": "Esse banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
"es": "Este banco <span class=\"subtle\">probablemente</span> no tiene una obra de arte integrada",
"pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada"
"pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
"fr": "Ce banc ne comporte <span class=\"subtle\">probablement</span> pas d'œuvre d'art"
},
"hideInAnswer": true
}
@ -1214,6 +1215,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -465,6 +465,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -294,6 +294,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -692,6 +692,26 @@
}
]
},
{
"id": "charge",
"condition": "fee=yes",
"question": {
"en": "How much does it cost to park your bike here?",
"nl": "Hoeveel kost het om een fiets te stallen?"
},
"questionHint": {
"en": "This is the amount which is charged for a single bike",
"nl": "Dit is de kostprijs voor een enkele fiets"
},
"render": {
"en": "Parking your bike costs {charge}",
"nl": "Je fiets hier parkeren kost {charge}"
},
"freeform": {
"key": "charge",
"type": "currency"
}
},
{
"builtin": "opening_hours_24_7",
"override": {
@ -956,18 +976,6 @@
}
}
],
"units": [
{
"maxstay": {
"quantity": "duration",
"denominations": [
"days",
"weeks",
"months"
]
}
}
],
"deletion": {
"softDeletionTags": {
"and": [
@ -980,5 +988,17 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
}
},
"units": [
{
"maxstay": {
"quantity": "duration",
"denominations": [
"days",
"weeks",
"months"
]
}
}
]
}

View file

@ -1132,6 +1132,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -191,6 +191,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -5,7 +5,12 @@
"nl": "Oplaadpunten",
"de": "Ladestationen"
},
"minzoom": 10,
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"ca": "Una estació de càrrega",
"de": "Eine Ladestation"
},
"source": {
"osmTags": {
"and": [
@ -20,6 +25,7 @@
]
}
},
"minzoom": 10,
"title": {
"render": {
"en": "Charging station",
@ -65,13 +71,103 @@
}
]
},
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"ca": "Una estació de càrrega",
"de": "Eine Ladestation"
},
"#": "no-question-hint-check",
"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"
}
}
],
"tagRenderings": [
"images",
{
@ -2413,103 +2509,6 @@
}
}
],
"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 Elektrofahrräder"
}
}
],
"filter": [
{
"id": "vehicle-type",
@ -2715,6 +2714,19 @@
]
}
],
"deletion": {
"softDeletionTags": {
"and": [
"amenity=",
"disused:amenity=charging_station"
]
},
"neededChangesets": 10
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"units": [
{
"maxstay": {
@ -2873,17 +2885,5 @@
}
}
],
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"deletion": {
"softDeletionTags": {
"and": [
"amenity=",
"disused:amenity=charging_station"
]
},
"neededChangesets": 10
}
}
"#": "no-question-hint-check"
}

View file

@ -545,6 +545,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -186,7 +186,8 @@
"alsoShowIf": "shape=",
"then": {
"en": "This elevator has a rectangular shape",
"de": "Dieser Aufzug hat eine rechteckige Form"
"de": "Dieser Aufzug hat eine rechteckige Form",
"fr": "Cet ascenseur est de forme rectangulaire"
},
"icon": "./assets/svg/square.svg"
},

View file

@ -6,6 +6,10 @@
"description": {
"en": "Food courts with a variety of food options."
},
"source": {
"osmTags": "amenity=food_court"
},
"minzoom": 12,
"title": {
"render": {
"en": "Food Court"
@ -17,35 +21,6 @@
}
]
},
"source": {
"osmTags": "amenity=food_court"
},
"minzoom": 12,
"tagRenderings": [
{
"id": "name",
"question": {
"en": "What is the name of this food court?"
},
"freeform": {
"key": "name",
"type": "string",
"placeholder": {
"en": "Name of the food court"
}
},
"render": {
"en": "This food court is called <b>{name}</b>."
}
},
"reviews",
"images",
"opening_hours",
"wheelchair-access",
"website",
"phone",
"smoking"
],
"pointRendering": [
{
"location": [
@ -72,5 +47,30 @@
"color": "#C77400",
"fillColor": "#C774004D"
}
],
"tagRenderings": [
{
"id": "name",
"question": {
"en": "What is the name of this food court?"
},
"freeform": {
"key": "name",
"type": "string",
"placeholder": {
"en": "Name of the food court"
}
},
"render": {
"en": "This food court is called <b>{name}</b>."
}
},
"reviews",
"images",
"opening_hours",
"wheelchair-access",
"website",
"phone",
"smoking"
]
}
}

View file

@ -352,7 +352,8 @@
"en": "This is a classroom",
"de": "Dies ist ein Klassenzimmer",
"ca": "Açò és una aula",
"cs": "Jedná se o učebnu"
"cs": "Jedná se o učebnu",
"fr": "C'est une salle de classe"
},
"icon": "./assets/layers/indoors/room_class.svg"
},
@ -449,7 +450,8 @@
"en": "This is an office",
"de": "Dies ist ein Büro",
"ca": "Açò és una oficina",
"cs": "Jedná se o kancelář"
"cs": "Jedná se o kancelář",
"fr": "C'est un bureau"
},
"icon": "./assets/layers/indoors/room_office.svg"
},

View file

@ -98,6 +98,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -422,6 +422,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -1,5 +1,9 @@
{
"id": "memorial",
"name": {
"en": "Memorials",
"de": "Denkmäler"
},
"description": "Layer showing memorial plaques, based upon a unofficial theme. Can be expanded to have multiple types of memorials later on",
"source": {
"osmTags": {
@ -9,11 +13,7 @@
]
}
},
"name": {
"en": "Memorials",
"de": "Denkmäler"
},
"defaultBackgroundId": "protomaps.white",
"minzoom": 9,
"title": {
"render": {
"en": "Memorial plaque",
@ -68,6 +68,17 @@
}
],
"lineRendering": [],
"presets": [
{
"title": {
"en": "a memorial",
"de": "ein Denkmal"
},
"tags": [
"historic=memorial"
]
}
],
"tagRenderings": [
"images",
{
@ -316,21 +327,10 @@
}
}
],
"presets": [
{
"title": {
"en": "a memorial",
"de": "ein Denkmal"
},
"tags": [
"historic=memorial"
]
}
],
"minzoom": 9,
"deletion": true,
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
}
},
"defaultBackgroundId": "protomaps.white"
}

View file

@ -358,7 +358,7 @@
],
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
},
"units": [
{

View file

@ -6,6 +6,10 @@
"description": {
"en": "Outdoor seating areas, usually located near cafes and restaurants."
},
"source": {
"osmTags": "leisure=outdoor_seating"
},
"minzoom": 19,
"title": {
"render": {
"en": "Outdoor Seating area"
@ -17,10 +21,26 @@
}
]
},
"source": {
"osmTags": "leisure=outdoor_seating"
},
"minzoom": 19,
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "./assets/layers/outdoor_seating/outdoor_seating.svg"
}
]
}
],
"lineRendering": [
{
"color": "green",
"fillColor": "#00FF004D",
"width": 2
}
],
"tagRenderings": [
"images",
{
@ -150,25 +170,5 @@
]
}
}
],
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "./assets/layers/outdoor_seating/outdoor_seating.svg"
}
]
}
],
"lineRendering": [
{
"color": "green",
"fillColor": "#00FF004D",
"width": 2
}
]
}
}

View file

@ -162,6 +162,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -8,7 +8,6 @@
"en": "Ski and snowboard pistes",
"de": "Ski- und Snowboardpisten"
},
"minzoom": 11,
"source": {
"osmTags": {
"and": [
@ -22,6 +21,7 @@
]
}
},
"minzoom": 11,
"title": {
"render": {
"en": "Ski piste {name}",

View file

@ -145,6 +145,10 @@
"id": "camera_direction"
}
],
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
},
"units": [
{
"maxspeed": {
@ -155,9 +159,5 @@
]
}
}
],
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
}
]
}

View file

@ -950,6 +950,6 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
}
}

View file

@ -422,6 +422,19 @@
"en": "{quantity} months",
"nl": "{quantity} maanden"
}
},
{
"canonicalDenomination": "years",
"addSpace": true,
"canonicalDenominationSingular": "year",
"humanSingular": {
"en": "one year",
"nl": "één jaar"
},
"human": {
"en": "{quantity} years",
"nl": "{quantity} jaar"
}
}
]
}

View file

@ -29,6 +29,7 @@
"_biggest_width_properties= /* Can be a list! */ get(feat)('_entrance_properties').filter(p => p.width === get(feat)('_biggest_width'))",
"_biggest_width_id=get(feat)('_biggest_width_properties').id"
],
"isCounted": false,
"minzoom": 18,
"shownByDefault": false,
"title": {
@ -121,7 +122,6 @@
"condition": "_biggest_width_id~*"
}
],
"isCounted": false,
"units": [
{
"width": {

View file

@ -1,13 +1,13 @@
{
"id": "bicycle_parkings",
"description": {
"en": "A map showing all types of bicycle parkings",
"de": "Eine Karte mit allen Arten von Fahrradabstellplätzen"
},
"title": {
"en": "Bicycle parkings",
"de": "Fahrradabstellplätze"
},
"description": {
"en": "A map showing all types of bicycle parkings",
"de": "Eine Karte mit allen Arten von Fahrradabstellplätzen"
},
"icon": "./assets/themes/bicycle_parkings/logo.svg",
"layers": [
{

View file

@ -785,7 +785,7 @@
"minzoom": 17,
"doCount": false
},
"widenFactor": 2,
"overpassMaxZoom": 15,
"osmApiTileSize": 17
"osmApiTileSize": 17,
"widenFactor": 2
}

View file

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

View file

@ -1,14 +1,14 @@
{
"id": "memorials",
"icon": "./assets/layers/memorial/memorial.svg",
"description": {
"en": "Memorials are physical objects permantently placed in the public space to remember a person or event. They can be a wide range of objects, such as statues, plaques, paintings, military objects (such as tanks), ...",
"de": "Denkmäler sind physische Objekte, die dauerhaft im öffentlichen Raum aufgestellt werden, um an eine Person oder ein Ereignis zu erinnern. Dabei kann es sich um eine Vielzahl von Objekten handeln, z. B. Statuen, Tafeln, Gemälde, militärische Objekte (wie Panzer), ..."
},
"title": {
"en": "Memorials",
"de": "Denkmäler"
},
"description": {
"en": "Memorials are physical objects permantently placed in the public space to remember a person or event. They can be a wide range of objects, such as statues, plaques, paintings, military objects (such as tanks), ...",
"de": "Denkmäler sind physische Objekte, die dauerhaft im öffentlichen Raum aufgestellt werden, um an eine Person oder ein Ereignis zu erinnern. Dabei kann es sich um eine Vielzahl von Objekten handeln, z. B. Statuen, Tafeln, Gemälde, militärische Objekte (wie Panzer), ..."
},
"icon": "./assets/layers/memorial/memorial.svg",
"layers": [
{
"builtin": [

View file

@ -42,7 +42,7 @@
"shownByDefault": false
},
"enableNoteImports": false,
"widenFactor": 1.2,
"overpassMaxZoom": 15,
"widenFactor": 1.2,
"#note": "The 'overpassMaxZoom' should be exactly the same as or less then the minzzom in overrideAll"
}

View file

@ -70,6 +70,6 @@
"layers": [
"tree_node"
],
"widenFactor": 0.2,
"osmApiTileSize": 18
"osmApiTileSize": 18,
"widenFactor": 0.2
}

View file

@ -72,6 +72,18 @@
}
}
},
{
"id": "show-data-velopark",
"render": {
"special": {
"type": "linked_data_from_website",
"key": "ref:velopark",
"useProxy": "no",
"host": "https://data.velopark.be",
"mode": "readonly"
}
}
},
{
"id": "closest_parkings",
"render": {
@ -90,7 +102,7 @@
"type": "multi",
"key": "_nearby_bicycle_parkings:props",
"classes": "p-2 m-1 my-4 border-2 border-dashed border-black",
"tagrendering": "<b><a href='#{id}'>{id}</a></b> ({_distance}m, {_velopark:id}) {minimap(20)} {tag_apply(ref:velopark=$_ref,Link this object.,link,id,_mr_id)}"
"tagrendering": "<b><a href='#{id}'>{id}</a></b> ({_distance}m, {_velopark:id}, place for {capacity}, covered: {covered}) {minimap(20,id,_mr_id)} {tag_apply(ref:velopark=$_ref,Link this object.,link,id,_mr_id)}"
}
}
},
@ -120,7 +132,7 @@
"id": "title_manually_copy",
"render": {
"en": "<h3>Manually link</h3>Does the bicycle parking exist in OpenStreetMap but is it further then 25m away? Then: <ol><li>Copy the following URL: <span class='literal-code'>{ref:velopark}</span></li><li>Select the correct bicycle parking on the map</li><li>Paste the URL into the question <i>What is the URL of the data path in Velopark?</i></li><li>Mark this item as handled with the button below:</li></ul>",
"nl": "<h3>Manueel linken</h3>"
"nl": "<h3>Manueel linken</h3>Bestaat de fietsenstalling in OpenStreetMap maar is staat deze meer dan 25m verder?In dit geval: <ol><li>Kopieer de volgende URL: <span class='literal-code'>{ref:velopark}</span></li><li>Selecteer de juiste fietsenstalling op de kaart</li><li>Plak de URL in de vraag <i>Wat is de data-url van deze fietsenstalling in Velopark.be?</i></li><li>Open deze fietsenstalling opnieuw en markeer deze als gelinkt met onderstaande knop:</li></ul>"
}
},
{
@ -168,18 +180,6 @@
"nl": "<h3>Extra informatie</h3>"
}
},
{
"id": "show-data-velopark",
"render": {
"special": {
"type": "linked_data_from_website",
"key": "ref:velopark",
"useProxy": "no",
"host": "https://data.velopark.be",
"mode": "readonly"
}
}
},
{
"id": "velopark-data-link",
"render": {
@ -319,7 +319,21 @@
}
],
"+tagRenderings": [
"questions"
{
"id": "questions-intro",
"render": {
"en": "The question(s) below inquiry about attributes that are not yet known in OpenStreetMap",
"nl": "De vragen hieronder zijn attributen die nog niet gekend zijn in OpenStreetMap"
}
},
"questions",
{
"id": "osm-block-title",
"render": {
"en": "<h3>Attributes from OpenStreetMap</h3>Editing below will make changes directly in OpenStreetMap",
"nl": "<h3>Attributen uit OpenStreetMap</h3>Als je hieronder wijzigingen maakt, dan worden die direct in OpenStreetMap opgeslaan"
}
}
],
"tagRenderings+": [
"images"
@ -338,7 +352,14 @@
"doCount": false,
"minzoom": 14,
"+tagRenderings": [
"questions"
"questions",
{
"id": "osm-block-title",
"render": {
"en": "<h3>Attributes from OpenStreetMap</h3>Editing below will make changes directly in OpenStreetMap",
"nl": "<h3>Attributen uit OpenStreetMap</h3>Als je hieronder wijzigingen maakt, dan worden die direct in OpenStreetMap opgeslaan"
}
}
],
"tagRenderings+": [
"images"