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

Small performance issues, improvement of #579

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-05 18:08:42 +01:00
parent 4fd30d1a62
commit ee962f4ba3
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Logic/UIEventSource.ts
View file

@ -281,10 +281,12 @@ export class UIEventSource<T> {
* @param f: The transforming function * @param f: The transforming function
* @param extraSources: also trigger the update if one of these sources change * @param extraSources: also trigger the update if one of these sources change
* @param g: a 'backfunction to let the sync run in two directions. (data of the new UIEVEntSource, currentData) => newData * @param g: a 'backfunction to let the sync run in two directions. (data of the new UIEVEntSource, currentData) => newData
* @param allowUnregister: if set, the update will be halted if no listeners are registered
*/ */
public map<J>(f: ((t: T) => J), public map<J>(f: ((t: T) => J),
extraSources: UIEventSource<any>[] = [], extraSources: UIEventSource<any>[] = [],
g: ((j: J, t: T) => T) = undefined): UIEventSource<J> { g: ((j: J, t: T) => T) = undefined,
allowUnregister = false): UIEventSource<J> {
const self = this; const self = this;
const stack = new Error().stack.split("\n"); const stack = new Error().stack.split("\n");
@ -297,6 +299,7 @@ export class UIEventSource<T> {
const update = function () { const update = function () {
newSource.setData(f(self.data)); newSource.setData(f(self.data));
return allowUnregister && newSource._callbacks.length === 0
} }
this.addCallback(update); this.addCallback(update);

19
UI/ShowDataLayer/ShowDataLayer.ts
View file

@ -146,6 +146,7 @@ export default class ShowDataLayer {
onEachFeature: (feature, leafletLayer) => self.postProcessFeature(feature, leafletLayer) onEachFeature: (feature, leafletLayer) => self.postProcessFeature(feature, leafletLayer)
}); });
const selfLayer = this.geoLayer;
const allFeats = this._features.features.data; const allFeats = this._features.features.data;
for (const feat of allFeats) { for (const feat of allFeats) {
if (feat === undefined) { if (feat === undefined) {
@ -153,12 +154,11 @@ export default class ShowDataLayer {
} }
try { try {
if (feat.geometry.type === "LineString") { if (feat.geometry.type === "LineString") {
const self = this;
const coords = L.GeoJSON.coordsToLatLngs(feat.geometry.coordinates) const coords = L.GeoJSON.coordsToLatLngs(feat.geometry.coordinates)
const tagsSource = this.allElements?.addOrGetElement(feat) ?? new UIEventSource<any>(feat.properties); const tagsSource = this.allElements?.addOrGetElement(feat) ?? new UIEventSource<any>(feat.properties);
let offsettedLine; let offsettedLine;
tagsSource tagsSource
.map(tags => this._layerToShow.lineRendering[feat.lineRenderingIndex].GenerateLeafletStyle(tags)) .map(tags => this._layerToShow.lineRendering[feat.lineRenderingIndex].GenerateLeafletStyle(tags), [], undefined, true)
.withEqualityStabilized((a, b) => { .withEqualityStabilized((a, b) => {
if (a === b) { if (a === b) {
return true return true
@ -176,6 +176,9 @@ export default class ShowDataLayer {
offsettedLine = L.polyline(coords, lineStyle); offsettedLine = L.polyline(coords, lineStyle);
this.postProcessFeature(feat, offsettedLine) this.postProcessFeature(feat, offsettedLine)
offsettedLine.addTo(this.geoLayer) offsettedLine.addTo(this.geoLayer)
// If 'self.geoLayer' is not the same as the layer the feature is added to, we can safely remove this callback
return self.geoLayer !== selfLayer
}) })
} else { } else {
this.geoLayer.addData(feat); this.geoLayer.addData(feat);
@ -186,11 +189,13 @@ export default class ShowDataLayer {
} }
if (options.zoomToFeatures ?? false) { if (options.zoomToFeatures ?? false) {
try { if(this.geoLayer.getLayers().length > 0){
const bounds = this.geoLayer.getBounds() try {
mp.fitBounds(bounds, {animate: false}) const bounds = this.geoLayer.getBounds()
} catch (e) { mp.fitBounds(bounds, {animate: false})
console.debug("Invalid bounds", e) } catch (e) {
console.debug("Invalid bounds", e)
}
} }
} }