@nextgis/leaflet-map-adapter 1.19.2 → 1.19.5

package/lib/leaflet-map-adapter.esm-bundler.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.5; author: NextGIS */
 import { EventEmitter } from 'events';
 import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Layer, Util, CRS, GridLayer, DomUtil, TileLayer as TileLayer$1, Map } from 'leaflet';
 import { defined, debounce as debounce$1 } from '@nextgis/utils';
@@ -684,11 +684,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 });
             }
         }
@@ -813,6 +824,7 @@ class GeoJsonAdapter extends BaseAdapter {
                 layer,
                 ...createFeaturePositionOptions(feature),
             };
+            // @ts-ignore
             layer.options.pane = this.pane;
             this._layers.push(def);
             let ok = true;
@@ -935,9 +947,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);
             }