@nextgis/ngw-map 1.11.8 → 1.12.0

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.11.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.12.0; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -2681,6 +2681,9 @@ var NgwMap = (function (exports) {
                             _c.sent();
                             _c.label = 11;
                         case 11:
+                            if (options.onAdded) {
+                                options.onAdded(_adapter);
+                            }
                             this._emitLayerEvent('layer:add', layerId, _adapter);
                             return [2 /*return*/, _adapter];
                         case 12: return [2 /*return*/, Promise.reject('No adapter')];
@@ -2821,8 +2824,15 @@ var NgwMap = (function (exports) {
         WebMapLayers.prototype.addTileLayer = function (url, options) {
             return this.addLayer('TILE', __assign(__assign({}, options), { url: url }));
         };
-        /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
-        WebMapLayers.prototype.addImageLayer = function (url, options) {
+        WebMapLayers.prototype.addImageLayer = function (urlOrOptions, options) {
+            var url;
+            if (typeof urlOrOptions === 'string') {
+                url = urlOrOptions;
+            }
+            else {
+                url = urlOrOptions.url;
+                options = urlOrOptions;
+            }
             return this.addLayer('IMAGE', __assign(__assign({}, options), { url: url }));
         };
         /**
@@ -5167,10 +5177,10 @@ var NgwMap = (function (exports) {
     function createGeoJsonFeature(item) {
         var geometry = item.geom;
         var feature = {
+            geometry: geometry,
             id: item.id,
             type: 'Feature',
             properties: item.fields,
-            geometry: geometry,
         };
         return feature;
     }
@@ -5193,68 +5203,85 @@ var NgwMap = (function (exports) {
     }
     // NGW REST API is not able to filtering by combined queries
     // therefore the filter is divided into several requests
-    function createFeatureFieldFilterQueries(opt, _queries, _parentAllParams) {
+    function createFeatureFieldFilterQueries(opt) {
+        var queries = getQueries(opt);
+        return CancelablePromise.all(queries).then(function (itemsParts) {
+            // this list of ids used for optimization
+            var ids = [];
+            var items = [];
+            for (var _i = 0, itemsParts_1 = itemsParts; _i < itemsParts_1.length; _i++) {
+                var part = itemsParts_1[_i];
+                for (var _a = 0, part_1 = part; _a < part_1.length; _a++) {
+                    var item = part_1[_a];
+                    if (!ids.includes(item.id)) {
+                        items.push(item);
+                        ids.push(item.id);
+                    }
+                }
+            }
+            var offset = opt.offset !== undefined ? opt.offset : 0;
+            var limit = opt.limit !== undefined ? opt.limit : items.length;
+            if (opt.offset || opt.limit) {
+                return items.splice(offset, limit);
+            }
+            return items;
+        });
+    }
+    function createParam(pf) {
+        var field = pf[0], operation = pf[1], value = pf[2];
+        var isFldStr = field !== 'id' ? 'fld_' : '';
+        var vStart = '';
+        var vEnd = '';
+        var field_ = String(field)
+            .trim()
+            .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
+            vStart = a;
+            vEnd = c;
+            return b;
+        });
+        var v = vStart + value + vEnd;
+        return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
+    }
+    function getQueries(opt, _queries, _parentAllParams) {
         if (_queries === void 0) { _queries = []; }
         if (_parentAllParams === void 0) { _parentAllParams = []; }
         var filters = opt.filters;
         var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
         var filters_ = filters.filter(function (x) { return Array.isArray(x); });
-        var createParam = function (pf) {
-            var field = pf[0], operation = pf[1], value = pf[2];
-            var isFldStr = field !== 'id' ? 'fld_' : '';
-            var vStart = '';
-            var vEnd = '';
-            var field_ = String(field)
-                .trim()
-                .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
-                vStart = a;
-                vEnd = c;
-                return b;
-            });
-            var v = vStart + value + vEnd;
-            return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
-        };
         if (logic === 'any') {
-            filters_.forEach(function (f) {
+            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
+                var f = filters_1[_i];
                 if (isPropertyFilter(f)) {
                     _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)], false) })));
                 }
                 else {
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
+                    getQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
                 }
-            });
+            }
         }
         else if (logic === 'all') {
-            var filters_2 = [];
+            var filters_3 = [];
             var propertiesFilterList = [];
-            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
-                var f = filters_1[_i];
+            for (var _a = 0, filters_2 = filters_; _a < filters_2.length; _a++) {
+                var f = filters_2[_a];
                 if (isPropertyFilter(f)) {
-                    filters_2.push(createParam(f));
+                    filters_3.push(createParam(f));
                 }
                 else {
                     propertiesFilterList.push(f);
                 }
             }
             if (propertiesFilterList.length) {
-                for (var _a = 0, propertiesFilterList_1 = propertiesFilterList; _a < propertiesFilterList_1.length; _a++) {
-                    var x = propertiesFilterList_1[_a];
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true));
+                for (var _b = 0, propertiesFilterList_1 = propertiesFilterList; _b < propertiesFilterList_1.length; _b++) {
+                    var x = propertiesFilterList_1[_b];
+                    getQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true) })));
             }
         }
-        return CancelablePromise.all(_queries).then(function (itemsParts) {
-            var items = itemsParts.reduce(function (a, b) { return a.concat(b); }, []);
-            var offset = opt.offset !== undefined ? opt.offset : 0;
-            var limit = opt.limit !== undefined ? opt.limit : items.length;
-            if (opt.offset || opt.limit) {
-                return items.splice(offset, limit);
-            }
-            return items;
-        });
+        return _queries;
     }
     function createWktFromCoordArray(coord) {
         var polygon = coord.map(function (_a) {
@@ -5266,7 +5293,7 @@ var NgwMap = (function (exports) {
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
-        var connector = options.connector, limit = options.limit, offset = options.offset, intersects = options.intersects, orderBy = options.orderBy, resourceId = options.resourceId, paramList = options.paramList;
+        var limit = options.limit, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
         if (limit) {
             if (limit !== Number.POSITIVE_INFINITY) {
                 params.limit = limit;
@@ -5279,7 +5306,6 @@ var NgwMap = (function (exports) {
         if (offset) {
             params.offset = offset;
         }
-        // TODO: fix type for options
         updateItemRequestParam(params, options);
         if (orderBy) {
             params.order_by = orderBy.join(',');
@@ -5331,12 +5357,16 @@ var NgwMap = (function (exports) {
         var filters = options.filters;
         if (filters) {
             return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
+                var _a;
+                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : true;
                 // Additional client-side filter check
-                data.filter(function (y) {
-                    var fields = prepareNgwFieldsToPropertiesFilter(__assign({}, y.fields));
-                    var result = propertiesFilter(fields, filters);
-                    return result;
-                });
+                if (clientFilterValidate) {
+                    data = data.filter(function (y) {
+                        var fields = prepareNgwFieldsToPropertiesFilter(__assign(__assign({}, y.fields), { id: y.id }));
+                        var result = propertiesFilter(fields, filters);
+                        return result;
+                    });
+                }
                 return data;
             });
         }
@@ -5695,6 +5725,26 @@ var NgwMap = (function (exports) {
         });
     }
 
+    function getImageAdapterOptions(_a) {
+        var resourceId = _a.resourceId, baseUrl = _a.baseUrl, nd = _a.nd, headers = _a.headers;
+        var url = baseUrl + '/api/component/render/image';
+        var params = { resource: resourceId };
+        if (nd) {
+            params.nd = nd;
+        }
+        return {
+            url: url,
+            resourceId: resourceId,
+            headers: headers,
+            params: params,
+            updateWmsParams: function (params_) {
+                if (nd) {
+                    params_.nd = nd;
+                }
+                return updateImageParams(params_, resourceId);
+            },
+        };
+    }
     function ngwApiToAdapterOptions(_a) {
         var options = _a.options, webMap = _a.webMap, baseUrl = _a.baseUrl;
         var adapter = options.adapter || 'IMAGE';
@@ -5706,16 +5756,12 @@ var NgwMap = (function (exports) {
         if (typeof resourceId === 'number') {
             if (adapter === 'IMAGE') {
                 if (isImageAllowed) {
-                    url = baseUrl + '/api/component/render/image';
-                    return {
-                        url: url,
+                    return getImageAdapterOptions({
                         resourceId: resourceId,
                         headers: options.headers,
-                        params: { resource: resourceId, nd: nd },
-                        updateWmsParams: function (params) {
-                            return updateImageParams(__assign({ nd: nd }, params), resourceId);
-                        },
-                    };
+                        nd: nd,
+                        baseUrl: baseUrl,
+                    });
                 }
                 else {
                     adapter = 'TILE';
@@ -7130,6 +7176,7 @@ var NgwMap = (function (exports) {
         NgwWebmapLayerAdapter.prototype._setBasemaps = function (baseWebmap) {
             var _this = this;
             var webMap = this.options.webMap;
+            // to avoid set many basemaps on init
             var enabledAlreadySet = false;
             var _loop_1 = function (x) {
                 createOnFirstShowNgwAdapter({
@@ -7138,9 +7185,11 @@ var NgwMap = (function (exports) {
                     item: x,
                     adapterOptions: { crossOrigin: this_1.options.crossOrigin },
                 }).then(function (adapter) {
-                    // to avoid set many basemaps on init
                     var visibility = enabledAlreadySet ? false : x.enabled;
-                    webMap
+                    if (x.enabled) {
+                        enabledAlreadySet = true;
+                    }
+                    return webMap
                         .addBaseLayer(adapter, {
                         id: WEBMAP_BASELAYER_ID_PREFIX + x.resource_id,
                         name: x.display_name,
@@ -7150,9 +7199,6 @@ var NgwMap = (function (exports) {
                         .then(function (l) {
                         l.id && _this._webmapBaselayersIds.push(l.id);
                     });
-                    if (x.enabled) {
-                        enabledAlreadySet = true;
-                    }
                 });
             };
             var this_1 = this;
@@ -7634,7 +7680,7 @@ var NgwMap = (function (exports) {
     function updateImageParams(params, resourceId) {
         var bbox = params.bbox, width = params.width, height = params.height, nd = params.nd;
         return {
-            resource: resourceId,
+            resource: Array.isArray(resourceId) ? resourceId.join(',') : resourceId,
             extent: bbox,
             size: width + ',' + height,
             timestamp: Date.now(),
@@ -7942,38 +7988,45 @@ var NgwMap = (function (exports) {
         }
         return CancelablePromise.resolve(undefined);
     }
+    function featureLayerIdentify(options) {
+        var g = options.geom;
+        var geom = [];
+        if (Array.isArray(g)) {
+            geom = g;
+        }
+        else {
+            var polygon = g.type === 'Feature' ? g.geometry : g.type === 'Polygon' ? g : false;
+            if (polygon) {
+                geom = polygon.coordinates[0];
+            }
+        }
+        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 });
+        }
+        else {
+            throw new Error('Not valid geometry format to make intersection');
+        }
+    }
     function sendIdentifyRequest(ev, options) {
+        var _a;
         deprecatedMapClick(ev);
-        var _a = ev.lngLat, lng = _a[0], lat = _a[1];
-        var geom = [];
-        if (options.geom) {
-            var polygon_1 = options.geom.type === 'Feature'
-                ? options.geom.geometry
-                : options.geom.type === 'Polygon'
-                    ? options.geom
-                    : false;
-            if (polygon_1) {
-                geom = polygon_1.coordinates[0];
-            }
-        }
-        if (!geom.length) {
-            geom = getCirclePolygonCoordinates(lng, lat, options.radius);
-        }
-        // create wkt string
-        var polygon = [];
-        geom.forEach(function (_a) {
-            var lng = _a[0], lat = _a[1];
-            var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
-            polygon.push(x + ' ' + y);
-        });
-        var wkt = "POLYGON((".concat(polygon.join(', '), "))");
-        var layers = options.layers;
-        var data = {
-            geom: wkt,
-            srs: 3857,
-            layers: layers,
-        };
-        return options.connector.post('feature_layer.identify', { data: data });
+        var _b = ev.lngLat, lng = _b[0], lat = _b[1];
+        var geom = (_a = options.geom) !== null && _a !== void 0 ? _a : getCirclePolygonCoordinates(lng, lat, options.radius);
+        return featureLayerIdentify(__assign(__assign({}, options), { geom: geom }));
     }
     function createIdentifyItem(opt) {
         return new IdentifyItem(opt);