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

Compare commits

base: FarmMaps:2825ce4ccce7d592aa380f0483a574fdf0c97272
Branches Tags
FarmMaps:develop
FarmMaps:master
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72
..
compare: FarmMaps:0d40141b2d66fb98c74b6861cb3f8fa589c5a824
Branches Tags
FarmMaps:master
FarmMaps:develop
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72

No commits in common. "2825ce4ccce7d592aa380f0483a574fdf0c97272" and "0d40141b2d66fb98c74b6861cb3f8fa589c5a824" have entirely different histories.
2825ce4ccc ... 0d40141b2d

2 changed files with 23 additions and 26 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "2.1.3", "version": "2.1.2",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",

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

@ -364,12 +364,16 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
} }
} }
installTopLayerPrerenderEventhandler(olLayer : Layer<Source>) { installTopLayerPrerenderEventhandler() {
if(!this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 && olLayer) { if(!this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 ) {
if(this.instance.getVisible()) { if(this.instance.getVisible()) {
olLayer.on('prerender',this.topLayerPrerenderEventhandler); var olLayers = this.instance.getLayers().getArray().filter(l=> l.getVisible());
olLayer.on('postrender',this.topLayerPostrenderEventhandler); if(olLayers.length >0) {
this.topLayerPrerenderEventhandlerInstalled = true; var topLayer = olLayers[0] as any;
topLayer.on('prerender',this.topLayerPrerenderEventhandler);
topLayer.on('postrender',this.topLayerPostrenderEventhandler);
this.topLayerPrerenderEventhandlerInstalled = true;
}
} }
} }
} }
@ -378,11 +382,13 @@ 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().forEach((l:any) => { var olLayers = this.instance.getLayers().getArray().filter(l=> l.getVisible());
l.un('prerender',this.topLayerPrerenderEventhandler); if(olLayers.length >0) {
l.un('postrender',this.topLayerPostrenderEventhandler); var topLayer = olLayers[0] as any;
}); topLayer.un('prerender',this.topLayerPrerenderEventhandler);
this.topLayerPrerenderEventhandlerInstalled = false; topLayer.un('postrender',this.topLayerPostrenderEventhandler);
this.topLayerPrerenderEventhandlerInstalled = false;
}
} }
} }
} }
@ -412,19 +418,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return layer; return layer;
} }
updateLayers(itemLayers: IItemLayer[] | IItemLayer) { updateLayers(itemLayers: 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 (ils) { if (itemLayers) {
ils.forEach((itemLayer, index) => { itemLayers.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);
@ -433,11 +431,9 @@ 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
@ -446,11 +442,12 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
olLayers.removeAt(newLayers.length); olLayers.removeAt(newLayers.length);
} }
this.selectionLayer=null; this.selectionLayer=null;
if(this.mapEventHandlerInstalled && ils.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') { if(this.mapEventHandlerInstalled && itemLayers.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) => {