Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Theme format refactoring: move line properties into a seperate lineRendering configuration

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

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

@ -42,6 +42,24 @@
"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"
]
},
{}
]
}
],

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

@ -123,6 +123,51 @@
"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"
]
},
{
"color": {
"render": "#3c3",
"mappings": [
{
"if": {
"and": [
"name=",
"noname=",
"operator=",
"access=",
"access:description=",
"leisure=park"
]
},
"then": "#cc1100"
},
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"width": {
"render": "5"
}
}
]
},
{
@ -221,6 +266,38 @@
"nl": "Voeg een ontbrekend park toe"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
},
{
"color": {
"render": "#3c3",
"mappings": [
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"width": {
"render": "5"
}
}
]
},
{
@ -338,6 +415,56 @@
"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"
]
},
{
"color": {
"render": "#3a3",
"mappings": [
{
"if": {
"and": [
"operator=",
"access=",
"access:description="
]
},
"then": "#cc1100"
},
{
"if": {
"and": [
"operator="
]
},
"then": "#cccc00"
},
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"width": {
"render": "5"
}
}
]
},
"viewpoint"

16
assets/themes/campersite/campersite.json
View file

@ -699,6 +699,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
},
@ -1111,6 +1119,14 @@
"location": [
"point"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
}

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

@ -585,6 +585,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#0f0"
},
"width": {
"render": "4"
}
}
]
},
@ -868,6 +876,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#d38d5fAA"
},
"width": {
"render": "8"
}
}
]
},
@ -1005,6 +1021,14 @@
"location": [
"point"
]
},
{
"color": {
"render": "#ddff55AA"
},
"width": {
"render": "2"
}
}
]
}

35
assets/themes/cycle_highways/cycle_highways.json
View file

@ -239,6 +239,41 @@
"location": [
"point"
]
},
{
"color": {
"render": "#ff7392",
"mappings": [
{
"if": "state=",
"then": "#00acfc"
},
{
"if": "state=temporary",
"then": "#00acfc"
}
]
},
"width": {
"render": "4"
},
"dashArray": {
"render": "",
"mappings": [
{
"if": "state=temporary",
"then": "12 10"
},
{
"if": "note:state=has_highway_no",
"then": "0 8"
},
{
"if": "note:state=has_highway_under_construction",
"then": "12 10"
}
]
}
}
]
}

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

@ -84,6 +84,18 @@
"width": "10",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
},
{
"color": "#0000ff",
"width": "10"
}
]
},
{
@ -136,6 +148,18 @@
"width": "5",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
},
{
"color": "#09f9dd",
"width": "5"
}
]
},
{
@ -201,6 +225,30 @@
},
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
},
{
"color": {
"render": "#aaaaaa",
"mappings": [
{
"then": "#0000ff",
"if": "cyclestreet=yes"
},
{
"then": "#09f9dd",
"if": "proposed:cyclestreet=yes"
}
]
},
"width": "5"
}
]
}
],

16
assets/themes/fruit_trees/fruit_trees.json
View file

@ -80,6 +80,14 @@
"location": [
"point"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
},
@ -195,6 +203,14 @@
"location": [
"point"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
}

8
assets/themes/grb.json
View file

@ -215,6 +215,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "2"
}
}
]
}

8
assets/themes/hackerspaces/hackerspaces.json
View file

@ -259,6 +259,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
}

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

@ -329,6 +329,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
},
@ -697,6 +705,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#c22"
},
"width": {
"render": "1"
}
}
]
},
@ -912,6 +928,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "1"
}
}
]
}

16
assets/themes/postboxes/postboxes.json
View file

@ -92,6 +92,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#DADADA"
},
"width": {
"render": "1"
}
}
]
},
@ -202,6 +210,14 @@
"point",
"centroid"
]
},
{
"color": {
"render": "#DADADA"
},
"width": {
"render": "1"
}
}
]
}

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

@ -42,6 +42,12 @@
"location": [
"point"
]
},
{
"color": "#444444",
"width": {
"render": "1"
}
}
]
},
@ -266,6 +272,24 @@
"location": [
"point"
]
},
{
"color": {
"render": "#6d6",
"mappings": [
{
"if": "color~*",
"then": "{color}"
},
{
"if": "colour~*",
"then": "{colour}"
}
]
},
"width": {
"render": "9"
}
}
]
}

32
assets/themes/uk_addresses/uk_addresses.json
View file

@ -305,6 +305,30 @@
"location": [
"point"
]
},
{
"color": {
"render": "#00f",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "#ff0"
}
]
},
"width": {
"render": "8"
}
}
]
},
@ -330,6 +354,14 @@
"location": [
"point"
]
},
{
"color": {
"render": "#ccc"
},
"width": {
"render": "0"
}
}
]
}