Show all props in tooltip if no prop is supplied

eoda-dev · Jan 23, 2024 · 268110a · 268110a
1 parent 3cceaa9
commit 268110a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/docs/examples/geopandas/app.py b/docs/examples/geopandas/app.py
@@ -29,7 +29,8 @@
 def create_map():
     m = Map(map_options)
     m.add_layer(wilderness_layer)
-    m.add_tooltip(LAYER_ID, "NAME")
+    # m.add_tooltip(LAYER_ID, "NAME")
+    m.add_tooltip(LAYER_ID, None)
     return m
 
 

diff --git a/maplibre/srcjs/index.js b/maplibre/srcjs/index.js
@@ -64,7 +64,12 @@
       const popup = new maplibregl.Popup(popupOptions);
       this._map.on("mousemove", layerId, (e) => {
         const feature = e.features[0];
-        const text = feature.properties[property];
+        let text;
+        if (property === null) {
+          text = Object.keys(feature.properties).map((key) => `${key}: ${feature.properties[key]}`).join("</br>");
+        } else {
+          text = feature.properties[property];
+        }
         popup.setLngLat(e.lngLat).setHTML(text).addTo(this._map);
       });
       this._map.on("mouseleave", layerId, () => {

diff --git a/srcjs/pymaplibregl.js b/srcjs/pymaplibregl.js
@@ -79,7 +79,15 @@ export default class PyMapLibreGL {
     const popup = new maplibregl.Popup(popupOptions);
     this._map.on("mousemove", layerId, (e) => {
       const feature = e.features[0];
-      const text = feature.properties[property];
+      let text;
+      if (property === null) {
+        text = Object.keys(feature.properties)
+          .map((key) => `${key}: ${feature.properties[key]}`)
+          .join("</br>");
+      } else {
+        text = feature.properties[property];
+      }
+
       popup.setLngLat(e.lngLat).setHTML(text).addTo(this._map);
     });