swtich over to opensky API fro production

Author: sarumaj

.github/workflows/deploy.yml

@@ -54,5 +54,6 @@ jobs:
           delay: 5
         env:
           HD_ADSBEXCHANGE_API_KEY: ${{ secrets.ADSBEXCHANGE_API_KEY }}
+          HD_DATA_PROVIDER: ${{ secrets.DATA_PROVIDER }}
           HD_OPENSKY_CLIENT_ID: ${{ secrets.OPENSKY_CLIENT_ID }}
           HD_OPENSKY_CLIENT_SECRET: ${{ secrets.OPENSKY_CLIENT_SECRET }}

Dockerfile

@@ -32,7 +32,7 @@ RUN <<EOF cat > /entrypoint.sh
 exec python -m local_flight_map \
   --app-port \${PORT:-5006} \
   --app-dev-mode false \
-  --map-refresh-interval 1000
+  --map-refresh-interval 1000 \
 EOF
 RUN chmod +x /entrypoint.sh
 

src/local_flight_map/api/opensky/client.py

@@ -120,7 +120,7 @@ async def get_states_from_opensky(
         if bbox:
             bbox.validate()
 
-        params = {}
+        params = {'extended': 1}
         if time_secs:
             if isinstance(time_secs, datetime):
                 time_secs = int(time_secs.timestamp())

src/local_flight_map/ui/app/config.py

@@ -29,7 +29,7 @@ class MapConfig(BaseSettings):
         map_refresh_interval: The interval between map updates in milliseconds.
         data_batch_size: The number of aircraft to process in each batch.
         data_max_threads: The maximum number of concurrent threads for data processing.
-        data_provider: The source of aircraft data (adsbexchange or opensky).
+        data_provider: The source of aircraft data (adsbexchange, opensky, opensky_personal).
         app_port: The port number for the web application.
         app_dev_mode: Whether to run in development mode.
     """
@@ -66,7 +66,7 @@ class MapConfig(BaseSettings):
         default=10,
         description="The maximum number of threads to use for the data"
     )
-    data_provider: Literal["adsbexchange", "opensky"] = Field(
+    data_provider: Literal["adsbexchange", "opensky", "opensky_personal"] = Field(
         default="adsbexchange",
         description="The provider of the data",
     )

src/local_flight_map/ui/app/data.py

@@ -5,6 +5,7 @@
 
 from typing import Dict, Any, Union, Tuple, Optional
 import asyncio
+import traceback
 
 from ...api import ApiClients, Location
 from ...api.adsbexchange import AdsbExchangeResponse
@@ -64,13 +65,41 @@ def _generate_tags(self, feature: Dict[str, Any], inplace: bool = False) -> list
             'callsign': properties.get('callsign'),
             'registration': properties.get('registration'),
             'altitude': properties.get('baro_altitude') or properties.get('geom_altitude'),
-            'speed': properties.get('ground_speed'),
+            'speed': properties.get('ground_speed') or properties.get('velocity'),
             'emergency': properties.get('emergency_status'),
-            'category': properties.get('category'),
+            'category': {
+                0: 'no_information',
+                1: 'no_adsb_emitter_category_information',
+                2: 'light',
+                3: 'small',
+                4: 'large',
+                5: 'high_vortex_large',
+                6: 'heavy',
+                7: 'high_performance',
+                8: 'rotorcraft',
+                9: 'glider_sailplane',
+                10: 'lighter_than_air',
+                11: 'parachutist_skydiver',
+                12: 'ultralight_hangglider_paraglider',
+                13: 'reserved',
+                14: 'unmanned_aerial_vehicle',
+                15: 'space_transatmospheric_vehicle',
+                16: 'surface_vehicle_emergency_vehicle',
+                17: 'surface_vehicle_service_vehicle',
+                18: 'point_obstacle_includes_tethered_balloons',
+                19: 'cluster_obstacle',
+                20: 'line_obstacle',
+            }.get(properties.get('category')),
+            "position_source": {
+                0: 'adsb',
+                1: 'asterix',
+                2: 'mlat',
+                3: 'flarm',
+            }.get(properties.get('position_source')),
         }
 
         for key, value in optional_tags.items():
-            if value:
+            if value is not None:
                 match key:
                     case 'altitude':
                         try:
@@ -100,6 +129,14 @@ def _generate_tags(self, feature: Dict[str, Any], inplace: bool = False) -> list
                         else:
                             tags.append('speed:fast')
 
+                    case 'category':
+                        properties["category"] = value
+                        tags.append(f"category:{value}")
+
+                    case 'position_source':
+                        properties["position_source"] = value
+                        tags.append(f"position_source:{value}")
+
                     case _:
                         tags.append(f"{key}:{value}")
 
@@ -158,13 +195,19 @@ async def resolve_route(label: str, route: str) -> Tuple[str, Optional[Dict[str,
                             if route
                         ]
                     ):
+                        if not airport:
+                            logger.error(f"No airport found for {label}")
+                            continue
                         for name, value in airport["properties"].items():
                             feature["properties"][f"{label}_{name}"] = value
 
                 self._generate_tags(feature, inplace=True)
 
             except Exception as e:
-                logger.error(f"Error processing feature {icao24}/{callsign}: {str(e)}")
+                logger.error(
+                    f"Error processing feature icao24:{icao24} callsign:{callsign}: "
+                    f"{str(e)}\n{traceback.format_exc()}"
+                )
 
             finally:
                 return feature
@@ -188,6 +231,9 @@ async def get_aircrafts_geojson(self) -> Dict[str, Any]:
             case 'opensky':
                 args = (0, None, self._config.map_bbox)
                 method = self._clients.opensky_client.get_states_from_opensky
+            case 'opensky_personal':
+                args = (0, None, None)
+                method = self._clients.opensky_client.get_my_states_from_opensky
             case _:
                 raise ValueError(f"Invalid provider: {self._config.data_provider}")
 

src/local_flight_map/ui/app/static/js/10_flight_marker_utils.js

@@ -113,7 +113,7 @@ const FlightMarkerUtils = {
     }
 
     const altitude = props.baro_altitude || props.geom_altitude || 0;
-    const groundSpeed = props.ground_speed || 0;
+    const groundSpeed = props.ground_speed || props.velocity || 0;
     const { vsColor, vsSymbol } = this.calculateVerticalSpeedIndicator(props);
     const flightLevel = altitude === 'ground' ? 0 : Math.round(altitude / 100);
 

src/local_flight_map/ui/plugins/js/realtime_point_to_layer.js

@@ -233,6 +233,18 @@
     }
   }
 
+  /**
+   * Convert snake case to title case with spaces
+   * @param {string} str - The string to convert
+   * @returns {string} The converted string
+   */
+  function snakeToTitleCase(str) {
+    return str
+      .split('_')
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join(' ');
+  }
+
   /**
    * Create popup content for the marker
    * @param {Object} props - Aircraft properties
@@ -248,7 +260,7 @@
       const [key, value] = tag.split(':');
       return `
               <span class="tag">
-                <span class="tag-key">${key}</span>
+                <span class="tag-key">${snakeToTitleCase(key)}</span>
                 <span class="tag-value">${value}</span>
               </span>
             `;
@@ -280,7 +292,7 @@
         <table>
           <tbody>`;
       for (const [key, value] of originProps) {
-        const displayKey = key.replace('origin_', '');
+        const displayKey = snakeToTitleCase(key.replace('origin_', ''));
         const displayValue = typeof value === 'object' && value !== null ? JSON.stringify(value, null, 2) : value;
         content += `
             <tr>
@@ -301,7 +313,7 @@
         <table>
           <tbody>`;
       for (const [key, value] of destinationProps) {
-        const displayKey = key.replace('destination_', '');
+        const displayKey = snakeToTitleCase(key.replace('destination_', ''));
         const displayValue = typeof value === 'object' && value !== null ? JSON.stringify(value, null, 2) : value;
         content += `
             <tr>
@@ -329,10 +341,11 @@
         <table>
           <tbody>`;
       for (const [key, value] of remainingProps) {
+        const displayKey = snakeToTitleCase(key);
         const displayValue = typeof value === 'object' && value !== null ? JSON.stringify(value, null, 2) : value;
         content += `
             <tr>
-              <th>${key}</th>
+              <th>${displayKey}</th>
               <td>${displayValue}</td>
             </tr>`;
       }