@nextgis/ngw-map 1.18.3 → 1.18.6

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.6; author: NextGIS */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { deepmerge, deprecatedWarn, defined, isObject, getIdentifyRadius } from '@nextgis/utils';

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.6; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -5511,10 +5511,11 @@ var NgwMap = (function (exports) {
          */
         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 });
@@ -5526,7 +5527,7 @@ var NgwMap = (function (exports) {
                     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();
@@ -8930,11 +8931,12 @@ var NgwMap = (function (exports) {
         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) {
@@ -8942,37 +8944,46 @@ var NgwMap = (function (exports) {
         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,
         };
     }