Update app.py

app.py

@@ -249,9 +249,10 @@ def test(input_json):
     
     
     subdomainsAccessibility = computeAccessibility(df_matrix,LivabilitySubdomainsInputs,alpha,threshold)   
-    transportAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
+    artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
+    gmtAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'GMT+HSR',alpha,threshold)
     
-    AccessibilityInputs = pd.concat([subdomainsAccessibility, transportAccessibility], axis=1)
+    AccessibilityInputs = pd.concat([subdomainsAccessibility, artAccessibility,gmtAccessibility], axis=1)
     
     
 
@@ -264,9 +265,9 @@ def test(input_json):
 
     
     
-    def accessibilityToLivability (DistanceMatrix,AccessibilityInputs, SubdomainAttributeDict,UniqueDomainsList):
+    def accessibilityToLivability (DistanceMatrix,accessibilityInputs, SubdomainAttributeDict,UniqueDomainsList):
     
-        livability = pd.DataFrame(index=DistanceMatrix.index, columns=AccessibilityInputs.columns)
+        livability = pd.DataFrame(index=DistanceMatrix.index, columns=accessibilityInputs.columns)
                              
         for domain in UniqueDomainsList:
             livability[domain] = 0
@@ -281,20 +282,20 @@ def test(input_json):
             max_livability = float(SubdomainAttributeDict[key]['max_points'])
             domains = [str(item) for item in SubdomainAttributeDict[key]['domain']]
         
-            if key in subdomainsAccessibility.columns and key != 'commercial':
-                livability_score = remap(AccessibilityInputs[key], 0, threshold, 0, max_livability)
-                livability.loc[AccessibilityInputs[key] >= threshold, key] = max_livability
-                livability.loc[AccessibilityInputs[key] < threshold, key] = livability_score          
+            if key in accessibilityInputs.columns and key != 'commercial':
+                livability_score = remap(accessibilityInputs[key], 0, threshold, 0, max_livability)
+                livability.loc[accessibilityInputs[key] >= threshold, key] = max_livability
+                livability.loc[accessibilityInputs[key] < threshold, key] = livability_score          
                 if any(domains):
                     for domain in domains:
                         if domain != 'Workplaces':
-                            livability.loc[AccessibilityInputs[key] >= threshold, domain] += max_livability
-                            livability.loc[AccessibilityInputs[key] < threshold, domain] += livability_score
+                            livability.loc[accessibilityInputs[key] >= threshold, domain] += max_livability
+                            livability.loc[accessibilityInputs[key] < threshold, domain] += livability_score
                                                 
             elif key == 'commercial':
-                livability_score = remap(AccessibilityInputs['jobs'], 0, threshold, 0, max_livability)
-                livability.loc[AccessibilityInputs['jobs'] >= threshold, domains[0]] = max_livability
-                livability.loc[AccessibilityInputs['jobs'] < threshold, domains[0]] = livability_score
+                livability_score = remap(accessibilityInputs['jobs'], 0, threshold, 0, max_livability)
+                livability.loc[accessibilityInputs['jobs'] >= threshold, domains[0]] = max_livability
+                livability.loc[accessibilityInputs['jobs'] < threshold, domains[0]] = livability_score
 
         
         return livability