Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
@@ -32,7 +32,7 @@ else:
|
|
32 |
landuse_attributes = fetch_all_database_pages(notion, landuseDatabaseId)
|
33 |
livability_attributes = fetch_all_database_pages(notion, subdomainAttributesDatabaseId)
|
34 |
landuseMapperDict = fetchDomainMapper (landuse_attributes)
|
35 |
-
|
36 |
|
37 |
|
38 |
|
@@ -174,12 +174,12 @@ def test(input_json):
|
|
174 |
|
175 |
# find a set of unique domains, to which subdomains are aggregated
|
176 |
temp = []
|
177 |
-
for key, values in
|
178 |
-
domain =
|
179 |
for item in domain:
|
180 |
if ',' in item:
|
181 |
domain_list = item.split(',')
|
182 |
-
|
183 |
for domain in domain_list:
|
184 |
temp.append(domain)
|
185 |
else:
|
@@ -211,7 +211,7 @@ def test(input_json):
|
|
211 |
|
212 |
LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_lu_filtered,landuseMapperDict,subdomainsUnique)
|
213 |
|
214 |
-
WorkplacesNumber = FindWorkplacesNumber(df_dm,
|
215 |
|
216 |
# prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
|
217 |
LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
|
@@ -226,7 +226,7 @@ def test(input_json):
|
|
226 |
if 'jobs' not in subdomainsAccessibility.columns:
|
227 |
print("Error: Column 'jobs' does not exist in the subdomainsAccessibility.")
|
228 |
|
229 |
-
livability = accessibilityToLivability(df_dm,AccessibilityInputs,
|
230 |
|
231 |
|
232 |
livability_dictionary = livability.to_dict('index')
|
@@ -244,7 +244,7 @@ def test(input_json):
|
|
244 |
"livability_dictionary": livability_dictionary,
|
245 |
"subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
|
246 |
"luDomainMapper": landuseMapperDict,
|
247 |
-
"attributeMapper":
|
248 |
"fetchDm": dm_dictionary,
|
249 |
"landuses":df_lu_filtered_dict
|
250 |
}
|
|
|
32 |
landuse_attributes = fetch_all_database_pages(notion, landuseDatabaseId)
|
33 |
livability_attributes = fetch_all_database_pages(notion, subdomainAttributesDatabaseId)
|
34 |
landuseMapperDict = fetchDomainMapper (landuse_attributes)
|
35 |
+
livabilityMapperDict = fetchSubdomainMapper (livability_attributes)
|
36 |
|
37 |
|
38 |
|
|
|
174 |
|
175 |
# find a set of unique domains, to which subdomains are aggregated
|
176 |
temp = []
|
177 |
+
for key, values in livabilityMapperDict.items():
|
178 |
+
domain = livabilityMapperDict[key]['domain']
|
179 |
for item in domain:
|
180 |
if ',' in item:
|
181 |
domain_list = item.split(',')
|
182 |
+
livabilityMapperDict[key]['domain'] = domain_list
|
183 |
for domain in domain_list:
|
184 |
temp.append(domain)
|
185 |
else:
|
|
|
211 |
|
212 |
LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_lu_filtered,landuseMapperDict,subdomainsUnique)
|
213 |
|
214 |
+
WorkplacesNumber = FindWorkplacesNumber(df_dm,livabilityMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
|
215 |
|
216 |
# prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
|
217 |
LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
|
|
|
226 |
if 'jobs' not in subdomainsAccessibility.columns:
|
227 |
print("Error: Column 'jobs' does not exist in the subdomainsAccessibility.")
|
228 |
|
229 |
+
livability = accessibilityToLivability(df_dm,AccessibilityInputs,livabilityMapperDict,domainsUnique)
|
230 |
|
231 |
|
232 |
livability_dictionary = livability.to_dict('index')
|
|
|
244 |
"livability_dictionary": livability_dictionary,
|
245 |
"subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
|
246 |
"luDomainMapper": landuseMapperDict,
|
247 |
+
"attributeMapper": livabilityMapperDict,
|
248 |
"fetchDm": dm_dictionary,
|
249 |
"landuses":df_lu_filtered_dict
|
250 |
}
|