Spaces:

vs4vijay
/

skywatch

Running

App Files Files Community

vs4vijay commited on Apr 3

Commit

d329ea1

verified ·

1 Parent(s): 7eec6c7

Add 1 files

Browse files

Files changed (1) hide show

index.html +98 -65

index.html CHANGED Viewed

@@ -3,8 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>SkyWatch - Plane Tracker</title>
-    <meta name="description" content="Track planes flying above your location in real-time">
     <meta name="theme-color" content="#1e40af">
     <link rel="manifest" href="/manifest.json">
     <script src="https://cdn.tailwindcss.com"></script>
@@ -187,7 +187,11 @@
             notifications: [],
             lastUpdated: null,
             currentPlane: null,
-            deferredPrompt: null
         };
         // DOM Elements
@@ -276,22 +280,87 @@
             elements.upcomingPlanes.innerHTML = '';
             elements.upcomingPlanes.appendChild(elements.loadingPlanes);
             elements.apiStatus.textContent = 'API: Loading...';
             try {
-                // In a real app, you would use the actual OpenSky Network API
-                // For this demo, we'll use mock data
-                // const response = await fetch(`https://opensky-network.org/api/states/all?lamin=${state.location.lat - 1}&lomin=${state.location.lon - 1}&lamax=${state.location.lat + 1}&lomax=${state.location.lon + 1}`);
-                // const data = await response.json();
-                // Mock data for demonstration
-                const mockPlanes = generateMockPlanes(state.location.lat, state.location.lon);
-                state.planes = mockPlanes.states;
                 processPlaneData();
-                elements.apiStatus.textContent = 'API: Online';
                 elements.apiStatus.className = elements.apiStatus.className.replace('text-red-500', 'text-green-500');
             } catch (error) {
-                console.error('Error fetching plane data:', error);
                 elements.apiStatus.textContent = 'API: Offline';
                 elements.apiStatus.className += ' text-red-500';
@@ -575,7 +644,7 @@
             // Extract airline code from callsign (first 3 letters usually)
             const airlineCode = callsign.substring(0, 3).toUpperCase();
-            // Mock airline database
             const airlines = {
                 'UAL': 'United Airlines',
                 'AAL': 'American Airlines',
@@ -592,63 +661,27 @@
                 'SIA': 'Singapore Airlines',
                 'THY': 'Turkish Airlines',
                 'UAE': 'Emirates',
-                'VIR': 'Virgin Atlantic'
             };
             return airlines[airlineCode] || null;
         }
-        // Generate mock plane data for demonstration
-        function generateMockPlanes(userLat, userLon) {
-            const now = Date.now() / 1000;
-            const mockPlanes = [];
-            // Generate 8-15 mock planes
-            const planeCount = 8 + Math.floor(Math.random() * 7);
-            for (let i = 0; i < planeCount; i++) {
-                // Generate random position within 50km radius
-                const distance = 0.5 + Math.random() * 50; // 0.5-50 km
-                const bearing = Math.random() * 360;
-                // Calculate position
-                const R = 6371; // Earth radius in km
-                const lat1 = userLat * Math.PI / 180;
-                const lon1 = userLon * Math.PI / 180;
-                const d = distance / R;
-                const lat2 = Math.asin(Math.sin(lat1) * Math.cos(d) +
-                                      Math.cos(lat1) * Math.sin(d) * Math.cos(bearing));
-                const lon2 = lon1 + Math.atan2(Math.sin(bearing) * Math.sin(d) * Math.cos(lat1),
-                                              Math.cos(d) - Math.sin(lat1) * Math.sin(lat2));
-                const planeLat = lat2 * 180 / Math.PI;
-                const planeLon = lon2 * 180 / Math.PI;
-                // Generate plane data
-                const callsigns = ['UAL123', 'AAL456', 'DAL789', 'SWA101', 'JBU202', 'FDX303', 'UPS404', 'AFR505', 'BAW606', 'DLH707'];
-                const callsign = callsigns[Math.floor(Math.random() * callsigns.length)];
-                mockPlanes.push([
-                    Math.random().toString(36).substring(2, 10).toUpperCase(), // icao24
-                    callsign, // callsign
-                    null, // origin country
-                    now - Math.random() * 3600, // time position
-                    now - Math.random() * 60, // last contact
-                    planeLon, // longitude
-                    planeLat, // latitude
-                    1000 + Math.random() * 35000, // altitude (ft)
-                    false, // on ground
-                    200 + Math.random() * 500, // velocity (knots)
-                    Math.random() * 360, // heading
-                    -20 + Math.random() * 40, // vertical rate
-                    null, null, null, null, null, null
-                ]);
-            }
-            return { states: mockPlanes };
-        }
         // Load notifications from localStorage
         function loadNotifications() {
             const savedNotifications = localStorage.getItem('skywatch-notifications');

 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>SkyWatch - Real-time Plane Tracker</title>
+    <meta name="description" content="Track real planes flying above your location">
     <meta name="theme-color" content="#1e40af">
     <link rel="manifest" href="/manifest.json">
     <script src="https://cdn.tailwindcss.com"></script>
             notifications: [],
             lastUpdated: null,
             currentPlane: null,
+            deferredPrompt: null,
+            apiKeys: {
+                opensky: null, // OpenSky is free but rate limited
+                adsbexchange: null // ADSBExchange requires API key
+            }
         };
         // DOM Elements
             elements.upcomingPlanes.innerHTML = '';
             elements.upcomingPlanes.appendChild(elements.loadingPlanes);
             elements.apiStatus.textContent = 'API: Loading...';
+            if(!state.location) {
+              return;
+            }
             try {
+                // Calculate bounding box (1 degree = ~111km)
+                const range = 1; // ~111km radius
+                const bbox = [
+                    state.location.lat - range,
+                    state.location.lon - range,
+                    state.location.lat + range,
+                    state.location.lon + range
+                ];
+                console.log('---state', state);
+                console.log('---bbox', bbox);
+                // Try OpenSky Network API first (free but rate limited)
+                let response = await fetch(`https://opensky-network.org/api/states/all?lamin=${bbox[0]}&lomin=${bbox[1]}&lamax=${bbox[2]}&lomax=${bbox[3]}`);
+                if (!response.ok) {
+                    // If OpenSky fails, try ADSBExchange (requires API key)
+                    throw new Error('OpenSky API failed, trying ADSBExchange');
+                }
+                const data = await response.json();
+                state.planes = data.states || [];
+                if (state.planes.length === 0) {
+                    // If no planes from OpenSky, try ADSBExchange
+                    await getADSBExchangeData();
+                } else {
+                    processPlaneData();
+                    elements.apiStatus.textContent = 'API: OpenSky';
+                    elements.apiStatus.className = elements.apiStatus.className.replace('text-red-500', 'text-green-500');
+                }
+            } catch (error) {
+                console.error('Error fetching plane data:', error);
+                // Fallback to ADSBExchange if OpenSky fails
+                await getADSBExchangeData();
+            }
+        }
+        // Fetch plane data from ADSBExchange API
+        async function getADSBExchangeData() {
+            try {
+                // ADSBExchange API (requires API key - this is a public demo key that may be rate limited)
+                const response = await fetch(`https://adsbexchange-com1.p.rapidapi.com/v2/lat/${state.location.lat}/lon/${state.location.lon}/dist/50/`, {
+                    headers: {
+                        'X-RapidAPI-Key': 'your-rapidapi-key-here', // Replace with your RapidAPI key
+                        'X-RapidAPI-Host': 'adsbexchange-com1.p.rapidapi.com'
+                    }
+                });
+                if (!response.ok) throw new Error('ADSBExchange API failed');
+                const data = await response.json();
+                // Convert ADSBExchange format to OpenSky-like format for consistency
+                state.planes = data.ac.map(plane => [
+                    plane.hex,        // icao24
+                    plane.flight,     // callsign
+                    null,             // origin country
+                    null,             // time position
+                    null,             // last contact
+                    plane.lon,        // longitude
+                    plane.lat,        // latitude
+                    plane.altitude,   // altitude (ft)
+                    false,            // on ground
+                    plane.speed,       // velocity (knots)
+                    plane.track,       // heading
+                    plane.vrate,       // vertical rate
+                    null, null, null, null, null, null
+                ]);
                 processPlaneData();
+                elements.apiStatus.textContent = 'API: ADSBExchange';
                 elements.apiStatus.className = elements.apiStatus.className.replace('text-red-500', 'text-green-500');
             } catch (error) {
+                console.error('Error fetching ADSBExchange data:', error);
                 elements.apiStatus.textContent = 'API: Offline';
                 elements.apiStatus.className += ' text-red-500';
             // Extract airline code from callsign (first 3 letters usually)
             const airlineCode = callsign.substring(0, 3).toUpperCase();
+            // Airline database
             const airlines = {
                 'UAL': 'United Airlines',
                 'AAL': 'American Airlines',
                 'SIA': 'Singapore Airlines',
                 'THY': 'Turkish Airlines',
                 'UAE': 'Emirates',
+                'VIR': 'Virgin Atlantic',
+                'RYR': 'Ryanair',
+                'EZY': 'EasyJet',
+                'WZZ': 'Wizz Air',
+                'AFL': 'Aeroflot',
+                'ANA': 'All Nippon Airways',
+                'JAL': 'Japan Airlines',
+                'CAL': 'China Airlines',
+                'CPA': 'Cathay Pacific',
+                'CES': 'China Eastern',
+                'CSN': 'China Southern',
+                'KAL': 'Korean Air',
+                'MAS': 'Malaysia Airlines',
+                'QTR': 'Qatar Airways',
+                'SVA': 'Saudia',
+                'THA': 'Thai Airways'
             };
             return airlines[airlineCode] || null;
         }
         // Load notifications from localStorage
         function loadNotifications() {
             const savedNotifications = localStorage.getItem('skywatch-notifications');