deal with RadarBox -> AirNav Radar rebranding

Signed-off-by: Dirk Hohndel <[email protected]>

README.md

@@ -39,7 +39,7 @@ These aggregators are also supported:
 - [Plane.watch](https://plane.watch)
 - [Plane Finder](https://planefinder.net)
 - [Planespotters.net](http://planespotters.net)
-- [RadarBox](https://www.radarbox.com)
+- [AirNav Radar](https://www.airnavradar.com)
 - [RadarPlane](https://radarplane.com/)
 - [Radar Virtuel](https://www.radarvirtuel.com)
 
@@ -53,7 +53,7 @@ These aggregators are also supported:
 - buy one of the supported boards (at least the Le Potato seems to be easily and cheaply available in most places)
 - invest in a decent power supply - while many of these can be driven from a powered hub or a cheap 'charger' plug, not having a stable 5V power
 source tends to be the biggest cause of issues with these SBC
-- get an SDR and antenna. There are many many choices. Availability may differ depending on where you are. But often the 'green' RadarBox SDR and
+- get an SDR and antenna. There are many many choices. Availability may differ depending on where you are. But often a generic SDR and
 an indoor or (much better) outdoor antenna is all you need. More detail on the [ADSB.im website](https://adsb.im/supported).
 - download the current release from the [Release section](https://github.com/dirkhh/adsb-feeder-image/releases/latest)
 - use a tool like the [Raspberry Pi Imager](https://github.com/raspberrypi/rpi-imager/releases) to write the image to a µSD card on your computer

release-notes.md

@@ -1,4 +1,5 @@
 Changes since v2.2.4 include:
+- deal with the RadarBox -> AirNav Radar rebranding
 - small wording changes to several pages that hopefully improve the user experience
 - system management page: don't offer an incorrect / non-existent 'origin/' channel for updates
 - feeder homepage: small changes to declutter the page

src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py

@@ -188,7 +188,7 @@ def list_value_by_tags(tags, idx):
 
         self.lastSetGainWrite = 0
 
-        # no one should share a CPU serial with RadarBox, so always create fake cpuinfo;
+        # no one should share a CPU serial with AirNav, so always create fake cpuinfo;
         # also identify if we would use the thermal hack for RB and Ultrafeeder
         self._d.env_by_tags("rbthermalhack").value = "/sys/class/thermal" if create_fake_info() else ""
 
@@ -223,7 +223,7 @@ def list_value_by_tags(tags, idx):
             ["flightradar", "flightradar24", "https://www.flightradar24.com/", ["/fr24STG2IDX/"], 1],
             ["planewatch", "Plane.watch", "https:/plane.watch/desktop.html", [""], 1],
             ["flightaware", "FlightAware", "https://www.flightaware.com/live/map", ["/fa-statusSTG2IDX/"], 1],
-            ["radarbox", "RadarBox", "https://www.radarbox.com/coverage-map", ["https://www.radarbox.com/stations/<FEEDER_RADARBOX_SN>"], 1],
+            ["radarbox", "AirNav Radar", "https://www.airnavradar.com/coverage-map", ["https://www.airnavradar.com/stations/<FEEDER_RADARBOX_SN>"], 1],
             ["planefinder", "PlaneFinder", "https://planefinder.net/", ["/planefinder-statSTG2IDX/"], 1],
             ["adsbhub", "ADSBHub", "https://www.adsbhub.org/coverage.php", [""], 1],
             ["opensky", "OpenSky", "https://opensky-network.org/network/explorer", ["https://opensky-network.org/receiver-profile?s=<FEEDER_OPENSKY_SERIAL>"], 1],
@@ -385,7 +385,6 @@ def update_version(self):
                 print_err("no version found on disk or in memory, using v0.0.0")
                 self._d.env_by_tags("base_version").value = "v0.0.0"
 
-
     def get_previous_version(self):
         previous_version = ""
         pv_file = "/opt/adsb/adsb.im.previous-version"
@@ -396,7 +395,6 @@ def get_previous_version(self):
 
         return previous_version
 
-
     def update_meminfo(self):
         self._memtotal = 0
         try:
@@ -1795,7 +1793,9 @@ def handle_implied_settings(self):
 
         # make all the smart choices for plugged in SDRs - unless we are a stage2 that hasn't explicitly requested SDR support
         # only run this for initial setup or when the SDR setup is requested via the interface
-        if (not self._d.is_enabled("stage2") or self._d.is_enabled("stage2_nano")) and not self._d.env_by_tags("sdrs_locked").value:
+        if (not self._d.is_enabled("stage2") or self._d.is_enabled("stage2_nano")) and not self._d.env_by_tags(
+            "sdrs_locked"
+        ).value:
             # first grab the SDRs plugged in and check if we have one identified for UAT
             self._sdrdevices._ensure_populated()
             env978 = self._d.env_by_tags("978serial")
@@ -2656,7 +2656,6 @@ def every_minute(self):
             print_err(f"sending previous version: {self._d.previous_version}")
             self._im_status.check()
 
-
     @check_restart_lock
     def index(self):
         # if we get to show the feeder homepage, the user should have everything figured out

src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/templates/aggregators.html

@@ -189,17 +189,17 @@ <h1 class="mt-3 text-center text-danger">
     <input type="checkbox" class="form-check-input me-1" name="radarbox--is_enabled" id="radarbox--is_enabled"
            {{ others_enabled("radarbox", m) }} />
     <label for="radarbox--is_enabled">
-      <a href="https://www.radarbox.com/terms-of-use" data-mdb-toggle="tooltip"
-         title="please note that this site is missing a clear data/privacy policy">RadarBox</a>
+      <a href="https://www.airnavradar.com/terms-of-use" data-mdb-toggle="tooltip"
+         title="please note that this site is missing a clear data/privacy policy">AirNav Radar</a>
       <div class="form-group" id="RB_FIELDS">
         <label for="radarbox--key">
-          You need a RadarBox sharing key. If you already have one, please enter it below. Otherwise, leave the field
-          empty and click on the button and we will try to get one for you. Please log into the
-          <a href="https://www.radarbox.com/sharing-data/claim">RadarBox website</a> once this process has completed
+          You need a AirNav Radar (formerly RadarBox) sharing key. If you already have one, please enter it below. Otherwise,
+          leave the field empty and click on the button and we will try to get one for you. Please log into the
+          <a href="https://www.radarbox.com/sharing-data/claim">AirNav Radar website</a> once this process has completed
           in order to claim the key for your account.
         </label>
         <input type="text" id="radarbox--key" name="radarbox--key" class="form-control w-75"
-               {{ env_values["RB"] | replace('checked', 'required') }} placeholder=" RadarBox sharing key"
+               {{ env_values["RB"] | replace('checked', 'required') }} placeholder="AirNav Radar sharing key"
                value="{{ list_value_by_tags(["radarbox", "key"], m) }}">
         <button type="submit" class="btn btn-primary mt-1" name="radarbox--submit" value="{{stay}}">Request key</button>
       </div>

src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/utils/other_aggregators.py

@@ -83,7 +83,9 @@ def force_remove_container(name):
                     capture_output=True,
                 )
             except subprocess.TimeoutExpired as exc2:
-                print_err(f"failed to remove the container {name} stderr: {str(exc2.stdout)} / stdout: {str(exc2.stderr)}")
+                print_err(
+                    f"failed to remove the container {name} stderr: {str(exc2.stdout)} / stdout: {str(exc2.stderr)}"
+                )
 
         # let's make sure the container isn't still there, if it is the docker run won't work
         force_remove_container("temp_container")
@@ -324,7 +326,7 @@ def _activate(self, user_input: str, idx=0):
 class RadarBox(Aggregator):
     def __init__(self, system: System):
         super().__init__(
-            name="RadarBox",
+            name="AirNav Radar",
             tags=["radarbox"],
             system=system,
         )