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

Fix: lines with opacity have colour again

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-23 00:59:35 +02:00
parent 64e791dbfb
commit f0d9365e06
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
UI/Map/ShowDataLayer.ts
View file

@ -153,8 +153,9 @@ class PointRenderingLayer {
if (this._onClick) { if (this._onClick) {
const self = this const self = this
el.addEventListener("click", function (ev) { el.addEventListener("click", function (ev) {
self._onClick(feature)
ev.preventDefault() ev.preventDefault()
self._onClick(feature)
console.log("Got click:", feature)
// Workaround to signal the MapLibreAdaptor to ignore this click // Workaround to signal the MapLibreAdaptor to ignore this click
ev["consumed"] = true ev["consumed"] = true
}) })
@ -246,7 +247,7 @@ class LineRenderingLayer {
for (const key of LineRenderingLayer.lineConfigKeys) { for (const key of LineRenderingLayer.lineConfigKeys) {
calculatedProps[key] = config[key]?.GetRenderValue(properties)?.Subs(properties).txt calculatedProps[key] = config[key]?.GetRenderValue(properties)?.Subs(properties).txt
} }
calculatedProps.fillColor = calculatedProps.fillColor ?? calculatedProps.lineColor calculatedProps.fillColor = calculatedProps.fillColor ?? calculatedProps.color
for (const key of LineRenderingLayer.lineConfigKeysColor) { for (const key of LineRenderingLayer.lineConfigKeysColor) {
let v = <string>calculatedProps[key] let v = <string>calculatedProps[key]
@ -256,12 +257,7 @@ class LineRenderingLayer {
if (v.length == 9 && v.startsWith("#")) { if (v.length == 9 && v.startsWith("#")) {
// This includes opacity // This includes opacity
calculatedProps[`${key}-opacity`] = parseInt(v.substring(7), 16) / 256 calculatedProps[`${key}-opacity`] = parseInt(v.substring(7), 16) / 256
v = v.substring(0, 7) calculatedProps[key] = v.substring(0, 7)
if (v.length == 9 && v.startsWith("#")) {
// This includes opacity
calculatedProps[`${key}-opacity`] = parseInt(v.substring(7), 16) / 256
v = v.substring(0, 7)
}
} }
} }
calculatedProps["fillColor-opacity"] = calculatedProps["fillColor-opacity"] ?? 0.1 calculatedProps["fillColor-opacity"] = calculatedProps["fillColor-opacity"] ?? 0.1
@ -315,6 +311,7 @@ class LineRenderingLayer {
}) })
map.on("click", linelayer, (e) => { map.on("click", linelayer, (e) => {
// line-layer-listener
e.originalEvent["consumed"] = true e.originalEvent["consumed"] = true
this._onClick(e.features[0]) this._onClick(e.features[0])
}) })
@ -333,7 +330,13 @@ class LineRenderingLayer {
}) })
if (this._onClick) { if (this._onClick) {
map.on("click", polylayer, (e) => { map.on("click", polylayer, (e) => {
// polygon-layer-listener
if(e.originalEvent["consumed"]){
// This is a polygon beneath a marker, we can ignore it
return
}
e.originalEvent["consumed"] = true e.originalEvent["consumed"] = true
console.log("Got features:", e.features, e)
this._onClick(e.features[0]) this._onClick(e.features[0])
}) })
} }