@regionerne/gis-komponent 0.0.54 → 0.0.56

package/fesm2022/regionerne-gis-komponent.mjs

@@ -3181,15 +3181,14 @@ class ToolboxComponent {
         if (!this.WKTString) {
             return;
         }
+        if (!this.selectedDrawItem) {
+            return;
+        }
         const wktFormat = new WKT();
         try {
             const feature = wktFormat.readFeature(this.WKTString, { featureProjection: 'EPSG:25832', dataProjection: 'EPSG:25832' });
             const featureType = feature.getGeometry()?.getType();
-            if (!this.selectedGeometrySetting?.availableGeometryTypes?.some(g => g === featureType)) {
-                this._confirmService.open({ message: `Den WKT du indlæser er af typen ${featureType} og det er ikke tilladt for denne indstilling`, primaryText: 'Ok', title: 'Advarsel' }).subscribe();
-                return;
-            }
-            this._settingsHelper.getStyle(this.selectedGeometrySetting.style, this.profile.styleRepositoryWorkspace, this.profile.styleRepositoryGeoserver, featureType).subscribe({
+            this._settingsHelper.getStyle(this.selectedDrawItem?.style, this.profile.styleRepositoryWorkspace, this.profile.styleRepositoryGeoserver, featureType).subscribe({
                 next: featureStyle => {
                     if (featureType === 'Polygon') {
                         this.handleFeatureValidation(feature).subscribe({
@@ -3197,7 +3196,7 @@ class ToolboxComponent {
                                 if (result) {
                                     result.forEach(feature => {
                                         feature.setStyle(featureStyle);
-                                        this._featureHelper.setTypeId(feature, this.selectedGeometrySetting?.typeId || '');
+                                        this._featureHelper.setTypeId(feature, this.selectedDrawItem?.typeId || '');
                                         this._featureHelper.setId(feature);
                                     });
                                     this._overlap.handleOverlaps(result).pipe(filter(f => !!f)).subscribe({
@@ -3222,7 +3221,7 @@ class ToolboxComponent {
                     }
                     else {
                         feature.setStyle(featureStyle);
-                        this._featureHelper.setTypeId(feature, this.selectedGeometrySetting?.typeId || '');
+                        this._featureHelper.setTypeId(feature, this.selectedDrawItem?.typeId || '');
                         this._featureHelper.setId(feature);
                         this._zoomService.zoomToFeatures([feature]);
                         this._drawLayerService.source.addFeature(feature);
@@ -3335,11 +3334,11 @@ class ToolboxComponent {
     startDraw() {
         this.activeMode = 'draw';
         // Set the first item as default
-        if (!this.selectedDrawItem) {
+        if (!this.selectedDrawItem && this.drawItems && this.drawItems.length > 0) {
             this.selectedDrawItem = this.drawItems[0];
+            // Actually start drawing immediately
+            this._doStartDraw(this.selectedDrawItem);
         }
-        // Actually start drawing immediately
-        this._doStartDraw(this.selectedDrawItem);
     }
     _deleteSelect;
     get deleteSelect() {
@@ -3866,7 +3865,7 @@ class ToolboxComponent {
         const changeTypeSelect = new Select$1({
             // layers: [this._drawLayer!],            
             layers: [this._drawLayerService.layer],
-            filter: f => !this._featureHelper.isLocked(f) && this._featureHelper.typeId(f) !== this.selectedGeometrySetting?.typeId // can't changed locked and cant change to same type
+            filter: f => !this._featureHelper.isLocked(f) && this._featureHelper.typeId(f) !== this.selectedDrawItem?.typeId // can't changed locked and cant change to same type
         });
         this._interactionHelper.setAsTemp(changeTypeSelect);
         changeTypeSelect.on('select', evt => {
@@ -3971,6 +3970,12 @@ class ToolboxComponent {
     setNewMapDimensions() {
         this.map.getTargetElement().style.width = this.mapWidth + 'px';
         this.map.getTargetElement().style.height = this.mapHeight + 'px';
+        if (this.mapWidth < 1920 && this.profile.toolboxInitialPosition.includes('højre')) {
+            const offset = this.mapWidth <= 800 ? 80 : (this.mapWidth <= 1280 ? 40 :
+                (this.mapWidth <= 1680 ? 20 : 0));
+            //Map got smaller, push Toolbox to the left
+            this._layoutService.bringElementIntoViewIfNeeded('.toolbox-wrapper', -offset, this.collapsed);
+        }
         this.map.updateSize();
     }
     doPrint() {