Merge pull request #124 from eoda-dev/feature/backend-dependencies

Feature/backend dependencies

Author: crazycapivara

.github/workflows/pytest.yml

@@ -4,7 +4,6 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -22,9 +21,10 @@ jobs:
       - name: Install Poetry and pytest
         run: pip install poetry pytest
       - name: Install package
-        run: poetry install
+        run: |
+          poetry lock
+          poetry install -E ipywidget -E shiny
       - name: Test package
         run: |
           poetry run pytest
           poetry run pytest --doctest-modules maplibre --ignore maplibre/ipywidget.py
-

README.md

@@ -11,21 +11,31 @@
 MapLibre for Python provides Python bindings for [MapLibre GL JS](https://github.com/maplibre/maplibre-gl-js).
 Furthermore, [Deck.GL Layers](https://deck.gl/docs/api-reference/layers) can be mixed with [MapLibre Layers](https://maplibre.org/maplibre-style-spec/layers/).
 
-It integrates seamlessly into [Shiny for Python](https://github.com/posit-dev/py-shiny) and [Jupyter](https://jupyter.org/).
+It integrates seamlessly into [Shiny for Python](https://github.com/posit-dev/py-shiny), [Marimo](https://marimo.io/) and [Jupyter](https://jupyter.org/).
 
 ## Installation
 
 ```bash
 # Stable
-pip install maplibre
+pip install maplibre # minimal
+
+pip install "maplibre[shiny]" # shiny bindings
+
+pip install "maplibre[ipywidget]" # marimo and jupyter bindings
 
 pip install "maplibre[all]"
 
-# Dev
+uv add maplibre
+
+uv add "maplibre[all]"
+
+# Unstable
 pip install git+https://github.com/eoda-dev/py-maplibregl@dev
 
 pip install "maplibre[all] @ git+https://github.com/eoda-dev/py-maplibregl@dev"
 
+uv add "git+https://github.com/eoda-dev/py-maplibregl@dev[all]"
+
 # Conda
 conda install -c conda-forge maplibre
 ```

_experimental/ma_notebook_test_app_view_with_widget.py

@@ -0,0 +1,98 @@
+import marimo
+
+__generated_with = "0.10.17"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _():
+    import marimo as mo
+    from maplibre import Layer, LayerType, MapOptions
+    from maplibre.sources import GeoJSONSource, VectorTileSource
+    from maplibre.ipywidget import MapWidget as Map
+    from maplibre.controls import NavigationControl, ScaleControl, ControlPosition
+    from maplibre.expressions import color_match_expr
+    Map._use_message_queue = False
+    return (
+        ControlPosition,
+        GeoJSONSource,
+        Layer,
+        LayerType,
+        Map,
+        MapOptions,
+        NavigationControl,
+        ScaleControl,
+        VectorTileSource,
+        color_match_expr,
+        mo,
+    )
+
+
+@app.cell
+def _(VectorTileSource):
+    blm_sma_source= VectorTileSource(
+        tiles=["https://tiles.lightfield.ag/blm_national_surface_management_data/{z}/{x}/{y}.mvt"],
+        min_zoom=0,
+        max_zoom=9
+    )
+    return (blm_sma_source,)
+
+
+@app.cell
+def _(color_match_expr):
+    fill_color = color_match_expr("ADMIN_DEPT_CODE", ["PVT", "DOD", "DOE", "DOI", "USDA"], "viridis")
+    # fill_color
+    return (fill_color,)
+
+
+@app.cell
+def _(Layer, LayerType, blm_sma_source, fill_color):
+    blm_sma_layer = Layer(
+        id="blm-sma",
+        type=LayerType.FILL,
+        source=blm_sma_source,
+        source_layer="blm_national_surface_management_data"
+    ).set_paint_props(fill_color=fill_color, fill_outline_color="steelblue")
+    return (blm_sma_layer,)
+
+
+@app.cell
+def _(Map, NavigationControl, blm_sma_layer):
+    m = Map(controls=[NavigationControl()], layers=[blm_sma_layer])
+    return (m,)
+
+
+@app.cell
+def _(m, mo):
+    widget = mo.ui.anywidget(m)
+    return (widget,)
+
+
+@app.cell
+def _(widget):
+    widget
+    return
+
+
+@app.cell
+def _(color_match_expr, m, mo):
+    mo.ui.dropdown(
+        ["viridis", "YlOrRd", "Blues"],
+        label="cmap",
+        on_change=lambda x: m.set_paint_property(
+            "blm-sma",
+            "fill-color",
+            color_match_expr("ADMIN_DEPT_CODE", ["PVT", "DOD", "DOE", "DOI", "USDA"], cmap=x)
+        )
+    )
+    return
+
+
+@app.cell
+def _(widget):
+    widget.view_state
+    return
+
+
+if __name__ == "__main__":
+    app.run()

docs/api/basemaps.md

@@ -2,4 +2,12 @@
     options:
         docstring_section_style: list
 
+::: maplibre.basemaps.OpenFreeMap
+    options:
+        docstring_section_style: list
+
+::: maplibre.basemaps.MapTiler
+    options:
+        docstring_section_style: list
+
 ::: maplibre.basemaps.construct_basemap_style

docs/changelog.md

@@ -1,5 +1,16 @@
 # Changelog for MapLibre for Python
 
+## maplibre v0.3.0 (unreleased)
+
+* Add 3d-buildings example
+* Add `basemaps.OpenFreeMap`
+* Make `shiny` and `htmltools` dependency optional
+* Make `anywidget` dependency optional
+* Add Mapbox Draw Ipywidget callbacks for
+  * `draw.create`
+  * `draw.update`
+  * `draw.delete`
+
 ## maplibre v0.2.8
 
 * Add Mapbox Draw Shiny callbacks for

docs/index.md

@@ -8,11 +8,17 @@ It integrates seamlessly into [Shiny for Python](https://github.com/posit-dev/py
 
 ```bash
 # Stable
-pip install maplibre
+pip install maplibre # minimal
 
 pip install "maplibre[all]"
 
-# Dev
+pip install "maplibre[shiny]" # shiny bindings
+
+pip install "maplibre[ipywidget]" # marimo and jupyter bindings
+
+uv add "maplibre[all]"
+
+# Unstable
 pip install git+https://github.com/eoda-dev/py-maplibregl@dev
 ```
 

examples/basemaps/carto.py

@@ -0,0 +1,5 @@
+from maplibre import Map, MapOptions
+from maplibre.basemaps import Carto
+
+m = Map(MapOptions(style=Carto.DARK_MATTER_NOLABELS))
+m.save(preview=True)

examples/basemaps/openfreemap-3d.py

@@ -0,0 +1,46 @@
+from maplibre import Map, MapOptions
+from maplibre.basemaps import OpenFreeMap
+from maplibre.controls import NavigationControl
+
+threed_buildings = {
+    "id": "3d-buildings",
+    "source": "openmaptiles",
+    "source-layer": "building",
+    "type": "fill-extrusion",
+    "min-zoom": 15,
+    "paint": {
+        "fill-extrusion-color": [
+            "interpolate",
+            ["linear"],
+            ["get", "render_height"],
+            0,
+            "lightgray",
+            200,
+            "royalblue",
+            400,
+            "lightblue",
+        ],
+        "fill-extrusion-height": [
+            "interpolate",
+            ["linear"],
+            ["zoom"],
+            15,
+            0,
+            16,
+            ["get", "render_height"],
+        ],
+        "fill-extrusion-base": [
+            "case",
+            [">=", ["get", "zoom"], 16],
+            ["get", "render_min_height"],
+            0,
+        ],
+    },
+}
+
+m = Map(
+    MapOptions(style=OpenFreeMap.BRIGHT, center=(-74.0066, 40.7135), zoom=16, pitch=45, bearing=-17),
+    controls=[NavigationControl()],
+)
+m.add_layer(threed_buildings)
+m.save(preview=True)

examples/basemaps/openfreemap.py

@@ -0,0 +1,5 @@
+from maplibre import Map, MapOptions
+from maplibre.basemaps import OpenFreeMap
+
+m = Map(MapOptions(style=OpenFreeMap.BRIGHT))
+m.save(preview=True)