adb-shared 6.2.17 → 6.2.19

package/fesm2022/adb-shared.mjs

@@ -2955,7 +2955,6 @@ class PolygonDrawerInput {
         this.subscriptions = new Subscription();
         this.mapId = "" + Math.floor(Math.random() * Date.now());
         this.polygonDraw = false;
-        this.shapeLayer = null;
         // ControlValueAccessor
         this.onChange = () => { };
         this.onTouched = () => { };
@@ -2984,19 +2983,25 @@ class PolygonDrawerInput {
             snapMiddle: false
         });
         this.map.on("pm:create", (e) => {
-            if (e.shape !== "Polygon" && e.shape !== "Circle")
+            if (e.shape !== 'Polygon' && e.shape !== 'Circle')
                 return;
             this.polygonDraw = false;
             this.map.pm.disableDraw();
             this.clearShape();
-            this.shapeLayer = e.shape === 'Polygon' ?
-                Leaflet__default.geoJson(e.layer.toGeoJSON(), { style: { fillOpacity: 0.5 } }) :
-                new Leaflet__default.FeatureGroup([new Leaflet__default.Circle(e.layer.getLatLng(), { radius: e.layer.getRadius() })]);
+            this.shapeLayer = e.layer;
+            if (this.shapeLayer instanceof Leaflet__default.Path) {
+                this.shapeLayer.setStyle({ fillOpacity: 0.5 });
+            }
             this.shapeLayer.interactive = false;
-            this.map.addLayer(this.shapeLayer);
             this.map.fitBounds(this.shapeLayer.getBounds());
-            this.onChange(e.layer.toGeoJSON());
-            this.map.removeLayer(e.layer);
+            const geo = this.shapeLayer.toGeoJSON();
+            if (this.shapeLayer instanceof Leaflet__default.Circle) {
+                geo.properties = {
+                    ...geo.properties,
+                    radius: Math.ceil(this.shapeLayer.getRadius())
+                };
+            }
+            this.onChange(geo);
         });
     }
     renderInitialShape() {