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

Various bug fixes and updates

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-09-09 18:42:13 +02:00
parent 97ec893479
commit e069b31e4e
29 changed files with 482 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Logic/FilteredLayer.ts
View file

@ -216,21 +216,26 @@ export class FilteredLayer {
pointToLayer: function (feature, latLng) {
const style = self._style(feature.properties);
let marker;
if (style.icon === undefined) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
if (style.icon === undefined) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else {
if(style.icon.iconSize === undefined){
style.icon.iconSize = [50,50]
}
marker = L.marker(latLng, {
icon: new L.icon(style.icon),
});
}
} else if (style.icon.iconUrl.startsWith("$circle ")) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else {
if (style.icon.iconSize === undefined) {
style.icon.iconSize = [50, 50]
}
marker = L.marker(latLng, {
icon: new L.icon(style.icon),
});
}
let eventSource = State.state.allElements.addOrGetElement(feature);
const uiElement = self._showOnPopup(eventSource, feature);
const popup = L.popup({}, marker).setContent(uiElement.Render());
@ -253,11 +258,7 @@ export class FilteredLayer {
}
} else {
self._geolayer.setStyle(function (featureX) {
const style = self._style(featureX.properties);
if (featureX === feature) {
console.log("Selected element is", featureX.properties.id)
}
return style;
return self._style(featureX.properties);
});
}
}