@nextgis/ngw-map 4.0.0 → 4.0.2

package/README.md

@@ -1,6 +1,6 @@
 # NgwMap
 
-![size](https://img.shields.io/bundlephobia/minzip/@nextgis/ngw-map) ![version](https://img.shields.io/npm/v/@nextgis/ngw-map)
+![version](https://img.shields.io/npm/v/@nextgis/ngw-map)
 
 Framework-independent NextGIS Web map class used by `ngw-leaflet`, `ngw-ol`,
 and `ngw-maplibre-gl`.
@@ -21,7 +21,7 @@ npm install @nextgis/ngw-map @nextgis/leaflet-map-adapter leaflet
 
 ## Usage
 
-```ts
+```javascript
 import { NgwMap } from '@nextgis/ngw-map';
 import MapAdapter from '@nextgis/leaflet-map-adapter';
 import 'leaflet/dist/leaflet.css';

package/lib/ngw-map.cjs.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 */
 '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: 4.0.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 4.0.2; author: NextGIS */
 const svgPath = {
   brill: '<path d="m6 0-5 6 5 6 5-6z"/>',
   circle: '<circle cx="6" cy="6" r="6"/>',
@@ -349,8 +349,14 @@ function fixUrlStr(url) {
   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);
@@ -360,7 +366,7 @@ function updateUrlParams(urlStr, params) {
   });
   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;
@@ -1077,7 +1083,7 @@ function unwrapListeners(arr) {
 }
 
 var pkg = {
-	version: "4.0.0"};
+	version: "4.0.2"};
 
 class AbortError extends Error {
   constructor(message = "AbortError") {
@@ -4879,7 +4885,7 @@ class NgwWebmapLayerAdapter {
       return webmap.bookmark_resource.id;
     }
   }
-  fetchBookmarks(options) {
+  fetchBookmarks(options = {}) {
     const bookmarkResId = this.getBookmarksResourceId();
     const connector = this.options.connector;
     if (bookmarkResId) {
@@ -5540,9 +5546,9 @@ function createBasemapLayerAdapter(_0) {
     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, {
@@ -5555,10 +5561,19 @@ function createBasemapLayerAdapter(_0) {
         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
+                  }));
                 }
               });
             }