Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2021-11-07 15:31:55 +01:00
commit 37231969e6
120 changed files with 44636 additions and 44531 deletions

View file

@ -36,15 +36,7 @@
"color": "#444444",
"width": {
"render": "1"
},
"mapRendering": [
{
"color": "#444444",
"width": {
"render": "1"
}
}
]
}
},
{
"builtin": "play_forest",
@ -260,33 +252,7 @@
},
"width": {
"render": "9"
},
"mapRendering": [
{
"icon": "./assets/themes/speelplekken/walking_route.svg",
"location": [
"point"
]
},
{
"color": {
"render": "#6d6",
"mappings": [
{
"if": "color~*",
"then": "{color}"
},
{
"if": "colour~*",
"then": "{colour}"
}
]
},
"width": {
"render": "9"
}
}
]
}
}
],
"clustering": {