Update app.py

app.py

@@ -80,7 +80,7 @@ import imports_utils
 import speckle_utils
 import data_utils
 
-from config import landuseDatabaseId , streamId,  branch_name_dm, commit_id_dm
+from config import landuseDatabaseId , streamId,  dmBranchName, dmCommitId, luBranchName, luCommitId
 from imports_utils import speckleToken
 from imports_utils import fetchDistanceMatrices
 from config import distanceMatrixActivityNodes
@@ -90,8 +90,16 @@ CLIENT = SpeckleClient(host="https://speckle.xyz/")
 account = get_default_account()
 CLIENT.authenticate_with_token(token=speckleToken)
 
-streamDistanceMatrices = speckle_utils.getSpeckleStream(streamId,branch_name_dm,CLIENT, commit_id_dm)
+streamDistanceMatrices = speckle_utils.getSpeckleStream(streamId,dmBranchName,CLIENT, dmCommitId)
 matrices = fetchDistanceMatrices (streamDistanceMatrices)
+
+streamLanduses = speckle_utils.getSpeckleStream(streamId,luBranchName,CLIENT, luCommitId)
+streamData = streamLanduses["@Data"]["@{0}"]
+df_speckle_lu = speckle_utils.get_dataframe(streamData, return_original_df=False)
+df_lu = df_speckle_lu.copy()
+# set index column
+df_lu =  df_lu.set_index("ids", drop=False)
+
 df_dm = matrices[distanceMatrixActivityNodes]
 df_dm_transport = matrices[distanceMatrixTransportStops]
 
@@ -99,6 +107,19 @@ dm_dictionary = df_dm.to_dict('index')
 df_dm_transport_dictionary = df_dm_transport.to_dict('index')
 
 
+# filter activity nodes attributes
+mask_connected = df_dm.index.tolist()
+lu_columns = []
+for name in df_lu.columns:
+  if name.startswith("lu+"):
+    lu_columns.append(name)
+df_lu_filtered = df_lu[lu_columns].loc[mask_connected]
+df_lu_filtered
+
+df_lu_filtered_dict = df_lu_filtered.to_dict('index')
+
+
+
 
 def test(input_json):
     print("Received input")
@@ -348,7 +369,7 @@ def test(input_json):
         "luDomainMapper": landuseMapperDict,
         "attributeMapper": attributeMapperDict,
         "fetchDm": dm_dictionary,
-        "transportDm":df_dm_transport_dictionary
+        "landuses":df_lu_filtered_dict
     }