fix output charts

Dockerfile

@@ -9,7 +9,7 @@ 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 conda install -c conda-forge gdal
-RUN pip install git+https://${GITHUB_TOKEN}@github.com/saferplaces/dcascade_py.git@development
+RUN pip install git+https://${GITHUB_TOKEN}@github.com/saferplaces/dcascade_py.git
 RUN pip install keplergl
 RUN pip install xarray
 COPY requirements.txt .

pages/01_dcascade.py

@@ -4,6 +4,7 @@ import shutil
 from typing import Optional, cast
 from ipyleaflet import Map, GeoData, basemaps, LayersControl, TileLayer
 import geopandas as gpd
+import numpy as np
 import solara
 from solara import FigureEcharts
 from solara.components.file_drop import FileInfo
@@ -24,15 +25,32 @@ ds = solara.reactive(None)
 feature_properties = solara.reactive(None)
 geo_data = solara.reactive(None)
 sel_feature = solara.reactive(None)
-timescale = solara.reactive("20")
+timescale = solara.reactive("50")
 sed_range = solara.reactive("-8,5")
 class_size = solara.reactive(2.5)
-deposit = solara.reactive(50.0)
+deposit = solara.reactive(100000.0)
 continuous_update = solara.reactive(True)
-formulas = ["Parker and Klingeman 1982", "Wilkock and Crowe 2003", "Engelund and Hansen 1967", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
+formulas = ["Wilkock and Crowe 2003", "Engelund and Hansen 1967"]   #,"Parker and Klingeman 1982", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
 formula = solara.reactive("Engelund and Hansen 1967")
-partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
-partitioning = solara.reactive("Shear stress correction approach")
+partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]  
+# - Engelund and Hansen with Direct approach\n
+# - Engelund and Hansen with Bed material fraction (BMF) approach\n
+# - Engelund and Hansen with Transport capacity function (TCF)\n
+# - Wilkock and Crowe with Shear stress correction\n""")
+partitioning = solara.reactive("Bed material fraction (BMF)")
+
+
+part_mapping = {
+    "Direct": 1,
+    "Bed material fraction (BMF)": 2,
+    "Transport capacity function (TCF)": 3,
+    "Shear stress correction approach": 4
+}
+
+formula_mapping = {
+    "Wilkock and Crowe 2003": 2,
+    "Engelund and Hansen 1967": 3
+}
 
 chart_options = solara.reactive({
         "line": {
@@ -75,18 +93,23 @@ def on_variable_change(variable):
                                         icon=True,
                             )
     else:
+        fid = feature_properties.value['fromn']
+        reach = feature_properties.value['reach_id']
+        data = ds.value[sel_var.value].values[:,fid-1]  # On nc file the index starts from 0, fromn starts from 1
+        # substitute nan values with False
+        data = np.where(np.isnan(data), None, data)
         chart_options.set({
             "line": {
-                "title": {"text": sel_var.value+" "+str(feature_properties.value['FromN']-1)},
+                "title": {"text": f"{sel_var.value} {reach} ({fid})"},
                 "tooltip": {},
-                "legend": {"data": [sel_var.value+" "+str(feature_properties.value['FromN']-1)]},
+                "legend": {"data": [f"{sel_var.value} {fid}"]},
                 "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))},  # {"type": "category"},
-                "yAxis": {"name": sel_var.value+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
+                "yAxis": {"name": f"{sel_var.value} {fid}","nameLocation": "middle","nameGap": 60},
                 "emphasis": {"itemStyle": {"shadowBlur":10}},
                 "series": [{
                     "type": "line",
                     "universalTransition": True,
-                    "data": ds.value[sel_var.value].values[:,feature_properties.value['FromN']-1].tolist()
+                    "data": data.tolist()
                 }]
             }
         })
@@ -104,18 +127,23 @@ def on_feature_click(feature, **kwargs):
         variables.set(list(ds.value.keys()))
         
         # ds_dec = xr.decode_cf(ds,decode_timedelta=False)
+        fid = properties['fromn']
+        reach = properties['reach_id']
+        data = ds.value[sel_var.value].values[:,fid-1]  # On nc file the index starts from 0, fromn starts from 1
+        # substitute nan values with False
+        data = np.where(np.isnan(data), None, data)
         chart_options.set({
             "line": {
-                "title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
+                "title": {"text": f"{sel_var.value} {reach} ({fid})"},
                 "tooltip": {},
-                "legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
+                "legend": {"data": f"{sel_var.value} {fid}"},
                 "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))},  # {"type": "category"},
-                "yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
+                "yAxis": {"name": f"{sel_var.value} {fid}","nameLocation": "middle","nameGap": 60},
                 "emphasis": {"itemStyle": {"shadowBlur":10}},
                 "series": [{
                     "type": "line",
                     "universalTransition": True,
-                    "data": ds.value[sel_var.value].values[:,properties['FromN']-1].tolist()
+                    "data": data.tolist()
                 }]
             }
         })
@@ -291,8 +319,10 @@ def Page():
                 if ds.value is not None:
                     ds.value.close()
                 set_no_file_selected(False)
-                sel_form = formulas.index(str(formula).replace("'",""))+1
-                sel_part = partitionings.index(str(partitioning).replace("'",""))+1
+                # sel_form = formulas.index(str(formula).replace("'",""))+1
+                # sel_part = partitionings.index(str(partitioning).replace("'",""))+1
+                sel_form = formula_mapping[formula.value]
+                sel_part = part_mapping[partitioning.value]
                 # sel_timescale = int(str(timescale).replace("'",""))
                 sel_timescale = int(timescale.value)