@nextgis/leaflet-map-adapter 1.8.1 → 1.9.0

package/lib/leaflet-map-adapter.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 1.8.1; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 1.9.0; author: NextGIS */
 var LeafletMapAdapter = (function () {
     'use strict';
 
@@ -15140,7 +15140,9 @@ var LeafletMapAdapter = (function () {
         GeoJsonAdapter.prototype.getBounds = function () {
             if (this.layer) {
                 var bounds = this.layer.getBounds();
-                return boundsToArray(bounds);
+                if (bounds.isValid()) {
+                    return boundsToArray(bounds);
+                }
             }
         };
         GeoJsonAdapter.prototype.setOpacity = function (value) {
@@ -15191,14 +15193,14 @@ var LeafletMapAdapter = (function () {
                 }
             }
         };
-        GeoJsonAdapter.prototype._openPopup = function (def, options, type, latlng) {
+        GeoJsonAdapter.prototype._openPopup = function (def, options, type, latLng) {
             var _a, _b;
             if (options === void 0) { options = {}; }
             return __awaiter(this, void 0, void 0, function () {
-                var feature, layer, _c, minWidth, autoPan, maxWidth, closeButton_, closeButton, popup, _closeHandlers, onClose, close, content, _d, unselectOnClose, p;
+                var feature, layer, _c, minWidth, autoPan, maxWidth, closeButton_, closeButton, popup, _closeHandlers, onClose, close, content, popupOptions, unselectOnClose, p;
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             feature = def.feature, layer = def.layer;
                             _c = __assign({ minWidth: 300 }, options), minWidth = _c.minWidth, autoPan = _c.autoPan, maxWidth = _c.maxWidth, closeButton_ = _c.closeButton;
@@ -15215,22 +15217,25 @@ var LeafletMapAdapter = (function () {
                             if (!options.createPopupContent) return [3 /*break*/, 2];
                             return [4 /*yield*/, options.createPopupContent(__assign({ layer: layer, feature: feature, target: this, type: type, close: close, onClose: onClose }, createFeaturePositionOptions(feature)))];
                         case 1:
-                            _d = _e.sent();
+                            content = _d.sent();
                             return [3 /*break*/, 3];
                         case 2:
-                            _d = options.popupContent;
-                            _e.label = 3;
+                            content = options.popupContent;
+                            _d.label = 3;
                         case 3:
-                            content = _d;
                             if (content && layer) {
-                                popup = layer.bindPopup(content, {
+                                popupOptions = {
                                     minWidth: minWidth,
                                     autoPan: autoPan,
-                                    maxWidth: maxWidth,
+                                    // maxWidth,
                                     closeButton: closeButton,
                                     closeOnClick: false,
                                     autoClose: false,
-                                });
+                                };
+                                if (defined(maxWidth)) {
+                                    popupOptions.maxWidth = maxWidth;
+                                }
+                                popup = layer.bindPopup(content, popupOptions);
                                 unselectOnClose = (_b = (_a = this.options.popupOptions) === null || _a === void 0 ? void 0 : _a.unselectOnClose) !== null && _b !== void 0 ? _b : true;
                                 if (unselectOnClose) {
                                     p = layer.getPopup();
@@ -15240,9 +15245,7 @@ var LeafletMapAdapter = (function () {
                                         }, this);
                                 }
                                 this._openedPopup.push([popup, _closeHandlers, def]);
-                                setTimeout(function () {
-                                    popup.openPopup(latlng);
-                                }, 0);
+                                popup.openPopup(latLng);
                             }
                             return [2 /*return*/];
                     }
@@ -15390,7 +15393,7 @@ var LeafletMapAdapter = (function () {
                     ok = this._filterFun(def_1);
                 }
                 if (ok) {
-                    var _a = this.options, popup = _a.popup, popupOptions = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
+                    var _a = this.options, popup_1 = _a.popup, popupOptions_1 = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
                     // @ts-ignore
                     layer.options.interactive = defined(interactive) ? interactive : true;
                     layer_.addLayer(layer);
@@ -15408,10 +15411,14 @@ var LeafletMapAdapter = (function () {
                         }
                     }
                     this._handleMouseEvents(layer);
-                    if (popup) {
-                        this._openPopup(__assign({ target: this, layer: layer, feature: feature }, createFeaturePositionOptions(feature)), popupOptions, 'api');
-                    }
-                    this._updateTooltip({ layer: layer, feature: feature });
+                    // The timeout is needed to display the popup immediately when adding a layer to the map.
+                    // Without a timeout, the layer may not yet have a _map object
+                    setTimeout(function () {
+                        if (popup_1) {
+                            _this._openPopup(__assign({ target: _this, layer: layer, feature: feature }, createFeaturePositionOptions(feature)), popupOptions_1, 'api');
+                        }
+                        _this._updateTooltip({ layer: layer, feature: feature });
+                    });
                 }
             }
         };
@@ -15989,6 +15996,15 @@ var LeafletMapAdapter = (function () {
         return OsmAdapter;
     }(TileAdapter));
 
+    function arrayToBoundsExpression(bounds) {
+        var e = bounds;
+        // top, left, bottom, right
+        return [
+            [e[3], e[0]],
+            [e[1], e[2]],
+        ];
+    }
+
     var LeafletMapAdapter$1 = /** @class */ (function () {
         function LeafletMapAdapter() {
             this.options = { target: 'map' };
@@ -16010,10 +16026,7 @@ var LeafletMapAdapter = (function () {
             this.options = __assign({}, options);
             if (this.options.target) {
                 var _a = this.options, zoom = _a.zoom, center = _a.center, maxZoom = _a.maxZoom, minZoom = _a.minZoom, mb = _a.maxBounds, mapAdapterOptions = _a.mapAdapterOptions;
-                this.map = new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb && [
-                        [mb[1], mb[0]],
-                        [mb[3], mb[2]],
-                    ], maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
+                this.map = new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb ? arrayToBoundsExpression(mb) : undefined, maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
                 // create default pane
                 var defPane = this.map.createPane('order-0');
                 this.map._addUnselectCb = function (def) {
@@ -16044,14 +16057,52 @@ var LeafletMapAdapter = (function () {
                 this.map.getContainer().style.cursor = cursor;
             }
         };
-        LeafletMapAdapter.prototype.setView = function (lngLat, zoom) {
-            var lng = lngLat[0], lat = lngLat[1];
-            if (this.map) {
-                if (typeof zoom === 'number') {
-                    this.map.setView([lat, lng], zoom, { animate: false });
+        LeafletMapAdapter.prototype.setView = function (lngLatOrOpt, zoom) {
+            var map = this.map;
+            if (!map)
+                return;
+            if (Array.isArray(lngLatOrOpt)) {
+                var lngLat = lngLatOrOpt;
+                var lng = lngLat[0], lat = lngLat[1];
+                if (this.map) {
+                    if (typeof zoom === 'number') {
+                        this.map.setView([lat, lng], zoom, { animate: false });
+                    }
+                    else {
+                        this.setCenter([lng, lat]);
+                    }
+                }
+            }
+            else {
+                var zoom_1 = lngLatOrOpt.zoom, center = lngLatOrOpt.center, maxBounds = lngLatOrOpt.maxBounds, bounds = lngLatOrOpt.bounds, minZoom = lngLatOrOpt.minZoom, maxZoom = lngLatOrOpt.maxZoom;
+                if (center && zoom_1 !== undefined) {
+                    this.setView(center, zoom_1);
                 }
                 else {
-                    this.setCenter([lng, lat]);
+                    if (zoom_1 !== undefined) {
+                        this.setZoom(zoom_1);
+                    }
+                    if (center) {
+                        this.setCenter(center);
+                    }
+                }
+                if (bounds) {
+                    this.fitBounds(bounds);
+                }
+                if (maxBounds !== undefined) {
+                    if (maxBounds) {
+                        map.setMaxBounds(arrayToBoundsExpression(maxBounds));
+                    }
+                    else {
+                        // @ts-ignore `null` works for unset maxBounds, but not in typing
+                        map.setMaxBounds(null);
+                    }
+                }
+                if (maxZoom !== undefined) {
+                    map.setMaxZoom(maxZoom);
+                }
+                if (minZoom !== undefined) {
+                    map.setMinZoom(minZoom);
                 }
             }
         };
@@ -16086,7 +16137,7 @@ var LeafletMapAdapter = (function () {
             return [sw.lng, sw.lat, ne.lng, ne.lat];
         };
         // [west, south, east, north]
-        LeafletMapAdapter.prototype.fitBounds = function (e, options) {
+        LeafletMapAdapter.prototype.fitBounds = function (bounds, options) {
             if (options === void 0) { options = {}; }
             if (this.map) {
                 var maxZoom = options.maxZoom, offset = options.offset, padding = options.padding;
@@ -16100,11 +16151,7 @@ var LeafletMapAdapter = (function () {
                 if (offset) {
                     opt.padding = offset;
                 }
-                // top, left, bottom, right
-                this.map.fitBounds([
-                    [e[3], e[0]],
-                    [e[1], e[2]],
-                ], opt);
+                this.map.fitBounds(arrayToBoundsExpression(bounds), opt);
             }
         };
         LeafletMapAdapter.prototype.getLayerAdapter = function (name) {
@@ -16226,5 +16273,5 @@ var LeafletMapAdapter = (function () {
 
     return LeafletMapAdapter;
 
-}());
+})();
 //# sourceMappingURL=leaflet-map-adapter.global.js.map