Make prop optional

docs/examples/geopandas/app.py

@@ -29,8 +29,9 @@
 def create_map():
     m = Map(map_options)
     m.add_layer(wilderness_layer)
-    # m.add_tooltip(LAYER_ID, "NAME")
-    m.add_tooltip(LAYER_ID, None)
+    m.add_tooltip(LAYER_ID, "NAME")
+    # m.add_tooltip(LAYER_ID)
+    # m.add_popup(LAYER_ID, "NAME")
     return m
 
 

maplibre/map.py

@@ -158,21 +158,21 @@ def add_marker(self, marker: Marker) -> None:
         """
         self.add_call("addMarker", marker.to_dict())
 
-    def add_popup(self, layer_id: str, prop: str) -> None:
+    def add_popup(self, layer_id: str, prop: str = None) -> None:
         """Add a popup to the map
 
         Args:
             layer_id (str): The layer to which the popup is added.
-            prop (str): The property of the source to be displayed.
+            prop (str): The property of the source to be displayed. If `None`, all properties will be displayed.
         """
         self.add_call("addPopup", layer_id, prop)
 
-    def add_tooltip(self, layer_id: str, prop: str) -> None:
+    def add_tooltip(self, layer_id: str, prop: str = None) -> None:
         """Add a tooltip to the map
 
         Args:
             layer_id (str): The layer to which the tooltip is added.
-            prop (str): The property of the source to be displayed.
+            prop (str): The property of the source to be displayed. If `None`, all properties will be displayed.
         """
         self.add_call("addTooltip", layer_id, prop)
 

srcjs/pymaplibregl.js

@@ -77,7 +77,8 @@ export default class PyMapLibreGL {
     const popup = new maplibregl.Popup(popupOptions);
     this._map.on("click", layerId, (e) => {
       const feature = e.features[0];
-      const text = feature.properties[property];
+      // const text = feature.properties[property];
+      const text = getTextFromFeature(feature, property);
       popup.setLngLat(e.lngLat).setHTML(text).addTo(this._map);
     });
   }