Merge pull request #12 from eoda-dev/refactor/method-call

Refactor/method call

Author: crazycapivara

.gitattributes

@@ -0,0 +1,2 @@
+* linguist-vendored
+*.py linguist-vendored=false

examples/standalone/gpd_multiple_layers.py

@@ -1,5 +1,5 @@
 import openlayers as ol
-from openlayers.basemaps import BasemapLayer
+from openlayers.basemaps import CartoBasemapLayer
 from openlayers.styles import FlatStyle
 
 # url = "https://openlayers.org/en/v4.6.5/examples/data/geojson/countries.geojson"
@@ -12,6 +12,6 @@
 # countries_layer = gpd.ol.to_layer(style=style, opacity=0.5)
 countries_layer = gpd.ol.color_category("name").to_layer(opacity=0.5, webgl=False)
 
-m = ol.Map(layers=[BasemapLayer.carto()])
+m = ol.Map(layers=[CartoBasemapLayer()])
 m.add_layer(countries_layer)
 m.save()

marimo/select-features.py

@@ -0,0 +1,65 @@
+
+
+import marimo
+
+__generated_with = "0.13.2"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _():
+    import marimo as mo
+    import openlayers as ol
+    ol.__version__
+    return mo, ol
+
+
+@app.cell
+def _():
+    data = "https://maplibre.org/maplibre-gl-js/docs/assets/us_states.geojson"
+    return (data,)
+
+
+@app.cell
+def _(data, ol):
+    vector = ol.VectorLayer(
+        # background="gray",
+        source=ol.VectorSource(url=data),
+        fit_bounds=True
+    )
+    return (vector,)
+
+
+@app.cell
+def _(ol, vector):
+    m = ol.MapWidget(layers=[ol.basemaps.CartoBasemapLayer(), vector])
+    m.add_tooltip()
+    m.add_select_interaction()
+    return (m,)
+
+
+@app.cell
+def _(m, mo):
+    w = mo.ui.anywidget(m)
+    return (w,)
+
+
+@app.cell
+def _(w):
+    w
+    return
+
+
+@app.cell
+def _(w):
+    [feat["properties"] for feat in w.value["features"]["selected"] if w.value["features"]]
+    return
+
+
+@app.cell
+def _():
+    return
+
+
+if __name__ == "__main__":
+    app.run()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openlayers"
-version = "0.1.5"
+version = "0.1.6-rc.1"
 description = "Python Bindings for OpenLayersJS"
 readme = "README.md"
 authors = [{ name = "Stefan Kuethe", email = "[email protected]" }]

src/openlayers/anywidget.py

@@ -49,7 +49,7 @@ def __init__(
         AnyWidget.__init__(self, height=height, **kwargs)
 
     def add_call(self, method_name: str, *args: Any) -> None:
-        call = dict(method=method_name, args=args)
+        call = dict(method_name=method_name, args=args)
         if self.created:
             return self.send(call)
 

src/openlayers/js/openlayers.anywidget.js

@@ -45,16 +45,16 @@ def initial_view_state(self):
 
     # 'apply_call_to_map'
     def add_call(self, method_name: str, *args: Any) -> None:
-        call = dict(method=method_name, args=args)
+        call = dict(method_name=method_name, args=args)
         self.calls.append(call)
 
     # 'apply_call_to_layer'
     def add_layer_call(self, layer_id: str, method_name: str, *args: Any):
-        layer_call = dict(method=method_name, args=args)
+        layer_call = dict(method_name=method_name, args=args)
         self.add_call("applyCallToLayer", layer_id, layer_call)
 
     def add_view_call(self, method_name: str, *args: Any) -> None:
-        view_call = dict(method=method_name, args=args)
+        view_call = dict(method_name=method_name, args=args)
         self.add_call("applyCallToView", view_call)
 
     def fit_bounds(self, bounds: tuple[float, float, float, float]) -> None:

src/openlayers/js/openlayers.standalone.js

@@ -17,6 +17,7 @@ class Control(OLBaseModel):
     id: str | None = None
 
     @field_validator("id")
+    @classmethod
     def validate_id(cls, v) -> str:
         if v is None:
             return uuid4().hex[0:10]
@@ -83,11 +84,7 @@ class ZoomToExtentControl(Control):
     Provides a button that changes the map view to a specific extent when clicked.
     """
 
-    extent: (
-        tuple[float | float | float | float]
-        | list[float | float | float | float]
-        | None
-    ) = None
+    extent: tuple[float, float, float, float] | list[float] | None = None
 
 
 # --- MapTiler

src/openlayers/map.py

@@ -18,6 +18,7 @@ class MapOptions(BaseModel):
     layers: list[dict | LayerT | LayerLike] | None = None
 
     @field_validator("layers")
+    @classmethod
     def validate_layers(cls, layers) -> list[dict | LayerT]:
         layers = [
             layer.model if isinstance(layer, LayerLike) else layer for layer in layers