@nextgis/geocoder 2.5.0 → 2.5.2

package/lib/geocoder.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 2.5.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 2.5.2; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 2.5.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 2.5.2; author: NextGIS */
 var __defProp$g = Object.defineProperty;
 var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$e = (obj, key, value) => __defNormalProp$g(obj, key + "" , value);
@@ -1205,6 +1205,62 @@ const _Cache = class _Cache {
 __publicField$8(_Cache, "instance", {});
 let Cache = _Cache;
 
+var pkg = {
+	name: "@nextgis/ngw-connector",
+	version: "2.5.2",
+	_priority: 12,
+	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
+	main: "index.js",
+	module: "lib/ngw-connector.esm-bundler.js",
+	unpkg: "lib/ngw-connector.global.prod.js",
+	jsdelivr: "lib/ngw-connector.global.prod.js",
+	types: "lib/index.d.ts",
+	dependencies: {
+		"@nextgis/cache": "^2.5.0",
+		"@nextgis/cancelable-promise": "^2.5.0",
+		"@nextgis/utils": "^2.5.0",
+		"@types/events": "^3.0.0",
+		events: "*",
+		"form-data": "^4.0.0"
+	},
+	devDependencies: {
+		"@nextgis/build-tools": "^2.5.0"
+	},
+	scripts: {
+		clean: "rimraf ./lib",
+		dev: "node ../build-tools/lib/build.js",
+		prod: "npm run dev -- --release",
+		lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
+		watch: "npm run dev -- --watch",
+		"gen:types": "node ./scripts/generator"
+	},
+	buildOptions: {
+		name: "NgwConnector",
+		formats: [
+			"esm-bundler",
+			"esm-browser",
+			"cjs",
+			"global"
+		]
+	},
+	keywords: [
+		"NextGIS",
+		"MAP"
+	],
+	author: "NextGIS",
+	files: [
+		"index.js",
+		"lib"
+	],
+	license: "MIT",
+	homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
+	repository: {
+		type: "git",
+		url: "git://github.com/nextgis/nextgis_frontend.git"
+	},
+	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
+};
+
 var __defProp$9 = Object.defineProperty;
 var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$7 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -1783,6 +1839,7 @@ class NgwConnector {
     __publicField$2(this, "resources");
     __publicField$2(this, "cache");
     __publicField$2(this, "withCredentials");
+    __publicField$2(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
     __publicField$2(this, "routeStr", "/api/component/pyramid/route");
     __publicField$2(this, "activeRequests", []);
     __publicField$2(this, "requestTransform");
@@ -1848,7 +1905,8 @@ class NgwConnector {
     const auth = this.options.auth;
     const makeConnect = () => new CancelablePromise((resolve, reject) => {
       const makeQuery = () => {
-        return this.makeQuery(this.routeStr, {}, {}).then((route) => {
+        const routeUrl = `${this.routeStr}?client=${this.client}`;
+        return this.makeQuery(routeUrl.toString(), {}, {}).then((route) => {
           resolve(route);
         }).catch((er) => {
           reject(er);
@@ -1921,9 +1979,9 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const str = unescape(encodeURIComponent(`${login}:${password}`));
+      const encodedStr = [login, password].map(encodeURIComponent).join(":");
       {
-        return window.btoa(str);
+        return window.btoa(encodedStr);
       }
     }
   }
@@ -2339,7 +2397,7 @@ function updateItemRequestParam(params, options) {
   if (extensionsStr !== "*") {
     params.extensions = extensionsStr;
   }
-  if (fields !== void 0) {
+  if (fields !== void 0 && fields !== null) {
     params.fields = Array.isArray(fields) ? fields.join(",") : "";
   }
   if (geom !== void 0) {