Fix: facade gardens: restore forgottne rendering

This commit is contained in:
Pieter Vander Vennet 2023-11-12 13:03:07 +01:00
parent daf6956f9d
commit f8fa1841e4
4 changed files with 86 additions and 10 deletions

View file

@ -688,6 +688,7 @@
"mappings": [
{
"if": "mapcomplete-show_debug=yes",
"icon": "./assets/svg/debug.svg",
"then": {
"en": "Show debug info",
"de": "Debug-Informationen anzeigen",
@ -720,15 +721,15 @@
}
]
},
{
"id": "debug",
"condition": "mapcomplete-show_debug=yes",
"render": "{all_tags()}"
},
{
"id":"debug-gps",
"condition": "mapcomplete-show_debug=yes",
"render": "{gps_all_tags()}"
},
{
"id": "debug",
"condition": "mapcomplete-show_debug=yes",
"render": "{all_tags()}"
}
]
}

View file

@ -579,11 +579,81 @@
"enableImproveAccuracy": true,
"enableRelocation": false
},
"pointRendering": [],
"lineRendering": [
{}
]
"pointRendering": [
{
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": {
"render": "./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "./assets/themes/facadegardens/schaduw.svg"
}
]
}
}
],
"iconBadges": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg"
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg"
}
],
"iconSize": "50,50",
"location": [
"point",
"centroid"
],
"anchor": "center"
}
],
"lineRendering": []
}
],
"widenFactor": 1.5
}
}

View file

@ -173,6 +173,8 @@ export default class GeoLocationHandler {
properties[k] = location[k]
}
}
console.log(location)
properties["_all"] = JSON.stringify(location)
const feature = <Feature>{
type: "Feature",

View file

@ -1062,6 +1062,9 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
)
}
if (!(json.pointRendering?.length > 0)) {
context.enter("pointRendering").err("There are no pointRenderings at all")
}
if (json.presets?.length > 0) {
if (!(json.pointRendering?.length > 0)) {
context.enter("presets").warn("A preset is defined, but there is no pointRendering")