Update DEM and Slope

app.py

@@ -177,45 +177,44 @@ def get_wayback_data():
 
         # Parse XML
         root = ET.fromstring(response.content)
+
         ns = {
-            "wmts": "http://www.opengis.net/wmts/1.0",
-            "ows": "http://www.opengis.net/ows/1.1",
-            "xlink": "http://www.w3.org/1999/xlink",
+            "wmts": "https://www.opengis.net/wmts/1.0",
+            "ows": "https://www.opengis.net/ows/1.1",
+            "xlink": "https://www.w3.org/1999/xlink",
         }
 
+        # Use a robust XPath to find all 'Layer' elements anywhere in the document.
+        # This is less brittle than specifying the full path.
         layers = root.findall(".//wmts:Contents/wmts:Layer", ns)
 
         layer_data = []
         for layer in layers:
-            title_element = layer.find("ows:Title", ns)
-            resource_element = layer.find("wmts:ResourceURL", ns)
+            title = layer.find("ows:Title", ns)
+            identifier = layer.find("ows:Identifier", ns)
+            resource = layer.find("wmts:ResourceURL", ns)  # Tile URL template
 
-            # Skip layer if essential elements are missing
-            if title_element is None or resource_element is None:
-                continue
-            
-            title_text = title_element.text
-            url_template = resource_element.get("template")
+            title_text = title.text if title is not None else "N/A"
+            identifier_text = identifier.text if identifier is not None else "N/A"
+            url_template = resource.get("template") if resource is not None else "N/A"
 
             layer_data.append({"Title": title_text, "ResourceURL_Template": url_template})
 
         wayback_df = pd.DataFrame(layer_data)
-
-        if wayback_df.empty:
-            print("Warning: No valid Wayback layers were found in the XML data.")
-            return wayback_df
-
         wayback_df["date"] = pd.to_datetime(wayback_df["Title"].str.extract(r"(\d{4}-\d{2}-\d{2})").squeeze(), errors="coerce")
-        # Drop rows where a date could not be parsed
-        wayback_df.dropna(subset=['date'], inplace=True)
-        
         wayback_df.set_index("date", inplace=True)
-        wayback_df.sort_index(ascending=False, inplace=True) # Sort with the latest first
         return wayback_df
 
-    except (requests.exceptions.RequestException, ET.ParseError, KeyError) as e:
-        print(f"Could not fetch or parse Wayback data: {e}")
-        return pd.DataFrame() # Return empty dataframe on failure
+    except requests.exceptions.RequestException as e:
+        print(f"Could not fetch Wayback data from URL: {e}")
+        return pd.DataFrame()
+    except ET.ParseError as e:
+        print(f"Could not parse Wayback XML data: {e}")
+        return pd.DataFrame()
+    except Exception as e:
+        print(f"An unexpected error occurred in get_wayback_data: {e}")
+        return pd.DataFrame() 
+
 
 def get_dem_slope_maps(ee_geometry, map_center, zoom=12, wayback_url=None, wayback_title=None):
     """Creates DEM and Slope maps from SRTM data, using wayback tiles as a basemap if available."""
@@ -363,12 +362,22 @@ def process_and_display(file_obj, url_str, buffer_m, progress=gr.Progress()):
         return None, f"Error processing file: {e}", None, None, None, None, None
 
     progress(0.5, desc="Generating maps and stats...")
-    
+
+
+    # Pass map_center to the function
+    ee_geometry = ee.Geometry(json.loads(geometry_gdf.to_crs(4326).to_json())['features'][0]['geometry'])
+    dem_html, slope_html = get_dem_slope_maps(ee_geometry, map_center, wayback_url=wayback_url, wayback_title=wayback_title)
+
+
+    # Create main map with folium using the calculated center
+    m = folium.Map()
+
     # --- Generate Maps ---
-    wayback_url, wayback_title = None, None
     if not WAYBACK_DF.empty:
+        # Select the first row, which is the most recent date after sorting
         latest_item = WAYBACK_DF.iloc[0]
         wayback_title = f"Esri Wayback ({latest_item.name.strftime('%Y-%m-%d')})"
+        print(wayback_title)
         wayback_url = (
             latest_item["ResourceURL_Template"]
             .replace("{TileMatrixSet}", "GoogleMapsCompatible")
@@ -376,25 +385,15 @@ def process_and_display(file_obj, url_str, buffer_m, progress=gr.Progress()):
             .replace("{TileRow}", "{y}")
             .replace("{TileCol}", "{x}")
         )
-        
-    # **NEW**: Calculate map center from the geometry's bounds
-    bounds = geometry_gdf.to_crs(epsg=4326).total_bounds
-    map_center = [(bounds[1] + bounds[3]) / 2, (bounds[0] + bounds[2]) / 2]
-
-    # **MODIFIED**: Pass map_center to the function
-    ee_geometry = ee.Geometry(json.loads(geometry_gdf.to_crs(4326).to_json())['features'][0]['geometry'])
-    dem_html, slope_html = get_dem_slope_maps(ee_geometry, map_center, wayback_url=wayback_url, wayback_title=wayback_title)
-
-    # Create main map with folium using the calculated center
-    m = folium.Map(location=map_center)
-    
-    if wayback_url:
-        print("added wayback layer")
         folium.TileLayer(tiles=wayback_url, attr="Esri", name=wayback_title).add_to(m)
-        
-    m = add_geometry_to_map(m, geometry_gdf, buffer_geometry_gdf)
+                
+    m = add_geometry_to_map(m, geometry_gdf, buffer_geometry_gdf, opacity=0.3)
     m.add_child(folium.LayerControl())
-    m.fit_bounds([[bounds[1], bounds[0]], [bounds[3], bounds[2]]])
+
+    # Fit the map view to the bounds of the geometry
+    bounds = geometry_gdf.to_crs(epsg=4326).total_bounds
+    map_bounds = [[bounds[1], bounds[0]], [bounds[3], bounds[2]]] # Format: [[south, west], [north, east]]
+    m.fit_bounds(map_bounds, padding=(10, 10))
 
     # ... (rest of the function remains the same) ...
     stats_df = pd.DataFrame({