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

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,
@@ -2739,7 +2737,7 @@ function fetchNgwLayerItemExtent({
     id: Number(resourceId),
     fid: featureId
   }).get({ cache, signal }).then((resp) => {
-    if (resp) {
+    if (resp && resp.extent) {
       const { maxLat, maxLon, minLat, minLon } = resp.extent;
       const extentArray = [minLon, minLat, maxLon, maxLat];
       return extentArray;
@@ -3191,7 +3189,8 @@ var __async$m = (__this, __arguments, generator) => {
 };
 const FEATURE_REQUEST_PARAMS = {
   srs: 4326,
-  geom_format: "geojson"
+  geom_format: "geojson",
+  dt_format: "iso"
 };
 function createGeoJsonFeature(item) {
   const geometry = item.geom;
@@ -3673,10 +3672,12 @@ class BookmarkItem {
       id: this.resourceId,
       fid: this.item.id
     }).get(opt).then((resp) => {
-      const { minLat, minLon, maxLat, maxLon } = resp.extent;
-      const lonLat = [minLon, minLat, maxLon, maxLat];
-      this._extent = lonLat;
-      return lonLat;
+      if (resp.extent) {
+        const { minLat, minLon, maxLat, maxLon } = resp.extent;
+        const lonLat = [minLon, minLat, maxLon, maxLat];
+        this._extent = lonLat;
+        return lonLat;
+      }
     });
   }
   geoJson(opt) {