@nextgis/ngw-map 3.0.0-alpha.13 → 3.0.0-alpha.15

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.13; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.14; author: NextGIS */
 import { getIcon } from '@nextgis/icons';
 import NgwConnector from '@nextgis/ngw-connector';
 import { NgwKit, fetchNgwLayerItem, fetchNgwLayerItems, fetchNgwLayerFeature, fetchNgwLayerFeatureCollection, fetchIdentifyItem, fetchIdentifyGeoJson, createNgwLayerAdapter, fetchNgwExtent, sendIdentifyRequest, getCompanyLogo, getIdentifyItems, createIdentifyItem } from '@nextgis/ngw-kit';

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.13; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.14; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -1068,7 +1068,7 @@ var NgwMap = (function (exports) {
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "3.0.0-alpha.13",
+  	version: "3.0.0-alpha.14",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -1464,7 +1464,7 @@ var NgwMap = (function (exports) {
   }
   function request(path, options, cacheEngine) {
     return __async$u(this, null, function* () {
-      var _b;
+      var _b, _c;
       const defaults = {
         method: "GET",
         credentials: "same-origin",
@@ -1489,6 +1489,7 @@ var NgwMap = (function (exports) {
         "query",
         "json"
       ]);
+      opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
       if (withCredentials) {
         opt.credentials = "include";
       }
@@ -1546,15 +1547,21 @@ var NgwMap = (function (exports) {
         }
         return body;
       });
-      if (cacheEngine && cache !== false && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
-        const props = cacheProps ? cacheProps : __spreadValues$w({}, objectRemoveEmpty({
-          withCredentials,
-          responseType
-        }));
-        return cacheEngine.add(cacheName || url, makeRequest, {
-          props,
-          expirationTime: cache ? void 0 : 500
-        });
+      if (cacheEngine) {
+        if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
+          if (cache !== false) {
+            const props = cacheProps ? cacheProps : __spreadValues$w({}, objectRemoveEmpty({
+              withCredentials,
+              responseType
+            }));
+            return cacheEngine.add(cacheName || url, makeRequest, {
+              props,
+              expirationTime: cache ? void 0 : 500
+            });
+          }
+        } else {
+          cacheEngine.clean();
+        }
       }
       return makeRequest();
     });
@@ -5869,15 +5876,19 @@ var NgwMap = (function (exports) {
           }
           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);
             }
           }
@@ -6424,24 +6435,26 @@ var NgwMap = (function (exports) {
         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;