Update app.py

app.py

@@ -217,40 +217,40 @@ def test(input_json):
     def accessibilityToLivability (DistanceMatrix,subdomainsAccessibility, SubdomainAttributeDict,UniqueDomainsList):
     
         livability = pd.DataFrame(index=DistanceMatrix.index, columns=subdomainsAccessibility.columns)
-        livability.drop(columns='jobs', inplace=True)
-        livability["Workplaces"] = 0
+        #livability.drop(columns='jobs', inplace=True)
+        #livability["Workplaces"] = 0
         livability.fillna(0, inplace=True)
         
              
         for domain in UniqueDomainsList:
             livability[domain] = 0
-    
+        
+        livability.drop(columns='Workplaces', inplace=True)
     
         # remap accessibility to livability points
         
         for key, values in SubdomainAttributeDict.items():
+            threshold = float(SubdomainAttributeDict[key]['thresholds'])
+            max_livability = float(SubdomainAttributeDict[key]['max_points'])
+            domain = [str(item) for item in SubdomainAttributeDict[key]['domain']]
+            """
             if key == 'commercial':
-                threshold = float(SubdomainAttributeDict[key]['thresholds'])
-                max_livability = float(SubdomainAttributeDict[key]['max_points'])
                 livability_score = remap(subdomainsAccessibility['jobs'], 0, threshold, 0, max_livability)
                 livability.loc[subdomainsAccessibility['jobs'] >= threshold, 'Workplaces'] = max_livability
                 livability.loc[subdomainsAccessibility['jobs'] < threshold, 'Workplaces'] = livability_score
-            elif key in subdomainsAccessibility.columns and key != 'commercial':
-                domain = [str(item) for item in SubdomainAttributeDict[key]['domain']]
-                threshold = float(SubdomainAttributeDict[key]['thresholds'])
-                max_livability = float(SubdomainAttributeDict[key]['max_points'])
-                sqm_per_employee = 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:
-                        if domain != 'Workplaces':
-                            livability.loc[subdomainsAccessibility[key] >= threshold, item] += max_livability
-                            livability.loc[subdomainsAccessibility[key] < threshold, item] += livability_score
+                        livability.loc[subdomainsAccessibility[key] >= threshold, item] += max_livability
+                        livability.loc[subdomainsAccessibility[key] < threshold, item] += livability_score
             
 
+        livability = livability.rename(columns={'jobs': 'Workplaces'})
+
         return livability