@nextgis/ngw-map 1.16.0 → 1.16.2

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.16.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.16.2; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -1175,7 +1175,9 @@ var NgwMap = (function (exports) {
 
     var d2r = Math.PI / 180; // degrees to radians
     var r2d = 180 / Math.PI; // radians to degrees
-    function getCirclePolygonCoordinates(lng, lat, radius, points) {
+    function getCirclePolygonCoordinates(lng, lat, 
+    /** In kilometers */
+    radius, points) {
         if (radius === void 0) { radius = 10; }
         if (points === void 0) { points = 6; }
         // find the radius in lat/lon
@@ -1225,6 +1227,14 @@ var NgwMap = (function (exports) {
             array.every(function (x) { return typeof x === 'number'; }));
     }
 
+    function getIdentifyRadius(center, zoom, pixelRadius) {
+        pixelRadius = pixelRadius !== null && pixelRadius !== void 0 ? pixelRadius : 10;
+        var metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
+            Math.pow(2, zoom + 8);
+        var radius = pixelRadius * metresPerPixel * 0.0005;
+        return radius;
+    }
+
     /**
      * Copy the values of all of the enumerable own properties from one or more source objects to a
      * target object. Returns the target object.
@@ -1306,6 +1316,11 @@ var NgwMap = (function (exports) {
         return newObj;
     }
 
+    function round(val, toFixed) {
+        var n = toFixed ? Number('1e+' + toFixed) : 1;
+        return Math.round((val + Number.EPSILON) * n) / n;
+    }
+
     function isObject$1(val) {
         return Object.prototype.toString.call(val) === '[object Object]';
     }
@@ -4212,6 +4227,65 @@ var NgwMap = (function (exports) {
         });
     }
 
+    function apiRequest(opt) {
+        var params = opt.params;
+        return new CancelablePromise(function (resolve, reject) {
+            opt.connector
+                .connect()
+                .then(function (apiItems) {
+                var apiItem = apiItems && apiItems[opt.name];
+                if (apiItem) {
+                    apiItem = __spreadArray([], apiItem, true);
+                    var url = apiItem.shift();
+                    if (apiItem.length) {
+                        var replaceParams = {};
+                        for (var fry = 0; fry < apiItem.length; fry++) {
+                            var arg = apiItem[fry];
+                            replaceParams[fry] = '{' + arg + '}';
+                            if (params[arg] === undefined) {
+                                throw new Error('`' + arg + '`' + ' url api argument is not specified');
+                            }
+                        }
+                        if (url) {
+                            url = template(url, replaceParams);
+                        }
+                    }
+                    // Transfer part of the parameters from `params` to the URL string
+                    if (params) {
+                        var paramArray_1 = [];
+                        var paramList = params.paramList;
+                        if (Array.isArray(paramList)) {
+                            delete params.paramList;
+                            paramList.forEach(function (x) {
+                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
+                            });
+                        }
+                        for (var p in params) {
+                            if (apiItem.indexOf(p) === -1) {
+                                paramArray_1.push("".concat(p, "=").concat(params[p]));
+                            }
+                        }
+                        if (paramArray_1.length) {
+                            url = url + '?' + paramArray_1.join('&');
+                        }
+                    }
+                    if (url) {
+                        resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
+                    }
+                    else {
+                        reject(new Error('request url is not set'));
+                    }
+                }
+                else {
+                    resolve(undefined);
+                }
+            })
+                .catch(function (er) {
+                reject(er);
+            });
+        });
+    }
+
     /**
      * Thrown when ...
      */
@@ -4577,65 +4651,6 @@ var NgwMap = (function (exports) {
         return ResourcesControl;
     }());
 
-    function apiRequest(opt) {
-        var params = opt.params;
-        return new CancelablePromise(function (resolve, reject) {
-            opt.connector
-                .connect()
-                .then(function (apiItems) {
-                var apiItem = apiItems && apiItems[opt.name];
-                if (apiItem) {
-                    apiItem = __spreadArray([], apiItem, true);
-                    var url = apiItem.shift();
-                    if (apiItem.length) {
-                        var replaceParams = {};
-                        for (var fry = 0; fry < apiItem.length; fry++) {
-                            var arg = apiItem[fry];
-                            replaceParams[fry] = '{' + arg + '}';
-                            if (params[arg] === undefined) {
-                                throw new Error('`' + arg + '`' + ' url api argument is not specified');
-                            }
-                        }
-                        if (url) {
-                            url = template(url, replaceParams);
-                        }
-                    }
-                    // Transfer part of the parameters from `params` to the URL string
-                    if (params) {
-                        var paramArray_1 = [];
-                        var paramList = params.paramList;
-                        if (Array.isArray(paramList)) {
-                            delete params.paramList;
-                            paramList.forEach(function (x) {
-                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
-                            });
-                        }
-                        for (var p in params) {
-                            if (apiItem.indexOf(p) === -1) {
-                                paramArray_1.push("".concat(p, "=").concat(params[p]));
-                            }
-                        }
-                        if (paramArray_1.length) {
-                            url = url + '?' + paramArray_1.join('&');
-                        }
-                    }
-                    if (url) {
-                        resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
-                    }
-                    else {
-                        reject(new Error('request url is not set'));
-                    }
-                }
-                else {
-                    resolve(undefined);
-                }
-            })
-                .catch(function (er) {
-                reject(er);
-            });
-        });
-    }
-
     var ID$1 = 0;
     var NgwConnector$1 = /** @class */ (function () {
         function NgwConnector(options) {
@@ -4706,9 +4721,9 @@ var NgwMap = (function (exports) {
                     if (auth) {
                         var login = auth.login, password = auth.password;
                         if (login && password) {
-                            return _this.getUserInfo({ login: login, password: password })
+                            return _this._login({ login: login, password: password })
                                 .then(function () {
-                                makeQuery();
+                                return makeQuery();
                             })
                                 .catch(function (er) { return reject(er); });
                         }
@@ -4726,10 +4741,10 @@ var NgwMap = (function (exports) {
          * Quick way to change NextGIS Web user.
          * @param credentials - New user credentials
          */
-        NgwConnector.prototype.login = function (credentials) {
+        NgwConnector.prototype.login = function (credentials, options) {
             this.logout();
             addConnector(this);
-            return this.getUserInfo(credentials);
+            return this._login(credentials, options);
         };
         /**
          * Disconnecting a user. Aborting all current requests
@@ -4742,29 +4757,16 @@ var NgwMap = (function (exports) {
             this.emitter.emit('logout');
             this.resources.cache.clean();
         };
-        NgwConnector.prototype.getUserInfo = function (credentials) {
-            var _this = this;
+        NgwConnector.prototype.getUserInfo = function (credentials, options) {
             if (this.user && this.user.id) {
                 return CancelablePromise.resolve(this.user);
             }
             if (credentials) {
                 this.options.auth = credentials;
             }
-            var options = {
-                headers: this.getAuthorizationHeaders(credentials),
-                // withCredentials: true
-            };
+            var options_ = __assign({ headers: this.getAuthorizationHeaders(credentials) }, options);
             // Do not use apiRequest('auth.current_user') to avoid circular-references
-            return this.makeQuery('/api/component/auth/current_user', {}, options)
-                .then(function (data) {
-                _this.user = data;
-                _this.emitter.emit('login', data);
-                return data;
-            })
-                .catch(function (er) {
-                _this.emitter.emit('login:error', er);
-                throw er;
-            });
+            return this.makeQuery('/api/component/auth/current_user', {}, options_);
         };
         /**
          * Obtaining the required Headers for authentication of requests in the NGW.
@@ -4830,6 +4832,7 @@ var NgwMap = (function (exports) {
          */
         NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
             var _this = this;
+            var _a;
             if (params_ === void 0) { params_ = {}; }
             if (requestOptions === void 0) { requestOptions = {}; }
             var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
@@ -4844,7 +4847,7 @@ var NgwMap = (function (exports) {
                     withCredentials: withCredentials,
                     responseType: responseType,
                     baseUrl: this.options.baseUrl,
-                    auth: this.options.auth,
+                    userId: (_a = this.user) === null || _a === void 0 ? void 0 : _a.id,
                 })));
             }
             return makeApiRequest();
@@ -5053,6 +5056,19 @@ var NgwMap = (function (exports) {
             this.activeRequests.push(request);
             return request;
         };
+        NgwConnector.prototype._login = function (credentials, options) {
+            var _this = this;
+            return this.getUserInfo(credentials, options)
+                .then(function (data) {
+                _this.user = data;
+                _this.emitter.emit('login', data);
+                return data;
+            })
+                .catch(function (er) {
+                _this.emitter.emit('login:error', er);
+                throw er;
+            });
+        };
         NgwConnector.prototype._cleanActiveRequests = function (request) {
             var activeRequestIndex = this.activeRequests.indexOf(request);
             if (activeRequestIndex !== -1) {
@@ -5396,14 +5412,14 @@ var NgwMap = (function (exports) {
     function createWktFromCoordArray(coord) {
         var polygon = coord.map(function (_a) {
             var lng = _a[0], lat = _a[1];
-            var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
+            var _b = degrees2meters(lng, lat).map(function (c) { return round(c); }), x = _b[0], y = _b[1];
             return x + ' ' + y;
         });
         return "POLYGON((".concat(polygon.join(', '), "))");
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
-        var limit = options.limit, cache = options.cache, signal = options.signal, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
+        var limit = options.limit, cache = options.cache, signal = options.signal, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, geomFormat = options.geomFormat, intersects = options.intersects, resourceId = options.resourceId;
         if (limit) {
             if (limit !== Number.POSITIVE_INFINITY) {
                 params.limit = limit;
@@ -5416,6 +5432,9 @@ var NgwMap = (function (exports) {
         if (offset) {
             params.offset = offset;
         }
+        if (geomFormat) {
+            params.geom_format = geomFormat;
+        }
         updateItemRequestParam(params, options);
         if (orderBy) {
             params.order_by = orderBy.join(',');
@@ -8322,14 +8341,6 @@ var NgwMap = (function (exports) {
         return options;
     }
 
-    function getIdentifyRadius(center, zoom, pixelRadius) {
-        pixelRadius = pixelRadius !== null && pixelRadius !== void 0 ? pixelRadius : 10;
-        var metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
-            Math.pow(2, zoom + 8);
-        var radius = pixelRadius * metresPerPixel * 0.0005;
-        return radius;
-    }
-
     /**
      * Base class containing the logic of interaction WebMap with NextGIS services.
      *
@@ -8678,7 +8689,7 @@ var NgwMap = (function (exports) {
                 this.$$selectFromNgwRaster = function (ev) {
                     var count = _this._getSelectListenersCount();
                     if (count) {
-                        _this._selectFromNgwRaster(ev);
+                        _this.selectFromNgwRaster(ev);
                     }
                 };
                 this.$$selectFromNgwVector = function (ev) {
@@ -8750,6 +8761,72 @@ var NgwMap = (function (exports) {
                 }
             });
         };
+        NgwMap.prototype.selectFromNgwRaster = function (ev) {
+            return __awaiter(this, void 0, void 0, function () {
+                var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            this._emitStatusEvent('ngw:preselect');
+                            promises = [];
+                            layers = Object.values(this._ngwLayers);
+                            layers.sort(function (a, b) {
+                                if (a.layer.order && b.layer.order) {
+                                    return b.layer.order - a.layer.order;
+                                }
+                                return 1;
+                            });
+                            for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
+                                l = layers_1[_i];
+                                layer = l.layer;
+                                identFunc = typeof layer.getIdentificationIds === 'function'
+                                    ? layer.getIdentificationIds
+                                    : false;
+                                if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
+                                    promises.push(identFunc.call(layer));
+                                }
+                            }
+                            getIdsPromise = Promise.all(promises);
+                            return [4 /*yield*/, getIdsPromise];
+                        case 1:
+                            getIds = _b.sent();
+                            ids = [];
+                            for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
+                                x = getIds_1[_a];
+                                if (x) {
+                                    ids.push.apply(ids, x);
+                                }
+                            }
+                            if (!ids.length) {
+                                this._emitStatusEvent('ngw:select', null);
+                                return [2 /*return*/];
+                            }
+                            pixelRadius = this.options.pixelRadius || 10;
+                            center = this.getCenter();
+                            zoom = this.getZoom();
+                            zoom = zoom !== undefined ? zoom : 20;
+                            if (!center || !zoom) {
+                                this._emitStatusEvent('ngw:select', null);
+                                return [2 /*return*/];
+                            }
+                            radius = getIdentifyRadius(center, zoom, pixelRadius);
+                            selectPromise = sendIdentifyRequest(ev, {
+                                layers: ids,
+                                connector: this.connector,
+                                radius: radius,
+                            }).then(function (resp) {
+                                var identify = __assign(__assign({}, resp), { resources: ids, sourceType: 'raster', event: ev });
+                                var identifyEvent = _this._prepareToIdentify(identify);
+                                _this._emitStatusEvent('ngw:select', identify);
+                                return identifyEvent;
+                            });
+                            this._addPromise('select', selectPromise);
+                            return [2 /*return*/, selectPromise];
+                    }
+                });
+            });
+        };
         NgwMap.prototype._addPromise = function (groupName, promise) {
             var group = this._promises[groupName];
             if (group && group.indexOf(promise) === -1) {
@@ -8885,70 +8962,6 @@ var NgwMap = (function (exports) {
                 }
             }
         };
-        NgwMap.prototype._selectFromNgwRaster = function (ev) {
-            return __awaiter(this, void 0, void 0, function () {
-                var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
-                var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            this._emitStatusEvent('ngw:preselect');
-                            promises = [];
-                            layers = Object.values(this._ngwLayers);
-                            layers.sort(function (a, b) {
-                                if (a.layer.order && b.layer.order) {
-                                    return b.layer.order - a.layer.order;
-                                }
-                                return 1;
-                            });
-                            for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
-                                l = layers_1[_i];
-                                layer = l.layer;
-                                identFunc = typeof layer.getIdentificationIds === 'function'
-                                    ? layer.getIdentificationIds
-                                    : false;
-                                if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
-                                    promises.push(identFunc.call(layer));
-                                }
-                            }
-                            getIdsPromise = Promise.all(promises);
-                            return [4 /*yield*/, getIdsPromise];
-                        case 1:
-                            getIds = _b.sent();
-                            ids = [];
-                            for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
-                                x = getIds_1[_a];
-                                if (x) {
-                                    ids.push.apply(ids, x);
-                                }
-                            }
-                            if (!ids.length) {
-                                this._emitStatusEvent('ngw:select', null);
-                                return [2 /*return*/];
-                            }
-                            pixelRadius = this.options.pixelRadius || 10;
-                            center = this.getCenter();
-                            zoom = this.getZoom();
-                            zoom = zoom !== undefined ? zoom : 20;
-                            if (!center || !zoom) {
-                                this._emitStatusEvent('ngw:select', null);
-                                return [2 /*return*/];
-                            }
-                            radius = getIdentifyRadius(center, zoom, pixelRadius);
-                            selectPromise = sendIdentifyRequest(ev, {
-                                layers: ids,
-                                connector: this.connector,
-                                radius: radius,
-                            }).then(function (resp) {
-                                _this._emitStatusEvent('ngw:select', _this._prepareToIdentify(__assign(__assign({}, resp), { resources: ids, sourceType: 'raster', event: ev })));
-                                return resp;
-                            });
-                            this._addPromise('select', selectPromise);
-                            return [2 /*return*/, selectPromise];
-                    }
-                });
-            });
-        };
         NgwMap.prototype._prepareToIdentify = function (identify) {
             var _this = this;
             var getIdentifyItems_ = function () {