package-lock.json

@@ -102,15 +102,15 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "~14.0.0",
-        "@farmmaps/common": ">=2.0.0",
+        "@farmmaps/common": ">=^2.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": "^14.0.0",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": "^14.0.0",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": "^14.0.0",
-        "ngrx-store-localstorage": ">=14.0.0",
+        "ngrx-store-localstorage": "^14.0.0",
-        "ngx-openlayers": ">=1.0.0-next.19",
+        "ngx-openlayers": "1.0.0-next.19",
-        "ol": ">=6.8.1",
+        "ol": "6.8.1",
-        "tassign": ">=1.0.0"
+        "tassign": "^1.0.0"
       }
     },
     "dist/common-map3d": {
@@ -120,11 +120,11 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": "^14.0.0",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^14.0.0",
-        "cesium": ">=1.82.1",
+        "cesium": "^1.82.1",
         "ngx-openlayers": "1.0.0-next.19",
-        "ol-cesium": ">=2.13.0"
+        "ol-cesium": "^2.13.0"
       }
     },
     "node_modules/@adobe/css-tools": {

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

@@ -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()) {
-        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.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;
   }
 
-  updateLayers(itemLayers: IItemLayer[] | IItemLayer) {
+  updateLayers(itemLayers: IItemLayer[]) {
     this.unInstallTopLayerPrerenderEventhandler();
-    let dataLayer = false;
-    var ils:IItemLayer[] = [];
-    if(Array.isArray(itemLayers)) {
-       ils = itemLayers;
-    } else {
-      dataLayer=true;
-       ils=[itemLayers];
-    }
     let newLayers: Layer<Source>[] = [];
-    if (ils) {
+    if (itemLayers) {
-      ils.forEach((itemLayer, index) => {
+      itemLayers.forEach((itemLayer, index) => {
         if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
           let il = itemLayer as ITemporalItemLayer;
           let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);          
@@ -433,11 +431,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           if(selectedLayer) newLayers.push(selectedLayer);
           let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
           if(nextLayer) newLayers.push(nextLayer);
-          this.installTopLayerPrerenderEventhandler(selectedLayer);
         } else {
           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
@@ -446,11 +442,12 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         olLayers.removeAt(newLayers.length);
       }
       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]));
         if(this.selectionLayer) olLayers.push(this.selectionLayer)
       }
     }
+    this.installTopLayerPrerenderEventhandler();
   }
 
   topLayerPrerenderEventhandler = (event) => {