Update app.py

app.py

@@ -62,49 +62,49 @@ def test(input_json):
     
     def accessibilityToLivability (DistanceMatrix,subdomainsAccessibility, SubdomainAttributeDict):
     
-    livability = pd.DataFrame(index=DistanceMatrix.index, columns=subdomainsAccessibility.columns)
-    livability.fillna(0, inplace=True)
+        livability = pd.DataFrame(index=DistanceMatrix.index, columns=subdomainsAccessibility.columns)
+        livability.fillna(0, inplace=True)
+        
+        # find a set of unique domains, to which subdomains are aggregated
+        
+        temp = []
+    
+        for key, values in SubdomainAttributeDict.items():
+          domain = SubdomainAttributeDict[key]['domain']
+          for item in domain:
+            if ',' in item:
+              domain_list = item.split(',')
+              SubdomainAttributeDict[key]['domain'] = domain_list
+              for domain in domain_list:
+                temp.append(domain) 
+            else:
+              if item != 0: 
+                  temp.append(item)  
+        
+        domainsUnique = list(set(temp))
+             
+        for domain in domainsUnique:
+            livability[domain] = 0
     
-    # find a set of unique domains, to which subdomains are aggregated
     
-    temp = []
-
-    for key, values in SubdomainAttributeDict.items():
-      domain = SubdomainAttributeDict[key]['domain']
-      for item in domain:
-        if ',' in item:
-          domain_list = item.split(',')
-          SubdomainAttributeDict[key]['domain'] = domain_list
-          for domain in domain_list:
-            temp.append(domain) 
-        else:
-          if item != 0: 
-              temp.append(item)  
-    
-    domainsUnique = list(set(temp))
-         
-    for domain in domainsUnique:
-        livability[domain] = 0
-
-
-    # remap accessibility to livability points
-    
-    for key, values in SubdomainAttributeDict.items():
-        threshold = float(SubdomainAttributeDict[key]['thresholds'])
-        max_livability = float(SubdomainAttributeDict[key]['max_points'])
-        domain = SubdomainAttributeDict[key]['domain']
-        sqm_per_employee = str(SubdomainAttributeDict[key]['sqmPerEmpl'])
-
-        if key in subdomainsAccessibility.columns:
-            livability_score = remap(subdomainsAccessibility[key], 0, threshold, 0, max_livability)
-            livability.loc[subdomainsAccessibility[key] >= threshold, key] = max_livability
-            livability.loc[subdomainsAccessibility[key] < threshold, key] = livability_score
-            if any(domain):
-                for item in domain:
-                    livability.loc[subdomainsAccessibility[key] >= threshold, domain] += max_livability
-                    livability.loc[subdomainsAccessibility[key] < threshold, domain] += livability_score
+        # remap accessibility to livability points
         
-    return livability
+        for key, values in SubdomainAttributeDict.items():
+            threshold = float(SubdomainAttributeDict[key]['thresholds'])
+            max_livability = float(SubdomainAttributeDict[key]['max_points'])
+            domain = SubdomainAttributeDict[key]['domain']
+            sqm_per_employee = str(SubdomainAttributeDict[key]['sqmPerEmpl'])
+    
+            if key in subdomainsAccessibility.columns:
+                livability_score = remap(subdomainsAccessibility[key], 0, threshold, 0, max_livability)
+                livability.loc[subdomainsAccessibility[key] >= threshold, key] = max_livability
+                livability.loc[subdomainsAccessibility[key] < threshold, key] = livability_score
+                if any(domain):
+                    for item in domain:
+                        livability.loc[subdomainsAccessibility[key] >= threshold, domain] += max_livability
+                        livability.loc[subdomainsAccessibility[key] < threshold, domain] += livability_score
+            
+        return livability