FarmMaps
/
FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix slide for temporal layer

AW-4620
Willem Dantuma 2022-09-28 12:01:59 +02:00
parent 0d40141b2d
commit 5d83293540
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
View File

@ -364,16 +364,12 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
} }
} }
installTopLayerPrerenderEventhandler() { installTopLayerPrerenderEventhandler(olLayer : Layer<Source>) {
if(!this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 ) { if(!this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 && olLayer) {
if(this.instance.getVisible()) { if(this.instance.getVisible()) {
var olLayers = this.instance.getLayers().getArray().filter(l=> l.getVisible()); olLayer.on('prerender',this.topLayerPrerenderEventhandler);
if(olLayers.length >0) { olLayer.on('postrender',this.topLayerPostrenderEventhandler);
var topLayer = olLayers[0] as any; this.topLayerPrerenderEventhandlerInstalled = true;
topLayer.on('prerender',this.topLayerPrerenderEventhandler);
topLayer.on('postrender',this.topLayerPostrenderEventhandler);
this.topLayerPrerenderEventhandlerInstalled = true;
}
} }
} }
} }
@ -382,13 +378,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 ) if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 )
{ {
if(this.instance.getVisible()) { if(this.instance.getVisible()) {
var olLayers = this.instance.getLayers().getArray().filter(l=> l.getVisible()); var olLayers = this.instance.getLayers().getArray().forEach((l:any) => {
if(olLayers.length >0) { l.un('prerender',this.topLayerPrerenderEventhandler);
var topLayer = olLayers[0] as any; l.un('postrender',this.topLayerPostrenderEventhandler);
topLayer.un('prerender',this.topLayerPrerenderEventhandler); });
topLayer.un('postrender',this.topLayerPostrenderEventhandler); this.topLayerPrerenderEventhandlerInstalled = false;
this.topLayerPrerenderEventhandlerInstalled = false;
}
} }
} }
} }
@ -418,11 +412,19 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return layer; return layer;
} }
updateLayers(itemLayers: IItemLayer[]) { updateLayers(itemLayers: IItemLayer[] | IItemLayer) {
this.unInstallTopLayerPrerenderEventhandler(); this.unInstallTopLayerPrerenderEventhandler();
let dataLayer = false;
var ils:IItemLayer[] = [];
if(Array.isArray(itemLayers)) {
ils = itemLayers;
} else {
dataLayer=true;
ils=[itemLayers];
}
let newLayers: Layer<Source>[] = []; let newLayers: Layer<Source>[] = [];
if (itemLayers) { if (ils) {
itemLayers.forEach((itemLayer, index) => { ils.forEach((itemLayer, index) => {
if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') { if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') {
let il = itemLayer as ITemporalItemLayer; let il = itemLayer as ITemporalItemLayer;
let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length); let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);
@ -431,9 +433,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
if(selectedLayer) newLayers.push(selectedLayer); if(selectedLayer) newLayers.push(selectedLayer);
let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length); let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
if(nextLayer) newLayers.push(nextLayer); if(nextLayer) newLayers.push(nextLayer);
this.installTopLayerPrerenderEventhandler(selectedLayer);
} else { } else {
let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length); let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
if(layer) newLayers.push(layer); if(layer) newLayers.push(layer);
this.installTopLayerPrerenderEventhandler(layer);
} }
}); });
// Remove the layers that have disapeared from childrenLayers // Remove the layers that have disapeared from childrenLayers
@ -442,12 +446,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
olLayers.removeAt(newLayers.length); olLayers.removeAt(newLayers.length);
} }
this.selectionLayer=null; this.selectionLayer=null;
if(this.mapEventHandlerInstalled && itemLayers.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') { if(this.mapEventHandlerInstalled && ils.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
this.selectionLayer = this.createSelectionLayer(this.getItemlayer(itemLayers[0])); this.selectionLayer = this.createSelectionLayer(this.getItemlayer(itemLayers[0]));
if(this.selectionLayer) olLayers.push(this.selectionLayer) if(this.selectionLayer) olLayers.push(this.selectionLayer)
} }
} }
this.installTopLayerPrerenderEventhandler();
} }
topLayerPrerenderEventhandler = (event) => { topLayerPrerenderEventhandler = (event) => {