@regionerne/gis-komponent 0.0.80 → 0.0.82

package/fesm2022/regionerne-gis-komponent.mjs

@@ -22,7 +22,7 @@ import { register } from 'ol/proj/proj4';
 import proj4 from 'proj4';
 import { Control, Rotate as Rotate$1 } from 'ol/control';
 import { TileWMS, Vector } from 'ol/source';
-import { Subject, BehaviorSubject, tap, switchMap, EMPTY, map, combineLatest, Observable, debounceTime, distinctUntilChanged, of, ReplaySubject, filter, interval, forkJoin, catchError, throwError } from 'rxjs';
+import { Subject, BehaviorSubject, tap, switchMap, EMPTY, map, combineLatest, Observable, debounceTime, distinctUntilChanged, filter, take, of, ReplaySubject, interval, forkJoin, catchError, throwError } from 'rxjs';
 import WMTS, { optionsFromCapabilities } from 'ol/source/WMTS';
 import VectorLayer from 'ol/layer/Vector';
 import TileSource from 'ol/source/Tile';
@@ -283,6 +283,11 @@ class LayerHelperService {
     _dmpLayersCacheStoragKey = 'dmpLayersCache';
     _layerErrorService = inject(LayerErrorService);
     layerActivatedByBackgroundGroup = new Subject();
+    layersAddedToMapSubject = new BehaviorSubject(false);
+    _map;
+    set map(value) {
+        this._map = value;
+    }
     setDbId(layer, id) {
         layer.set(this._layerDbIdKey, id);
     }
@@ -349,9 +354,9 @@ class LayerHelperService {
             });
         }
     }
-    startFailoverForBackgroundGroup(aMap, groupId) {
+    startFailoverForBackgroundGroup(groupId, aMap = undefined) {
         const currentIndex$ = new BehaviorSubject(0);
-        const layergroup = aMap.getLayers().getArray()
+        const layergroup = (aMap ? aMap : this._map).getLayers().getArray()
             .find(layergroup => layergroup instanceof OLLayerGroup && layergroup.get('id') === groupId);
         if (!layergroup)
             return;
@@ -934,7 +939,6 @@ class LayerSelectorComponent {
                 else {
                     this._loadPosition(this.collapsed);
                     this.filteredLayerGroups = cachedProfileInfo.cachedLayerGroups.filter(gr => !gr.background);
-                    ;
                     this.filteredBackgroundLayerGroups = cachedProfileInfo.cachedLayerGroups.filter(gr => gr.background);
                     this._setVisibleLayersFromCache(cachedProfileInfo.cachedLayerGroups);
                 }
@@ -964,7 +968,7 @@ class LayerSelectorComponent {
                 group.layers.forEach(layer => layer.visible = false); //Turn all layers off in selector to begin with
                 group.visible = true; // Expand the group (there will be at least one active layer)
                 group.expanded = true;
-                this.map?.once('rendercomplete', () => this._layerHelper.startFailoverForBackgroundGroup(this.map, group.id));
+                this._layerHelper.layersAddedToMapSubject.pipe(filter(added => added === true), take(1)).subscribe((added) => this._layerHelper.startFailoverForBackgroundGroup(group.id));
             });
             this._initializeMapControl();
         }
@@ -1090,7 +1094,7 @@ class LayerSelectorComponent {
         if (visible && layerGroup.background) {
             //Toggle background group on, apply failover logic
             layerGroup.layers.forEach(layer => layer.visible = false); // Turn all off in selector to begin with
-            this._layerHelper.startFailoverForBackgroundGroup(this.map, layerGroup.id);
+            this._layerHelper.startFailoverForBackgroundGroup(layerGroup.id, this.map);
         }
         else {
             layerGroup.layers.forEach(layer => {
@@ -5421,11 +5425,13 @@ class GisKomponentComponent {
                             }))
                         ];
                         this.map.setLayers(layers);
+                        this._layerHelper.layersAddedToMapSubject.next(true);
                         if (this.settings) {
                             this._featureLoader.loadFeaturesSettings(this.settings);
                         }
                         this._currentItems.map = this.map;
                         this._layoutService.map = this.map;
+                        this._layerHelper.map = this.map;
                         this._layerHelper.applyCachedLayersToDisplayInMap(this.map, profile.id);
                     }
                 });