@nextgis/ngw-leaflet 1.18.10 → 1.18.12

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.18.10; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.18.12; author: NextGIS */
 import 'leaflet/dist/leaflet.css';
 import { Icon } from 'leaflet';
 import { NgwMap } from '@nextgis/ngw-map';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.18.10; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.18.12; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -15512,6 +15512,37 @@ var NgwLeaflet = (function () {
         }
         return value;
     };
+    function typeOfValue(value) {
+        if (value === null)
+            return 'null';
+        switch (typeof value) {
+            case 'string':
+                return 'string';
+            case 'number':
+                return 'number';
+            case 'boolean':
+                return 'boolean';
+            case 'object':
+                if (Array.isArray(value)) {
+                    var arrayType = 'value';
+                    if (value.every(function (item) { return typeof item === 'number'; })) {
+                        arrayType = 'number';
+                    }
+                    else if (value.every(function (item) { return typeof item === 'string'; })) {
+                        arrayType = 'string';
+                    }
+                    else if (value.every(function (item) { return typeof item === 'boolean'; })) {
+                        arrayType = 'boolean';
+                    }
+                    return "array<".concat(arrayType, ", ").concat(value.length, ">");
+                }
+                else {
+                    return 'object';
+                }
+            default:
+                return 'undefined';
+        }
+    }
     var typeExpressions = {
         array: evaluateArgs(array),
         boolean: evaluateArgs(fallback(function (arg) { return (typeof arg === 'boolean' ? arg : undefined); })),
@@ -15531,7 +15562,7 @@ var NgwLeaflet = (function () {
         'to-string': evaluateArgs(fallback(String)),
         typeof: evaluateArgs(function (_a) {
             var arg = _a[0];
-            return typeof arg;
+            return typeOfValue(arg);
         }),
     };
 
@@ -15637,42 +15668,39 @@ var NgwLeaflet = (function () {
         var expr = _a[0];
         return !expr;
     }
-    var checkCompareValues = function (_a) {
-        var a = _a[0], b = _a[1];
-        if (typeof a !== typeof b) {
-            throw new Error('Values have different types.');
-        }
-    };
     function notEqual(_a) {
         var a = _a[0], b = _a[1];
-        checkCompareValues([a, b]);
         return a !== b;
     }
     function lessThan(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left < right;
     }
     function lessThanOrEqual(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left <= right;
     }
     function equal(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left === right;
     }
     function greaterThan(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left > right;
     }
     function greaterThanOrEqual(_a) {
         var left = _a[0], right = _a[1];
-        checkCompareValues([left, right]);
         return left >= right;
     }
+    var coalesce = function (args) {
+        for (var i = 0; i < args.length; i++) {
+            var arg = args[i]();
+            if (arg !== null && arg !== undefined) {
+                return arg;
+            }
+        }
+        return null;
+    };
     var all = function (args) {
         for (var i = 0; i < args.length; i++) {
             var arg = args[i]();
@@ -15729,6 +15757,7 @@ var NgwLeaflet = (function () {
         '==': evaluateArgs(equal),
         '>': evaluateArgs(greaterThan),
         '>=': evaluateArgs(greaterThanOrEqual),
+        coalesce: coalesce,
         all: all,
         any: any,
         case: caseFunc,
@@ -22883,45 +22912,45 @@ var NgwLeaflet = (function () {
         return CancelablePromise.resolve(undefined);
     }
     function featureLayerIdentify(options) {
-        var geom = options.geom, signal = options.signal, cache = options.cache;
-        var geom_ = [];
-        if (Array.isArray(geom)) {
-            geom_ = geom;
+        var geom = options.geom, signal = options.signal, cache = options.cache, layers = options.layers;
+        var wkt = typeof geom === 'string' ? geom : convertGeomToWKT(geom);
+        if (!wkt) {
+            throw new Error('Not valid geometry format to make intersection');
         }
-        else {
-            var polygon = geom.type === 'Feature'
-                ? geom.geometry
-                : geom.type === 'Polygon'
-                    ? geom
-                    : false;
-            if (polygon) {
-                geom_ = polygon.coordinates[0];
-            }
+        var data = {
+            geom: wkt,
+            srs: 3857,
+            layers: layers,
+        };
+        return options.connector.post('feature_layer.identify', {
+            data: data,
+            signal: signal,
+            cache: cache,
+        });
+    }
+    function convertGeomToWKT(geom) {
+        var coordinates = getPolygonCoordinates(geom);
+        if (!coordinates)
+            return null;
+        var polygonStr = coordinates.map(function (_a) {
+            var lng = _a[0], lat = _a[1];
+            var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
+            return "".concat(x, " ").concat(y);
+        });
+        return "POLYGON((".concat(polygonStr.join(','), "))");
+    }
+    function getPolygonCoordinates(geom) {
+        var _a;
+        if (Array.isArray(geom)) {
+            return geom;
         }
-        if (geom_) {
-            // create wkt string
-            var polygonStr = [];
-            for (var _i = 0, geom_1 = geom_; _i < geom_1.length; _i++) {
-                var _a = geom_1[_i], lng = _a[0], lat = _a[1];
-                var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
-                polygonStr.push(x + ' ' + y);
-            }
-            var wkt = "POLYGON((".concat(polygonStr.join(', '), "))");
-            var layers = options.layers;
-            var data = {
-                geom: wkt,
-                srs: 3857,
-                layers: layers,
-            };
-            return options.connector.post('feature_layer.identify', {
-                data: data,
-                signal: signal,
-                cache: cache,
-            });
+        if (geom.type === 'Feature') {
+            return (_a = geom.geometry) === null || _a === void 0 ? void 0 : _a.coordinates[0];
         }
-        else {
-            throw new Error('Not valid geometry format to make intersection');
+        if (geom.type === 'Polygon') {
+            return geom.coordinates[0];
         }
+        return null;
     }
     function sendIdentifyRequest(ev, options) {
         deprecatedMapClick(ev);