Spaces:
Runtime error
Runtime error
Commit ·
47be833
1
Parent(s): 304afd3
ui: give extra info after data generation
Browse filesWhen the data generation is completed, the ui gives
an extra information stating that the building, household
and individual are created and the user can upload hazard
and vulnerability/fragility data.
The default form of the message is added to the .env.global
file via data_generation_complete_message keyword. The message can be
customized by setting data_generation_complete_message variable in
.env.global or .env.local file. If the key is not defined
the hard-coded string in the code is used.
- .env.global +5 -1
- tomorrowcities/pages/engine.py +7 -2
.env.global
CHANGED
|
@@ -28,4 +28,8 @@ enable_test_logon=False
|
|
| 28 |
aws_access_key_id=
|
| 29 |
aws_secret_access_key=
|
| 30 |
region_name=
|
| 31 |
-
bucket_name=
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
aws_access_key_id=
|
| 29 |
aws_secret_access_key=
|
| 30 |
region_name=
|
| 31 |
+
bucket_name=
|
| 32 |
+
|
| 33 |
+
# User-Interface Messages
|
| 34 |
+
data_generation_complete_message="Building, Household and Individual layers are generated. You can now upload hazard and vulnerability/fragility data!"
|
| 35 |
+
|
tomorrowcities/pages/engine.py
CHANGED
|
@@ -21,7 +21,7 @@ import logging, sys
|
|
| 21 |
#logging.basicConfig(stream=sys.stderr, level=logging.INFO)
|
| 22 |
import pickle
|
| 23 |
import datetime
|
| 24 |
-
from . import storage, user, session_storage, store_in_session_storage, read_from_session_storage
|
| 25 |
from .settings import landslide_max_trials
|
| 26 |
from .settings import threshold_flood_ds2, threshold_flood_ds3, threshold_flood_ds4, threshold_flood_distance, threshold_road_water_height, threshold_culvert_water_height, preserve_edge_directions,\
|
| 27 |
population_displacement_consensus
|
|
@@ -1989,7 +1989,8 @@ def ImportDataZone2():
|
|
| 1989 |
if "geometry" in list(data.columns):
|
| 1990 |
center = (data.geometry.centroid.y.mean(), data.geometry.centroid.x.mean())
|
| 1991 |
layers.value['center'].set(center)
|
| 1992 |
-
|
|
|
|
| 1993 |
layers.value['render_count'].value += 1
|
| 1994 |
|
| 1995 |
def progress(x):
|
|
@@ -2059,6 +2060,10 @@ def ImportDataZone2():
|
|
| 2059 |
set_generate_btn_disabled(True)
|
| 2060 |
solara.Text(generate_message)
|
| 2061 |
solara.ProgressLinear(value=True)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2062 |
else:
|
| 2063 |
#solara.Text("Spacer", style={"visibility": "hidden"})
|
| 2064 |
set_generate_btn_disabled(not is_ready_to_generate())
|
|
|
|
| 21 |
#logging.basicConfig(stream=sys.stderr, level=logging.INFO)
|
| 22 |
import pickle
|
| 23 |
import datetime
|
| 24 |
+
from . import storage, user, session_storage, store_in_session_storage, read_from_session_storage, config
|
| 25 |
from .settings import landslide_max_trials
|
| 26 |
from .settings import threshold_flood_ds2, threshold_flood_ds3, threshold_flood_ds4, threshold_flood_distance, threshold_road_water_height, threshold_culvert_water_height, preserve_edge_directions,\
|
| 27 |
population_displacement_consensus
|
|
|
|
| 1989 |
if "geometry" in list(data.columns):
|
| 1990 |
center = (data.geometry.centroid.y.mean(), data.geometry.centroid.x.mean())
|
| 1991 |
layers.value['center'].set(center)
|
| 1992 |
+
set_generate_message(config.get('data_generation_complete_message',
|
| 1993 |
+
'Building/household/individual layers are ready! You can now upload hazard and vulnerability data.'))
|
| 1994 |
layers.value['render_count'].value += 1
|
| 1995 |
|
| 1996 |
def progress(x):
|
|
|
|
| 2060 |
set_generate_btn_disabled(True)
|
| 2061 |
solara.Text(generate_message)
|
| 2062 |
solara.ProgressLinear(value=True)
|
| 2063 |
+
elif generate_result.state == solara.ResultState.FINISHED and generate_message != "":
|
| 2064 |
+
solara.Success(generate_message)
|
| 2065 |
+
set_generate_btn_disabled(not is_ready_to_generate())
|
| 2066 |
+
solara.ProgressLinear(value=False)
|
| 2067 |
else:
|
| 2068 |
#solara.Text("Spacer", style={"visibility": "hidden"})
|
| 2069 |
set_generate_btn_disabled(not is_ready_to_generate())
|