fix dockerfile and map

Dockerfile

@@ -6,13 +6,9 @@ RUN mamba install -c conda-forge leafmap geopandas localtileserver -y && \
 
 USER root
 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
-RUN apt-get install -y software-properties-common
-RUN add-apt-repository -y ppa:ubuntugis/ppa
-RUN apt-get install -y gdal-bin libgdal-dev
-RUN export CPLUS_INCLUDE_PATH=/usr/include/gdal
-RUN export C_INCLUDE_PATH=/usr/include/gdal
-RUN pip install GDAL==3.4.3
-RUN pip install git+https://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@github.com/saferplaces/dcascade_py.git@development
+RUN conda install -c conda-forge gdal
+RUN pip install git+https://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@github.com/saferplaces/dcascade_py.git@test_no_click
+RUN pip install keplergl
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 

pages/01_leafmap.py

@@ -115,10 +115,33 @@ config = {'version': 'v1',
 class Map(leafmap.Map):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
+        self.updateMap()
         # Add what you want below
         # self.add_basemap("OpenTopoMap")
         # change_basemap(self)
         # self.add_shp()
+    def updateMap(self):
+        print("ADDING SHP")
+        self.add_shp("public/deposito.shp", "Countries")
+        self.config = config
+        print("UPDATED MAP AND CONFIGS")
+        # self.add_basemap("OpenTopoMap")
+        # change_basemap(self)
+
+
+@solara.component
+def MapComponent():
+    m = Map()
+    m.element(  # type: ignore
+        zoom=zoom.value,
+        on_zoom=zoom.set,
+        center=center.value,
+        on_center=center.set,
+        scroll_wheel_zoom=True,
+        toolbar_ctrl=False,
+        data_ctrl=False,
+    )
+    m.config = config
 
 
 @solara.component
@@ -128,17 +151,7 @@ def Page():
         # solara.SliderInt(label="Zoom level", value=zoom, min=1, max=20)
         # using 3rd party widget library require wiring up the events manually
         # using zoom.value and zoom.set
-        m = Map()
-        m.element(  # type: ignore
-            zoom=zoom.value,
-            on_zoom=zoom.set,
-            center=center.value,
-            on_center=center.set,
-            scroll_wheel_zoom=True,
-            toolbar_ctrl=False,
-            data_ctrl=False,
-        )
-        m.config = config
+        
         
         # solara.Text(f"Zoom: {zoom.value}")
         # solara.Text(f"Center: {center.value}")
@@ -147,6 +160,10 @@ def Page():
         filename, set_filename = solara.use_state("")
         size, set_size = solara.use_state(0)
         file_browser, set_file_browser = solara.use_state(cast(Optional[Path], None))
+        map_loaded, set_map_loaded = solara.use_state(False)
+
+        if map_loaded:
+            MapComponent()
 
 
         def on_file(file: FileInfo):
@@ -170,23 +187,25 @@ def Page():
                     # m.add_shp(str(file_browser), "Countries")
 
         def run_dcascade():
-            file_river = os.getcwd()+"/public/River_Network.shp"
-            file_q = os.getcwd()+"/public/Q_Vjosa.csv"
+            river = os.getcwd()+"/public/River_Network.shp"
+            q = os.getcwd()+"/public/Q_Vjosa.csv"
             print(os.getcwd())
             print(os.listdir(os.getcwd()+"/public"))
-            print(file_river)
-            print(os.path.exists(Path(file_river)))
-            dcascade_main.main(river=file_river, q=file_q,timescale=20, formula=3, partitioning=4, out="public/deposito.shp", version=False, verbose=False, debug=False, credits=False)
+            # print(file_river)
+            # print(os.path.exists(Path(file_river)))
+            dcascade_main.main(river, q, timescale=20, formula=3, partitioning=4, out="public/deposito.shp", version=False, verbose=False, debug=False, credits=False)
             # m = leafmap.Map.element(center=[20, 0], zoom=1)
-            m.add_shp("public/deposito.shp", "Countries")
-            m.config = config
-            m
+            # m.add_shp("public/deposito.shp", "Countries")
+            # m.config = config
+            print("UPDATING MAP")
+            set_map_loaded(True)
+            # m.updateMap()
 
         with solara.Div() as main:
             
             with solara.Card("Upload files and run dcascade"):
                 solara.FileDrop(
-                label="Drag and drop a file here to read the first 100 bytes",
+                label="Drag and drop a file here ",
                 on_file=on_file,
                 lazy=True, 
             )