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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-05-02 23:56:31 +02:00
commit ef3e27ee8b
399 changed files with 38592 additions and 44846 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/layers/aerialway/aerialway.json
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}",

2
assets/layers/artwork/artwork.json
View file

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

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

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

2
assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
View file

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

2
assets/layers/bike_cleaning/bike_cleaning.json
View file

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

56
assets/layers/bike_parking/bike_parking.json
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,27 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
}
},
"units": [
{
"maxstay": {
"quantity": "duration",
"denominations": [
"days",
"weeks",
"months"
]
},
"charge": {
"quantity": "duration",
"inverted": true,
"denominations": [
"days",
"weeks",
"months",
"years"
]
}
}
]
}

2
assets/layers/bike_repair_station/bike_repair_station.json
View file

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

2
assets/layers/binocular/binocular.json
View file

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

2
assets/layers/drinking_water/drinking_water.json
View file

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

60
assets/layers/food_courts/food_courts.json
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"
]
}
}

2
assets/layers/information_board/information_board.json
View file

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

2
assets/layers/map/map.json
View file

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

36
assets/layers/memorial/memorial.json
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"
}

2
assets/layers/observation_tower/observation_tower.json
View file

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

50
assets/layers/outdoor_seating/outdoor_seating.json
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
}
]
}
}

2
assets/layers/picnic_table/picnic_table.json
View file

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

2
assets/layers/ski_piste/ski_piste.json
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}",

10
assets/layers/speed_camera/speed_camera.json
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
}
]
}

2
assets/layers/tree_node/tree_node.json
View file

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

13
assets/layers/unit/unit.json
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"
}
}
]
}

2
assets/layers/walls_and_buildings/walls_and_buildings.json
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": {