rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-11 13:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve weather location handling. Use full location string with city, state, and country for better API results.

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-19 17:17:44 -05:00
parent d700316f75
commit ebda8e04a0
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/weather_manager.py
View File

@@ -128,13 +128,28 @@ class WeatherManager:
try: try:
# Fetch new data from OpenWeatherMap API # Fetch new data from OpenWeatherMap API
api_key = self.weather_config.get('api_key') api_key = self.weather_config.get('api_key')
location = self.location.get('city') # Get city from location config
if not location: # Construct full location string
self.logger.error("No location configured for weather") city = self.location.get('city')
state = self.location.get('state')
country = self.location.get('country')
if not city:
self.logger.error("No city configured for weather")
return None return None
# Build location string with state and country if available
location = city
if state:
location += f",{state}"
if country:
location += f",{country}"
units = self.weather_config.get('units', 'imperial') units = self.weather_config.get('units', 'imperial')
# Log the parameters being used
self.logger.info(f"Fetching weather for location: {location}, units: {units}")
# Fetch current weather # Fetch current weather
current_url = "https://api.openweathermap.org/data/2.5/weather" current_url = "https://api.openweathermap.org/data/2.5/weather"
params = { params = {
@@ -144,9 +159,11 @@ class WeatherManager:
} }
try: try:
self.logger.debug(f"Making request to {current_url} with params: {params}")
response = self.session.get(current_url, params=params, timeout=10) response = self.session.get(current_url, params=params, timeout=10)
response.raise_for_status() response.raise_for_status()
current_data = response.json() current_data = response.json()
self.logger.debug(f"Current weather response: {current_data}")
except (ConnectionError, RequestException) as e: except (ConnectionError, RequestException) as e:
self.logger.error(f"Network error fetching current weather: {e}") self.logger.error(f"Network error fetching current weather: {e}")
# Try to use cached data as fallback # Try to use cached data as fallback
@@ -159,9 +176,11 @@ class WeatherManager:
# Fetch forecast # Fetch forecast
forecast_url = "https://api.openweathermap.org/data/2.5/forecast" forecast_url = "https://api.openweathermap.org/data/2.5/forecast"
try: try:
self.logger.debug(f"Making request to {forecast_url} with params: {params}")
response = self.session.get(forecast_url, params=params, timeout=10) response = self.session.get(forecast_url, params=params, timeout=10)
response.raise_for_status() response.raise_for_status()
forecast_data = response.json() forecast_data = response.json()
self.logger.debug(f"Forecast response: {forecast_data}")
except (ConnectionError, RequestException) as e: except (ConnectionError, RequestException) as e:
self.logger.error(f"Network error fetching forecast: {e}") self.logger.error(f"Network error fetching forecast: {e}")
# If we have current data but forecast failed, use cached forecast if available # If we have current data but forecast failed, use cached forecast if available