@nextgis/ngw-map 1.16.4 → 1.16.5

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.16.4; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.16.5; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -838,8 +838,9 @@ var NgwMap = (function (exports) {
                 if (er instanceof _this.CancelError) {
                     for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
                         var v = values_1[_i];
-                        if ('cancel' in v) {
-                            v.cancel();
+                        var v_ = v;
+                        if ('cancel' in v_) {
+                            v_.cancel();
                         }
                     }
                 }
@@ -2969,7 +2970,7 @@ var NgwMap = (function (exports) {
                     }
                 });
             }); };
-            if (layer && layer.options.visibility !== toStatus) {
+            if (layer) {
                 return this.onMapLoad().then(function () { return action(layer); });
             }
             return Promise.resolve();
@@ -3095,20 +3096,21 @@ var NgwMap = (function (exports) {
         };
         WebMapLayers.prototype.propertiesFilter = function (layerDef, filters, options) {
             var layer = this.getLayer(layerDef);
-            if (!layer)
-                return;
-            var adapter = layer;
-            if (adapter.propertiesFilter) {
-                adapter.propertiesFilter(filters, options);
-            }
-            else if (adapter.filter) {
-                this.filterLayer(adapter, function (e) {
-                    if (e.feature && e.feature.properties) {
-                        return propertiesFilter(e.feature.properties, filters);
-                    }
-                    return true;
-                });
+            if (layer) {
+                var adapter = layer;
+                if (adapter.propertiesFilter) {
+                    return adapter.propertiesFilter(filters, options);
+                }
+                else if (adapter.filter) {
+                    this.filterLayer(adapter, function (e) {
+                        if (e.feature && e.feature.properties) {
+                            return propertiesFilter(e.feature.properties, filters);
+                        }
+                        return true;
+                    });
+                }
             }
+            return Promise.resolve();
         };
         WebMapLayers.prototype.removeLayerFilter = function (layerDef) {
             var layer = this.getLayer(layerDef);
@@ -7802,7 +7804,7 @@ var NgwMap = (function (exports) {
             extent: bbox,
             size: width + ',' + height,
             timestamp: Date.now(),
-            nd: nd,
+            nd: nd !== null && nd !== void 0 ? nd : 200,
         };
     }
     var vectorLayerGeomToPaintTypeAlias = {
@@ -8240,28 +8242,32 @@ var NgwMap = (function (exports) {
         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 STROKE = 0.8;
-    function insertSvg(width, height, stroke, content) {
+    function generateSvg(width, height, stroke, content) {
         if (stroke === void 0) { stroke = 0; }
         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>");
+        return svg;
+    }
+    function insertSvg(svg) {
         var oParser = new DOMParser();
         var oDOM = oParser.parseFromString(svg, 'image/svg+xml');
         return oDOM.documentElement;
     }
     function getIcon(opt) {
+        var _a, _b, _c, _d;
         if (opt === void 0) { opt = {}; }
         // default values
-        var shape = opt.shape || 'circle';
-        var color = opt.color || 'blue';
-        var strokeColor = opt.strokeColor || 'white';
-        var size = opt.size || 12;
+        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 anchor = size / 2;
         var defSize = 12;
         var stroke = typeof opt.stroke === 'number' ? opt.stroke : STROKE;
         var scale = size / defSize;
-        var pathAlias = svgPath[shape] || 'circle';
+        var pathAlias = opt.p || svgPath[shape] || 'circle';
         var path = typeof pathAlias === 'string' ? pathAlias : pathAlias(opt);
-        var svg = insertSvg(size, size, stroke * scale, path);
+        var svg = insertSvg(opt.svg || generateSvg(size, size, stroke * scale, path));
         var fistChild = svg.firstChild;
         var transform = "scale(".concat(scale, ")");
         fistChild.setAttribute('fill', color);
@@ -8645,7 +8651,10 @@ var NgwMap = (function (exports) {
                             _a.label = 5;
                         case 5:
                             if (item) {
-                                fetchNgwResourceExtent(item, this.connector).then(function (extent) {
+                                fetchNgwExtent({
+                                    resourceId: item.resource.id,
+                                    connector: this.connector,
+                                }).then(function (extent) {
                                     if (extent) {
                                         _this.fitBounds(extent, options);
                                     }
@@ -8654,7 +8663,7 @@ var NgwMap = (function (exports) {
                             _a.label = 6;
                         case 6: return [3 /*break*/, 8];
                         case 7:
-                            _super.prototype.fitLayer.call(this, layerDef, options);
+                            _super.prototype.fitLayer.call(this, typeof layerDef === 'number' ? String(layerDef) : layerDef, options);
                             _a.label = 8;
                         case 8: return [2 /*return*/];
                     }