@nextgis/ngw-map 1.18.0 → 1.18.2

package/lib/ngw-map.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.2; 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.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.2; author: NextGIS */
 var events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -1947,32 +1947,43 @@ function createPropertiesPaint(propertiesPaint) {
         return mask;
     };
 }
-function expressionCallback(paint, defaultPaint, getPaintFunctions) {
+function expressionCallback({ paint, defaultPaint, }) {
     const expressionCallback = createExpressionCallback(paint);
     if (expressionCallback) {
         const expressionPaintCb = (feature) => {
-            return preparePaint(expressionCallback(feature), defaultPaint, getPaintFunctions);
+            return preparePaint({
+                paint: expressionCallback(feature),
+                defaultPaint,
+            });
         };
-        expressionPaintCb.paint = paint;
+        expressionPaintCb.paint = finalizePaint({ paint, defaultPaint });
         return expressionPaintCb;
     }
+    return finalizePaint({ paint, defaultPaint });
+}
+function finalizePaint({ paint, defaultPaint }) {
+    var _a;
     let newPaint = { ...defaultPaint };
     newPaint = { ...newPaint, ...paint };
-    newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
+    newPaint.fill = (_a = newPaint.fill) !== null && _a !== void 0 ? _a : true;
     newPaint.stroke =
         newPaint.stroke !== undefined
             ? newPaint.stroke
             : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
     return newPaint;
 }
-function preparePaint(paint, defaultPaint, getPaintFunctions) {
+function preparePaint({ paint, defaultPaint, getPaintFunctions, }) {
     if (!paint) {
         throw new Error('paint is empty');
     }
     let newPaint = { ...defaultPaint };
     if (isPaintCallback(paint)) {
         const getPaintFunction = (feature) => {
-            const getPaint = preparePaint(paint(feature), defaultPaint, getPaintFunctions);
+            const getPaint = preparePaint({
+                paint: paint(feature),
+                defaultPaint,
+                getPaintFunctions,
+            });
             getPaint.type = paint.type;
             return getPaint;
         };
@@ -1981,20 +1992,28 @@ function preparePaint(paint, defaultPaint, getPaintFunctions) {
     }
     else if (isPropertiesPaint(paint)) {
         return (feature) => {
-            return preparePaint(createPropertiesPaint(paint)(feature), defaultPaint, getPaintFunctions);
+            return preparePaint({
+                paint: createPropertiesPaint(paint)(feature),
+                defaultPaint,
+                getPaintFunctions,
+            });
         };
     }
     else if (paint.type === 'get-paint') {
         const getPaint = updatePaintOptionFromCallback(paint, getPaintFunctions);
         if (getPaint) {
-            newPaint = preparePaint(getPaint, defaultPaint, getPaintFunctions);
+            newPaint = preparePaint({
+                paint: getPaint,
+                defaultPaint,
+                getPaintFunctions,
+            });
         }
     }
     else if (paint.type === 'icon') {
         return paint;
     }
     else {
-        newPaint = expressionCallback(paint, defaultPaint, getPaintFunctions);
+        newPaint = expressionCallback({ paint, defaultPaint });
     }
     if (isPaintCallback(newPaint)) {
         return newPaint;
@@ -3602,10 +3621,18 @@ class WebMapLayers extends WebMapMain {
         };
         if (!options.nativePaint) {
             if (this.options.paint) {
-                options.paint = preparePaint(options.paint || {}, this.options.paint, this.getPaintFunctions);
+                options.paint = preparePaint({
+                    paint: options.paint || {},
+                    defaultPaint: this.options.paint,
+                    getPaintFunctions: this.getPaintFunctions,
+                });
             }
             if (options.selectedPaint && this.options.selectedPaint) {
-                options.selectedPaint = preparePaint(options.selectedPaint, this.options.selectedPaint, this.getPaintFunctions);
+                options.selectedPaint = preparePaint({
+                    paint: options.selectedPaint,
+                    defaultPaint: this.options.selectedPaint,
+                    getPaintFunctions: this.getPaintFunctions,
+                });
             }
         }
     }
@@ -8034,21 +8061,23 @@ function insertSvg(svg) {
     return oDOM.documentElement;
 }
 function getIcon(opt = {}) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     // 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 rotate = (_e = opt.rotate) !== null && _e !== void 0 ? _e : 0;
     const anchor = size / 2;
     const defSize = 12;
-    const stroke = typeof opt.stroke === 'number' ? opt.stroke : STROKE;
+    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 transform = `scale(${scale})`;
+    const scaledAnchor = defSize / 2;
+    const transform = `scale(${scale}) rotate(${rotate}, ${scaledAnchor}, ${scaledAnchor})`;
     fistChild.setAttribute('fill', color);
     if (stroke) {
         fistChild.setAttribute('stroke', strokeColor);