Update app.py

app.py

@@ -119,6 +119,9 @@ CLIENT.authenticate_with_token(token=speckleToken)
 streamDistanceMatrices = speckle_utils.getSpeckleStream(streamId,branch_name_dm,CLIENT, commit_id_dm)
 matrices = fetchDistanceMatrices (streamDistanceMatrices)
 df_dm = matrices[distanceMatrixActivityNodes]
+df_dm_transport = matrices[distanceMatrixTransportStops]
+
+
 dm_dictionary = df_dm.to_dict('index')
 
 """
@@ -189,7 +192,7 @@ def test(input_json):
         
         return result_dicts
 
-    result_dicts = split_dict_by_subkey(transport_matrix, tranportModes)
+    result_dicts = split_dict_by_subkey(df_dm_transport, tranportModes)
 
     # Accessing each dictionary
     art_dict = result_dicts["DRT"]
@@ -204,7 +207,7 @@ def test(input_json):
     
 
     # create a mask based on the matrix size and ids, crop activity nodes to the mask
-    mask_connected = df_matrix.index.tolist()
+    mask_connected = df_dm.index.tolist()
 
     valid_indexes = [idx for idx in mask_connected if idx in df_landuses.index]
     # Identify and report missing indexes
@@ -262,7 +265,7 @@ def test(input_json):
 
     
 
-    LivabilitySubdomainsWeights = landusesToSubdomains(df_matrix,df_landuses_filtered,landuseMapperDict,subdomainsUnique)
+    LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_landuses_filtered,landuseMapperDict,subdomainsUnique)
     
 
 
@@ -284,7 +287,7 @@ def test(input_json):
         return df_LivabilitySubdomainsWorkplaces
 
 
-    WorkplacesNumber = FindWorkplaces(df_matrix,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
+    WorkplacesNumber = FindWorkplaces(df_dm,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
     
     # prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
     LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
@@ -320,7 +323,7 @@ def test(input_json):
     
     
     
-    subdomainsAccessibility = computeAccessibility(df_matrix,LivabilitySubdomainsInputs,alpha,threshold)   
+    subdomainsAccessibility = computeAccessibility(df_dm,LivabilitySubdomainsInputs,alpha,threshold)   
     artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
     gmtAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'GMT+HSR',alpha,threshold)
     
@@ -375,7 +378,7 @@ def test(input_json):
     
     
 
-    livability = accessibilityToLivability(df_matrix,AccessibilityInputs,attributeMapperDict,domainsUnique)
+    livability = accessibilityToLivability(df_dm,AccessibilityInputs,attributeMapperDict,domainsUnique)
     
 
     livability_dictionary = livability.to_dict('index')