adb-shared 6.2.16 → 6.2.18

package/fesm2022/adb-shared.mjs

@@ -2893,14 +2893,13 @@ class AdbMapUtils {
         {
             name: 'Sveriges gränser',
             id: 7,
-            url: 'https://sosgeo.artdata.slu.se/geoserver/it.geosolutions/wms',
+            url: 'https://sosgeo.artdata.slu.se/geoserver/GeoRegion/wms',
             minZoom: 6,
             maxZoom: 18,
             params: {
                 maxNativeZoom: 14,
                 attribution: '© <a href="https://www.lantmateriet.se/">Sveriges gränser</a>',
-                layers: 'it.geosolutions:Sverige_epsg5845', styles: 'municipality_name_yellow',
-                epsg: 5845
+                layers: 'GeoRegion:County', styles: 'municipality_name_yellow'
             },
             wms: true
         }
@@ -2935,13 +2934,18 @@ class AdbMapUtils {
     static addProviders(map) {
         const backgroundMaps = {};
         for (const value of Object.values(AdbMapUtils.Providers)) {
+            const baseOptions = {
+                ...value.params,
+                updateWhenZooming: false,
+                updateWhenIdle: true,
+                keepBuffer: 2,
+                crossOrigin: true
+            };
             backgroundMaps[value.name] = value.wms
-                ? Leaflet.tileLayer.wms(value.url, value.params)
-                : Leaflet.tileLayer(value.url, value.params);
-        }
-        if (backgroundMaps['Open Streetmap']) {
-            map.addLayer(backgroundMaps['Open Streetmap']);
+                ? Leaflet.tileLayer.wms(value.url, baseOptions)
+                : Leaflet.tileLayer(value.url, baseOptions);
         }
+        map.addLayer(backgroundMaps['Open Streetmap']);
         Leaflet.control.layers(backgroundMaps, AdbMapUtils.OverlayMaps).addTo(map);
     }
 }
@@ -2951,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 = () => { };
@@ -2980,18 +2983,25 @@ class PolygonDrawerInput {
             snapMiddle: false
         });
         this.map.on("pm:create", (e) => {
-            if (e.shape !== "Polygon")
+            if (e.shape !== 'Polygon' && e.shape !== 'Circle')
                 return;
             this.polygonDraw = false;
             this.map.pm.disableDraw();
             this.clearShape();
-            this.shapeLayer = Leaflet__default.geoJSON(e.layer.toGeoJSON(), {
-                interactive: false
-            });
-            this.map.addLayer(this.shapeLayer);
+            this.shapeLayer = e.layer;
+            if (this.shapeLayer instanceof Leaflet__default.Path) {
+                this.shapeLayer.setStyle({ fillOpacity: 0.5 });
+            }
+            this.shapeLayer.interactive = false;
             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: this.shapeLayer.getRadius()
+                };
+            }
+            this.onChange(geo);
         });
     }
     renderInitialShape() {
@@ -3019,6 +3029,13 @@ class PolygonDrawerInput {
             snappable: false
         });
     }
+    onDrawCircle() {
+        this.polygonDraw = true;
+        this.map.pm.enableDraw("Circle", {
+            allowSelfIntersection: false,
+            snappable: false
+        });
+    }
     onUndoStep() {
         const draw = this.map.pm.Draw?.Polygon;
         draw?._removeLastVertex();
@@ -3047,7 +3064,7 @@ class PolygonDrawerInput {
                 useExisting: forwardRef((() => PolygonDrawerInput)),
                 multi: true
             }
-        ], ngImport: i0, template: "<div class=\"mb-1 d-flex gap-1 flex-wrap align-items-start\">\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawPolygon()\" title=\"Polygon\">\r\n    <span class=\"fas fa-draw-polygon\"></span> {{'OBSERVATION.DRAW'|translate}}\r\n  </button>\r\n  @if (polygonDraw) {\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDeleteShape()\" title=\"Ta bort\">\r\n    <span class=\"fas fa-times\"></span>\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onUndoStep()\" title=\"\u00C5ngra\">\r\n    <span class=\"fas fa-undo\"></span>\r\n  </button>\r\n  }\r\n</div>\r\n<div [id]=\"mapId\" class=\"border\" style=\"height:20rem\"></div>", dependencies: [{ kind: "pipe", type: i1$1.TranslatePipe, name: "translate" }] }); }
+        ], ngImport: i0, template: "<div class=\"mb-1 d-flex gap-1 flex-wrap align-items-start\">\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawPolygon()\" title=\"Polygon\">\r\n    <span class=\"fas fa-draw-polygon\"></span> {{'OBSERVATION.DRAW'|translate}}\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawCircle()\" title=\"Circle\">\r\n    <span class=\"fas fa-draw-circle\"></span> {{'OBSERVATION.DRAW_CIRCLE'|translate}}\r\n  </button>\r\n  @if (polygonDraw) {\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDeleteShape()\" title=\"Ta bort\">\r\n    <span class=\"fas fa-times\"></span>\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onUndoStep()\" title=\"\u00C5ngra\">\r\n    <span class=\"fas fa-undo\"></span>\r\n  </button>\r\n  }\r\n</div>\r\n<div [id]=\"mapId\" class=\"border\" style=\"height:20rem\"></div>", dependencies: [{ kind: "pipe", type: i1$1.TranslatePipe, name: "translate" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: PolygonDrawerInput, decorators: [{
             type: Component,
@@ -3057,7 +3074,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
                             useExisting: forwardRef((() => PolygonDrawerInput)),
                             multi: true
                         }
-                    ], template: "<div class=\"mb-1 d-flex gap-1 flex-wrap align-items-start\">\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawPolygon()\" title=\"Polygon\">\r\n    <span class=\"fas fa-draw-polygon\"></span> {{'OBSERVATION.DRAW'|translate}}\r\n  </button>\r\n  @if (polygonDraw) {\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDeleteShape()\" title=\"Ta bort\">\r\n    <span class=\"fas fa-times\"></span>\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onUndoStep()\" title=\"\u00C5ngra\">\r\n    <span class=\"fas fa-undo\"></span>\r\n  </button>\r\n  }\r\n</div>\r\n<div [id]=\"mapId\" class=\"border\" style=\"height:20rem\"></div>" }]
+                    ], template: "<div class=\"mb-1 d-flex gap-1 flex-wrap align-items-start\">\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawPolygon()\" title=\"Polygon\">\r\n    <span class=\"fas fa-draw-polygon\"></span> {{'OBSERVATION.DRAW'|translate}}\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDrawCircle()\" title=\"Circle\">\r\n    <span class=\"fas fa-draw-circle\"></span> {{'OBSERVATION.DRAW_CIRCLE'|translate}}\r\n  </button>\r\n  @if (polygonDraw) {\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onDeleteShape()\" title=\"Ta bort\">\r\n    <span class=\"fas fa-times\"></span>\r\n  </button>\r\n  <button class=\"btn btn-secondary\" type=\"button\" (click)=\"onUndoStep()\" title=\"\u00C5ngra\">\r\n    <span class=\"fas fa-undo\"></span>\r\n  </button>\r\n  }\r\n</div>\r\n<div [id]=\"mapId\" class=\"border\" style=\"height:20rem\"></div>" }]
         }] });
 
 var AdbMapFilterType;
@@ -3376,7 +3393,7 @@ class AdbMapFilters {
         this.filters = config.filters;
     }
     ngOnInit() {
-        const lists$ = this.http.get(this.config.taxaListsApi, { params: { limit: -1 } });
+        const lists$ = this.http.get(this.config.taxaListsApi);
         const combined$ = combineLatest([this.activatedRoute.paramMap, this.activatedRoute.queryParamMap, lists$])
             .pipe(map$1(results => ({ params: results[0], qParams: results[1], lists: results[2] })), debounceTime$1(0));
         this.subscriptions.add(combined$.subscribe(result => {