@nextgis/leaflet-map-adapter 1.19.2 → 1.19.4

package/lib/leaflet-map-adapter.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 1.19.2; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 1.19.4; author: NextGIS */
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 var events = {exports: {}};
@@ -15272,11 +15272,22 @@ class GeoJsonAdapter extends BaseAdapter {
     }
     _updateTooltip(layerDef) {
         const { feature, layer } = layerDef;
-        if (feature && layer && feature.properties && this.options.labelField) {
+        const { label, labelField, labelOnHover } = this.options;
+        if (layer) {
             layer.unbindTooltip();
-            const message = feature.properties[this.options.labelField];
-            if (message !== undefined) {
-                const permanent = !this.options.labelOnHover;
+            let message;
+            if (feature.properties && labelField) {
+                message = feature.properties[labelField];
+            }
+            else if (label) {
+                message = label({
+                    target: this,
+                    ...layerDef,
+                    ...createFeaturePositionOptions(feature),
+                });
+            }
+            if (message) {
+                const permanent = !labelOnHover;
                 layer.bindTooltip(String(message), { permanent, sticky: false });
             }
         }
@@ -15523,9 +15534,9 @@ class GeoJsonAdapter extends BaseAdapter {
     _addMapListener() {
         const map = this.map;
         if (map) {
-            const { labelField, labelOnHover } = this.options;
+            const { label, labelField, labelOnHover } = this.options;
             this._addMapClickListener();
-            if (labelField && !labelOnHover) {
+            if ((labelField || label) && !labelOnHover) {
                 map.on('zoomend', this.$updateTooltip);
                 map.on('moveend', this.$updateTooltip);
             }