Update app.py

app.py

@@ -217,36 +217,22 @@ def test(input_json):
     
     
     from imports_utils import landusesToSubdomains
-
-    """
-    def landusesToSubdomains(DistanceMatrix, LanduseDf, LanduseToSubdomainDict, UniqueSubdomainsList):
-        df_LivabilitySubdomainsArea = pd.DataFrame(0, index=DistanceMatrix.index, columns=UniqueSubdomainsList)
+    from imports_utils import FindWorkplacesNumber
     
-        for subdomain in UniqueSubdomainsList:
-            for lu, lu_subdomain in LanduseToSubdomainDict.items():
-                if lu_subdomain == subdomain:
-                    if lu in LanduseDf.columns:
-                        df_LivabilitySubdomainsArea[subdomain] = df_LivabilitySubdomainsArea[subdomain].add(LanduseDf[lu], fill_value=0)
-                    else:
-                        print(f"Warning: Column '{lu}' not found in landuse database")
-    
-        return df_LivabilitySubdomainsArea
 
-    
-    """
     LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_landuses_filtered,landuseMapperDict,subdomainsUnique)
     
 
 
 
-    
-    def FindWorkplaces (DistanceMatrix,SubdomainAttributeDict,destinationWeights,UniqueSubdomainsList ):
+    """
+    def FindWorkplacesNumber (DistanceMatrix,SubdomainAttributeDict,destinationWeights,UniqueSubdomainsList ):
         
         df_LivabilitySubdomainsWorkplaces = pd.DataFrame(0, index=DistanceMatrix.index, columns=['jobs'])
     
         for subdomain in UniqueSubdomainsList:
           for key, value_list in SubdomainAttributeDict.items():
-            sqm_per_empl = float(SubdomainAttributeDict[subdomain]['sqmPerEmpl'])  #[0])
+            sqm_per_empl = float(SubdomainAttributeDict[subdomain]['sqmPerEmpl'])  
             if key in destinationWeights.columns and key == subdomain:
               if sqm_per_empl > 0:
                 df_LivabilitySubdomainsWorkplaces['jobs'] += (round(destinationWeights[key] / sqm_per_empl,2)).fillna(0)
@@ -255,8 +241,8 @@ def test(input_json):
     
         return df_LivabilitySubdomainsWorkplaces
 
-
-    WorkplacesNumber = FindWorkplaces(df_dm,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
+    """
+    WorkplacesNumber = FindWorkplacesNumber(df_dm,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
     
     # prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
     LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)