@nextgis/ngw-map 2.5.1 → 2.5.3

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 2.5.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 2.5.3; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -1258,7 +1258,7 @@ var NgwMap = (function (exports) {
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "2.5.1",
+  	version: "2.5.2",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -2030,9 +2030,9 @@ var NgwMap = (function (exports) {
       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);
         }
       }
     }
@@ -5321,7 +5321,6 @@ var NgwMap = (function (exports) {
       __publicField$b(this, "emitter", new EventEmitter());
       __publicField$b(this, "_extent");
       __publicField$b(this, "response");
-      __publicField$b(this, "_webmapLayersIds");
       __publicField$b(this, "_webmapBaselayersIds", []);
       __publicField$b(this, "_lastActiveBaselayer");
       const r = options.resourceId;
@@ -5366,7 +5365,6 @@ var NgwMap = (function (exports) {
       }
       delete this.layer;
       delete this.response;
-      delete this._webmapLayersIds;
     }
     showLayer() {
       return __async$9(this, null, function* () {
@@ -5457,26 +5455,19 @@ var NgwMap = (function (exports) {
     getIdentificationIds() {
       return __async$9(this, null, function* () {
         const visibleLayers = [];
-        let ids = this._webmapLayersIds;
-        if (!ids) {
-          ids = yield this._getWebMapIds();
-          this._webmapLayersIds = ids;
-        }
-        if (ids && ids.length) {
-          let deps = this.getDependLayers();
-          deps = deps.sort((a, b) => b.id - a.id);
-          deps.forEach((x) => {
-            const item = x.item;
-            const parentId = item.parentId;
-            if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
-              const visible = x.properties.property("visibility");
-              const isVisible = visible.get() && !visible.isBlocked();
-              if (isVisible) {
-                visibleLayers.push(parentId);
-              }
+        let deps = this.getDependLayers();
+        deps = deps.sort((a, b) => b.id - a.id);
+        deps.forEach((x) => {
+          const item = x.item;
+          const parentId = item.style_parent_id;
+          if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
+            const visible = x.properties.property("visibility");
+            const isVisible = visible.get() && !visible.isBlocked();
+            if (isVisible) {
+              visibleLayers.push(parentId);
             }
-          });
-        }
+          }
+        });
         return visibleLayers;
       });
     }
@@ -5605,31 +5596,6 @@ var NgwMap = (function (exports) {
       }
       return item;
     }
-    _getWebMapIds() {
-      return __async$9(this, null, function* () {
-        const webMapItem = this.layer;
-        if (webMapItem && webMapItem.item.item_type === "root") {
-          const layers = webMapItem.tree.getDescendants();
-          const promises = [];
-          for (const x of layers) {
-            const item = x.item;
-            if (item.item_type === "layer") {
-              const id = item.layer_style_id;
-              const promise = this.options.connector.getResource(id).then((y) => {
-                if (y) {
-                  const parentId = Number(y.resource.parent.id);
-                  item.parentId = parentId;
-                  return parentId;
-                }
-              });
-              promises.push(promise);
-            }
-          }
-          const ids = yield Promise.all(promises);
-          return ids.filter((x) => x !== void 0);
-        }
-      });
-    }
   }
 
   var __defProp$g = Object.defineProperty;
@@ -9398,7 +9364,7 @@ var NgwMap = (function (exports) {
           if (mem.layer.getDependLayers) {
             const dependLayers = mem.layer.getDependLayers();
             const dependFit = dependLayers.find((x) => {
-              return x.item && x.item.parentId === id;
+              return x.item && x.item.style_parent_id === id;
             });
             if (dependFit) {
               return dependFit.layer;