@regionerne/gis-komponent 0.0.75 → 0.0.76

package/fesm2022/regionerne-gis-komponent.mjs

@@ -1058,7 +1058,6 @@ class LayerSelectorComponent {
             }
             group.noOfVisibleLayers = group.layers.filter(l => l.activeInSelector && l.visible).length;
             group.visible = group.layers.some(l => l.visible);
-            group.expanded = group.layers.some(l => l.visible);
         });
         // DMP Layer
         this.dmpLayers.forEach(dmpLayer => { if (dmpLayer.datasetId === layerId)
@@ -2085,14 +2084,14 @@ class OverlapService {
             const primaryFeaturesForPreview = this._handleUnlockedFeaturesOverlapping(primaryFeatures, 'primary', true);
             const secondaryFeaturesForPreview = this._handleUnlockedFeaturesOverlapping(secondaryFeatures, 'secondary', true);
             return this._confirmService.open({
-                primaryText: 'Nye',
-                secondaryText: 'Eksisterende',
+                primaryText: 'Beskær den aktive',
+                secondaryText: 'Bevar den aktive',
                 disableClose: false,
                 previewEnabled: true,
                 primaryFeaturesForPreview: primaryFeaturesForPreview,
                 secondaryFeaturesForPreview: secondaryFeaturesForPreview,
                 drawLayerSourceService: this._drawLayerService,
-                message: 'Den nye flade overlapper med eksisterende flade. Ønsker du at beskære de nye eller de eksisterende (hold musen over for at se forhåndsvisning)?',
+                message: 'Fladerne beskæres for at undgå overlap (hold musen over for at se forhåndsvisning)?',
                 title: 'Beskæring'
             }).pipe(map(msg => {
                 return this._handleUnlockedFeaturesOverlapping(features, msg);
@@ -2108,6 +2107,7 @@ class OverlapService {
         return clonedFeature;
     }
     _handleUnlockedFeaturesOverlapping(features, msg, isPreview) {
+        const featuresToHideInPreview = []; // Holds features from the map that are completely within the new feature.
         features.forEach(feature => {
             const overlappingUnlockedFeatures = this._drawLayerService.source.getFeatures().filter(f => !this._featureHelper.isLocked(f) && f.getGeometry()?.intersectsExtent(feature.getGeometry().getExtent()));
             if (overlappingUnlockedFeatures.length > 0) {
@@ -2145,67 +2145,39 @@ class OverlapService {
                                 }
                             }
                         }
+                        else {
+                            // Check if the existing feature is totally within the new
+                            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);
+                                        featuresToHideInPreview.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);
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     });
                 }
             }
         });
         features = features.filter(feature => feature.getGeometry() !== undefined);
-        return features;
-    }
-    handleOverlap(feature) {
-        // Handle the locked.
-        const overlappingLockedFeatures = this._drawLayerService.source.getFeatures().filter(f => this._featureHelper.isLocked(f) && f.getGeometry()?.intersectsExtent(feature.getGeometry().getExtent()));
-        const clipped = this._handleLockedFeaturesOverlapping(overlappingLockedFeatures, feature);
-        if (clipped) {
-            this._confirmService.open({ message: 'Der var overlap med låste flader, så den indtegnede flade er blevet beskåret', primaryText: 'OK', title: 'Advarsel' }).subscribe();
-        }
-        // Handle the unlocked. 
-        const overlappingUnlockedFeatures = this._drawLayerService.source.getFeatures().filter(f => !this._featureHelper.isLocked(f) && f.getGeometry()?.intersectsExtent(feature.getGeometry().getExtent()));
-        if (overlappingUnlockedFeatures.length === 0) {
-            return of(feature);
-        }
-        else {
-            let newFeatureGeoJson = this._geoJsonFormat.writeFeatureObject(feature);
-            const newFeatureArea = area(newFeatureGeoJson);
-            const unlockedFeaturesAsGeoJson = overlappingUnlockedFeatures.map(f => this._geoJsonFormat.writeFeatureObject(f));
-            const newClippedFeature = difference(featureCollection([newFeatureGeoJson, ...unlockedFeaturesAsGeoJson]));
-            // if the new feature is completely inside one of the existing features, newClippedFeature will be null
-            const areaNewClippedFeature = newClippedFeature ? area(newClippedFeature) : 1;
-            if (Math.abs(newFeatureArea - areaNewClippedFeature) < this.EPSILON) {
-                return of(feature);
-            }
-            else {
-                return this._confirmService.open({
-                    primaryText: 'Nye',
-                    secondaryText: 'Eksisterende',
-                    disableClose: true,
-                    message: 'Den nye flade overlapper med eksisterende flade. Ønsker du at beskære de nye eller de eksisterende?',
-                    title: 'Beskæring'
-                }).pipe(map(msg => {
-                    if (msg === 'primary') {
-                        const newGeometry = this._geoJsonFormat.readGeometry(newClippedFeature.geometry);
-                        feature.setGeometry(newGeometry);
-                        return feature;
-                    }
-                    else {
-                        unlockedFeaturesAsGeoJson.forEach(f => {
-                            const featureArea = area(f.geometry);
-                            const fc = featureCollection([f, newFeatureGeoJson]);
-                            const featureDiff = difference(fc);
-                            const featureDiffArea = area(featureDiff.geometry);
-                            if (Math.abs(featureArea - featureDiffArea) > this.EPSILON) {
-                                const existingFeature = this._drawLayerService.source.getFeatureById(f.id);
-                                if (existingFeature) {
-                                    const newGeometry = this._geoJsonFormat.readGeometry(featureDiff?.geometry);
-                                    existingFeature.setGeometry(newGeometry);
-                                }
-                            }
-                        });
-                        return feature;
-                    }
-                }));
-            }
-        }
+        return [...features, ...featuresToHideInPreview];
     }
     _handleLockedFeaturesOverlapping(overlappingFeatures, orgFeature) {
         let newFeatureGeoJson = this._geoJsonFormat.writeFeatureObject(orgFeature);