Import sources and refactor tooltip

Author: stfnkth

maplibre/__init__.py

@@ -30,6 +30,8 @@
 except ImportError as e:
     print(e)
 
+from .sources import *
+
 __version__ = importlib.metadata.version(__package__)
 
 __all__ = ["Map", "MapOptions", "Layer", "LayerType", "ControlPosition"]

maplibre/anywidget.py

@@ -104,6 +104,7 @@ def add_call(self, method_name: str, *args) -> None:
         # Initial calls
         self.calls = self.calls + [call]
 
+    """
     def _add_call(self, method_name: str, *args) -> None:
         call = [method_name, args]
         if not self._rendered:
@@ -115,3 +116,7 @@ def _add_call(self, method_name: str, *args) -> None:
             return
 
         self.send({"calls": [call], "msg": "custom call"})
+    """
+
+    def add_tooltip(self, layer_id, template = None) -> None:
+        return self.add_call("addTooltip", layer_id, template)

maplibre/sources.py

@@ -204,3 +204,5 @@ def to_source(self, **kwargs) -> GeoJSONSource:
 
     def to_sources_dict(self, **kwargs) -> dict:
         return {self.source_id: self.to_source(**kwargs)}
+
+__all__ = ["GeoJSONSource", "RasterSource", "RasterDEMSource"]

maplibre/srcjs/maplibre.anywidget.js

@@ -0,0 +1,74 @@
+import marimo
+
+__generated_with = "0.10.17"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _():
+    import marimo as mo
+    import maplibre as mlb
+    return mlb, mo
+
+
+@app.cell
+def _(mlb):
+    m = mlb.MapWidget()
+    return (m,)
+
+
+@app.cell
+def _():
+    image_url = "https://maplibre.org/maplibre-gl-js/docs/assets/custom_marker.png"
+    image_id = "custom-marker"
+    return image_id, image_url
+
+
+@app.cell
+def _(image_id, image_url, m):
+    m.add_call("addImage", image_id, image_url)
+    return
+
+
+@app.cell
+def _():
+    data_url = "https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_month.geojson"
+    return (data_url,)
+
+
+@app.cell
+def _(data_url, image_id, mlb):
+    vector = mlb.Layer(
+        id="icons",
+        type=mlb.LayerType.SYMBOL,
+        source=mlb.GeoJSONSource(data=data_url),
+        layout={"icon-image": image_id, "icon-overlap": "always"},
+    )
+    return (vector,)
+
+
+@app.cell
+def _(m, vector):
+    m.add_layer(vector)
+    return
+
+
+@app.cell
+def _(m):
+    m
+    return
+
+
+@app.cell
+def _(m):
+    m.add_tooltip("icons", "{{ place }}, {{ mag }}")
+    return
+
+
+@app.cell
+def _():
+    return
+
+
+if __name__ == "__main__":
+    app.run()

marimo/icons.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from geopandas import GeoDataFrame, read_file
-from maplibre.sources import *
+from maplibre.sources import GeoJSONSource, SimpleFeatures, VectorTileSource
 
 
 def test_geojson_source():