Integrated road network analysis into metric3

Using hospital_access attribute in household layer
is used to update metric3.

tomorrowcities/backend/engine.py

@@ -496,9 +496,10 @@ def compute(gdf_landuse, gdf_buildings, df_household, df_individual,gdf_intensit
     return bld_hazard
 
 
-def calculate_metrics(gdf_buildings, df_household, df_individual, hazard_type, policies=[],capacity=1.0):
+def calculate_metrics(gdf_buildings, df_household, df_individual, infra, hazard_type, policies=[],capacity=1.0):
     # only use necessary columns
-    bld_hazard = gdf_buildings[['bldid','ds','expstr','occupancy','storeys','code_level','material','nhouse','residents']]
+    bld_hazard = gdf_buildings[['bldid','ds','expstr','occupancy','storeys',
+                                'code_level','material','nhouse','residents','hospital_access']]
 
     # Find the damage state of the building that the household is in
     df_household_bld = df_household.merge(bld_hazard[['bldid','ds']], on='bldid', how='left',validate='many_to_one')
@@ -582,7 +583,10 @@ def calculate_metrics(gdf_buildings, df_household, df_individual, hazard_type, p
     df_metric2['metric2'] = df_metric2['metric2'].fillna(0).astype(int)
 
     # metric 3 number of households in each building with no access to hospitals
-    df_hospitals_per_household = df_hospitals[df_hospitals['ds'] > thresholds['metric3']].groupby(
+    metric3_index = df_hospitals['ds'] > thresholds['metric3']
+    if 'road' in infra:
+        metric3_index = (metric3_index) | (df_hospitals['hospital_access'] == False)
+    df_hospitals_per_household = df_hospitals[metric3_index].groupby(
         'bldid',as_index=False).agg({'hhid':'count'})
 
     df_metric3 = bld_hazard.merge(df_hospitals_per_household,how='left',left_on='bldid',right_on='bldid')[['bldid','nhouse','hhid']]

tomorrowcities/pages/engine.py

@@ -989,7 +989,7 @@ def ExecutePanel():
             print(buildings.head())
             print('number of damaged roads/bridges',len(edges[edges['is_damaged']]))
 
-            return edges, buildings
+            return edges, buildings, household
 
         def execute_power():
             nodes = layers.value['layers']['power nodes']['data'].value
@@ -1039,6 +1039,14 @@ def ExecutePanel():
                 layers.value['hazard'].value,policies=policies)
             buildings['ds'] = list(df_bld_hazard['ds'])
 
+            return buildings
+
+        def execute_metric():
+            buildings = layers.value['layers']['building']['data'].value
+            household = layers.value['layers']['household']['data'].value
+            individual = layers.value['layers']['individual']['data'].value
+            policies = [p['id'] for _, p in layers.value['policies'].items() if f"{p['label']}/{p['description']}" in layers.value['selected_policies'].value]
+
             implementation_capacity_score = layers.value['implementation_capacity_score'].value
             if implementation_capacity_score == 'medium':
                 capacity = 1.25
@@ -1047,8 +1055,8 @@ def ExecutePanel():
             else:
                 capacity = 1
             computed_metrics, df_metrics = calculate_metrics(buildings, household, 
-                                                             individual, layers.value['hazard'].value, policies=policies,capacity=capacity)
-        
+                                                             individual, layers.value['infra'].value,
+                                                             layers.value['hazard'].value, policies=policies,capacity=capacity)
             print(computed_metrics)
             for metric in df_metrics.keys():
                 buildings[metric] = list(df_metrics[metric][metric])
@@ -1056,6 +1064,7 @@ def ExecutePanel():
                 layers.value['metrics'][metric]['max_value'] = computed_metrics[metric]['max_value']
             return buildings
 
+
         if execute_counter > 0 :
             is_ready, missing = is_ready_to_run(layers.value['infra'].value, layers.value['hazard'].value)
             if not is_ready:
@@ -1065,14 +1074,17 @@ def ExecutePanel():
                 nodes = execute_power()
                 layers.value['layers']['power nodes']['data'].set(nodes)
             if 'road' in layers.value['infra'].value:
-                edges, buildings = execute_road()
+                edges, buildings, household = execute_road()
                 layers.value['layers']['road edges']['data'].set(edges)
                 layers.value['layers']['building']['data'].set(buildings)
-
+                layers.value['layers']['household']['data'].set(household)
             if 'building' in layers.value['infra'].value:
                 buildings = execute_building()
                 layers.value['layers']['building']['data'].set(buildings)
 
+            buildings = execute_metric()
+            layers.value['layers']['building']['data'].set(buildings)
+
             # trigger render event
             layers.value['render_count'].set(layers.value['render_count'].value + 1)
             if 'power' in layers.value['infra'].value: