@nextgis/ngw-map 3.0.0-alpha.14 → 3.0.0-alpha.16

package/lib/ngw-map.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.14; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.16; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.14; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.16; author: NextGIS */
 const svgPath = {
   brill: '<path d="m6 0-5 6 5 6 5-6z"/>',
   circle: '<circle cx="6" cy="6" r="6"/>',
@@ -1065,7 +1065,7 @@ function unwrapListeners(arr) {
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.14",
+	version: "3.0.0-alpha.16",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -1557,7 +1557,10 @@ function request(path, options, cacheEngine) {
           });
         }
       } else {
-        cacheEngine.clean();
+        const ignoredForClean = ["api/feature_layer/identify"];
+        if (ignoredForClean.every((part) => !path.includes(part))) {
+          cacheEngine.clean();
+        }
       }
     }
     return makeRequest();
@@ -1863,12 +1866,16 @@ class NgwConnector {
     __publicField$s(this, "user");
     __publicField$s(this, "cache");
     __publicField$s(this, "withCredentials");
+    // Dedicated cache for route requests, as these are executed before any other requests.
+    // This cache does not need to be cleared during the session.
+    __publicField$s(this, "routeCache");
     __publicField$s(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
     __publicField$s(this, "routeStr", "/api/component/pyramid/route");
     __publicField$s(this, "activeRequests", {});
     __publicField$s(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
+    this.routeCache = new Cache({ namespace: "routecache" });
     if (exist) {
       return exist;
     } else {
@@ -1929,19 +1936,9 @@ class NgwConnector {
         }
       }
       const routeUrl = `${this.routeStr}?client=${this.client}`;
-      return this.makeQuery(
-        routeUrl,
-        {},
-        {
-          cacheName: "route",
-          signal,
-          cache: true,
-          cacheProps: {
-            id: this.id,
-            auth,
-            baseUrl: this.options.baseUrl
-          }
-        }
+      return this.routeCache.add(
+        this.options.baseUrl || String(this.id),
+        () => this.makeQuery(routeUrl, null, { signal, cache: false })
       );
     });
   }
@@ -1962,6 +1959,7 @@ class NgwConnector {
     removeConnector(this);
     this.options.auth = void 0;
     this.user = void 0;
+    this.routeCache.clean();
     this.clearCache();
     this.emitter.emit("logout");
   }
@@ -2068,7 +2066,7 @@ class NgwConnector {
           this._cleanActiveRequest(id);
         }
       });
-      if (method === "GET") {
+      if (method === "GET" && cache !== false) {
         const cacheOptions = cacheProps ? cacheProps : __spreadProps$h(__spreadValues$u({}, objectRemoveEmpty({
           headers,
           withCredentials,
@@ -5873,15 +5871,19 @@ function createRasterAdapter(_0) {
         }
         showLayer() {
           this._layerVisibility = true;
-          if (this.layer) {
-            if (!this._blocked) {
+          if (!this._blocked) {
+            if (super.showLayer) {
+              super.showLayer(this.layer);
+            } else if (this.layer) {
               webMap.mapAdapter.showLayer(this.layer);
             }
           }
         }
         hideLayer() {
           this._layerVisibility = false;
-          if (this.layer) {
+          if (super.hideLayer) {
+            super.hideLayer(this.layer);
+          } else if (this.layer) {
             webMap.mapAdapter.hideLayer(this.layer);
           }
         }
@@ -6428,24 +6430,26 @@ function getCompanyLogo(connector, options) {
       img.style.maxHeight = "100px";
       img.style.maxWidth = "100px";
       img.src = "";
-      try {
-        const resp = yield connector.route("pyramid.csettings").get();
-        const logo = (_b = resp.pyramid) == null ? void 0 : _b.header_logo;
-        if (logo) {
-          const [mimeType, base64Data] = logo;
-          const byteCharacters = atob(base64Data);
-          const byteNumbers = new Array(byteCharacters.length);
-          for (let i = 0; i < byteCharacters.length; i++) {
-            byteNumbers[i] = byteCharacters.charCodeAt(i);
-          }
-          const byteArray = new Uint8Array(byteNumbers);
-          const blob = new Blob([byteArray], { type: mimeType });
-          const urlCreator = window.URL || window.webkitURL;
-          const imageUrl = urlCreator.createObjectURL(blob);
-          img.src = imageUrl;
+      const resp = yield connector.route("pyramid.csettings").get({
+        query: {
+          pyramid: ["header_logo"]
         }
-      } catch (er) {
-        console.warn(er);
+      });
+      const logo = (_b = resp.pyramid) == null ? void 0 : _b.header_logo;
+      if (logo) {
+        const [mimeType, base64Data] = logo;
+        const byteCharacters = atob(base64Data);
+        const byteNumbers = new Array(byteCharacters.length);
+        for (let i = 0; i < byteCharacters.length; i++) {
+          byteNumbers[i] = byteCharacters.charCodeAt(i);
+        }
+        const byteArray = new Uint8Array(byteNumbers);
+        const blob = new Blob([byteArray], { type: mimeType });
+        const urlCreator = window.URL || window.webkitURL;
+        const imageUrl = urlCreator.createObjectURL(blob);
+        img.src = imageUrl;
+      } else {
+        return;
       }
       if (settings.company_logo.link !== null && settings.company_logo.link.trim() !== "") {
         anchor.href = settings.company_logo.link;