Update app.py

app.py

@@ -225,7 +225,7 @@ def test(input_json):
         
         #livability.drop(columns='Workplaces', inplace=True)
 
-    
+        templist = []
         # remap accessibility to livability points
         
         for key, values in SubdomainAttributeDict.items():
@@ -243,22 +243,23 @@ def test(input_json):
                             livability.loc[subdomainsAccessibility[key] >= threshold, item] += max_livability
                             livability.loc[subdomainsAccessibility[key] < threshold, item] += livability_score
                 
-                livability['Workplaces'] = 0
-                
+                                
             elif key == 'commercial':
                 livability_score = remap(subdomainsAccessibility['jobs'], 0, threshold, 0, max_livability)
                 livability.loc[subdomainsAccessibility['jobs'] >= threshold, domain[0]] = max_livability
                 livability.loc[subdomainsAccessibility['jobs'] < threshold, domain[0]] = livability_score
-            
-
+                if subdomainsAccessibility['jobs'] >= threshold:
+                    templist.append(max_livability)
+                else:
+                    templist.append(livability_score)
         #livability = livability.rename(columns={'jobs': 'Workplaces'})
 
-        return livability
+        return [livability, templist]
     
     
     
 
-    livability = accessibilityToLivability(df_matrix,subdomainsAccessibility,attributeMapperDict,domainsUnique)
+    livability, templist = accessibilityToLivability(df_matrix,subdomainsAccessibility,attributeMapperDict,domainsUnique)
     
 
     livability_dictionary = livability.to_dict('index')
@@ -271,7 +272,8 @@ def test(input_json):
         "livability_dictionary": livability_dictionary,
         "subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
         "luDomainMapper": landuseMapperDict,
-        "attributeMapper": attributeMapperDict
+        "attributeMapper": attributeMapperDict,
+        "workplaces":templist
     }