midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: loading oneway arrows on multiple layers; fix nullpointer

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-02-07 20:29:05 +01:00
parent c823e745a3
commit 16784270ce
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -312,7 +312,7 @@ export default class PointRenderingConfig extends WithContextLoader {
if (cssLabel) { if (cssLabel) {
label.SetStyle(cssLabel) label.SetStyle(cssLabel)
} else if (labelOnly) { } else if (labelOnly) {
return label.SetStyle("transform: translate(-50%, -50%);") return label?.SetStyle("transform: translate(-50%, -50%);")
} }
return new Combine([label]).SetClass("flex flex-col items-center") return new Combine([label]).SetClass("flex flex-col items-center")
}) })

19
src/UI/Map/ShowDataLayer.ts
View file

@ -235,17 +235,26 @@ class LineRenderingLayer {
map.on("styledata", () => self.update(features.features)) map.on("styledata", () => self.update(features.features))
} }
private addSymbolLayer(sourceId: string, url: string = "./assets/png/oneway.png"){ private async addSymbolLayer(sourceId: string, url: string = "./assets/png/oneway.png") {
const map = this._map const map = this._map
const imgId = url.replaceAll(/[/.-]/g, "_") const imgId = url.replaceAll(/[/.-]/g, "_")
if (map.getImage(imgId) === undefined) {
await new Promise<void>((resolve, reject) => {
map.loadImage(url, (err, image) => { map.loadImage(url, (err, image) => {
if (err) { if (err) {
console.error("Could not add symbol layer to line due to", err); console.error("Could not add symbol layer to line due to", err)
reject(err)
return return
} }
map.addImage(imgId, image); map.addImage(imgId, image)
resolve()
})
})
}
map.addLayer({ map.addLayer({
'id': "symbol-layer"+imgId, "id": "symbol-layer_" + this._layername + "-" + imgId,
'type': 'symbol', 'type': 'symbol',
'source': sourceId, 'source': sourceId,
'layout': { 'layout': {
@ -259,7 +268,7 @@ class LineRenderingLayer {
'visibility': 'visible' 'visibility': 'visible'
} }
}); });
});
} }
public destruct(): void { public destruct(): void {