@nextgis/ngw-map 4.0.0 → 4.0.2

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 4.0.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 4.0.2; 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: 4.0.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 4.0.2; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -352,8 +352,14 @@ var NgwMap = (function (exports) {
     return url.replace(/([^:]\/)\/+/g, "$1");
   }
   function updateUrlParams(urlStr, params) {
-    const url = new URL(urlStr);
-    const searchParams = new URLSearchParams(url.search);
+    const hashIndex = urlStr.indexOf("#");
+    const hash = hashIndex === -1 ? "" : urlStr.slice(hashIndex);
+    const url = hashIndex === -1 ? urlStr : urlStr.slice(0, hashIndex);
+    const queryIndex = url.indexOf("?");
+    const baseUrl = queryIndex === -1 ? url : url.slice(0, queryIndex);
+    const searchParams = new URLSearchParams(
+      queryIndex === -1 ? "" : url.slice(queryIndex + 1)
+    );
     Object.entries(params).forEach(([key, value]) => {
       if (value === void 0) {
         searchParams.delete(key);
@@ -363,7 +369,7 @@ var NgwMap = (function (exports) {
     });
     searchParams.set("timestamp", String((/* @__PURE__ */ new Date()).getTime()));
     const newSearch = [...searchParams.entries()].map(([key, value]) => `${key}=${value}`).join("&");
-    return `${url.origin}${url.pathname}?${newSearch}`;
+    return `${baseUrl}?${newSearch}${hash}`;
   }
 
   const templateRe = /\{ *([\w_-]+) *\}/g;
@@ -1080,7 +1086,7 @@ var NgwMap = (function (exports) {
   }
 
   var pkg = {
-  	version: "4.0.0"};
+  	version: "4.0.2"};
 
   class AbortError extends Error {
     constructor(message = "AbortError") {
@@ -4882,7 +4888,7 @@ var NgwMap = (function (exports) {
         return webmap.bookmark_resource.id;
       }
     }
-    fetchBookmarks(options) {
+    fetchBookmarks(options = {}) {
       const bookmarkResId = this.getBookmarksResourceId();
       const connector = this.options.connector;
       if (bookmarkResId) {
@@ -5543,9 +5549,9 @@ var NgwMap = (function (exports) {
       item
     }) {
       if (item.basemap_layer) {
-        const qms = item.basemap_layer.qms;
-        const url = item.basemap_layer.url;
-        if (qms) {
+        const basemap = item.basemap_layer;
+        const { qms, url } = basemap;
+        if (qms && typeof qms === "string") {
           const qms_ = JSON.parse(qms);
           const adapter = Promise.resolve(
             createQmsAdapter(webMap, {
@@ -5558,10 +5564,19 @@ var NgwMap = (function (exports) {
           const TileAdapter = webMap.mapAdapter.layerAdapters.TILE;
           if (TileAdapter) {
             class BasemapTileAdapter extends TileAdapter {
+              constructor(map, options) {
+                super(map, __spreadProps$a(__spreadValues$f({}, options), { baselayer: true, order: 0 }));
+              }
               addLayer(opt) {
                 return __async$g(this, null, function* () {
+                  var _a, _b, _c;
                   if (url) {
-                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$a(__spreadValues$f({}, opt), { url }));
+                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$a(__spreadValues$f({}, opt), {
+                      url,
+                      minZoom: (_a = basemap.z_min) != null ? _a : opt.minZoom,
+                      maxZoom: (_b = basemap.z_max) != null ? _b : opt.maxZoom,
+                      attribution: (_c = basemap.copyright_text) != null ? _c : opt.attribution
+                    }));
                   }
                 });
               }