@nextgis/ngw-map 1.8.4 → 1.9.0

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.8.4; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.9.0; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -1428,10 +1428,6 @@ var NgwMap = (function (exports) {
         }
         return false;
     }
-    /** @deprecated use {@link isPropertyFilter} instead */
-    function checkIfPropertyFilter(filter) {
-        return isPropertyFilter(filter);
-    }
     function featureFilter(feature, filters) {
         var properties = __assign({}, feature.properties);
         if (properties) {
@@ -2051,7 +2047,11 @@ var NgwMap = (function (exports) {
          * @returns The map's current zoom level (0-24).
          */
         WebMapMain.prototype.getZoom = function () {
-            return this.mapAdapter.getZoom();
+            var zoom = this.mapAdapter.getZoom();
+            if (typeof zoom === 'number') {
+                return zoom;
+            }
+            throw Error('Unable to get zoom level. Perhaps the map is not have been initialized yet');
         };
         WebMapMain.prototype.zoomIn = function () {
             if (this.mapAdapter.zoomIn) {
@@ -2077,27 +2077,25 @@ var NgwMap = (function (exports) {
                 }
             }
         };
-        /**
-         * Sets the view of the map geographical center and zoom
-         * @param lngLat - Array of two numbers representing longitude and latitude of the center of the map view.
-         * @param zoom - The zoom level to set (0-24).
-         *
-         * @example
-         * ```javascript
-         * // Mount Everest 27° 59′ 17″ N, 86° 55′ 31″ E
-         * webMap.setView([86.925278, 27.988056], 12)
-         * ```
-         */
-        WebMapMain.prototype.setView = function (lngLat, zoom) {
-            if (this.mapAdapter.setView && lngLat && defined(zoom)) {
-                this.mapAdapter.setView(lngLat, zoom);
+        WebMapMain.prototype.setView = function (lngLatOrOpt, zoom) {
+            if (Array.isArray(lngLatOrOpt)) {
+                var lngLat = lngLatOrOpt;
+                if (this.mapAdapter.setView && lngLat && defined(zoom)) {
+                    this.mapAdapter.setView(lngLat, zoom);
+                }
+                else {
+                    if (lngLat) {
+                        this.mapAdapter.setCenter(lngLat);
+                    }
+                    if (defined(zoom)) {
+                        this.mapAdapter.setZoom(zoom);
+                    }
+                }
             }
             else {
-                if (lngLat) {
-                    this.mapAdapter.setCenter(lngLat);
-                }
-                if (defined(zoom)) {
-                    this.mapAdapter.setZoom(zoom);
+                var viewOpt = lngLatOrOpt;
+                if (this.mapAdapter.setView) {
+                    this.mapAdapter.setView(viewOpt);
                 }
             }
         };
@@ -2547,9 +2545,9 @@ var NgwMap = (function (exports) {
             var _a, _b;
             if (options === void 0) { options = {}; }
             return __awaiter(this, void 0, void 0, function () {
-                var id, _order, adapterEngine, geoJsonOptions, _c, maxZoom, minZoom, visibility, modified, _adapter, layerId, layer, opacity, getBounds, extent;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var id, _order, adapterEngine, geoJsonOptions, visibility, modified, _adapter, layerId, layer, opacity, getBounds, extent;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             id = this._layersIdCounter++;
                             _order = defined(order)
@@ -2568,13 +2566,12 @@ var NgwMap = (function (exports) {
                             if (!('then' in adapter)) return [3 /*break*/, 4];
                             return [4 /*yield*/, adapter];
                         case 3:
-                            adapterEngine = (_d.sent());
-                            _d.label = 4;
+                            adapterEngine = (_c.sent());
+                            _c.label = 4;
                         case 4:
                             geoJsonOptions = options;
                             this._updateGeoJsonOptions(geoJsonOptions);
-                            _c = this.options, maxZoom = _c.maxZoom, minZoom = _c.minZoom;
-                            options = __assign({ id: String(id), order: _order, maxZoom: maxZoom, minZoom: minZoom }, options);
+                            options = __assign({ id: String(id), order: _order }, options);
                             visibility = (_a = options.visibility) !== null && _a !== void 0 ? _a : true;
                             options.visibility = false;
                             if (options.baselayer) {
@@ -2610,11 +2607,11 @@ var NgwMap = (function (exports) {
                             this._emitLayerEvent('layer:preadd', layerId || '', _adapter);
                             return [4 /*yield*/, this.onMapLoad()];
                         case 5:
-                            _d.sent();
+                            _c.sent();
                             _adapter.map = this.mapAdapter.map;
                             return [4 /*yield*/, _adapter.addLayer(_adapter.options)];
                         case 6:
-                            layer = _d.sent();
+                            layer = _c.sent();
                             // checking that the original layer was inserted into the adapter anyway
                             _adapter.layer = layer;
                             // think about how to move `id` to the adapter's constructor,
@@ -2643,8 +2640,8 @@ var NgwMap = (function (exports) {
                             if (!visibility) return [3 /*break*/, 8];
                             return [4 /*yield*/, this.showLayer(layerId)];
                         case 7:
-                            _d.sent();
-                            _d.label = 8;
+                            _c.sent();
+                            _c.label = 8;
                         case 8:
                             opacity = options.opacity;
                             if (opacity !== undefined && opacity <= 1) {
@@ -2654,12 +2651,12 @@ var NgwMap = (function (exports) {
                             if (!(options.fit && getBounds)) return [3 /*break*/, 11];
                             return [4 /*yield*/, getBounds.call(_adapter)];
                         case 9:
-                            extent = _d.sent();
+                            extent = _c.sent();
                             if (!extent) return [3 /*break*/, 11];
                             return [4 /*yield*/, this.fitBounds(extent)];
                         case 10:
-                            _d.sent();
-                            _d.label = 11;
+                            _c.sent();
+                            _c.label = 11;
                         case 11:
                             this._emitLayerEvent('layer:add', layerId, _adapter);
                             return [2 /*return*/, _adapter];
@@ -3163,6 +3160,17 @@ var NgwMap = (function (exports) {
                 attribution: tileJson.attribution,
             });
         };
+        /** @internal */
+        WebMapLayers.prototype._emitLayerEvent = function (name, id, options) {
+            var name_ = String(name);
+            if (defined(id) && name_.startsWith('layer:')) {
+                var specificLayerName = name_.replace('layer:', 'layer-' + id + ':');
+                // @ts-ignore can't paste template literal key for interface
+                this.emitter.emit(specificLayerName, options);
+            }
+            // @ts-ignore
+            this.emitter.emit(name, options);
+        };
         WebMapLayers.prototype._onLayerClick = function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 var id;
@@ -3222,14 +3230,6 @@ var NgwMap = (function (exports) {
                 }
             }
         };
-        WebMapLayers.prototype._emitLayerEvent = function (name, id, options) {
-            if (defined(id) && name.startsWith('layer:')) {
-                var specificLayerName = name.replace('layer:', 'layer-' + id + ':');
-                // @ts-ignore can't paste template literal key for interface
-                this.emitter.emit(specificLayerName, options);
-            }
-            this.emitter.emit(name, options);
-        };
         return WebMapLayers;
     }(WebMapMain));
 
@@ -5006,7 +5006,7 @@ var NgwMap = (function (exports) {
         };
         if (logic === 'any') {
             filters_.forEach(function (f) {
-                if (checkIfPropertyFilter(f)) {
+                if (isPropertyFilter(f)) {
                     _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)]) })));
                 }
                 else {
@@ -5019,7 +5019,7 @@ var NgwMap = (function (exports) {
             var propertiesFilterList = [];
             for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
                 var f = filters_1[_i];
-                if (checkIfPropertyFilter(f)) {
+                if (isPropertyFilter(f)) {
                     filters_2.push(createParam(f));
                 }
                 else {
@@ -5155,10 +5155,21 @@ var NgwMap = (function (exports) {
         });
     }
 
+    function fetchNgwLayerCount(_a) {
+        var connector = _a.connector, resourceId = _a.resourceId, _b = _a.cache, cache = _b === void 0 ? true : _b;
+        return connector
+            .get('feature_layer.feature.count', { cache: cache }, {
+            id: resourceId,
+        })
+            .then(function (resp) {
+            return resp.total_count;
+        });
+    }
+
     function createGeoJsonAdapter(props) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var item, webMap, Adapter, connector, layerOptions, alop, addLayerOptionsPriority, options, GeoJsonAdapter, _fullDataLoad, _lastFilterArgs, _dataPromise, resourceId, getData, removed, abort, NgwGeoJsonAdapter;
+            var item, webMap, Adapter, connector, layerOptions, alop, addLayerOptionsPriority, options, GeoJsonAdapter, _loadedIds, _fullDataLoad, _lastFilterArgs, _dataPromise, resourceId, getData, removed, abort, NgwGeoJsonAdapter;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -5167,6 +5178,7 @@ var NgwMap = (function (exports) {
                         addLayerOptionsPriority = alop !== null && alop !== void 0 ? alop : true;
                         options = layerOptions;
                         GeoJsonAdapter = Adapter || webMap.mapAdapter.layerAdapters.GEOJSON;
+                        _loadedIds = [];
                         _fullDataLoad = false;
                         return [4 /*yield*/, resourceIdFromLayerOptions(options, connector)];
                     case 1:
@@ -5205,7 +5217,7 @@ var NgwMap = (function (exports) {
                             }
                             NgwGeoJsonAdapter.prototype.addLayer = function (opt) {
                                 return __awaiter(this, void 0, void 0, function () {
-                                    var needUpdate, waitFullLoad, layer, updatePromise;
+                                    var needUpdate, waitFullLoad, strategy, layer, updatePromise;
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0:
@@ -5233,8 +5245,9 @@ var NgwMap = (function (exports) {
                                                     opt.data = undefined;
                                                     needUpdate = false;
                                                 }
+                                                strategy = opt.strategy || undefined;
+                                                this.options.strategy = strategy;
                                                 layer = _super.prototype.addLayer.call(this, opt);
-                                                this.options.strategy = opt.strategy || undefined;
                                                 _lastFilterArgs = {
                                                     filters: opt.propertiesFilter,
                                                     options: getLayerFilterOptions(opt),
@@ -5248,7 +5261,7 @@ var NgwMap = (function (exports) {
                                                 _a.sent();
                                                 _a.label = 2;
                                             case 2:
-                                                if (this.options.strategy === 'BBOX' && !_fullDataLoad) {
+                                                if (strategy && strategy.startsWith('BBOX') && !_fullDataLoad) {
                                                     this._addBboxEventListener();
                                                 }
                                                 return [2 /*return*/, layer];
@@ -5262,10 +5275,11 @@ var NgwMap = (function (exports) {
                             };
                             NgwGeoJsonAdapter.prototype.getBounds = function () {
                                 return __awaiter(this, void 0, void 0, function () {
-                                    var hasData;
+                                    var hasData, strategy;
                                     return __generator(this, function (_a) {
                                         hasData = this.getLayers && this.getLayers().length;
-                                        if (this.options.strategy === 'BBOX' || hasData) {
+                                        strategy = this.options.strategy;
+                                        if ((strategy === null || strategy === void 0 ? void 0 : strategy.startsWith('BBOX')) || hasData) {
                                             return [2 /*return*/, fetchNgwResourceExtent(item, connector)];
                                         }
                                         else {
@@ -5288,61 +5302,86 @@ var NgwMap = (function (exports) {
                                 abort();
                             };
                             NgwGeoJsonAdapter.prototype.getCount = function () {
-                                var _this = this;
-                                if (this._count !== undefined) {
-                                    return this._count;
-                                }
-                                return connector
-                                    .get('feature_layer.feature.count', { cache: true }, {
-                                    id: resourceId,
-                                })
-                                    .then(function (resp) {
-                                    if (resp) {
-                                        _this._count = resp.total_count;
-                                        return _this._count;
-                                    }
-                                });
+                                return fetchNgwLayerCount({ connector: connector, resourceId: resourceId, cache: true });
                             };
                             NgwGeoJsonAdapter.prototype.updateLayer = function (filterArgs) {
+                                var _a;
                                 return __awaiter(this, void 0, void 0, function () {
-                                    var data, count, er_1;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
+                                    var _b, minZoom, maxZoom, zoom, data, newData, count, _i, _c, f, er_1;
+                                    return __generator(this, function (_d) {
+                                        switch (_d.label) {
                                             case 0:
                                                 filterArgs = filterArgs || _lastFilterArgs || {};
-                                                if (!(this.options.strategy === 'BBOX')) return [3 /*break*/, 2];
+                                                if (!((_a = this.options.strategy) === null || _a === void 0 ? void 0 : _a.startsWith('BBOX'))) return [3 /*break*/, 2];
                                                 return [4 /*yield*/, webMap.onLoad('create')];
                                             case 1:
-                                                _a.sent();
+                                                _d.sent();
                                                 filterArgs.options = filterArgs.options || {};
                                                 filterArgs.options.intersects = webMap.getBounds();
-                                                _a.label = 2;
+                                                _b = this.options, minZoom = _b.minZoom, maxZoom = _b.maxZoom;
+                                                zoom = webMap.getZoom();
+                                                if (minZoom !== undefined && zoom < minZoom) {
+                                                    return [2 /*return*/];
+                                                }
+                                                if (maxZoom !== undefined && zoom > maxZoom) {
+                                                    return [2 /*return*/];
+                                                }
+                                                if (_fullDataLoad) {
+                                                    return [2 /*return*/];
+                                                }
+                                                _d.label = 2;
                                             case 2:
                                                 if (removed) {
                                                     return [2 /*return*/];
                                                 }
-                                                _a.label = 3;
+                                                _d.label = 3;
                                             case 3:
-                                                _a.trys.push([3, 7, , 8]);
+                                                _d.trys.push([3, 10, , 11]);
                                                 return [4 /*yield*/, getData(filterArgs.filters, __assign(__assign({}, filterArgs.options), { srs: this.options.srs }))];
                                             case 4:
-                                                data = _a.sent();
+                                                data = _d.sent();
+                                                newData = data;
                                                 return [4 /*yield*/, this.getCount()];
                                             case 5:
-                                                count = _a.sent();
-                                                _fullDataLoad = count === data.features.length;
-                                                return [4 /*yield*/, webMap.setLayerData(this, data)];
+                                                count = _d.sent();
+                                                if (!(this.options.strategy === 'BBOX+')) return [3 /*break*/, 7];
+                                                newData = {
+                                                    type: 'FeatureCollection',
+                                                    features: [],
+                                                };
+                                                for (_i = 0, _c = data.features; _i < _c.length; _i++) {
+                                                    f = _c[_i];
+                                                    if (_loadedIds.indexOf(String(f.id)) === -1) {
+                                                        _loadedIds.push(String(f.id));
+                                                        newData.features.push(f);
+                                                    }
+                                                }
+                                                _fullDataLoad = count !== undefined && _loadedIds.length >= count;
+                                                return [4 /*yield*/, webMap.addLayerData(this, newData)];
                                             case 6:
-                                                _a.sent();
-                                                this.emitter.emit('updated');
-                                                return [3 /*break*/, 8];
+                                                _d.sent();
+                                                return [3 /*break*/, 9];
                                             case 7:
-                                                er_1 = _a.sent();
+                                                _fullDataLoad = count !== undefined && data.features.length >= count;
+                                                return [4 /*yield*/, webMap.setLayerData(this, data)];
+                                            case 8:
+                                                _d.sent();
+                                                _d.label = 9;
+                                            case 9:
+                                                this.emitter.emit('updated', data);
+                                                webMap._emitLayerEvent('layer:updated', options.id || '', {
+                                                    data: data,
+                                                    newData: newData,
+                                                    isFull: _fullDataLoad,
+                                                });
+                                                return [3 /*break*/, 11];
+                                            case 10:
+                                                er_1 = _d.sent();
                                                 if (er_1 instanceof Error && er_1.name !== 'CancelError') {
                                                     throw er_1;
                                                 }
-                                                return [3 /*break*/, 8];
-                                            case 8:
+                                                return [3 /*break*/, 11];
+                                            case 11:
                                                 if (_super.prototype.updateLayer) {
                                                     _super.prototype.updateLayer.call(this);
                                                 }
@@ -6312,8 +6351,6 @@ var NgwMap = (function (exports) {
             return setScaleRatio(scale);
         };
         NgwWebmapItem.prototype._getZoomRange = function (item) {
-            var minZoomMap = this.webMap.options.minZoom;
-            var maxZoomMap = this.webMap.options.maxZoom;
             var minZoomWebmap = this.options.minZoom;
             var maxZoomWebmap = this.options.maxZoom;
             var minZoomLayer = item.layer_min_scale_denom
@@ -6322,8 +6359,8 @@ var NgwMap = (function (exports) {
             var maxZoomLayer = item.layer_max_scale_denom
                 ? this._mapScaleToZoomLevel(item.layer_max_scale_denom)
                 : undefined;
-            var minZooms = [minZoomMap, minZoomWebmap, minZoomLayer].filter(Boolean);
-            var maxZooms = [maxZoomMap, maxZoomWebmap, maxZoomLayer].filter(Boolean);
+            var minZooms = [minZoomWebmap, minZoomLayer].filter(Boolean);
+            var maxZooms = [maxZoomWebmap, maxZoomLayer].filter(Boolean);
             var minZoom = Math.max.apply(Math, minZooms);
             var maxZoom = Math.min.apply(Math, maxZooms);
             return { minZoom: minZoom, maxZoom: maxZoom };