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

Fix: fix UK-Addresses themes again

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-11-12 15:26:08 +01:00
parent b2e7b7d221
commit 370b200bb3
2 changed files with 110 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,18 @@
}, },
"pointRendering": [], "pointRendering": [],
"lineRendering": [ "lineRendering": [
{} {
"width": 2,
"color": {
"render": "#00f",
"mappings": [
{
"if": "_has_address=true",
"then": "#0f0"
}
]
}
}
] ]
}, },
{ {
@ -112,7 +123,7 @@
"_embedding_object:addr:housenumber=JSON.parse(feat.properties._embedding_object)?.['addr:housenumber']", "_embedding_object:addr:housenumber=JSON.parse(feat.properties._embedding_object)?.['addr:housenumber']",
"_embedding_object:addr:street=JSON.parse(feat.properties._embedding_object)?.['addr:street']", "_embedding_object:addr:street=JSON.parse(feat.properties._embedding_object)?.['addr:street']",
"_embedding_inspire_polygon_has_address=overlapWith(feat)('raw_inspire_polygons')[0]?.feat?.properties?._has_address", "_embedding_inspire_polygon_has_address=overlapWith(feat)('raw_inspire_polygons')[0]?.feat?.properties?._has_address",
"_embedding_object:id=feat.get('_embedding_object')?.id ?? feat.properties._embedding_inspire_polygon_has_address" "_embedding_object:id=get(feat, '_embedding_object')?.id ?? feat.properties._embedding_inspire_polygon_has_address"
], ],
"filter": [ "filter": [
{ {
@ -137,7 +148,37 @@
} }
], ],
"description": "Alamat", "description": "Alamat",
"pointRendering": [], "pointRendering": [
{
"marker":[{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
"mappings": [
{
"if": {
"and": [
"_embedding_object:id~*",
"_embedding_object:id!=false"
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
},
{
"if": "_imported=yes",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
}
]
}
}],
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
}
],
"lineRendering": [ "lineRendering": [
{} {}
] ]
@ -581,9 +622,62 @@
} }
} }
], ],
"pointRendering": [], "pointRendering": [ {
"lineRendering": [ "label": {
{} "render": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{addr:housenumber}</div>",
"condition": "addr:housenumber~*"
},
"iconSize": "50,50",
"marker":[{
"icon": {
"render": "./assets/layers/address/housenumber_blank.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
}
]
}
}]
,
"location": [
"point",
"centroid"
],
"anchor": "center"
}],
"lineRendering": [ {
"color": {
"render": "#00f",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "#ff0"
}
]
},
"width": "3"
}
] ]
}, },
"named_streets" "named_streets"
@ -609,4 +703,4 @@
"minNeededFeatures": 25, "minNeededFeatures": 25,
"maxZoom": 16 "maxZoom": 16
} }
} }

14
src/UI/Map/ShowOverlayRasterLayer.ts
View file

@ -45,11 +45,15 @@ export default class ShowOverlayRasterLayer {
let zoom = this._mapProperties?.zoom?.data let zoom = this._mapProperties?.zoom?.data
let withinRange = zoom === undefined || zoom > this._layer.min_zoom let withinRange = zoom === undefined || zoom > this._layer.min_zoom
let isDisplayed = (this._isDisplayed?.data ?? true) && withinRange let isDisplayed = (this._isDisplayed?.data ?? true) && withinRange
this._map.data?.setLayoutProperty( try {
this._layer.id, this._map.data?.setLayoutProperty(
"visibility", this._layer.id,
isDisplayed ? "visible" : "none" "visibility",
) isDisplayed ? "visible" : "none"
)
} catch (e) {
console.error(e)
}
} }
private async awaitStyleIsLoaded(): Promise<void> { private async awaitStyleIsLoaded(): Promise<void> {