Update app.py

app.py

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