@nextgis/leaflet-map-adapter 1.19.2 → 1.19.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- /** Bundle of @nextgis/leaflet-map-adapter; version: 1.19.2; author: NextGIS */
1
+ /** Bundle of @nextgis/leaflet-map-adapter; version: 1.19.5; author: NextGIS */
2
2
  var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
3
3
 
4
4
  var events = {exports: {}};
@@ -15272,11 +15272,22 @@ class GeoJsonAdapter extends BaseAdapter {
15272
15272
  }
15273
15273
  _updateTooltip(layerDef) {
15274
15274
  const { feature, layer } = layerDef;
15275
- if (feature && layer && feature.properties && this.options.labelField) {
15275
+ const { label, labelField, labelOnHover } = this.options;
15276
+ if (layer) {
15276
15277
  layer.unbindTooltip();
15277
- const message = feature.properties[this.options.labelField];
15278
- if (message !== undefined) {
15279
- const permanent = !this.options.labelOnHover;
15278
+ let message;
15279
+ if (feature.properties && labelField) {
15280
+ message = feature.properties[labelField];
15281
+ }
15282
+ else if (label) {
15283
+ message = label({
15284
+ target: this,
15285
+ ...layerDef,
15286
+ ...createFeaturePositionOptions(feature),
15287
+ });
15288
+ }
15289
+ if (message) {
15290
+ const permanent = !labelOnHover;
15280
15291
  layer.bindTooltip(String(message), { permanent, sticky: false });
15281
15292
  }
15282
15293
  }
@@ -15401,6 +15412,7 @@ class GeoJsonAdapter extends BaseAdapter {
15401
15412
  layer,
15402
15413
  ...createFeaturePositionOptions(feature),
15403
15414
  };
15415
+ // @ts-ignore
15404
15416
  layer.options.pane = this.pane;
15405
15417
  this._layers.push(def);
15406
15418
  let ok = true;
@@ -15523,9 +15535,9 @@ class GeoJsonAdapter extends BaseAdapter {
15523
15535
  _addMapListener() {
15524
15536
  const map = this.map;
15525
15537
  if (map) {
15526
- const { labelField, labelOnHover } = this.options;
15538
+ const { label, labelField, labelOnHover } = this.options;
15527
15539
  this._addMapClickListener();
15528
- if (labelField && !labelOnHover) {
15540
+ if ((labelField || label) && !labelOnHover) {
15529
15541
  map.on('zoomend', this.$updateTooltip);
15530
15542
  map.on('moveend', this.$updateTooltip);
15531
15543
  }