@nextgis/ngw-leaflet 1.18.2 → 1.18.6

package/lib/ngw-leaflet.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.18.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.18.6; author: NextGIS */
 import 'leaflet/dist/leaflet.css';
 import { Icon } from 'leaflet';
 import { NgwMap } from '@nextgis/ngw-map';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.18.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.18.6; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -19584,10 +19584,11 @@ var NgwLeaflet = (function () {
          */
         NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
             var _this = this;
-            var _a;
+            var _a, _b;
             if (params_ === void 0) { params_ = {}; }
             if (requestOptions === void 0) { requestOptions = {}; }
             var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
+            params_ = (_a = requestOptions.params) !== null && _a !== void 0 ? _a : params_;
             var params = objectRemoveEmpty(params_);
             var makeApiRequest = function () {
                 return apiRequest({ name: name, params: params, requestOptions: requestOptions, connector: _this });
@@ -19599,7 +19600,7 @@ var NgwLeaflet = (function () {
                     withCredentials: withCredentials,
                     responseType: responseType,
                     baseUrl: this.options.baseUrl,
-                    userId: (_a = this.user) === null || _a === void 0 ? void 0 : _a.id,
+                    userId: (_b = this.user) === null || _b === void 0 ? void 0 : _b.id,
                 })));
             }
             return makeApiRequest();
@@ -20051,8 +20052,10 @@ var NgwLeaflet = (function () {
         return feature;
     }
     function updateItemRequestParam(params, options) {
-        var extensions = options.extensions, geom = options.geom, fields = options.fields, srs = options.srs;
-        params.extensions = extensions ? extensions.join(',') : '';
+        var extensions = options.extensions, geom = options.geom, fields = options.fields, srs = options.srs, ilike = options.ilike, like = options.like;
+        if (extensions) {
+            params.extensions = extensions.join(',');
+        }
         if (fields !== undefined) {
             params.fields = Array.isArray(fields) ? fields.join(',') : '';
         }
@@ -20063,6 +20066,12 @@ var NgwLeaflet = (function () {
                 delete params.geom_format;
             }
         }
+        if (defined(ilike)) {
+            params.ilike = ilike;
+        }
+        else if (defined(like)) {
+            params.like = like;
+        }
         if (defined(srs)) {
             params.srs = srs;
         }
@@ -22984,11 +22993,12 @@ var NgwLeaflet = (function () {
         minus: '<path d="m12 7.5v-3h-12v3z"/>',
         asterisk: '<path d="m7.59 12v-3.27l2.83 1.64 1.58-2.74-2.85-1.64 2.83-1.64-1.56-2.74-2.83 1.64v-3.24h-3.17v3.24l-2.85-1.64-1.57 2.74 2.84 1.64-2.84 1.64 1.57 2.74 2.85-1.64v3.27z"/>',
     };
+    var VIEW_BOX = 12;
     var STROKE = 0.8;
-    function generateSvg(width, height, stroke, content) {
-        if (stroke === void 0) { stroke = 0; }
+    function generateSvg(_a) {
+        var width = _a.width, height = _a.height, _b = _a.stroke, stroke = _b === void 0 ? 0 : _b, content = _a.content;
         var s = stroke / 2;
-        var svg = "<svg\n    version=\"1.1\"\n    xmlns=\"http://www.w3.org/2000/svg\"\n    width=\"".concat(width, "\"\n    height=\"").concat(height, "\"\n    viewBox=\"-").concat(s, " -").concat(s, " ").concat(width + stroke, " ").concat(height + stroke, "\"\n  >").concat(content, "</svg>");
+        var svg = "<svg\n    version=\"1.1\"\n    xmlns=\"http://www.w3.org/2000/svg\"\n    width=\"".concat(width, "\"\n    height=\"").concat(height, "\"\n    viewBox=\"-").concat(s, " -").concat(s, " ").concat(VIEW_BOX + stroke, " ").concat(VIEW_BOX + stroke, "\"\n  >").concat(content, "</svg>");
         return svg;
     }
     function insertSvg(svg) {
@@ -22996,37 +23006,46 @@ var NgwLeaflet = (function () {
         var oDOM = oParser.parseFromString(svg, 'image/svg+xml');
         return oDOM.documentElement;
     }
+    /**
+     * Retrieves an icon with the provided options.
+     * @function
+     * @param {IconOptions} [opt={}] - Options for the icon.
+     * @returns {IconPaint} Icon paint object.
+     */
     function getIcon(opt) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (opt === void 0) { opt = {}; }
-        // default values
+        // Default values
         var shape = (_a = opt.shape) !== null && _a !== void 0 ? _a : 'circle';
         var color = (_b = opt.color) !== null && _b !== void 0 ? _b : 'blue';
         var strokeColor = (_c = opt.strokeColor) !== null && _c !== void 0 ? _c : 'white';
-        var size = (_d = opt.size) !== null && _d !== void 0 ? _d : 12;
+        var size = (_d = opt.size) !== null && _d !== void 0 ? _d : VIEW_BOX;
         var rotate = (_e = opt.rotate) !== null && _e !== void 0 ? _e : 0;
-        var anchor = size / 2;
-        var defSize = 12;
+        var anchor = (_f = opt.anchor) !== null && _f !== void 0 ? _f : [size / 2, size / 2];
         var stroke = opt.stroke !== undefined ? Number(opt.stroke) : STROKE;
-        var scale = size / defSize;
         var pathAlias = opt.p || svgPath[shape] || 'circle';
         var path = typeof pathAlias === 'string' ? pathAlias : pathAlias(opt);
-        var svg = insertSvg(opt.svg || generateSvg(size, size, stroke * scale, path));
-        var fistChild = svg.firstChild;
-        var scaledAnchor = defSize / 2;
-        var transform = "scale(".concat(scale, ") rotate(").concat(rotate, ", ").concat(scaledAnchor, ", ").concat(scaledAnchor, ")");
-        fistChild.setAttribute('fill', color);
+        var svg = insertSvg(opt.svg ||
+            generateSvg({
+                width: size,
+                height: size,
+                stroke: stroke,
+                content: path,
+            }));
+        svg.setAttribute('width', String(size));
+        svg.setAttribute('height', String(size));
+        svg.setAttribute('fill', color);
         if (stroke) {
-            fistChild.setAttribute('stroke', strokeColor);
-            fistChild.setAttribute('stroke-width', String(stroke));
+            svg.setAttribute('stroke', strokeColor);
+            svg.setAttribute('stroke-width', String(stroke));
         }
-        fistChild.setAttribute('transform', transform);
         var s = new XMLSerializer();
         return {
             type: 'icon',
             iconSize: [size, size],
-            iconAnchor: [anchor, anchor],
+            iconAnchor: anchor,
             html: s.serializeToString(svg),
+            rotate: rotate,
             svg: svg,
         };
     }
@@ -23936,14 +23955,6 @@ var NgwLeaflet = (function () {
         };
     }
 
-    function createMouseEvent(_a) {
-        var layer = _a.layer, source = _a.source;
-        var layer_ = source.target;
-        var feature = layer_.feature;
-        var opt = __assign({ layer: layer, feature: feature, event: convertMapClickEvent(source), source: source }, createFeaturePositionOptions(feature));
-        return opt;
-    }
-
     function findMostFrequentGeomType(arr) {
         var counts = {};
         for (var fry = 0; fry < arr.length; fry++) {
@@ -23999,6 +24010,195 @@ var NgwLeaflet = (function () {
         return BaseAdapter;
     }());
 
+    function createMouseEvent(_a) {
+        var layer = _a.layer, source = _a.source;
+        var layer_ = source.target;
+        var feature = layer_.feature;
+        var opt = __assign({ layer: layer, feature: feature, event: convertMapClickEvent(source), source: source }, createFeaturePositionOptions(feature));
+        return opt;
+    }
+
+    var GeoJsonEvents = /** @class */ (function () {
+        function GeoJsonEvents(layer) {
+            this.layer = layer;
+        }
+        GeoJsonEvents.prototype.handleMouseEvents = function (layer) {
+            var _this = this;
+            var _a = this.layer.options, onClick = _a.onClick, onLayerClick = _a.onLayerClick, onMouseOut = _a.onMouseOut, onMouseOver = _a.onMouseOver;
+            // TODO: remove backward compatibility for onLayerClick
+            var onClick_ = onClick || onLayerClick;
+            if (onClick_) {
+                this._onclick = function (e) {
+                    var selected = !!_this.layer._getSelected(layer);
+                    onClick_(__assign({ selected: selected }, _this._createMouseEvent(e)));
+                };
+                layer.on('click', this._onclick, this);
+            }
+            if (onMouseOut) {
+                this._mouseout = function (e) {
+                    onMouseOut(_this._createMouseEvent(e));
+                };
+                layer.on('mouseout', this._mouseout, this);
+            }
+            if (onMouseOver) {
+                this._mouseover = function (e) {
+                    onMouseOver(_this._createMouseEvent(e));
+                };
+                layer.on('mouseover', this._mouseover, this);
+            }
+        };
+        GeoJsonEvents.prototype.stopMouseEvents = function (layer) {
+            if (this._mouseover) {
+                layer.off('mouseover', this._mouseover, this);
+            }
+            if (this._mouseout) {
+                layer.off('mouseout', this._mouseout, this);
+            }
+            if (this._onclick) {
+                layer.off('click', this._onclick, this);
+            }
+        };
+        GeoJsonEvents.prototype._createMouseEvent = function (source) {
+            return createMouseEvent({
+                layer: this.layer,
+                source: source,
+            });
+        };
+        return GeoJsonEvents;
+    }());
+
+    var GeoJsonPaint = /** @class */ (function () {
+        function GeoJsonPaint(layer) {
+            this.layer = layer;
+        }
+        GeoJsonPaint.prototype.setPaintEachLayer = function (paint) {
+            var _this = this;
+            this.layer._layers.forEach(function (layerDef) {
+                _this.setPaint(layerDef, paint);
+            });
+        };
+        GeoJsonPaint.prototype.setPaint = function (layerDef, paint) {
+            var style = undefined;
+            var layer = layerDef.layer, feature = layerDef.feature;
+            if (layer && feature) {
+                if (isPaintCallback(paint)) {
+                    style = paint(feature);
+                }
+                else if (isPaint(paint)) {
+                    style = paint;
+                }
+                if (style) {
+                    if (this.layer.type === 'point' && style.type === 'icon') {
+                        var marker_1 = layer;
+                        var divIcon_1 = this._createDivIcon(style);
+                        setTimeout(function () {
+                            marker_1.setIcon(divIcon_1);
+                        }, 10);
+                    }
+                    else if ('setStyle' in layer) {
+                        layer.setStyle(this.preparePaint(style));
+                    }
+                }
+            }
+        };
+        GeoJsonPaint.prototype.preparePaint = function (paint) {
+            if (paint.type !== 'get-paint') {
+                var paintAliases = [
+                    ['color', 'strokeColor'],
+                    ['opacity', 'strokeOpacity'],
+                    ['stroke', 'stroke'],
+                    ['fillColor', 'fillColor'],
+                    ['fillOpacity', 'fillOpacity'],
+                    ['fill', 'fill'],
+                    ['weight', 'weight'],
+                ];
+                var aliases = this.layer.type === 'line'
+                    ? [
+                        ['color', 'strokeColor'],
+                        ['opacity', 'strokeOpacity'],
+                        ['weight', 'weight'],
+                    ]
+                    : paintAliases;
+                var readyPaint = {};
+                if ('radius' in paint && typeof paint.radius === 'number') {
+                    readyPaint.radius = paint.radius;
+                }
+                for (var _i = 0, aliases_1 = aliases; _i < aliases_1.length; _i++) {
+                    var _a = aliases_1[_i], to = _a[0], from = _a[1];
+                    var opacity = this.layer.options.opacity;
+                    var paintProp = paint[from];
+                    if (defined(opacity) && from.toLowerCase().indexOf('opacity') !== -1) {
+                        paintProp = Number(paintProp) * opacity;
+                    }
+                    if (paintProp !== undefined) {
+                        Object.defineProperty(readyPaint, to, {
+                            enumerable: true,
+                            value: paintProp,
+                        });
+                    }
+                }
+                return readyPaint;
+            }
+            return PAINT;
+        };
+        GeoJsonPaint.prototype._createDivIcon = function (icon) {
+            var html = icon.html, rotate = icon.rotate, className = icon.className, toLIconOpt = __rest(icon, ["html", "rotate", "className"]);
+            var element = document.createElement('div');
+            if (className) {
+                element.className = className;
+            }
+            if (rotate) {
+                element.style.transform = "rotateZ(".concat(rotate, "deg)");
+            }
+            if (html) {
+                element.innerHTML = html;
+            }
+            var divIcon = new leafletSrc.exports.DivIcon(__assign(__assign({ className: '' }, toLIconOpt), { html: element }));
+            return divIcon;
+        };
+        GeoJsonPaint.prototype.createPaintToLayer = function (icon) {
+            var _this = this;
+            if (icon && icon.type) {
+                if (icon.type === 'icon') {
+                    var iconClassName = icon.className;
+                    var html = icon.html;
+                    if (iconClassName || html) {
+                        return function (_, latlng) {
+                            var divIcon = _this._createDivIcon(icon);
+                            return new leafletSrc.exports.Marker(latlng, { icon: divIcon });
+                        };
+                    }
+                }
+                else if (icon.type === 'pin') {
+                    return function (_, latlng) {
+                        return new leafletSrc.exports.Marker(latlng);
+                    };
+                }
+            }
+            return function (_, latlng) {
+                var p = PAINT;
+                return new leafletSrc.exports.CircleMarker(latlng, _this.preparePaint(__assign(__assign({}, p), icon)));
+            };
+        };
+        GeoJsonPaint.prototype.createPaintOptions = function (paint) {
+            var geoJsonOptions = {};
+            var newPaint = this.preparePaint(paint);
+            if (paint) {
+                geoJsonOptions.style = function () {
+                    return newPaint;
+                };
+            }
+            if (this.layer.type === 'point') {
+                geoJsonOptions.pointToLayer = this.createPaintToLayer(paint);
+            }
+            else if (this.layer.type === 'line') {
+                newPaint.stroke = true;
+            }
+            return geoJsonOptions;
+        };
+        return GeoJsonPaint;
+    }());
+
     var GeoJsonAdapter = /** @class */ (function (_super) {
         __extends(GeoJsonAdapter, _super);
         function GeoJsonAdapter(map, options) {
@@ -24014,6 +24214,8 @@ var NgwLeaflet = (function () {
             _this.$unselect = function () {
                 _this.unselect();
             };
+            _this._events = new GeoJsonEvents(_this);
+            _this._paint = new GeoJsonPaint(_this);
             return _this;
         }
         GeoJsonAdapter.prototype.addLayer = function (options) {
@@ -24043,7 +24245,7 @@ var NgwLeaflet = (function () {
             else if (!this.selected) {
                 this.selected = true;
                 if (this.selectedPaint) {
-                    this._setPaintEachLayer(this.selectedPaint);
+                    this._paint.setPaintEachLayer(this.selectedPaint);
                 }
             }
         };
@@ -24061,7 +24263,7 @@ var NgwLeaflet = (function () {
                     this._removePopup(p[0]);
                 }
                 if (this.paint) {
-                    this._setPaintEachLayer(this.paint);
+                    this._paint.setPaintEachLayer(this.paint);
                 }
                 this._selectedLayers.length = 0;
                 this.selected = false;
@@ -24222,7 +24424,7 @@ var NgwLeaflet = (function () {
                 this.paint = paint;
                 for (var _i = 0, _a = this._layers; _i < _a.length; _i++) {
                     var l = _a[_i];
-                    this._setPaint(l, paint);
+                    this._paint.setPaint(l, paint);
                 }
             }
         };
@@ -24231,7 +24433,7 @@ var NgwLeaflet = (function () {
                 this.selectedPaint = paint;
                 for (var _i = 0, _a = this._selectedLayers; _i < _a.length; _i++) {
                     var l = _a[_i];
-                    this._setPaint(l, paint);
+                    this._paint.setPaint(l, paint);
                 }
             }
         };
@@ -24239,16 +24441,19 @@ var NgwLeaflet = (function () {
             this.paint = __assign(__assign({}, this.paint), paint);
             for (var _i = 0, _a = this._layers; _i < _a.length; _i++) {
                 var l = _a[_i];
-                this._setPaint(l, this.paint);
+                this._paint.setPaint(l, this.paint);
             }
         };
         GeoJsonAdapter.prototype.updateSelectedPaint = function (paint) {
             this.selectedPaint = __assign(__assign({}, this.selectedPaint), paint);
             for (var _i = 0, _a = this._selectedLayers; _i < _a.length; _i++) {
                 var l = _a[_i];
-                this._setPaint(l, this.selectedPaint);
+                this._paint.setPaint(l, this.selectedPaint);
             }
         };
+        GeoJsonAdapter.prototype._getSelected = function (layer) {
+            return this._selectedLayers.find(function (x) { return x.layer === layer; });
+        };
         GeoJsonAdapter.prototype._updateTooltip = function (layerDef) {
             var feature = layerDef.feature, layer = layerDef.layer;
             if (feature && layer && feature.properties && this.options.labelField) {
@@ -24340,79 +24545,6 @@ var NgwLeaflet = (function () {
                 }
             }
         };
-        GeoJsonAdapter.prototype._setPaintEachLayer = function (paint) {
-            var _this = this;
-            this._layers.forEach(function (l) {
-                _this._setPaint(l, paint);
-            });
-        };
-        GeoJsonAdapter.prototype._setPaint = function (def, paint) {
-            var style = undefined;
-            var layer = def.layer, feature = def.feature;
-            if (layer && feature) {
-                if (isPaintCallback(paint)) {
-                    style = paint(feature);
-                }
-                else if (isPaint(paint)) {
-                    style = paint;
-                }
-                if (style) {
-                    if (this.type === 'point' && style.type === 'icon') {
-                        var marker = layer;
-                        var divIcon = this._createDivIcon(style);
-                        marker.setIcon(divIcon);
-                    }
-                    else if ('setStyle' in layer) {
-                        layer.setStyle(this._preparePaint(style));
-                    }
-                }
-            }
-        };
-        GeoJsonAdapter.prototype._preparePaint = function (paint) {
-            if (paint.type !== 'get-paint') {
-                // const path: CircleMarkerOptions | PathOptions = paint as CircleMarkerOptions | PathOptions;
-                // if (path.opacity) {
-                //   path.fillOpacity = path.opacity;
-                // }
-                var paintAliases = [
-                    // ['color', 'color'],
-                    ['color', 'strokeColor'],
-                    ['opacity', 'strokeOpacity'],
-                    ['stroke', 'stroke'],
-                    ['fillColor', 'fillColor'],
-                    ['fillOpacity', 'fillOpacity'],
-                    ['fill', 'fill'],
-                    ['weight', 'weight'],
-                ];
-                var aliases = this.type === 'line'
-                    ? [
-                        ['color', 'strokeColor'],
-                        ['opacity', 'strokeOpacity'],
-                        ['weight', 'weight'],
-                    ]
-                    : paintAliases;
-                var readyPaint = {};
-                if ('radius' in paint && typeof paint.radius === 'number') {
-                    readyPaint.radius = paint.radius;
-                }
-                for (var _i = 0, aliases_1 = aliases; _i < aliases_1.length; _i++) {
-                    var _a = aliases_1[_i], to = _a[0], from = _a[1];
-                    var paintProp = paint[from];
-                    if (defined(this.options.opacity) &&
-                        from.toLowerCase().indexOf('opacity') !== -1) {
-                        paintProp = Number(paintProp) * this.options.opacity;
-                    }
-                    if (paintProp !== undefined) {
-                        Object.defineProperty(readyPaint, to, {
-                            enumerable: true,
-                            value: paintProp,
-                        });
-                    }
-                }
-                return readyPaint;
-            }
-            return PAINT;
-        };
         GeoJsonAdapter.prototype._getGeoJsonOptions = function (options, type) {
             var _this = this;
             var paint = options.paint;
@@ -24422,7 +24554,7 @@ var NgwLeaflet = (function () {
                     // TODO: fix types (@geoman-io/leaflet-geoman-free)
                     lopt.pointToLayer = function (feature, latLng) {
                         var iconOpt = paint(feature);
-                        var pointToLayer = _this._createPaintToLayer(iconOpt);
+                        var pointToLayer = _this._paint.createPaintToLayer(iconOpt);
                         return pointToLayer(feature, latLng);
                     };
                 }
@@ -24430,17 +24562,17 @@ var NgwLeaflet = (function () {
                     lopt = {
                         style: function (feature) {
                             if (feature) {
-                                return _this._preparePaint(__assign(__assign({}, PAINT), paint(feature)));
+                                return _this._paint.preparePaint(__assign(__assign({}, PAINT), paint(feature)));
                             }
                             else {
-                                return _this._preparePaint(__assign(__assign({}, PAINT), { type: 'path' }));
+                                return _this._paint.preparePaint(__assign(__assign({}, PAINT), { type: 'path' }));
                             }
                         },
                     };
                 }
             }
             else {
-                lopt = this._createPaintOptions(paint, type);
+                lopt = this._paint.createPaintOptions(paint);
             }
             lopt.onEachFeature = function (feature, layer) {
                 _this._onEachFeature(feature, layer);
@@ -24452,7 +24584,6 @@ var NgwLeaflet = (function () {
             var layer_ = this.layer;
             if (layer_) {
                 var def_2 = __assign({ target: this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
-                // @ts-ignore
                 layer.options.pane = this.pane;
                 this._layers.push(def_2);
                 var ok = true;
@@ -24477,7 +24608,7 @@ var NgwLeaflet = (function () {
                             layer.on('click', function (e) { return _this._selectOnLayerClick(e); }, this);
                         }
                     }
-                    this._handleMouseEvents(layer);
+                    this._events.handleMouseEvents(layer);
                     // The timeout is needed to display the popup immediately when adding a layer to the map.
                     // Without a timeout, the layer may not yet have a _map object
                     setTimeout(function () {
@@ -24489,37 +24620,6 @@ var NgwLeaflet = (function () {
                 }
             }
         };
-        GeoJsonAdapter.prototype._handleMouseEvents = function (layer) {
-            var _this = this;
-            var _a = this.options, onClick = _a.onClick, onLayerClick = _a.onLayerClick, onMouseOut = _a.onMouseOut, onMouseOver = _a.onMouseOver;
-            // TODO: remove backward compatibility for onLayerClick
-            var onClick_ = onClick || onLayerClick;
-            if (onClick_) {
-                layer.on('click', function (e) {
-                    var selected = !!_this._getSelected(layer);
-                    onClick_(__assign({ selected: selected }, _this._createMouseEvent(e)));
-                }, this);
-            }
-            if (onMouseOut) {
-                layer.on('mouseout', function (e) {
-                    onMouseOut(_this._createMouseEvent(e));
-                }, this);
-            }
-            if (onMouseOver) {
-                layer.on('mouseover', function (e) {
-                    onMouseOver(_this._createMouseEvent(e));
-                }, this);
-            }
-        };
-        GeoJsonAdapter.prototype._createMouseEvent = function (source) {
-            return createMouseEvent({
-                layer: this,
-                source: source,
-            });
-        };
-        GeoJsonAdapter.prototype._getSelected = function (layer) {
-            return this._selectedLayers.find(function (x) { return x.layer === layer; });
-        };
         GeoJsonAdapter.prototype._selectOnLayerClick = function (e) {
             leafletSrc.exports.DomEvent.stopPropagation(e);
             var layer = e.target;
@@ -24549,7 +24649,7 @@ var NgwLeaflet = (function () {
             this.selected = true;
             var _a = this.options, selectedPaint = _a.selectedPaint, popupOnSelect = _a.popupOnSelect, popupOptions = _a.popupOptions;
             if (selectedPaint && def.layer) {
-                this._setPaint(def, selectedPaint);
+                this._paint.setPaint(def, selectedPaint);
             }
             if (popupOnSelect) {
                 this._openPopup(def, popupOptions, type, latlng);
@@ -24565,7 +24665,7 @@ var NgwLeaflet = (function () {
                 this._selectedLayers.splice(index, 1);
                 if (this.options) {
                     if (this.options.paint) {
-                        this._setPaint(def, this.options.paint);
+                        this._paint.setPaint(def, this.options.paint);
                     }
                     if (this.options.popupOnSelect && def.layer) {
                         this._removePopup(def.layer);
@@ -24574,51 +24674,6 @@ var NgwLeaflet = (function () {
             }
             this.selected = this._selectedLayers.length > 0;
         };
-        GeoJsonAdapter.prototype._createDivIcon = function (icon) {
-            var toLIconOpt = __rest(icon, []);
-            return new leafletSrc.exports.DivIcon(__assign({ className: '' }, toLIconOpt));
-        };
-        GeoJsonAdapter.prototype._createPaintToLayer = function (icon) {
-            var _this = this;
-            if (icon && icon.type) {
-                if (icon.type === 'icon') {
-                    var iconClassName = icon.className;
-                    var html = icon.html;
-                    if (iconClassName || html) {
-                        return function (geoJsonPoint, latlng) {
-                            var divIcon = _this._createDivIcon(icon);
-                            return new leafletSrc.exports.Marker(latlng, { icon: divIcon });
-                        };
-                    }
-                }
-                else if (icon.type === 'pin') {
-                    return function (geoJsonPoint, latlng) {
-                        // const divIcon = this.createDivIcon(icon);
-                        return new leafletSrc.exports.Marker(latlng);
-                    };
-                }
-            }
-            return function (geoJsonPoint, latlng) {
-                var p = PAINT;
-                return new leafletSrc.exports.CircleMarker(latlng, _this._preparePaint(__assign(__assign({}, p), icon)));
-            };
-        };
-        GeoJsonAdapter.prototype._createPaintOptions = function (paintOptions, type) {
-            var geoJsonOptions = {};
-            var paint = (paintOptions && this._preparePaint(paintOptions)) || {};
-            if (paintOptions) {
-                geoJsonOptions.style = function () {
-                    return paint;
-                };
-            }
-            if (type === 'point') {
-                geoJsonOptions.pointToLayer = this._createPaintToLayer(paintOptions);
-            }
-            else if (type === 'line') {
-                paint.stroke = true;
-            }
-            return geoJsonOptions;
-        };
         GeoJsonAdapter.prototype._addMapClickListener = function () {
             var map = this.map;
             if (map) {