Update app.py

app.py

@@ -107,8 +107,7 @@ def test(input_json):
     
 
     LivabilitySubdomainsWeights = landusesToSubdomains(df_matrix,df_landuses_filtered,landuseMapperDict,subdomainsUnique)
-    # make a dictionary to output in grasshopper / etc
-    LivabilitySubdomainsWeights_dictionary = LivabilitySubdomainsWeights.to_dict('index')
+    
 
 
 
@@ -119,7 +118,7 @@ def test(input_json):
     
         for domain in UniqueSubdomainsList:
           for key, value_list in SubdomainAttributeDict.items():
-            sqm_per_empl = float(SubdomainAttributeDict[domain][0])
+            sqm_per_empl = float(SubdomainAttributeDict[domain]['sqmPerEmpl'])
             if key in destinationWeights.columns and key == domain:
               if sqm_per_empl > 0:
                 df_LivabilitySubdomainsWorkplaces['jobs'] += (round(destinationWeights[key] / sqm_per_empl,2)).fillna(0)
@@ -131,8 +130,10 @@ def test(input_json):
 
     WorkplacesNumber = FindWorkplaces(df_matrix,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
 
-    LivabilitySubdomainsWeights =pd.concat([df_LivabilitySubdomainsArea, df_LivabilitySubdomainsWorkplaces], axis=1)
-
+    LivabilitySubdomainsWeights =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
+    
+    # make a dictionary to output in grasshopper / etc
+    LivabilitySubdomainsWeights_dictionary = LivabilitySubdomainsWeights.to_dict('index')
     
     
     def computeAccessibility (DistanceMatrix,weightsNames, destinationWeights=None,alpha = 0.0038, threshold = 600):