nastasiasnk commited on
Commit
e4cab2d
·
verified ·
1 Parent(s): 5d7e3d9

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +5 -5
app.py CHANGED
@@ -104,6 +104,7 @@ streamLanduses = speckle_utils.getSpeckleStream(streamId,luBranchName,CLIENT, lu
104
  streamData = streamLanduses["@Data"]["@{0}"]
105
  df_speckle_lu = speckle_utils.get_dataframe(streamData, return_original_df=False)
106
  df_lu = df_speckle_lu.copy()
 
107
  # set index column
108
  df_lu = df_lu.set_index("ids", drop=False)
109
 
@@ -122,7 +123,7 @@ for name in df_lu.columns:
122
  df_lu_filtered = df_lu[lu_columns].loc[mask_connected]
123
 
124
  df_lu_filtered.columns = [col.replace('lu+', '') for col in df_lu_filtered.columns]
125
- #df_lu_filtered.columns = [col.replace('ASSETS+', '') for col in df_lu_filtered.columns]
126
 
127
  df_lu_filtered = df_lu_filtered.astype(str)
128
  df_lu_filtered_dict = df_lu_filtered.to_dict('index')
@@ -140,12 +141,11 @@ def test(input_json):
140
 
141
  # ------------------------- Accessing input data from Grasshopper ------------------------- #
142
 
143
- #if df_dm is None:
144
  matrix = inputs['input']["matrix"]
145
-
146
- #if df_dm_transport is None:
147
  matrix_transport = inputs['input']["transportMatrix"]
148
-
 
149
  """
150
  if df_lu_filtered is None or df_lu_filtered.empty:
151
  landuses = inputs['input']["landuse_areas"]
 
104
  streamData = streamLanduses["@Data"]["@{0}"]
105
  df_speckle_lu = speckle_utils.get_dataframe(streamData, return_original_df=False)
106
  df_lu = df_speckle_lu.copy()
107
+ df_lu = df_lu.astype(str)
108
  # set index column
109
  df_lu = df_lu.set_index("ids", drop=False)
110
 
 
123
  df_lu_filtered = df_lu[lu_columns].loc[mask_connected]
124
 
125
  df_lu_filtered.columns = [col.replace('lu+', '') for col in df_lu_filtered.columns]
126
+ df_lu_filtered.columns = [col.replace('ASSETS+', '') for col in df_lu_filtered.columns]
127
 
128
  df_lu_filtered = df_lu_filtered.astype(str)
129
  df_lu_filtered_dict = df_lu_filtered.to_dict('index')
 
141
 
142
  # ------------------------- Accessing input data from Grasshopper ------------------------- #
143
 
144
+
145
  matrix = inputs['input']["matrix"]
 
 
146
  matrix_transport = inputs['input']["transportMatrix"]
147
+ landuses = inputs['input']["landuse_areas"]
148
+
149
  """
150
  if df_lu_filtered is None or df_lu_filtered.empty:
151
  landuses = inputs['input']["landuse_areas"]