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

Merge branch 'develop' into features/left-right-rendering

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-20 01:27:01 +02:00
commit 7b9836f273
43 changed files with 1324 additions and 1118 deletions
Download patch file Download diff file Expand all files Collapse all files

55
assets/layers/bike_shop/bike_shop.json
View file

@ -157,10 +157,6 @@
]
},
"titleIcons": [
{
"render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
"condition": "operator=De Fietsambassade Gent"
},
{
"render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
"condition": "operator=De Fietsambassade Gent"
@ -178,6 +174,10 @@
"condition": "service:bicycle:diy=yes",
"render": "<img src='./assets/layers/bike_shop/tools.svg'/>"
},
{
"condition": "service:bicycle:cleaning=yes",
"render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>"
},
"defaults"
],
"description": {
@ -314,13 +314,6 @@
},
"id": "bike_shop-access"
},
{
"render": "Enkel voor {access}",
"freeform": {
"key": "access"
},
"id": "bike_shop-access"
},
{
"id": "bike_repair_sells-bikes",
"question": {
@ -670,6 +663,32 @@
}
}
]
},
{
"question": "How much does it cost to use the cleaning service?",
"render": "Using the cleaning service costs {charge}",
"freeform": {
"key": "service:bicycle:cleaning:charge",
"addExtraTags": [
"service:bicycle:cleaning:fee=yes"
]
},
"mappings": [
{
"if": "service:bicycle:cleaning:fee=no&service:bicycle:cleaning:charge=",
"then": "The cleaning service is free to use"
},
{
"if": "service:bicycle:cleaning:fee=no&",
"then": "Free to use",
"hideInAnswer": true
},
{
"if": "service:bicycle:cleaning:fee=yes",
"then": "The cleaning service has a fee"
}
],
"id": "bike_cleaning-service:bicycle:cleaning:charge"
}
],
"presets": [
@ -708,13 +727,19 @@
"badge": true
},
{
"if": "opening_hours~*",
"then": "isOpen",
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"if": {
"and": [
"service:bicycle:cleaning~*"
]
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
},
"badge": true
}
],

22
assets/themes/aed/aed_brugge.json
View file

@ -42,26 +42,12 @@
"iconSize": "20,20,center",
"tagRenderings": [
"all_tags"
],
"mapRendering": [
{
"icon": {
"render": "circle:red",
"mappings": [
{
"if": "_has_closeby_feature=yes",
"then": "circle:#008000aa"
}
]
},
"iconSize": "20,20,center",
"location": [
"point"
]
}
]
}
],
"hideFromOverview": true,
"defaultBackgroundId": "HDM_HOT"
"defaultBackgroundId": "HDM_HOT",
"clustering": {
"maxZoom": 0
}
}

40
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -1,7 +1,6 @@
{
"id": "buurtnatuur",
"title": {
"#": "DO NOT TRANSLATE THIS THEME - this one is only meant to be in dutch!",
"nl": "Breng jouw buurtnatuur in kaart"
},
"shortDescription": {
@ -124,19 +123,6 @@
"nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
},
{
@ -235,19 +221,6 @@
"nl": "Voeg een ontbrekend park toe"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
@ -365,19 +338,6 @@
"nl": "Voeg een ontbrekend bos toe aan de kaart"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
"viewpoint"

24
assets/themes/cyclestreets/cyclestreets.json
View file

@ -84,14 +84,6 @@
"width": "10",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
}
]
},
{
@ -144,14 +136,6 @@
"width": "5",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
}
]
},
{
@ -217,14 +201,6 @@
},
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
}
]
}
],