Merge pull request #150 from eoda-dev/nuayge-shiny-module

Nuayge shiny module

Author: crazycapivara

docs/changelog.md

@@ -1,5 +1,9 @@
 # Changelog for MapLibre for Python
 
+## maplibre v0.3.5
+
+* Fix #142 (thx to @nuayge)
+
 ## maplibre v0.3.4
 
 * Fix pydantic list bug in `basemaps.py` and `light.py` (#144)

examples/shiny/app_with_modules.py

@@ -0,0 +1,37 @@
+from shiny import App, ui, module, reactive
+from maplibre import output_maplibregl, render_maplibregl, Map, MapContext
+
+
+@module.ui
+def shiny_module_ui():
+    return ui.page_fluid(
+        ui.panel_title("MapLibre"),
+        ui.input_action_button("btn", "Click"),
+        output_maplibregl("mapgl", height=600),
+    )
+
+
+@module.server
+def shiny_module_server(input, output, session):
+
+    @render_maplibregl
+    def mapgl():
+        m = Map()
+        return m
+
+    @reactive.effect
+    @reactive.event(input.btn)
+    async def move_it(): 
+        async with MapContext("mapgl") as m:
+            m.add_call("flyTo", {"center": [-1.66928, 48.1024159], "zoom": 15})
+
+
+app_ui = ui.page_fluid(shiny_module_ui("shiny_mod"))
+
+
+def server(input, output, session):
+    shiny_module_server("shiny_mod")
+
+
+app = App(app_ui, server)
+

maplibre/mapcontext.py

@@ -18,8 +18,8 @@ class MapContext(Map):
     """
 
     def __init__(self, id: str, session: Session = None) -> None:
-        self.id = id
         self._session = require_active_session(session)
+        self.id = id if self._session.ns == "" else f"{self._session.ns}-{id}"
         self.map_options = {}
         self._message_queue = []
 

maplibre/shiny/mapcontext.py

@@ -26,8 +26,8 @@ class MapContext(Map):
     """
 
     def __init__(self, id: str, session: Session = None) -> None:
-        self.id = id
         self._session = require_active_session(session)
+        self.id = id if self._session.ns == "" else f"{self._session.ns}-{id}"
         self.map_options = dict()
         self._message_queue = list()
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "maplibre"
-version = "0.3.4"
+version = "0.3.5"
 description = "Python bindings for MapLibre GL JS"
 authors = ["Stefan Kuethe <stefan.kuethe@eoda.de>"]
 readme = "README.md"