@nextgis/ngw-leaflet 4.0.0-rc.2 → 4.0.1

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 4.0.0-rc.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 4.0.1; author: NextGIS */
 import LeafletMapAdapter from '@nextgis/leaflet-map-adapter';
 import { NgwMap } from '@nextgis/ngw-map';
 import { Icon } from 'leaflet';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 4.0.0-rc.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 4.0.1; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -15781,13 +15781,22 @@ var NgwLeaflet = (function () {
       __publicField$K(this, "options", options);
       __publicField$K(this, "layer");
       __publicField$K(this, "pane", "order-0");
+      var _a, _b;
       if (options.order !== void 0) {
-        const pane = "order-" + options.order;
+        const order = options.order;
+        const pane = "order-" + order;
         let exist = map.getPane(pane);
         if (!exist) {
           exist = map.createPane(pane);
+          const nextPane = (_a = Object.entries(map.getPanes()).filter(([name]) => name.startsWith("order-")).map(([name, element]) => ({
+            element,
+            order: Number(name.slice("order-".length))
+          })).filter((candidate) => candidate.order > order).sort((a, b) => a.order - b.order)[0]) == null ? void 0 : _a.element;
+          if (nextPane) {
+            (_b = exist.parentElement) == null ? void 0 : _b.insertBefore(exist, nextPane);
+          }
         }
-        exist.style.zIndex = String(Math.round(options.order * 100));
+        exist.style.zIndex = String(Math.round(order * 100));
         this.pane = pane;
       }
     }
@@ -21266,7 +21275,7 @@ var NgwLeaflet = (function () {
   let Cache = _Cache;
 
   var pkg = {
-  	version: "4.0.0-rc.2"};
+  	version: "4.0.1"};
 
   class AbortError extends Error {
     constructor(message = "AbortError") {
@@ -24974,7 +24983,7 @@ var NgwLeaflet = (function () {
         return webmap.bookmark_resource.id;
       }
     }
-    fetchBookmarks(options) {
+    fetchBookmarks(options = {}) {
       const bookmarkResId = this.getBookmarksResourceId();
       const connector = this.options.connector;
       if (bookmarkResId) {
@@ -25638,9 +25647,9 @@ var NgwLeaflet = (function () {
       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, {
@@ -25653,10 +25662,19 @@ var NgwLeaflet = (function () {
           const TileAdapter = webMap.mapAdapter.layerAdapters.TILE;
           if (TileAdapter) {
             class BasemapTileAdapter extends TileAdapter {
+              constructor(map, options) {
+                super(map, __spreadProps$8(__spreadValues$a({}, options), { baselayer: true, order: 0 }));
+              }
               addLayer(opt) {
                 return __async$b(this, null, function* () {
+                  var _a, _b, _c;
                   if (url) {
-                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$8(__spreadValues$a({}, opt), { url }));
+                    return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$8(__spreadValues$a({}, 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
+                    }));
                   }
                 });
               }