Upload 4 files

app.py

@@ -7,6 +7,8 @@ from data.geometry import fetch_gis_subdivisions, has_associated_features
 from data.hotosm import download_hotosm_data
 from data.ckan import download_resource_ckan
 
+from analysis import run_analyses
+
 # Discover available hazard modules dynamically
 def get_available_hazards():
     hazard_dir = "hazards"
@@ -33,6 +35,7 @@ with gr.Blocks(title="Hazard Raster Downloader") as demo:
     generate_btn = gr.Button("Generate Raster", visible=False)
     status_text = gr.Markdown("")
     file_output = gr.Files(label="Downloads", interactive=False)
+    analysis_output = gr.Markdown("", label="Analysis Results")
 
     def wrapper(hazard, iso, rp, subdivision):
         # Dynamic import of selected hazard module
@@ -41,9 +44,14 @@ with gr.Blocks(title="Hazard Raster Downloader") as demo:
             generate_func = getattr(hazard_module, f"generate_{hazard}_raster")
         except (ModuleNotFoundError, AttributeError):
             return [], f"❌ Error: No raster generation function found for hazard '{hazard}'."
-
+        
+        # Extract just the subdivision name if it's not the country-level option
+        subdivision_name = None
+        if subdivision and not subdivision.endswith("(Country level)"):
+            subdivision_name = subdivision
+        
         # Generate raster
-        raster_path, msg = generate_func(iso, rp, subdivision)
+        raster_path, msg = generate_func(iso, rp, subdivision_name)
 
         iso3 = iso.split(",")[-1].strip() if "," in iso else iso
 
@@ -69,25 +77,46 @@ with gr.Blocks(title="Hazard Raster Downloader") as demo:
             files.extend(admin_path)
         if pop_paths:
             files.extend(pop_paths)
+        # Run all available analyses
+        analysis_results = run_analyses(
+            raster_path=raster_path,
+            pp_path=pp_path,
+            roads_path=roads_path,
+            buildings_path=buildings_path,
+            admin_path=admin_path,
+            pop_paths=pop_paths
+        )
+        
+        if analysis_results:
+            analysis_msg = analysis_results
+        else:
+            analysis_msg = "✅ No analyses could be run."
+        
         if not files:
             msg += " ⚠️ No data could be downloaded."
-
-        return files, msg
+        return files, msg, analysis_msg
 
     def get_subdivision_options(iso_code):
-        has_features, _ = has_associated_features(iso_code)
+        has_features, data = has_associated_features(iso_code)
+        subdivisions = fetch_gis_subdivisions(iso_code)
+
+        # Lookup the country name from iso_options
+        country_name = next((name for name, code in iso_options if code == iso_code), iso_code)
+
         if not has_features:
-            subdivisions = fetch_gis_subdivisions(iso_code)
+            # Only subdivisions available
             return (
                 gr.update(choices=subdivisions, visible=True, value=None),
                 gr.update(visible=False),
-                gr.update(value="✅ Subdivisions loaded. Please select one.")
+                gr.update(value=f"✅ Subdivisions loaded for {country_name}. Please select one.")
             )
         else:
+            # Add the whole country as the first option
+            country_option = f"{country_name} (Country level)"
             return (
+                gr.update(choices=[country_option] + subdivisions, visible=True, value=country_option),
                 gr.update(visible=False),
-                gr.update(visible=True),
-                gr.update(value="")
+                gr.update(value=f"✅ Country and subdivisions loaded for {country_name}. You may choose either.")
             )
 
     iso_input.change(
@@ -109,7 +138,7 @@ with gr.Blocks(title="Hazard Raster Downloader") as demo:
     generate_btn.click(
         fn=wrapper,
         inputs=[hazard_input, iso_input, rp_input, subdivision_input],
-        outputs=[file_output, status_text]
+        outputs=[file_output, status_text, analysis_output]
     )
 
 if __name__ == "__main__":