@regionerne/gis-komponent 0.0.117 → 0.0.119

package/fesm2022/regionerne-gis-komponent.mjs

@@ -2142,6 +2142,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
             type: Injectable
         }] });
 
+class GeometryService {
+    config = inject(GISKOMPONENT_CONFIG);
+    _baseUrl = this.config.apiBaseUrl;
+    _http = inject(HttpClient);
+    validate(wkt) {
+        const url = `${this._baseUrl}/api/geometry/validate`;
+        return this._http.post(url, { wkt: wkt });
+    }
+    dmpValidate(wkt) {
+        const url = `${this._baseUrl}/api/geometry/dmpvalidate`;
+        return this._http.post(url, { wkt: wkt });
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 class MergeFeaturesService {
     _current = inject(CurrentItemsService);
     _featureHelper = inject(FeatureHelperService);
@@ -2149,9 +2171,11 @@ class MergeFeaturesService {
     _drawLayerService = inject(DrawLayerSourceService);
     _undoRedoService = inject(UndoRedoService);
     _overLapService = inject(OverlapService);
+    _geometryService = inject(GeometryService);
     _selectedMergeFeature;
     formatter = new GeoJSON$1();
     _formatterOptions = { dataProjection: 'EPSG:4326', featureProjection: 'EPSG:25832' };
+    _wktFormat = new WKT$1();
     _selectFilter(f, typeId) {
         if (this._featureHelper.isLocked(f)) {
             return false;
@@ -2187,29 +2211,44 @@ class MergeFeaturesService {
                         if (evt.selected && evt.selected.length > 0 && this._selectedMergeFeature.getId() !== evt.selected[0].getId()) {
                             const feature1 = this.formatter.writeFeatureObject(this._selectedMergeFeature, this._formatterOptions);
                             const feature2 = this.formatter.writeFeatureObject(evt.selected[0], this._formatterOptions);
-                            const bufferedFeature1 = buffer(feature1, 5, { units: 'centimeters' });
-                            const bufferedFeature2 = buffer(feature2, 5, { units: 'centimeters' });
-                            const newFeatureObject = union(featureCollection([bufferedFeature1, bufferedFeature2]));
+                            const bufferedFeature1 = buffer(feature1, 1, { units: 'centimeters' });
+                            const bufferedFeature2 = buffer(feature2, 1, { units: 'centimeters' });
+                            const newFeatureObjectUnminusBuffered = union(featureCollection([bufferedFeature1, bufferedFeature2]));
+                            const newFeatureObject = buffer(newFeatureObjectUnminusBuffered, -1, { units: 'centimeters' });
                             const newFeature = this.formatter.readFeature(newFeatureObject, this._formatterOptions);
-                            this._drawLayerService.source.removeFeatures([evt.selected[0], this._selectedMergeFeature]);
-                            const style = this._selectedMergeFeature.getStyle();
-                            const typeId = this._featureHelper.typeId(this._selectedMergeFeature);
-                            this._overLapService.handleOverlaps([newFeature]).subscribe({
-                                next: overlapResult => {
-                                    this._selectedMergeFeature?.setGeometry(overlapResult[0].getGeometry());
-                                    const mergedFeature = evt.selected[0].clone();
-                                    mergedFeature.setGeometry(overlapResult[0].getGeometry());
-                                    mergedFeature.setStyle(style);
-                                    this._featureHelper.setTypeId(mergedFeature, typeId);
-                                    this._featureHelper.setId(mergedFeature);
-                                    this._drawLayerService.source.addFeature(mergedFeature);
-                                    this._undoRedoService.addStep();
+                            const newFeatureWKT = this._wktFormat.writeGeometry(newFeature.getGeometry());
+                            this._geometryService.validate(newFeatureWKT).subscribe({
+                                next: r => {
+                                    const result = r;
+                                    if (result.wasCorrected) {
+                                        const geometry = this._wktFormat.readGeometry(result.correctedGeometries[0]);
+                                        newFeature.setGeometry(geometry);
+                                    }
+                                    this._drawLayerService.source.removeFeatures([evt.selected[0], this._selectedMergeFeature]);
+                                    const style = this._selectedMergeFeature.getStyle();
+                                    const typeId = this._featureHelper.typeId(this._selectedMergeFeature);
+                                    this._overLapService.handleOverlaps([newFeature]).subscribe({
+                                        next: overlapResult => {
+                                            this._selectedMergeFeature?.setGeometry(overlapResult[0].getGeometry());
+                                            const mergedFeature = evt.selected[0].clone();
+                                            mergedFeature.setGeometry(overlapResult[0].getGeometry());
+                                            mergedFeature.setStyle(style);
+                                            this._featureHelper.setTypeId(mergedFeature, typeId);
+                                            this._featureHelper.setId(mergedFeature);
+                                            this._drawLayerService.source.addFeature(mergedFeature);
+                                            this._undoRedoService.addStep();
+                                            this._selectedMergeFeature = undefined;
+                                            map.removeInteraction(select);
+                                            done();
+                                        }
+                                    });
                                 }
                             });
                         }
-                        this._selectedMergeFeature = undefined;
-                        map.removeInteraction(select);
-                        done();
+                        else {
+                            this._selectedMergeFeature = undefined;
+                            done();
+                        }
                     }
                     else {
                         this._selectedMergeFeature = evt.selected[0];
@@ -2629,28 +2668,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
             type: Injectable
         }] });
 
-class GeometryService {
-    config = inject(GISKOMPONENT_CONFIG);
-    _baseUrl = this.config.apiBaseUrl;
-    _http = inject(HttpClient);
-    validate(wkt) {
-        const url = `${this._baseUrl}/api/geometry/validate`;
-        return this._http.post(url, { wkt: wkt });
-    }
-    dmpValidate(wkt) {
-        const url = `${this._baseUrl}/api/geometry/dmpvalidate`;
-        return this._http.post(url, { wkt: wkt });
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: GeometryService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class PrintHelperService {
     _layerHelper = inject(LayerHelperService);
     setVisibiltyOnDOMElements(baseElement, visible, printSetting) {
@@ -2698,6 +2715,7 @@ class PrintHelperService {
             setTimeout(() => {
                 html2canvas(htmlElement, {
                     useCORS: true,
+                    allowTaint: true,
                 }).then(originalCanvas => {
                     if (printSetting.printDimensions) {
                         const srcW = originalCanvas.width;
@@ -4740,6 +4758,7 @@ class ToolboxComponent {
         this._printHelper.setVisibiltyOnDOMElements(htmlElement, false);
         html2canvas(htmlElement, {
             useCORS: true,
+            allowTaint: true,
         }).then(canvas => {
             const imgData = canvas.toDataURL(this.format);
             const link = document.createElement('a');
@@ -4753,8 +4772,11 @@ class ToolboxComponent {
             }
             link.download = download;
             link.click();
-            this._printHelper.setVisibiltyOnDOMElements(htmlElement, true);
-        });
+        })
+            .catch(error => {
+            console.error("🚀 ~ ToolboxComponent ~ doPrint ~ error:", error);
+        })
+            .finally(() => this._printHelper.setVisibiltyOnDOMElements(htmlElement, true));
     }
     toggleSelectFeatureHighlight() {
         if (this.activeMode === 'select-highlight') {
@@ -6291,8 +6313,8 @@ class GisKomponentComponent {
             case 'WMS':
                 result = new ImageLayer({
                     source: new ImageWMS({
+                        crossOrigin: 'anonymous', // Print requires CORS-enabled sources
                         url: layer.baseUrl,
-                        // crossOrigin: 'anonymous', // This gives us CORS errors sometimes
                         params,
                     })
                 });
@@ -6301,7 +6323,7 @@ class GisKomponentComponent {
                 result = new TileLayer({
                     source: new TileWMS({
                         url: layer.baseUrl,
-                        // crossOrigin: 'anonymous', 
+                        crossOrigin: 'anonymous', // Print requires CORS-enabled sources
                         params,
                     })
                 });
@@ -6311,7 +6333,7 @@ class GisKomponentComponent {
                 const options = optionsFromCapabilities(wmtsOptions[layer.baseUrl], {
                     layer: layer.layers,
                     matrixSet: layer.projection || projection,
-                    crossOrigin: 'anonymous'
+                    crossOrigin: 'anonymous' // Print requires CORS-enabled sources
                 });
                 result = new TileLayer({
                     source: new WMTS(options)