get weather by coords or ip

Author: AnthonyGress

backend/src/routes/weather.route.ts

@@ -13,35 +13,48 @@ export const weatherRoute = Router();
  */
 weatherRoute.get('/', async (req: Request, res: Response): Promise<void> => {
     try {
-        const { latitude, longitude } = req.query;
-
-        if (!latitude || !longitude) {
-            res.status(StatusCodes.BAD_REQUEST).json({
-                message: 'Please provide both latitude and longitude as query parameters.'
-            });
+        let latitude, longitude;
+        // Extract client IP (supports proxies)
+        if (!req.query.latitude && !req.query.longitude) {
+            const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
+
+            console.log(`Fetching location for IP: ${ip}`);
+
+            // Fetch geolocation data using ip-api.com
+            const geoResponse = await axios.get(`http://ip-api.com/json/${ip}`);
+            const { lat, lon, city, country, status } = geoResponse.data;
+            latitude = lat;
+            longitude = lon;
+
+            if (status !== 'success') {
+                res.status(400).json({ error: 'Unable to determine location from IP' });
+                console.error(`Error fetching weather: ${ip}`);
+                return;
+            }
+            console.log(`Determined location: ${city}, ${country} (${lat}, ${lon})`);
+        } else {
+            latitude = req.query.latitude;
+            longitude = req.query.longitude;
         }
 
-        // Construct the Open-Meteo API URL:
-        const apiUrl = `https://api.open-meteo.com/v1/forecast?latitude=${latitude}&longitude=${longitude}&current=temperature_2m,weathercode,windspeed_10m&daily=temperature_2m_max,temperature_2m_min,weathercode,sunrise,sunset&timezone=auto`;
-
-        // Fetch data from the Open-Meteo API using Axios
-        const { data, status } = await axios.get(apiUrl);
 
-        // If status is not 200, treat it as an error
-        if (status !== StatusCodes.OK) {
-            res.status(StatusCodes.BAD_REQUEST).json({
-                message: 'Failed to fetch data from Open-Meteo'
-            });
-        }
+        // Fetch weather data from Open-Meteo
+        const weatherResponse = await axios.get('https://api.open-meteo.com/v1/forecast', {
+            params: {
+                latitude: latitude,
+                longitude: longitude,
+                current: 'temperature_2m,weathercode,windspeed_10m',
+                daily: 'temperature_2m_max,temperature_2m_min,weathercode,sunrise,sunset',
+                timezone: 'auto'
+            }
+        });
+        console.log(weatherResponse.data);
 
-        // Return the JSON data from Open-Meteo
-        res.status(StatusCodes.OK).json(data);
+        res.json(
+            weatherResponse.data
+        );
 
     } catch (error) {
-        // Handle unexpected errors (e.g., network issues)
-        res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({
-            message: 'Error fetching weather data',
-            error: (error as Error).message,
-        });
+        console.error('Error fetching weather:', error);
     }
 });

frontend/src/api/dash-api.ts

@@ -40,7 +40,7 @@ export class DashApi {
         return null;
     }
 
-    public static async getWeather(latitude: number, longitude: number): Promise<any> {
+    public static async getWeather(latitude?: number, longitude?: number): Promise<any> {
         const res = await axios.get(`${BACKEND_URL}/api/weather`, {
             params: {
                 latitude,

frontend/src/components/widgets/WeatherWidget.tsx

@@ -85,14 +85,21 @@ export const WeatherWidget: React.FC = () => {
 
     useEffect(() => {
         const fetchWeather = async () => {
-            if (!location) return;
             setLoading(true);
             try {
-                const data = await DashApi.getWeather(location.latitude, location.longitude);
-                console.log('Weather data:', data);
+                let data;
+                if (!location) {
+                    console.log('no location');
+
+                    data = await DashApi.getWeather();
+                    console.log('Weather data:', data);
+                } else {
+                    data = await DashApi.getWeather(location.latitude, location.longitude);
+                    console.log('Weather data:', data);
+                }
                 setWeatherData(data);
             } catch (error) {
-                console.error('Error fetching weather:', error);
+                console.log('Error fetching weather:', error);
             } finally {
                 setLoading(false);
             }