@nextgis/ngw-map 1.18.0 → 1.18.1

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.1; 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.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.1; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -2140,32 +2140,46 @@ var NgwMap = (function (exports) {
             return mask;
         };
     }
-    function expressionCallback(paint, defaultPaint, getPaintFunctions) {
+    function expressionCallback(_a) {
+        var paint = _a.paint, defaultPaint = _a.defaultPaint;
         var expressionCallback = createExpressionCallback(paint);
         if (expressionCallback) {
             var expressionPaintCb = function (feature) {
-                return preparePaint(expressionCallback(feature), defaultPaint, getPaintFunctions);
+                return preparePaint({
+                    paint: expressionCallback(feature),
+                    defaultPaint: defaultPaint,
+                });
             };
-            expressionPaintCb.paint = paint;
+            expressionPaintCb.paint = finalizePaint({ paint: paint, defaultPaint: defaultPaint });
             return expressionPaintCb;
         }
+        return finalizePaint({ paint: paint, defaultPaint: defaultPaint });
+    }
+    function finalizePaint(_a) {
+        var _b;
+        var paint = _a.paint, defaultPaint = _a.defaultPaint;
         var newPaint = __assign({}, defaultPaint);
         newPaint = __assign(__assign({}, newPaint), paint);
-        newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
+        newPaint.fill = (_b = newPaint.fill) !== null && _b !== void 0 ? _b : true;
         newPaint.stroke =
             newPaint.stroke !== undefined
                 ? newPaint.stroke
                 : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
         return newPaint;
     }
-    function preparePaint(paint, defaultPaint, getPaintFunctions) {
+    function preparePaint(_a) {
+        var paint = _a.paint, defaultPaint = _a.defaultPaint, getPaintFunctions = _a.getPaintFunctions;
         if (!paint) {
             throw new Error('paint is empty');
         }
         var newPaint = __assign({}, defaultPaint);
         if (isPaintCallback(paint)) {
             var getPaintFunction = function (feature) {
-                var getPaint = preparePaint(paint(feature), defaultPaint, getPaintFunctions);
+                var getPaint = preparePaint({
+                    paint: paint(feature),
+                    defaultPaint: defaultPaint,
+                    getPaintFunctions: getPaintFunctions,
+                });
                 getPaint.type = paint.type;
                 return getPaint;
             };
@@ -2174,20 +2188,28 @@ var NgwMap = (function (exports) {
         }
         else if (isPropertiesPaint(paint)) {
             return function (feature) {
-                return preparePaint(createPropertiesPaint(paint)(feature), defaultPaint, getPaintFunctions);
+                return preparePaint({
+                    paint: createPropertiesPaint(paint)(feature),
+                    defaultPaint: defaultPaint,
+                    getPaintFunctions: getPaintFunctions,
+                });
             };
         }
         else if (paint.type === 'get-paint') {
             var getPaint = updatePaintOptionFromCallback(paint, getPaintFunctions);
             if (getPaint) {
-                newPaint = preparePaint(getPaint, defaultPaint, getPaintFunctions);
+                newPaint = preparePaint({
+                    paint: getPaint,
+                    defaultPaint: defaultPaint,
+                    getPaintFunctions: getPaintFunctions,
+                });
             }
         }
         else if (paint.type === 'icon') {
             return paint;
         }
         else {
-            newPaint = expressionCallback(paint, defaultPaint, getPaintFunctions);
+            newPaint = expressionCallback({ paint: paint, defaultPaint: defaultPaint });
         }
         if (isPaintCallback(newPaint)) {
             return newPaint;
@@ -3943,10 +3965,18 @@ var NgwMap = (function (exports) {
             };
             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,
+                    });
                 }
             }
         };