@regionerne/gis-komponent 0.0.114 → 0.0.116

package/fesm2022/regionerne-gis-komponent.mjs

@@ -50,7 +50,6 @@ import * as i1$4 from '@angular/material/dialog';
 import { MatDialog, MatDialogModule, MatDialogContent, MatDialogActions, MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle } from '@angular/material/dialog';
 import 'ol/ol.css';
 import { MultiPolygon, Polygon, Point as Point$1, LineString } from 'ol/geom';
-import { getArea, getLength } from 'ol/sphere';
 import Draw, { createBox, createRegularPolygon } from 'ol/interaction/Draw';
 import { Draw as Draw$1, Snap, Select as Select$1, Modify } from 'ol/interaction';
 import { Style, Fill, Circle, Stroke, Icon, Text, RegularShape } from 'ol/style';
@@ -80,6 +79,7 @@ import PrecisionModel from 'jsts/org/locationtech/jts/geom/PrecisionModel';
 import { polygon } from '@turf/helpers';
 import booleanWithin$1 from '@turf/boolean-within';
 import booleanOverlap from '@turf/boolean-overlap';
+import { getArea } from 'ol/sphere';
 import * as i5 from '@angular/material/autocomplete';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { map as map$1 } from 'rxjs/operators';
@@ -2192,12 +2192,15 @@ class MergeFeaturesService {
                             const newFeatureObject = union(featureCollection([bufferedFeature1, bufferedFeature2]));
                             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(this._selectedMergeFeature?.getStyle());
+                                    mergedFeature.setStyle(style);
+                                    this._featureHelper.setTypeId(mergedFeature, typeId);
                                     this._featureHelper.setId(mergedFeature);
                                     this._drawLayerService.source.addFeature(mergedFeature);
                                     this._undoRedoService.addStep();
@@ -4263,7 +4266,7 @@ class ToolboxComponent {
         zIndex: 999,
         style: (feature) => {
             const geom = feature.getGeometry();
-            const area = getArea(geom);
+            const area = geom.getArea();
             const formattedArea = this.settings.sizeInHa
                 ? `(${this._formatNumber(area / 10000, 2)} ha)`
                 : (area > 1000000
@@ -4308,7 +4311,7 @@ class ToolboxComponent {
         zIndex: 999,
         style: (feature) => {
             const geom = feature.getGeometry();
-            const length = getLength(geom);
+            const length = geom.getLength(); // getLength(geom);
             const formattedLength = `${this._formatNumber(length, 2)} m`;
             return new Style({
                 stroke: new Stroke({
@@ -4342,7 +4345,6 @@ class ToolboxComponent {
         this._distanceMeasureDraw.on('drawstart', (evt) => {
             const sketch = evt.feature;
             this._featureHelper.setId(sketch);
-            console.log("🚀 ~ ToolboxComponent ~ constructor ~ sketch:", sketch);
             sketch.getGeometry().on('change', (geomEvt) => {
                 const geom = geomEvt.target;
                 const coords = geom.getCoordinates();
@@ -4354,7 +4356,7 @@ class ToolboxComponent {
                     const c1 = coords[i];
                     const c2 = coords[i + 1];
                     const segment = new LineString([c1, c2]);
-                    const length = getLength(segment);
+                    const length = segment.getLength(); // getLength(segment, { projection: 'EPSG:25832' });
                     totalLength += length;
                     const mid = [(c1[0] + c2[0]) / 2, (c1[1] + c2[1]) / 2];
                     const formatted = `${this._formatNumber(length, 2)} m`;