ui: move preserve_edge_directions to engine page

preserve_edge_directions parameter is moved from settings page
to engine page.

tomorrowcities/assets/custom.css

@@ -31,9 +31,18 @@ header {
 }
 
 .v-input--selection-controls .v-input__slot  {
-	margin-top: 10px;
+	margin-top: 0px;
 	position: relative;
-	padding: 4px;
+	padding: 0px;
+}
+
+.v-input--selection-controls {
+    margin-top: 4px;
+    padding-top: 2px;
+}
+
+.v-input--checkbox {
+    height: 100%;
 }
 
 .col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto {

tomorrowcities/pages/engine.py

@@ -23,7 +23,7 @@ import pickle
 import datetime
 from . import storage, user, session_storage, store_in_session_storage, read_from_session_storage, config
 from .settings import landslide_max_trials
-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,\
+from .settings import threshold_flood_ds2, threshold_flood_ds3, threshold_flood_ds4, threshold_flood_distance, threshold_road_water_height, threshold_culvert_water_height,\
                       population_displacement_consensus
 from ..backend.engine import compute, compute_power_infra, compute_road_infra, generate_exposure, \
     create_tally, generate_metrics
@@ -49,6 +49,7 @@ def create_new_app_state():
     'datetime_analysis': datetime.datetime.utcnow(),
     'landslide_trigger_level': solara.reactive('moderate'),
     'landslide_trigger_level_list': ['minor','moderate','severe'],
+    'preserve_edge_directions': solara.reactive(False),
     'earthquake_intensity_unit': solara.reactive('m/s2'),
     'earthquake_simulation_methods': ["legacy","monte carlo"],
     'earthquake_simulation_method_selected': solara.reactive('legacy'),
@@ -1371,6 +1372,7 @@ def ExecutePanel():
             intensity = layers.value['layers']['intensity']['data'].value
             fragility = layers.value['layers']['road fragility']['data'].value
             earthquake_intensity_unit = layers.value['earthquake_intensity_unit'].value
+            preserve_edge_directions = layers.value['preserve_edge_directions'].value
             if layers.value['hazard'].value == 'landslide':
                 fragility = layers.value['layers']['landslide fragility']['data'].value
                 trigger_level= layers.value['landslide_trigger_level'].value
@@ -1392,7 +1394,7 @@ def ExecutePanel():
                     household_hospital_access, individual_facility_access  = \
                 compute_road_infra(buildings, household, individual, nodes, edges, intensity, 
                 fragility, hazard, threshold_road_water_height.value, threshold_culvert_water_height.value,
-                threshold_flood_distance.value, preserve_edge_directions.value,
+                threshold_flood_distance.value, preserve_edge_directions,
                 earthquake_intensity_unit=earthquake_intensity_unit,
                 policies=policies,
                 cdf_median_increase_in_percent=cdf_median_increase_in_percent,
@@ -1422,6 +1424,7 @@ def ExecutePanel():
             fragility = layers.value['layers']['power fragility']['data'].value
             hazard = layers.value['hazard'].value
             earthquake_intensity_unit = layers.value['earthquake_intensity_unit'].value
+            preserve_edge_directions = layers.value['preserve_edge_directions'].value
             threshold_flood = [threshold_flood_ds2.value, threshold_flood_ds3.value, threshold_flood_ds4.value]
 
             if layers.value['hazard'].value == 'landslide':
@@ -1440,7 +1443,7 @@ def ExecutePanel():
                                     intensity,
                                     fragility,
                                     hazard, threshold_flood, threshold_flood_distance.value,
-                                    preserve_edge_directions.value,
+                                    preserve_edge_directions,
                                     earthquake_intensity_unit=earthquake_intensity_unit,
                                     )
             
@@ -1606,6 +1609,12 @@ def ExecutePanel():
         solara.Markdown("#### Infrastructure")
         with solara.Row(justify="left"):
             solara.ToggleButtonsMultiple(value=layers.value['infra'].value, on_value=layers.value['infra'].set, values=["building","power","road"])
+        # preserve_edge_directions is only used for graph-based inputs (power and road)
+        if set(layers.value['infra'].value) & set(['power','road']):
+            with solara.Row(justify="left", style="min-height: 0px"):
+                with solara.Tooltip('Obey the edge directions in road/power networks (default: False)'):
+                    solara.Checkbox(label='Preserve directions', value=layers.value['preserve_edge_directions'])
+                solara.Button(icon_name="mdi-help-box", attributes={"href": "https://github.com/TomorrowsCities/tomorrowscities/wiki/4%E2%80%90Engine#parameters", "target": "_blank"}, text=True, outlined=False)
         solara.Markdown("#### Hazard")
         with solara.Row(justify="left"):
             solara.ToggleButtonsSingle(value=layers.value['hazard'].value, on_value=layers.value['hazard'].set, values=layers.value['hazard_list'])

tomorrowcities/pages/settings.py

@@ -13,7 +13,6 @@ threshold_flood_ds4 = solara.reactive(0.50)
 threshold_flood_distance = solara.reactive(10)
 threshold_road_water_height = solara.reactive(0.3) 
 threshold_culvert_water_height = solara.reactive(1.5)
-preserve_edge_directions = solara.reactive(False)
 population_displacement_consensus = solara.reactive(2)
 
 @solara.component
@@ -23,9 +22,6 @@ def Page(name: Optional[str] = None, page: int = 0, page_size=100):
                      subtitle='Minimum number of direct damage, inaccessibility or power lost should be observed to claim a population displacement.'):
         solara.Select(label='population displacement consensus', values=[1,2,3,4], value=population_displacement_consensus)
 
-    with solara.Card(title='Connectivity Parameters',subtitle='Parameters effecting connectivity analysis in road/power networks'):
-        solara.Checkbox(label='Preserve directions in graph edges', value=preserve_edge_directions)
-
     with solara.Card(title='Landslide Parameters',subtitle='Choose the parameters for the landslide simulation'):
         solara.SliderInt(label='Number of Monte-Carlo Trials', value=landslide_max_trials, min=1,max=100)