fixed feature selection bug

pages/01_dcascade.py

@@ -13,10 +13,15 @@ from solara.components.file_drop import FileInfo
 from dcascade_py import dcascade_py
 import xarray as xr
 from shapely.geometry import LineString
+import time
+import pandas as pd
 
+
+file_nc = solara.reactive("")
+file_shp = solara.reactive("")
 zoom = solara.reactive(6)
 center = solara.reactive((20, 0))
-map_loaded = solara.reactive(False)
+global_map_loaded = solara.reactive(False)
 variables = solara.reactive([])
 sel_var = solara.reactive("")
 ds = solara.reactive(None)
@@ -49,6 +54,7 @@ map_name = solara.reactive(list(maps)[0])
 
 def on_variable_change(variable):
     print("feature",feature_properties.value)
+    sel_var.set(variable)
     if feature_properties.value is None:
         solara.Warning(f"Select a feature on the map first",
                                         text=True,
@@ -58,16 +64,16 @@ def on_variable_change(variable):
     else:
         chart_options.set({
             "line": {
-                "title": {"text": variable+" "+str(feature_properties.value['FromN']-1)},
+                "title": {"text": sel_var.value+" "+str(feature_properties.value['FromN']-1)},
                 "tooltip": {},
-                "legend": {"data": [variable+" "+str(feature_properties.value['FromN']-1)]},
+                "legend": {"data": [sel_var.value+" "+str(feature_properties.value['FromN']-1)]},
                 "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, 21))},  # {"type": "category"},
-                "yAxis": {"name": variable+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
+                "yAxis": {"name": sel_var.value+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
                 "emphasis": {"itemStyle": {"shadowBlur":10}},
                 "series": [{
                     "type": "line",
                     "universalTransition": True,
-                    "data": ds.value[variable].values[:,0].tolist()
+                    "data": ds.value[sel_var.value].values[:,feature_properties.value['FromN']-1].tolist()
                 }]
             }
         })
@@ -80,57 +86,46 @@ def on_feature_click(feature, **kwargs):
     feature_properties.set(properties)
     sel_feature.set(feature)
 
-    print("GD",geo_data.value.geo_dataframe)
-    for f in geo_data.value.geo_dataframe['FromN']:
-        if f == properties['FromN']:
-            print("FOUND f",f)
-            # geo_data.value.geo_dataframe.loc[geo_data.value.geo_dataframe['FromN'] == f, 'color'] = 'red'
-        else:
-            geo_data.value.geo_dataframe.loc[geo_data.value.geo_dataframe['FromN'] == f, 'color'] = '#3366cc'
-
-    # Highlight the clicked feature
-    # feature.style = {'color': 'red', 'fillColor': 'red', 'opacity':0.5, 'weight':3.9, 'dashArray':'2', 'fillOpacity':0.5}
-
-
-    filename = os.getcwd()+'/public/deposito.nc'
-    ds.set(xr.open_dataset(filename, decode_times=False))
-    variables.set(list(ds.value.keys()))
-    
-    # ds_dec = xr.decode_cf(ds,decode_timedelta=False)
-    chart_options.set({
-        "line": {
-            "title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
-            "tooltip": {},
-            "legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
-            "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, 21))},  # {"type": "category"},
-            "yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
-            "emphasis": {"itemStyle": {"shadowBlur":10}},
-            "series": [{
-                "type": "line",
-                "universalTransition": True,
-                "data": ds.value[sel_var.value].values[:,properties['FromN']-1].tolist()
-            }]
-        }
-    })
+    if(file_nc.value):
+        ds.set(xr.open_dataset(file_nc.value, decode_times=False))
+        variables.set(list(ds.value.keys()))
+        
+        # ds_dec = xr.decode_cf(ds,decode_timedelta=False)
+        chart_options.set({
+            "line": {
+                "title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
+                "tooltip": {},
+                "legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
+                "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, 21))},  # {"type": "category"},
+                "yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
+                "emphasis": {"itemStyle": {"shadowBlur":10}},
+                "series": [{
+                    "type": "line",
+                    "universalTransition": True,
+                    "data": ds.value[sel_var.value].values[:,properties['FromN']-1].tolist()
+                }]
+            }
+        })
+        ds.value.close()
 
 
 @solara.component
 def MapComponent():
     # Isolation is required to prevent the map from overlapping navigation (when screen width < 960px)
-    print("RENDERING MAP COMPONENT")
     with solara.Column(style={"isolation": "isolate"}):
 
         sel_geo_data = None
 
-        if not map_loaded.value:
-            sel_df = gpd.read_file(os.getcwd()+'/public/deposito.shp')
-            geo_df = sel_df.to_crs(4326) #32634
+        if not global_map_loaded.value:
+            #sel_df = xr.open_dataset(file_nc.value)        # os.getcwd()+'/public/deposito.shp'
+            sel_df = gpd.read_file(file_shp.value)
+            geo_df = sel_df.to_crs(4326)                    # 32634
             geo_data.set(GeoData(geo_dataframe=geo_df,
                             hover_style={'fillColor': 'red' , 'fillOpacity': 5.2}, name="deposito"))
             geo_data.value.on_click(on_feature_click)
             center.set((geo_df.total_bounds[1], geo_df.total_bounds[0]))
             geo_data.value.style = {'color': 'black', 'fillColor': '#3366cc', 'opacity':0.5, 'weight':3.9, 'dashArray':'2', 'fillOpacity':0.1}
-        print(type(sel_feature.value))
+            # sel_df.close()
 
         m = Map(center=center.value, zoom = zoom.value, basemap= basemaps.Esri.WorldTopoMap)
         map_type = maps[map_name.value]
@@ -140,7 +135,6 @@ def MapComponent():
         m.add(geo_data.value)
         m.add(LayersControl())
         if sel_feature.value is not None:
-            # print("SEL FEATURE",sel_feature.value)
             # Extracting the geometry
             geometry = LineString(sel_feature.value['geometry']['coordinates'])
 
@@ -180,7 +174,7 @@ def MapComponent():
                     geo_data.value
                 ]
             )
-        map_loaded.set(True)
+        global_map_loaded.set(True)
         solara.Select(label="Variable", value=sel_var, values=variables.value, on_value=on_variable_change)
         FigureEcharts(option=chart_options.value["line"])
         
@@ -268,23 +262,33 @@ def Page():
             if (river_filename == "" or q_filename == ""):
                 set_no_file_selected(True)
             else:
+                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_timescale = int(str(timescale).replace("'",""))
                 
                 set_map_loaded(False)
+                global_map_loaded.set(False)
                 river = river_filename
                 q = q_filename
-                out = os.getcwd()+"/public/deposito"
-                out_shp = out+".nc"    #".shp"
+                current_time = str(int(time.time()))
+                os.makedirs(os.getcwd()+"/public/data/"+current_time)
+                out = f"{os.getcwd()}/public/data/{current_time}/deposito"
+                out_nc = out+".nc"    #".shp"
+                out_shp = out+".shp"
+                file_nc.set(out_nc)
+                file_shp.set(out_shp)
                 # out_prj = out+".prj"
                 # shutil.copyfile(river,out_prj)
-                dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_shp, version=False, verbose=False, debug=False, credits=False)
+                dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_nc, version=False, verbose=False, debug=False, credits=False)
                 set_map_loaded(True)
-                filename = os.getcwd()+'/public/deposito.nc'
-                ds.set(xr.open_dataset(filename, decode_times=False))
+                # filename = os.getcwd()+'/public/deposito.nc'
+                ds.set(xr.open_dataset(out_nc, decode_times=False))
                 variables.set(list(ds.value.keys()))
+                sel_var.set(variables.value[0])
+                ds.value.close()
 
         with solara.Div() as main: