Update app.py

app.py

@@ -171,7 +171,7 @@ def test(input_json):
     # Apply the filtered mask
     df_landuses_filtered = df_landuses.loc[valid_indexes]
 
-
+    """
     # find a set of unique domains, to which subdomains are aggregated    
     temp = []
     for key, values in livabilityMapperDict.items():
@@ -188,16 +188,20 @@ def test(input_json):
     
     domainsUnique = list(set(temp))
 
-
+    
     # find a list of unique subdomains, to which land uses are aggregated
     temp = []    
     for key, values in landuseMapperDict.items():
-      subdomain = str(landuseMapperDict[key])
+      subdomain = str(landuseMapperDict[key]["subdomain livability"])
       if subdomain != 0: 
         temp.append(subdomain) 
         
     subdomainsUnique = list(set(temp))
+
+    """
     
+    domainsUnique = findUniqueDomains(livabilityMapperDict)
+    subdomainsUnique = findUniqueSubdomains(landuseMapperDict)
     
     from imports_utils import landusesToSubdomains
     from imports_utils import FindWorkplacesNumber
@@ -216,7 +220,7 @@ def test(input_json):
     
     # prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
     LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
-   """
+   
     subdomainsAccessibility = computeAccessibility(df_dm,LivabilitySubdomainsInputs,alpha,threshold)   
     artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
     gmtAccessibility = computeAccessibility_pointOfInterest(df_gmt_matrix,'GMT+HSR',alpha,threshold)
@@ -236,17 +240,17 @@ def test(input_json):
     artmatrix = df_art_matrix.to_dict('index')
 
     LivabilitySubdomainsWeights_dictionary = LivabilitySubdomainsWeights.to_dict('index')
-    """
+    
     
     # Prepare the output
     output = {
-       # "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
-       # "livability_dictionary": livability_dictionary,
+        "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
+        "livability_dictionary": livability_dictionary,
         "subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
         "luDomainMapper": landuseMapperDict,
-        "attributeMapper": livabilityMapperDict
-       # "fetchDm": dm_dictionary,
-       # "landuses":df_lu_filtered_dict 
+        "attributeMapper": livabilityMapperDict,
+        "fetchDm": dm_dictionary,
+        "landuses":df_lu_filtered_dict 
     }