OpenSky: add OSH_BASE_URL override, uid on datastream, fix display URL

Author: Sam-Bolling

publishers/opensky/bootstrap_opensky.py

@@ -421,6 +421,7 @@ def _datastream_schema() -> dict:
     """SWE DataRecord schema for ADS-B state vector datastream."""
     return {
         "outputName": DS_OUTPUT_NAME,
+        "uid": "urn:os4csapi:datastream:opensky-feed:adsbState:v1",
         "name": "Aircraft State Vectors",
         "description": (
             "Normalized OpenSky aircraft state vectors. Each observation represents one aircraft "

publishers/opensky/opensky_publisher.py

@@ -212,7 +212,10 @@ def __init__(self):
 
         # REST config
         import base64
-        self._base_url = f"https://{self.osh_address}/{self.osh_root}/api"
+        self._base_url = os.environ.get(
+            "OSH_BASE_URL",
+            f"https://{self.osh_address}/{self.osh_root}/api",
+        )
         self._auth = "Basic " + base64.b64encode(
             f"{self.osh_user}:{self.osh_pass}".encode()).decode()
 
@@ -359,7 +362,7 @@ def run(self, *, interval: float = 300.0, dry_run: bool = False, once: bool = Fa
         print("=" * 70)
         print(f"  {self.name}")
         print("=" * 70)
-        print(f"  Server:    https://{self.osh_address}:{self.osh_port}/{self.osh_root}/api")
+        print(f"  Server:    {self._base_url}")
         print(f"  Bbox:      lat {bbox['lamin']}–{bbox['lamax']}, lon {bbox['lomin']}–{bbox['lomax']}")
         print(f"  Interval:  {interval}s")
         print(f"  Dry run:   {dry_run}")