@nextgis/ngw-map 1.18.3 → 1.18.6

package/lib/ngw-map.cjs.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 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.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 events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -4979,8 +4979,9 @@ class NgwConnector$1 {
      * ```
      */
     apiRequest(name, params_ = {}, requestOptions = {}) {
-        var _a;
+        var _a, _b;
         const { method, headers, withCredentials, responseType } = requestOptions;
+        params_ = (_a = requestOptions.params) !== null && _a !== void 0 ? _a : params_;
         const params = objectRemoveEmpty(params_);
         const makeApiRequest = () => apiRequest({ name, params, requestOptions, connector: this });
         if (requestOptions.cache && method === 'GET') {
@@ -4992,7 +4993,7 @@ class NgwConnector$1 {
                     withCredentials,
                     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,
                 }),
             });
         }
@@ -8051,15 +8052,16 @@ const svgPath = {
     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"/>',
 };
+const VIEW_BOX = 12;
 const STROKE = 0.8;
-function generateSvg(width, height, stroke = 0, content) {
+function generateSvg({ width, height, stroke = 0, content, }) {
     const s = stroke / 2;
     const svg = `<svg
     version="1.1"
     xmlns="http://www.w3.org/2000/svg"
     width="${width}"
     height="${height}"
-    viewBox="-${s} -${s} ${width + stroke} ${height + stroke}"
+    viewBox="-${s} -${s} ${VIEW_BOX + stroke} ${VIEW_BOX + stroke}"
   >${content}</svg>`;
     return svg;
 }
@@ -8068,36 +8070,45 @@ function insertSvg(svg) {
     const 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;
-    // default values
+    var _a, _b, _c, _d, _e, _f;
+    // Default values
     const shape = (_a = opt.shape) !== null && _a !== void 0 ? _a : 'circle';
     const color = (_b = opt.color) !== null && _b !== void 0 ? _b : 'blue';
     const strokeColor = (_c = opt.strokeColor) !== null && _c !== void 0 ? _c : 'white';
-    const size = (_d = opt.size) !== null && _d !== void 0 ? _d : 12;
+    const size = (_d = opt.size) !== null && _d !== void 0 ? _d : VIEW_BOX;
     const rotate = (_e = opt.rotate) !== null && _e !== void 0 ? _e : 0;
-    const anchor = size / 2;
-    const defSize = 12;
+    const anchor = (_f = opt.anchor) !== null && _f !== void 0 ? _f : [size / 2, size / 2];
     const stroke = opt.stroke !== undefined ? Number(opt.stroke) : STROKE;
-    const scale = size / defSize;
     const pathAlias = opt.p || svgPath[shape] || 'circle';
     const path = typeof pathAlias === 'string' ? pathAlias : pathAlias(opt);
-    const svg = insertSvg(opt.svg || generateSvg(size, size, stroke * scale, path));
-    const fistChild = svg.firstChild;
-    const scaledAnchor = defSize / 2;
-    const transform = `scale(${scale}) rotate(${rotate}, ${scaledAnchor}, ${scaledAnchor})`;
-    fistChild.setAttribute('fill', color);
+    const svg = insertSvg(opt.svg ||
+        generateSvg({
+            width: size,
+            height: size,
+            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);
     const s = new XMLSerializer();
     return {
         type: 'icon',
         iconSize: [size, size],
-        iconAnchor: [anchor, anchor],
+        iconAnchor: anchor,
         html: s.serializeToString(svg),
+        rotate,
         svg,
     };
 }