Update app.py

app.py

@@ -111,6 +111,29 @@ def test(input_json):
     LivabilitySubdomainsWeights_dictionary = LivabilitySubdomainsWeights.to_dict('index')
 
 
+
+    
+    def FindWorkplaces (DistanceMatrix,SubdomainAttributeDict,destinationWeights,UniqueSubdomainsList ):
+        
+        df_LivabilitySubdomainsWorkplaces = pd.DataFrame(0, index=DistanceMatrix.index, columns=['jobs'])
+    
+        for domain in UniqueSubdomainsList:
+          for key, value_list in SubdomainAttributeDict.items():
+            sqm_per_empl = float(SubdomainAttributeDict[domain][0])
+            if key in destinationWeights.columns and key == domain:
+              if sqm_per_empl > 0:
+                df_LivabilitySubdomainsWorkplaces['jobs'] += (round(destinationWeights[key] / sqm_per_empl,2)).fillna(0)
+              else:
+                df_LivabilitySubdomainsWorkplaces['jobs'] += 0
+    
+        return df_LivabilitySubdomainsWorkplaces
+
+
+    WorkplacesNumber = FindWorkplaces(df_matrix,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
+
+    LivabilitySubdomainsWeights =pd.concat([df_LivabilitySubdomainsArea, df_LivabilitySubdomainsWorkplaces], axis=1)
+
+    
     
     def computeAccessibility (DistanceMatrix,weightsNames, destinationWeights=None,alpha = 0.0038, threshold = 600):
     
@@ -152,7 +175,13 @@ def test(input_json):
         # remap accessibility to livability points
         
         for key, values in SubdomainAttributeDict.items():
-            if key in subdomainsAccessibility.columns:
+            if key == 'commercial':
+                threshold = float(SubdomainAttributeDict['commercial'][1])
+                max_livability = float(SubdomainAttributeDict['commercial'][2])
+                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:
                 domain = [str(item) for item in SubdomainAttributeDict[key]['domain']]
                 threshold = float(SubdomainAttributeDict[key]['thresholds'])
                 max_livability = float(SubdomainAttributeDict[key]['max_points'])
@@ -165,7 +194,7 @@ def test(input_json):
                     for item in domain:
                         livability.loc[subdomainsAccessibility[key] >= threshold, item] += max_livability
                         livability.loc[subdomainsAccessibility[key] < threshold, item] += livability_score
-
+            
 
         return livability