Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On redraw an area when it's style or points change

Browse Source
This commit is contained in:
James Lyne 2020-12-14 15:53:58 +00:00
parent ba5f8d70be
commit 4124b6b8e8
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/util/areas.ts
View File

@ -21,15 +21,44 @@ export const updateArea = (area: Polyline | Polygon | undefined, options: Dynmap
return createArea(options, converter); return createArea(options, converter);
} }
const oldPoints = area.getLatLngs();
let dirty = false;
//Avoid pointless setStyle() redrawing by checking if styles have actually changed
if(!isStyleEqual(area.options, options.style)) {
area.setStyle(options.style); //FIXME: Maybe override setStyle to add an option for not redrawing
dirty = true;
}
if(!arePointsEqual(oldPoints.length === 1 ? oldPoints[0] : oldPoints, points)) {
area.setLatLngs(points);
dirty = true;
}
area.unbindPopup(); area.unbindPopup();
area.bindPopup(() => createPopup(options)); area.bindPopup(() => createPopup(options));
area.setStyle(options.style);
area.setLatLngs(points); if(dirty) {
area.redraw(); area.redraw();
}
return area; return area;
}; };
const arePointsEqual = (oldPoints: any, newPoints: any) => {
return JSON.stringify(oldPoints) === JSON.stringify(newPoints);
}
const isStyleEqual = (oldStyle: any, newStyle: any) => {
return oldStyle && newStyle
&& (oldStyle.color === newStyle.color)
&& (oldStyle.weight === newStyle.weight)
&& (oldStyle.opacity === newStyle.opacity)
&& (oldStyle.fillColor === newStyle.fillColor)
&& (oldStyle.fillOpacity === newStyle.fillOpacity)
}
export const createPopup = (options: DynmapArea): HTMLElement => { export const createPopup = (options: DynmapArea): HTMLElement => {
const popup = document.createElement('span'); const popup = document.createElement('span');