Update app.py

app.py

@@ -2,9 +2,7 @@ import gradio as gr
 import pandas as pd
 import numpy as np
 import json
-from datetime import datetime, timezone
 
-import geopy
 from geopy import distance
 from geopy.geocoders import Nominatim
 import srtm
@@ -18,12 +16,14 @@ import plotly.graph_objects as go
 # --- GLOBAL SETUP ---
 
 elevation_data = srtm.get_data()
+
 with open("weather_icons_custom.json", "r") as f:
 	icons = json.load(f)
 
 cache_session = requests_cache.CachedSession(".cache", expire_after=3600)
 retry_session = retry(cache_session, retries=5, backoff_factor=0.2)
 openmeteo = openmeteo_requests.Client(session=retry_session)
+
 geolocator = Nominatim(user_agent="snow_finder")
 
 OVERPASS_URL = "https://maps.mail.ru/osm/tools/overpass/api/interpreter"
@@ -68,6 +68,8 @@ def get_elevation_from_srtm(lat, lon):
 	return None
 
 
+# --- PEAK FETCHING (REFACTORED LOGIC) ---
+
 def get_peaks_from_overpass(lat, lon, dist_km):
 	bbox = compute_bbox(lat, lon, dist_km)
 
@@ -168,6 +170,7 @@ def get_weather_for_peaks_iteratively(df_peaks, min_snow_cm, max_results=20, max
 				continue
 
 			idx = 0
+
 			snow_depth_cm = float(hourly.Variables(3).ValuesAsNumpy()[idx]) * 100
 
 			if snow_depth_cm >= min_snow_cm:
@@ -213,14 +216,29 @@ def format_weather_data(df):
 	return df
 
 
+def geocode_location(location_text):
+	try:
+		loc = geolocator.geocode(location_text, timeout=10)
+		if loc:
+			return loc.latitude, loc.longitude, f"Found: {loc.address}"
+		return None, None, f"Location '{location_text}' not found."
+	except Exception as e:
+		return None, None, f"Geocoding error: {e}"
+
+
 # --- CORE LOGIC ---
 
 def find_snowy_peaks(min_snow_cm, radius_km, lat, lon):
 	if lat is None or lon is None:
-		fig = create_map_with_center(DEFAULT_LAT, DEFAULT_LON)
+		fig = create_empty_map(DEFAULT_LAT, DEFAULT_LON)
 		fig.update_layout(title_text="Enter valid coordinates.")
 		return fig, "Please enter coordinates."
 
+	if not (-90 <= lat <= 90 and -180 <= lon <= 180):
+		fig = create_empty_map(DEFAULT_LAT, DEFAULT_LON)
+		fig.update_layout(title_text="Invalid coordinates.")
+		return fig, "Coordinates out of range."
+
 	df_peaks = get_peaks_from_overpass(lat, lon, radius_km)
 	if df_peaks.empty:
 		fig = create_map_with_center(lat, lon)
@@ -239,12 +257,113 @@ def find_snowy_peaks(min_snow_cm, radius_km, lat, lon):
 	return fig, f"🎉 Showing {len(df_final)} snowy peaks with ≥ {min_snow_cm} cm of snow."
 
 
-# --- MAP HELPERS (UNCHANGED) ---
-# create_empty_map, create_map_with_center, create_map_with_results
-# [identical to your original script]
+# --- MAP HELPERS ---
+
+def create_empty_map(lat, lon):
+	fig = go.Figure()
+	fig.update_layout(
+		map=dict(style="open-street-map", center={"lat": lat, "lon": lon}, zoom=8),
+		margin={"r": 0, "t": 40, "l": 0, "b": 0},
+		height=1024,
+		width=1024,
+	)
+	return fig
+
+
+def create_map_with_center(lat, lon):
+	fig = go.Figure(
+		go.Scattermap(
+			lat=[lat],
+			lon=[lon],
+			mode="markers",
+			marker=dict(size=24, color="white", opacity=0.8),
+			hoverinfo="skip",
+		)
+	)
+	fig.add_trace(
+		go.Scattermap(
+			lat=[lat],
+			lon=[lon],
+			mode="markers",
+			marker=dict(size=12, color="red"),
+			text=["Search Center"],
+			hoverinfo="text",
+		)
+	)
+	fig.update_layout(
+		map=dict(style="open-street-map", center={"lat": lat, "lon": lon}, zoom=8),
+		margin={"r": 0, "t": 40, "l": 0, "b": 0},
+		height=1024,
+		width=1024,
+	)
+	return fig
+
+
+def create_map_with_results(lat, lon, df_final):
+	fig = go.Figure()
+
+	fig.add_trace(
+		go.Scattermap(
+			lat=df_final["latitude"],
+			lon=df_final["longitude"],
+			mode="markers",
+			marker=dict(size=24, color="white", opacity=0.8),
+			hoverinfo="skip",
+		)
+	)
+
+	fig.add_trace(
+		go.Scattermap(
+			lat=df_final["latitude"],
+			lon=df_final["longitude"],
+			mode="markers",
+			marker=dict(size=12, color="blue"),
+			customdata=df_final[
+				["name", "altitude", "distance_km", "snow_depth_cm",
+				 "weather_desc", "temp_c_str"]
+			],
+			hovertemplate=(
+				"<b>%{customdata[0]}</b><br>"
+				"Altitude: %{customdata[1]} m<br>"
+				"Distance: %{customdata[2]} km<br>"
+				"<b>❄️ Snow: %{customdata[3]} cm</b><br>"
+				"Weather: %{customdata[4]}<br>"
+				"🌡 Temp: %{customdata[5]}<extra></extra>"
+			),
+		)
+	)
+
+	fig.add_trace(
+		go.Scattermap(
+			lat=[lat],
+			lon=[lon],
+			mode="markers",
+			marker=dict(size=24, color="white", opacity=0.8),
+			hoverinfo="skip",
+		)
+	)
+	fig.add_trace(
+		go.Scattermap(
+			lat=[lat],
+			lon=[lon],
+			mode="markers",
+			marker=dict(size=12, color="red"),
+			text=["Search Center"],
+			hoverinfo="text",
+		)
+	)
+
+	fig.update_layout(
+		map=dict(style="open-street-map", center={"lat": lat, "lon": lon}, zoom=9),
+		margin={"r": 0, "t": 40, "l": 0, "b": 0},
+		height=1024,
+		width=1024,
+		showlegend=False,
+	)
+	return fig
 
 
-# --- GRADIO UI (UNCHANGED) ---
+# --- GRADIO UI ---
 
 with gr.Blocks(theme=gr.themes.Soft(), title="Snow Finder") as demo:
 	gr.Markdown("# ☃️ Snow Finder for Families")