Update app.py

app.py

@@ -164,8 +164,9 @@ def soil_recognizer_page():
             st.write(f"{cls}: {score:.2%}")
 
         if st.button("Save to site"):
-            site["Soil Profile"] = predicted_class
-            site["Soil Recognizer Confidence"] = confidence_scores[predicted_class]
+            # Save predicted soil class into Soil Profile field
+            st.session_state["sites"][st.session_state["active_site"]]["Soil Class"] = predicted_class
+            st.session_state["sites"][st.session_state["active_site"]]"Soil Recognizer Confidence"] = confidence_scores[predicted_class]
             save_active_site(site)
             st.success("Saved prediction to active site memory.")
 
@@ -595,43 +596,49 @@ def build_full_geotech_pdf(site: Dict[str, Any], filename: str, include_map_imag
 if "sites" not in st.session_state:
     # initialize with a default site
     st.session_state["sites"] = [{
-        "Soil Profile": None,
+        "Site Name":"home",
+        "Project Name": "Project ",
+        "Soil Class": None,
         "Soil Recognizer Confidence": None,
-        "Site Name":"Home",
-        "Project Name":"Demo Project",
-        "Site ID": 0,
-        "Coordinates":"",
+        "Site ID": idx,
+        "Coordinates": "",
         "lat": None,
         "lon": None,
-        "Project Description":"",
-        "Topography":"",
-        "Drainage":"",
-        "Current Land Use":"",
-        "Regional Geology":"",
+        "Project Description": "",
+        # Site Characterization
+        "Topography": None,              # manual / descriptive topo entry
+        "Drainage": None,                # manual drainage notes
+        "Current Land Use": None,        # can be linked to Environmental Data
+        "Regional Geology": None,        # manual geology notes
+        # Investigations & Lab
         "Field Investigation": [],
         "Laboratory Results": [],
         "GSD": None,
         "USCS": None,
         "AASHTO": None,
         "GI": None,
+        # Geotechnical Parameters
         "Load Bearing Capacity": None,
         "Skin Shear Strength": None,
         "Relative Compaction": None,
         "Rate of Consolidation": None,
-        "Nature of Construction": None,
-        "Soil Profile": None,
-        "Flood Data": None,
-        "Seismic Data": None,
-        "Environmental Data": None,
-        "Topo Data": None,
+        "Nature of Construction": None
+        # Earth Engine Data
+        "Soil Profile": None,            # SoilGrids (clay/sand/silt etc.)
+        "Flood Data": None,              # JRC Global Surface Water
+        "Seismic Data": None,            # GSHAP Seismic hazard
+        "Environmental Data": None,      # Landcover, forest loss, urban
+        "Topo Data": None,               # SRTM DEM elevation
+        # Map & Visualization
         "map_snapshot": None,
+        # AI / Reporting
         "chat_history": [],
         "classifier_inputs": {},
         "classifier_decision": None,
         "report_convo_state": 0,
         "report_missing_fields": [],
         "report_answers": {}
-    }]
+     })
 
 if "active_site" not in st.session_state:
     st.session_state["active_site"] = 0
@@ -706,31 +713,39 @@ with st.sidebar:
                 "Site Name": new_site_name.strip(),
                 "Project Name": "Project - " + new_site_name.strip(),
                 "Site ID": idx,
-                "Coordinates":"",
+                "Soil Class": None,
+                "Soil Recognizer Confidence": None,
+                "Coordinates": "",
                 "lat": None,
                 "lon": None,
-                "Project Description":"",
-                "Topography":"",
-                "Drainage":"",
-                "Current Land Use":"",
-                "Regional Geology":"",
+                "Project Description": "",
+                # Site Characterization
+                "Topography": None,              # manual / descriptive topo entry
+                "Drainage": None,                # manual drainage notes
+                "Current Land Use": None,        # can be linked to Environmental Data
+                "Regional Geology": None,        # manual geology notes
+                # Investigations & Lab
                 "Field Investigation": [],
                 "Laboratory Results": [],
                 "GSD": None,
                 "USCS": None,
                 "AASHTO": None,
                 "GI": None,
+                # Geotechnical Parameters
                 "Load Bearing Capacity": None,
                 "Skin Shear Strength": None,
                 "Relative Compaction": None,
                 "Rate of Consolidation": None,
-                "Nature of Construction": None,
-                "Soil Profile": None,
-                "Flood Data": None,
-                "Seismic Data": None,
-                "Environmental Data": None,
-                "Topo Data": None,
+                "Nature of Construction": None
+                # Earth Engine Data
+                "Soil Profile": None,            # SoilGrids (clay/sand/silt etc.)
+                "Flood Data": None,              # JRC Global Surface Water
+                "Seismic Data": None,            # GSHAP Seismic hazard
+                "Environmental Data": None,      # Landcover, forest loss, urban
+                "Topo Data": None,               # SRTM DEM elevation
+                # Map & Visualization
                 "map_snapshot": None,
+                # AI / Reporting
                 "chat_history": [],
                 "classifier_inputs": {},
                 "classifier_decision": None,
@@ -738,6 +753,7 @@ with st.sidebar:
                 "report_missing_fields": [],
                 "report_answers": {}
             })
+
             st.success(f"Site '{new_site_name.strip()}' created.")
             st.session_state["active_site"] = idx
             st.rerun()
@@ -993,47 +1009,125 @@ def ocr_page():
 def locator_page():
     st.header("🌍 Locator — Select Area of Interest")
     site = st.session_state["sites"][st.session_state["active_site"]]
+
     st.markdown("You can enter coordinates manually or draw/upload a GeoJSON boundary (draw-mode not available in this minimal example).")
+
     lat = st.number_input("Latitude", value=site.get("lat") or 0.0, format="%.6f", key="locator_lat")
     lon = st.number_input("Longitude", value=site.get("lon") or 0.0, format="%.6f", key="locator_lon")
     site["lat"] = lat; site["lon"] = lon
+
     if st.button("Fetch Earth Data (EE)"):
         if not EE_AVAILABLE:
-            st.error("Earth Engine/Geemap not available in this environment. Please add geemap & earthengine-api to requirements.")
+            st.error("Earth Engine/Geemap not available in this environment. Please add `geemap` & `earthengine-api` to requirements.txt.")
         else:
             try:
-                # Initialize EE if needed
+                # Initialize Earth Engine with service account if not already
                 if not ee.data._credentials:
-                    # try to authenticate via service account string in env
-                    ee_key_json = os.environ.get("EARTH_ENGINE_KEY")
-                    # if provided as JSON string, write to temp file
-                    tmp = tempfile.NamedTemporaryFile(mode="w+", delete=False, suffix=".json")
-                    tmp.write(ee_key_json)
-                    tmp.flush()
-                    ee.Initialize(service_account=os.environ.get("SERVICE_ACCOUNT"), private_key_json=tmp.name)
-                # sample calls (very simple placeholders)
-                st.info("Querying Earth Engine for available layers (this may take a few seconds)...")
-                # NOTE: Detailed real EE reducers and datasets must be added for production.
-                # We'll store placeholder results and attempt to create a simple map snapshot.
-                site["Soil Profile"] = f"Colluvial soils over dolomite (fetched {datetime.today().date()})"
-                site["Flood Data"] = "No major floods in last 20 years (placeholder)"
-                site["Seismic Data"] = "Seismic zone: Moderate; historic events: low"
-                site["Environmental Data"] = "No major environmental constraints found (placeholder)"
-                site["Topo Data"] = "Gentle slope"
-                # Create a simple map via geemap and snapshot it
-                m = geemap.Map(center=[lat, lon], zoom=10)
+                    ee_key_json = os.environ.get("EARTHENGINE_TOKEN")
+                    if ee_key_json:
+                        token_dict = json.loads(ee_key_json)
+                        ee.Initialize(credentials=ee.ServiceAccountCredentials(
+                            email=token_dict["client_email"],
+                            key_data=json.dumps(token_dict)
+                        ))
+                    else:
+                        st.error("No Earth Engine credentials found.")
+                        return
+
+                st.info("Querying Earth Engine datasets... (this may take a few seconds)")
+
+                # ----------------------------
+                # DEM / Topography (SRTM)
+                # ----------------------------
+                dem = ee.Image("USGS/SRTMGL1_003")
+                elevation = dem.sample(region=ee.Geometry.Point([lon, lat]), scale=30).first().get("elevation").getInfo()
+                site["Topo Data"] = f"Elevation: {elevation:.1f} m (from SRTM DEM)"
+
+                # ----------------------------
+                # Flood (JRC Global Surface Water)
+                # ----------------------------
+                gsw = ee.Image("JRC/GSW1_4/GlobalSurfaceWater").select("occurrence")
+                flood_val = gsw.sample(region=ee.Geometry.Point([lon, lat]), scale=30).first().get("occurrence").getInfo()
+                site["Flood Data"] = f"Flood occurrence probability: {flood_val:.1f}%"
+
+                # ----------------------------
+                # Soil (SoilGrids250m from ISRIC)
+                # ----------------------------
+                soil = ee.Image("ISRIC/SoilGrids/2017/original").select("clay_0-5cm_mean")
+                soil_val = soil.sample(region=ee.Geometry.Point([lon, lat]), scale=250).first().get("clay_0-5cm_mean").getInfo()
+                site["Soil Profile"] = f"Surface clay content: {soil_val:.1f} g/kg (SoilGrids)"
+
+                # ----------------------------
+                # Seismic (GSHAP Global Seismic Hazard)
+                # ----------------------------
+                seismic = ee.Image("SEDAC/GSHAPSeismicHazard")
+                seis_val = seismic.sample(region=ee.Geometry.Point([lon, lat]), scale=1000).first().get("gshap").getInfo()
+                site["Seismic Data"] = f"Seismic hazard (PGA, g): {seis_val:.3f}"
+
+                # ----------------------------
+                # Environmental (Landcover, Deforestation, Urbanization)
+                # ----------------------------
+
+                # 1. ESA WorldCover 2020 landcover class
+                landcover = ee.ImageCollection("ESA/WorldCover/v200").first()
+                lc_val = landcover.sample(region=ee.Geometry.Point([lon, lat]), scale=10).first().get("Map").getInfo()
+                landcover_dict = {
+                    10: "Tree Cover",
+                    20: "Shrubland",
+                    30: "Grassland",
+                    40: "Cropland",
+                    50: "Built-up",
+                    60: "Bare / Sparse vegetation",
+                    70: "Snow and Ice",
+                    80: "Permanent Water",
+                    90: "Herbaceous Wetland",
+                    95: "Mangroves",
+                    100: "Moss & Lichen"
+                    }
+                lc_class = landcover_dict.get(lc_val, "Unknown")
+
+                # 2. Hansen Forest Loss (2001–2021)
+                forest = ee.Image("UMD/hansen/global_forest_change_2021_v1_9").select("loss")
+                forest_loss = forest.sample(region=ee.Geometry.Point([lon, lat]), scale=30).first().get("loss").getInfo()
+                forest_status = "Recent forest loss detected" if forest_loss == 1 else "No forest loss detected"
+
+                # 3. Urban footprint (GHSL built-up)
+                urban = ee.Image("JRC/GHSL/P2016/BUILT_LDSMT_GLOBE_V1").select("built")
+                urban_val = urban.sample(region=ee.Geometry.Point([lon, lat]), scale=250).first().get("built").getInfo()
+                urban_status = "Urban area" if urban_val == 1 else "Non-urban area"
+
+                # Combine environmental info
+                site["Environmental Data"] = (
+                    f"Landcover: {lc_class}; "
+                    f"{forest_status};
+                    f"{urban_status}."
+                    )
+                
+
+                # ----------------------------
+                # Map Display
+                # ----------------------------
+                m = geemap.Map(center=[lat, lon], zoom=8)
                 m.add_basemap("SATELLITE")
-                # capture map to PNG (geemap has method to export html; we use to_image if available)
-                try:
-                    img = m.to_image()
-                    buf = io.BytesIO()
-                    img.save(buf, format="PNG")
-                    img_bytes = buf.getvalue()
-                    site["map_snapshot"] = img_bytes
-                    st.image(img_bytes, caption="Map snapshot", use_column_width=True)
-                except Exception:
-                    st.warning("Map snapshot not available in this environment.")
-                st.success("Earth Engine data fetched and saved to site (placeholders).")
+
+                # Add layers with visualization params
+                m.addLayer(dem, {"min": 0, "max": 3000, "palette": ["blue", "green", "brown", "white"]}, "DEM")
+                m.addLayer(gsw, {"min": 0, "max": 100, "palette": ["white", "blue"]}, "Flood Occurrence")
+                m.addLayer(soil, {"min": 0, "max": 600, "palette": ["yellow", "brown", "red"]}, "Soil Clay (0-5cm)")
+                m.addLayer(seismic, {"min": 0, "max": 1, "palette": ["green", "yellow", "red"]}, "Seismic Hazard")
+                m.addLayer(landcover, {"min": 10, "max": 100, "palette": ["006400","ffbb22","ffff4c","f096ff","fa0000","b4b4b4","f0f0f0","0064c8","0096a0","00cf75","fae6a0"]}, "Landcover")
+                m.addLayer(forest, {"palette":["white","green"]}, "Forest Loss")
+                m.addLayer(urban, {"min":0,"max":1,"palette":["white","black"]}, "Urban Footprint")
+
+                m.addLayerControl()
+
+                # Save to /tmp and embed in Streamlit
+                map_file = "/tmp/locator_map.html"
+                m.to_html(map_file)
+                st.components.v1.html(open(map_file, "r").read(), height=600)
+
+                st.success("✅ Earth Engine data fetched and saved to site!")
+
             except Exception as e:
                 st.error(f"Earth Engine error: {e}")
 
@@ -1182,7 +1276,7 @@ page = st.session_state["page"]
 selected = option_menu(
     None,
     ["Home","Soil recognizer","Classifier","GSD","OCR","Locator","RAG","Reports"],
-    icons=["house","graph","journal-code","bar-chart","camera","geo-alt","robot","file-earmark-text"],
+    icons=["house","chart","journal-code","bar-chart","camera","geo-alt","robot","file-earmark-text"],
     menu_icon="cast",
     default_index=["Home","Soil recognizer","Classifier","GSD","OCR","Locator","RAG","Reports"].index(page) if page in ["Home","Soil recognizer","Classifier","GSD","OCR","Locator","RAG","Reports"] else 0,
     orientation="horizontal",