@regionerne/gis-komponent 0.0.110 → 0.0.112

package/fesm2022/regionerne-gis-komponent.mjs

@@ -408,9 +408,23 @@ class LayoutService {
     _map;
     mapResizedSubject = new Subject();
     mapSetSubject = new BehaviorSubject(false);
+    _resizeObserver = null;
     set map(value) {
         this._map = value;
         this.mapSetSubject.next(true);
+        this._observeMapResize();
+    }
+    _observeMapResize() {
+        if (this._resizeObserver) {
+            this._resizeObserver.disconnect();
+        }
+        const viewport = this._map?.getViewport();
+        if (!viewport)
+            return;
+        this._resizeObserver = new ResizeObserver(() => {
+            this.mapResizedSubject.next(true);
+        });
+        this._resizeObserver.observe(viewport);
     }
     async keepWidgetInViewPort(dragPosition, widgetName, widgetHeight, widgetWidth, resizedContainerHeight = null, resizedContainerWidth = null) {
         //Expanding or changing map size, make sure the widget stays in viewport
@@ -847,6 +861,7 @@ class LayerSelectorComponent {
     _layerSelectorBodyControl;
     dialogRef;
     _dialog = inject(MatDialog);
+    _resizeSubscription;
     _mapFilteredLayerGroupsKeyName = 'mapFilteredLayerGroups';
     POSITION_STORAGE_KEY = 'layerSelectorPosition';
     _dmpLayersCacheStoragKey = 'dmpLayersCache';
@@ -863,6 +878,12 @@ class LayerSelectorComponent {
                         .replace('partly', 'Delvis klar til brug') }));
             }
         });
+        this._resizeSubscription = this._layoutService.mapResizedSubject.subscribe(async () => {
+            this.layerSelectorDragPosition = await this._layoutService.keepWidgetInViewPort(this.layerSelectorDragPosition, this.POSITION_STORAGE_KEY, this.collapsed ? WidgetConstants.collapsedHeight : WidgetConstants.layerSelectorHeight, this.collapsed ? WidgetConstants.collapsedWidth : WidgetConstants.layerSelectorWidth);
+        });
+    }
+    ngOnDestroy() {
+        this._resizeSubscription?.unsubscribe();
     }
     ngOnChanges(changes) {
         if (changes['profile'] && this.profile) {
@@ -2176,6 +2197,7 @@ class MergeFeaturesService {
                                     this._selectedMergeFeature?.setGeometry(overlapResult[0].getGeometry());
                                     const mergedFeature = evt.selected[0].clone();
                                     mergedFeature.setGeometry(overlapResult[0].getGeometry());
+                                    mergedFeature.setStyle(this._selectedMergeFeature?.getStyle());
                                     this._featureHelper.setId(mergedFeature);
                                     this._drawLayerService.source.addFeature(mergedFeature);
                                     this._undoRedoService.addStep();
@@ -3076,6 +3098,7 @@ class ToolboxComponent {
     _cursorLayerForDraw;
     _geometrySearchService = inject(GeometrySearchService);
     _polygonCleanupService = inject(PolygonCleanupService);
+    _resizeSubscription;
     drawInteraction;
     get showDocumentSearch() {
         return this.settings?.showDocumentSearch !== false;
@@ -4356,9 +4379,8 @@ class ToolboxComponent {
         this._originalMapHeight = this.map.getSize()[1];
         this._originalMapWidth = this.map.getSize()[0];
         this.bufferInMeters = this.settings.defaultBufferInMeters ?? 0.2;
-        this._layoutService.mapResizedSubject.subscribe(async (mapResized) => {
-            //Map resized, make sure it stays in viewport
-            this.dragPosition = await this._layoutService.keepWidgetInViewPort(this.dragPosition, this._POSITION_STORAGE_KEY, WidgetConstants.toolboxHeight, WidgetConstants.toolboxWidth, this.mapHeight, this.mapWidth);
+        this._resizeSubscription = this._layoutService.mapResizedSubject.subscribe(async () => {
+            this.dragPosition = await this._layoutService.keepWidgetInViewPort(this.dragPosition, this._POSITION_STORAGE_KEY, this.collapsed ? WidgetConstants.collapsedHeight : WidgetConstants.toolboxHeight, this.collapsed ? WidgetConstants.collapsedWidth : WidgetConstants.toolboxWidth);
         });
         this.drawItems = [];
         (this.settings.geometryTypeSettings ?? []).filter(f => f.availableGeometryTypes).forEach(geomSetting => {
@@ -4385,6 +4407,9 @@ class ToolboxComponent {
             this._featureHelper.setTypeId(evt.feature, this.selectedGeometrySetting?.typeId || '');
         });
     }
+    ngOnDestroy() {
+        this._resizeSubscription?.unsubscribe();
+    }
     ngOnChanges(changes) {
         if (changes['profile'] && this.profile) {
             this.collapsed = this.profile.toolbarCollapsed;
@@ -4910,6 +4935,7 @@ class ActiveObjectsComponent {
     _conflictService = inject(ConflictAnalysisSearchProvider);
     _undoRedo = inject(UndoRedoService);
     _dialogService = inject(ConfirmDialogService);
+    _resizeSubscription;
     isZoomedToAll = false;
     features$ = this._drawLayerService.features$;
     collapsed = true;
@@ -4994,6 +5020,12 @@ class ActiveObjectsComponent {
     ngOnInit() {
         this.conflictAnalysisAvailable = !!this._current.gisKomponentSettings.containsCheck && this._current.gisKomponentSettings.containsCheck.enabled &&
             this._current.profile.layerGroups.flatMap(lg => lg.layers).some(l => l.useInConflictAnalysis);
+        this._resizeSubscription = this._layoutService.mapResizedSubject.subscribe(async () => {
+            this.dragPosition = await this._layoutService.keepWidgetInViewPort(this.dragPosition, this.POSITION_STORAGE_KEY, this.collapsed ? WidgetConstants.collapsedHeight : WidgetConstants.activeObjectsHeight, this.collapsed ? WidgetConstants.collapsedWidth : WidgetConstants.activeObjectsWidth);
+        });
+    }
+    ngOnDestroy() {
+        this._resizeSubscription?.unsubscribe();
     }
     endSession() {
         this.sessionDone.emit();
@@ -5244,6 +5276,7 @@ class MapSearchComponent {
     _layoutService = inject(LayoutService);
     _profileService = inject(ProfileService);
     _zoomService = inject(ZoomService);
+    _resizeSubscription;
     ngOnInit() {
         this._layerHelperService.activeLayersChanged
             .subscribe(() => this._addWFSSearchLayers());
@@ -5254,6 +5287,12 @@ class MapSearchComponent {
                 this.filteredResults = result.filter(result => result.items.length > 0);
             }
         });
+        this._resizeSubscription = this._layoutService.mapResizedSubject.subscribe(async () => {
+            this.dragPosition = await this._layoutService.keepWidgetInViewPort(this.dragPosition, this.POSITION_STORAGE_KEY, this.collapsed ? WidgetConstants.collapsedHeight : WidgetConstants.searchHeight, this.collapsed ? WidgetConstants.collapsedWidth : WidgetConstants.searchWidth);
+        });
+    }
+    ngOnDestroy() {
+        this._resizeSubscription?.unsubscribe();
     }
     ngOnChanges(changes) {
         if (changes['profile'] && this.profile) {
@@ -5425,6 +5464,7 @@ class LegendsListComponent {
     _layoutService = inject(LayoutService);
     _profileService = inject(ProfileService);
     config = inject(GISKOMPONENT_CONFIG);
+    _resizeSubscription;
     map;
     profile;
     filteredLayersDetailed = [];
@@ -5440,6 +5480,9 @@ class LegendsListComponent {
                 this.filteredLayersDetailed = result;
             });
         });
+        this._resizeSubscription = this._layoutService.mapResizedSubject.subscribe(async () => {
+            this.dragPosition = await this._layoutService.keepWidgetInViewPort(this.dragPosition, this.POSITION_STORAGE_KEY, this.collapsed ? WidgetConstants.collapsedHeight : WidgetConstants.legendsHeight, this.collapsed ? WidgetConstants.collapsedWidth : WidgetConstants.legendsWidth);
+        });
     }
     ngOnChanges(changes) {
         this._layoutService.mapResizedSubject.subscribe(async () => {
@@ -5454,6 +5497,7 @@ class LegendsListComponent {
         }
     }
     ngOnDestroy() {
+        this._resizeSubscription?.unsubscribe();
         if (this._legendsListBodyControl) {
             this.map.removeControl(this._legendsListBodyControl);
         }