feat: POTUS Fleet tracker, Docker secrets, route fix, SQLite->JSON migration

- Add Docker Swarm secrets _FILE support (AIS_API_KEY_FILE, etc.) - Fix flight route lookup: pass lat/lng to adsb.lol routeset API, return airport names - Replace SQLite plane_alert DB with JSON file + O(1) category color mapping - Add POTUS Fleet (AF1, AF2, Marine One) with hardcoded ICAO overrides - Add tracked_names enrichment from Excel data with POTUS protection - Add oversized gold-ringed POTUS SVG icons on map - Add POTUS Fleet tracker panel in WorldviewLeftPanel with fly-to - Overhaul tracked flight labels: zoom-gated, PIA hidden, color-mapped - Add orange color to trackedIconMap, soften white icon strokes - Fix NewsFeed Wikipedia links to use alert_wiki slug Former-commit-id: 6f952104c1
2026-06-12 17:17:50 +02:00 · 2026-03-11 12:28:04 -06:00
parent ac62e4763f
commit 5ab02e821f
9 changed files with 423 additions and 121 deletions
@@ -1 +0,0 @@
-{}
@@ -0,0 +1 @@
+eb32e2f229fad1d5a14fe81e071e71591f875673
@@ -1,3 +1,40 @@
+import os
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+# ---------------------------------------------------------------------------
+# Docker Swarm Secrets support
+# For each VAR below, if VAR_FILE is set (e.g. AIS_API_KEY_FILE=/run/secrets/AIS_API_KEY),
+# the file is read and its trimmed content is placed into VAR.
+# This MUST run before service imports — modules read os.environ at import time.
+# ---------------------------------------------------------------------------
+_SECRET_VARS = [
+    "AIS_API_KEY",
+    "OPENSKY_CLIENT_ID",
+    "OPENSKY_CLIENT_SECRET",
+    "LTA_ACCOUNT_KEY",
+    "CORS_ORIGINS",
+]
+
+for _var in _SECRET_VARS:
+    _file_var = f"{_var}_FILE"
+    _file_path = os.environ.get(_file_var)
+    if _file_path:
+        try:
+            with open(_file_path, "r") as _f:
+                _value = _f.read().strip()
+            if _value:
+                os.environ[_var] = _value
+                logger.info(f"Loaded secret {_var} from {_file_path}")
+            else:
+                logger.warning(f"Secret file {_file_path} for {_var} is empty")
+        except FileNotFoundError:
+            logger.error(f"Secret file {_file_path} for {_var} not found")
+        except Exception as _e:
+            logger.error(f"Failed to read secret file {_file_path} for {_var}: {_e}")
+
 from fastapi import FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
 from contextlib import asynccontextmanager
@@ -5,14 +42,10 @@ from services.data_fetcher import start_scheduler, stop_scheduler, get_latest_da
 from services.ais_stream import start_ais_stream, stop_ais_stream
 from services.carrier_tracker import start_carrier_tracker, stop_carrier_tracker
 import uvicorn
-import logging
 import hashlib
 import json as json_mod
-import os
 import socket

-logging.basicConfig(level=logging.INFO)
-

 def _build_cors_origins():
    """Build a CORS origins whitelist: localhost + LAN IPs + env overrides.
@@ -187,9 +220,9 @@ async def api_get_nearest_radios_list(lat: float, lng: float, limit: int = 5):
 from services.network_utils import fetch_with_curl

@app.get("/api/route/{callsign}")
-async def get_flight_route(callsign: str):
-    r = fetch_with_curl("https://api.adsb.lol/api/0/routeset", method="POST", json_data={"planes": [{"callsign": callsign}]}, timeout=10)
-    if r.status_code == 200:
+async def get_flight_route(callsign: str, lat: float = 0.0, lng: float = 0.0):
+    r = fetch_with_curl("https://api.adsb.lol/api/0/routeset", method="POST", json_data={"planes": [{"callsign": callsign, "lat": lat, "lng": lng}]}, timeout=10)
+    if r and r.status_code == 200:
        data = r.json()
        route_list = []
        if isinstance(data, dict):
@@ -201,9 +234,13 @@ async def get_flight_route(callsign: str):
            route = route_list[0]
            airports = route.get("_airports", [])
            if len(airports) >= 2:
+                orig = airports[0]
+                dest = airports[-1]
                return {
-                    "orig_loc": [airports[0].get("lon", 0), airports[0].get("lat", 0)],
-                    "dest_loc": [airports[-1].get("lon", 0), airports[-1].get("lat", 0)]
+                    "orig_loc": [orig.get("lon", 0), orig.get("lat", 0)],
+                    "dest_loc": [dest.get("lon", 0), dest.get("lat", 0)],
+                    "origin_name": f"{orig.get('iata', '') or orig.get('icao', '')}: {orig.get('name', 'Unknown')}",
+                    "dest_name": f"{dest.get('iata', '') or dest.get('icao', '')}: {dest.get('name', 'Unknown')}",
                }
    return {}

@@ -142,56 +142,132 @@ def _mark_fresh(*keys):
 _data_lock = threading.Lock()

 # ---------------------------------------------------------------------------
-# Plane-Alert DB — load tracked aircraft from CSV on startup
+# Plane-Alert DB — load tracked aircraft from JSON on startup
 # ---------------------------------------------------------------------------

-# Category → color mapping
-_PINK_CATEGORIES = {
-    "Dictator Alert", "Head of State", "Da Comrade", "Oligarch",
-    "Governments", "Royal Aircraft", "Quango",
-}
-_RED_CATEGORIES = {
-    "Don't you know who I am?", "As Seen on TV", "Joe Cool",
-    "Vanity Plate", "Football", "Bizjets",
-}
-_DARKBLUE_CATEGORIES = {
-    "USAF", "United States Navy", "United States Marine Corps",
-    "Special Forces", "Hired Gun", "Oxcart", "Gunship", "Nuclear",
-    "CAP", "Zoomies",
+# Exact category → color mapping for all 53 known categories.
+# O(1) dict lookup — no keyword scanning, no false positives.
+_CATEGORY_COLOR: dict[str, str] = {
+    # YELLOW — Military / Intelligence / Defense
+    "USAF": "yellow",
+    "Other Air Forces": "yellow",
+    "Toy Soldiers": "yellow",
+    "Oxcart": "yellow",
+    "United States Navy": "yellow",
+    "GAF": "yellow",
+    "Hired Gun": "yellow",
+    "United States Marine Corps": "yellow",
+    "Gunship": "yellow",
+    "RAF": "yellow",
+    "Other Navies": "yellow",
+    "Special Forces": "yellow",
+    "Zoomies": "yellow",
+    "Royal Navy Fleet Air Arm": "yellow",
+    "Army Air Corps": "yellow",
+    "Aerobatic Teams": "yellow",
+    "UAV": "yellow",
+    "Ukraine": "yellow",
+    "Nuclear": "yellow",
+    # LIME — Emergency / Medical / Rescue / Fire
+    "Flying Doctors": "#32cd32",
+    "Aerial Firefighter": "#32cd32",
+    "Coastguard": "#32cd32",
+    # BLUE — Government / Law Enforcement / Civil
+    "Police Forces": "blue",
+    "Governments": "blue",
+    "Quango": "blue",
+    "UK National Police Air Service": "blue",
+    "CAP": "blue",
+    # BLACK — Privacy / PIA
+    "PIA": "black",
+    # RED — Dictator / Oligarch
+    "Dictator Alert": "red",
+    "Da Comrade": "red",
+    "Oligarch": "red",
+    # HOT PINK — High Value Assets / VIP / Celebrity
+    "Head of State": "#ff1493",
+    "Royal Aircraft": "#ff1493",
+    "Don't you know who I am?": "#ff1493",
+    "As Seen on TV": "#ff1493",
+    "Bizjets": "#ff1493",
+    "Vanity Plate": "#ff1493",
+    "Football": "#ff1493",
+    # ORANGE — Joe Cool
+    "Joe Cool": "orange",
+    # WHITE — Climate Crisis
+    "Climate Crisis": "white",
+    # PURPLE — General Tracked / Other Notable
+    "Historic": "purple",
+    "Jump Johnny Jump": "purple",
+    "Ptolemy would be proud": "purple",
+    "Distinctive": "purple",
+    "Dogs with Jobs": "purple",
+    "You came here in that thing?": "purple",
+    "Big Hello": "purple",
+    "Watch Me Fly": "purple",
+    "Perfectly Serviceable Aircraft": "purple",
+    "Jesus he Knows me": "purple",
+    "Gas Bags": "purple",
+    "Radiohead": "purple",
 }

 def _category_to_color(cat: str) -> str:
-    if cat in _PINK_CATEGORIES:
-        return "pink"
-    if cat in _RED_CATEGORIES:
-        return "red"
-    if cat in _DARKBLUE_CATEGORIES:
-        return "darkblue"
-    return "white"
+    """O(1) exact lookup. Unknown categories default to purple."""
+    return _CATEGORY_COLOR.get(cat, "purple")

-# Load once on module import
-_PLANE_ALERT_DB: dict = {}  # uppercase ICAO hex → dict of aircraft info
+_PLANE_ALERT_DB: dict = {}
+
+# ---------------------------------------------------------------------------
+# POTUS Fleet — override colors and operator names for presidential aircraft.
+# These are hardcoded ICAO hexes verified against FAA registry + plane-alert.
+# ---------------------------------------------------------------------------
+_POTUS_FLEET: dict[str, dict] = {
+    # Air Force One — Boeing VC-25A (747-200B)
+    "ADFDF8": {"color": "#ff1493", "operator": "Air Force One (82-8000)", "category": "Head of State", "wiki": "Air_Force_One", "fleet": "AF1"},
+    "ADFDF9": {"color": "#ff1493", "operator": "Air Force One (92-9000)", "category": "Head of State", "wiki": "Air_Force_One", "fleet": "AF1"},
+    # Air Force Two — Boeing C-32A (757-200)
+    "ADFEB7": {"color": "blue", "operator": "Air Force Two (98-0001)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "ADFEB8": {"color": "blue", "operator": "Air Force Two (98-0002)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "ADFEB9": {"color": "blue", "operator": "Air Force Two (99-0003)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "ADFEBA": {"color": "blue", "operator": "Air Force Two (99-0004)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "AE4AE6": {"color": "blue", "operator": "Air Force Two (09-0015)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "AE4AE8": {"color": "blue", "operator": "Air Force Two (09-0016)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "AE4AEA": {"color": "blue", "operator": "Air Force Two (09-0017)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    "AE4AEC": {"color": "blue", "operator": "Air Force Two (19-0018)", "category": "Governments", "wiki": "Air_Force_Two", "fleet": "AF2"},
+    # Marine One — VH-3D Sea King / VH-92A Patriot
+    "AE0865": {"color": "#ff1493", "operator": "Marine One (VH-3D)", "category": "Head of State", "wiki": "Marine_One", "fleet": "M1"},
+    "AE5E76": {"color": "#ff1493", "operator": "Marine One (VH-92A)", "category": "Head of State", "wiki": "Marine_One", "fleet": "M1"},
+    "AE5E77": {"color": "#ff1493", "operator": "Marine One (VH-92A)", "category": "Head of State", "wiki": "Marine_One", "fleet": "M1"},
+    "AE5E79": {"color": "#ff1493", "operator": "Marine One (VH-92A)", "category": "Head of State", "wiki": "Marine_One", "fleet": "M1"},
+}

 def _load_plane_alert_db():
-    """Parse plane_alert_db.json into a dict keyed by uppercase ICAO hex."""
+    """Load plane_alert_db.json (exported from SQLite) into memory."""
    global _PLANE_ALERT_DB
-    import json
    json_path = os.path.join(
        os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
        "data", "plane_alert_db.json"
    )
    if not os.path.exists(json_path):
-        logger.warning(f"Plane-Alert JSON DB not found at {json_path}")
+        logger.warning(f"Plane-Alert DB not found at {json_path}")
        return
    try:
        with open(json_path, "r", encoding="utf-8") as fh:
-            data = json.load(fh)
-            for icao_hex, info in data.items():
-                info["color"] = _category_to_color(info.get("category", ""))
-                _PLANE_ALERT_DB[icao_hex] = info
-        logger.info(f"Plane-Alert JSON DB loaded: {len(_PLANE_ALERT_DB)} aircraft")
+            raw = json.load(fh)
+        for icao_hex, info in raw.items():
+            info["color"] = _category_to_color(info.get("category", ""))
+            # Apply POTUS fleet overrides (correct colors + clean operator names)
+            override = _POTUS_FLEET.get(icao_hex)
+            if override:
+                info["color"] = override["color"]
+                info["operator"] = override["operator"]
+                info["category"] = override["category"]
+                info["wiki"] = override.get("wiki", "")
+                info["potus_fleet"] = override.get("fleet", "")
+            _PLANE_ALERT_DB[icao_hex] = info
+        logger.info(f"Plane-Alert DB loaded: {len(_PLANE_ALERT_DB)} aircraft")
    except Exception as e:
-        logger.error(f"Failed to load Plane-Alert JSON DB: {e}")
+        logger.error(f"Failed to load Plane-Alert DB: {e}")

 _load_plane_alert_db()

@@ -204,11 +280,12 @@ def enrich_with_plane_alert(flight: dict) -> dict:
        flight["alert_color"] = info["color"]
        flight["alert_operator"] = info["operator"]
        flight["alert_type"] = info["ac_type"]
-        flight["alert_tag1"] = info["tag1"]
-        flight["alert_tag2"] = info["tag2"]
-        flight["alert_tag3"] = info["tag3"]
+        flight["alert_tags"] = info["tags"]
        flight["alert_link"] = info["link"]
-        # Override registration if DB has a better one
+        if info.get("wiki"):
+            flight["alert_wiki"] = info["wiki"]
+        if info.get("potus_fleet"):
+            flight["potus_fleet"] = info["potus_fleet"]
        if info["registration"]:
            flight["registration"] = info["registration"]

@@ -245,18 +322,22 @@ _load_tracked_names()

 def enrich_with_tracked_names(flight: dict) -> dict:
    """If flight's registration matches our Excel extraction, tag it as tracked."""
+    # POTUS fleet overrides are authoritative — never let Excel overwrite them
+    icao = flight.get("icao24", "").strip().upper()
+    if icao in _POTUS_FLEET:
+        return flight
+
    reg = flight.get("registration", "").strip().upper()
    callsign = flight.get("callsign", "").strip().upper()
-    
+
    match = None
    if reg and reg in _TRACKED_NAMES_DB:
        match = _TRACKED_NAMES_DB[reg]
    elif callsign and callsign in _TRACKED_NAMES_DB:
        match = _TRACKED_NAMES_DB[callsign]
-        
+
    if match:
-        # Don't overwrite Plane-Alert DB operator if it exists unless we want Excel to take precedence.
-        # Let's let Excel take precedence as it has cleaner individual names (e.g. Elon Musk instead of FALCON LANDING LLC).
+        # Let Excel take precedence as it has cleaner individual names (e.g. Elon Musk instead of FALCON LANDING LLC).
        flight["alert_operator"] = match["name"]
        flight["alert_category"] = match["category"]
        if "alert_color" not in flight: