@regionerne/gis-komponent 0.0.103 → 0.0.104

package/fesm2022/regionerne-gis-komponent.mjs

@@ -1941,27 +1941,27 @@ class OverlapService {
                         }
                         else {
                             // Check if the existing feature is totally within the new
+                            // or if they are the same geometry (item # 234 when importing WKT from existing active object, then keep only the new one)
                             const fcReversed = featureCollection([newFeatureGeoJson, f]);
                             const featureDiffReversed = difference(fcReversed);
-                            if (featureDiffReversed) {
-                                const reversedDiffArea = area(featureDiffReversed);
-                                if (reversedDiffArea) {
-                                    // The only way to get here is that the new feature completely overlaps this one. This one should be removed
-                                    // and added to the output-array, because that is used for hiding features in preview
-                                    if (isPreview) {
-                                        const featureToHide = new Feature(f.geometry);
-                                        featureToHide.setId(f.id);
-                                        featuresToAddToOutput.push(featureToHide);
-                                        const overlappedFeature = features.find(existingFeature => existingFeature.getId() === f.id);
-                                        if (overlappedFeature) {
-                                            overlappedFeature.setGeometry(undefined);
-                                        }
+                            const featureArea = area(f.geometry);
+                            const newFeatureArea = area(newFeatureGeoJson.geometry);
+                            if ((featureDiffReversed && area(featureDiffReversed)) || (Math.abs(featureArea - newFeatureArea) < this.EPSILON)) {
+                                // The only way to get here is that the new feature completely overlaps this one. This one should be removed
+                                // and added to the output-array, because that is used for hiding features in preview
+                                if (isPreview) {
+                                    const featureToHide = new Feature(f.geometry);
+                                    featureToHide.setId(f.id);
+                                    featuresToAddToOutput.push(featureToHide);
+                                    const overlappedFeature = features.find(existingFeature => existingFeature.getId() === f.id);
+                                    if (overlappedFeature) {
+                                        overlappedFeature.setGeometry(undefined);
                                     }
-                                    else {
-                                        const featureToRemove = this._drawLayerService.source.getFeatureById(f.id);
-                                        if (featureToRemove) {
-                                            this._drawLayerService.source.removeFeature(featureToRemove);
-                                        }
+                                }
+                                else {
+                                    const featureToRemove = this._drawLayerService.source.getFeatureById(f.id);
+                                    if (featureToRemove) {
+                                        this._drawLayerService.source.removeFeature(featureToRemove);
                                     }
                                 }
                             }
@@ -3541,6 +3541,11 @@ class ToolboxComponent {
                 this._confirmService.open({ message, primaryText: 'Ok', title: 'Advarsel' }).subscribe();
                 return;
             }
+            // Validate against invalid holes - item # 234
+            if (featureType === 'Polygon' && this._polygonCleanupService.cleanupPolygonTurf(feature.getGeometry()) === 'changed') {
+                this._confirmService.open({ primaryText: 'OK', title: 'Fejl i geometri', message: 'WKT kunne ikke indlæses - den geometri kunne ikke valideres' }).subscribe();
+                return;
+            }
             this._settingsHelper.getStyle(this.selectedDrawItem?.style, this.profile.styleRepositoryWorkspace, this.profile.styleRepositoryGeoserver, featureType).subscribe({
                 next: featureStyle => {
                     if (featureType === 'Polygon') {
@@ -3574,6 +3579,44 @@ class ToolboxComponent {
                                 }
                             }
                         });
+                        //Handle MultyPolygon - item # 234
+                    }
+                    else if (feature.getGeometry()?.getType() === 'MultiPolygon') {
+                        const polys = this._featureHelper.splitMultiPolygonFeature(feature.getGeometry());
+                        polys.forEach(poly => {
+                            const newFeature = feature.clone();
+                            newFeature.setGeometry(poly);
+                            this.handleFeatureValidation(newFeature).subscribe({
+                                next: (result) => {
+                                    if (result) {
+                                        result.forEach(feature => {
+                                            feature.setStyle(featureStyle);
+                                            this._featureHelper.setTypeId(feature, this.selectedDrawItem?.typeId || '');
+                                            this._featureHelper.setId(feature);
+                                        });
+                                        this._overlap.handleOverlaps(result).pipe(filter(f => !!f)).subscribe({
+                                            next: f => {
+                                                if (f) {
+                                                    f.forEach(feature => {
+                                                        this._drawLayerService.source.addFeature(feature);
+                                                    });
+                                                    this._zoomService.zoomToFeatures(f);
+                                                    if (f.length > 1) {
+                                                        this._confirmService.open({ message: `Den indtegnede flade var ikke gyldig, men rettet til ${f.length} nye flader`, primaryText: 'OK', title: 'Advarsel' }).subscribe();
+                                                    }
+                                                    if (f.length > 0) {
+                                                        this._undoRedo.addStep();
+                                                    }
+                                                }
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        this._confirmService.open({ message: `Validering af de tegnede flader resulterede i ingen flader`, primaryText: 'OK', title: 'Advarsel' }).subscribe();
+                                    }
+                                }
+                            });
+                        });
                     }
                     else {
                         feature.setStyle(featureStyle);