diff --git a/horusmapper.cfg.example b/horusmapper.cfg.example index 80724a4..653870d 100644 --- a/horusmapper.cfg.example +++ b/horusmapper.cfg.example @@ -49,8 +49,6 @@ car_source_port = 12345 # sondehubamateur = SondeHub Amateur Database, for viewing on the SondeHub-Amateur Tracker (https://amateur.sondehub.org) # Use this when chasing your own flights, and you want to show up on the sondehub-amateur tracker. # -# habitat = Habitat Database, for viewing on the HabHub tracker (https://tracker.habhub.org) -# Use this when chasing your own flights, and you want to show up on the HabHub tracker. online_tracker = sondehub # Other profiles can be defined in sections like the following: @@ -72,8 +70,6 @@ car_source_port = 55672 # Where to upload chase-car positions and balloon recovery notifications to. # sondehub = Sondehub v2 Database, for viewing on the SondeHub tracker (https://tracker.sondehub.org) # sondehubamateur = SondeHub Amateur Database, for viewing on the SondeHub-Amateur Tracker (https://amateur.sondehub.org) -# Use this when chasing your own flights, and you want to show up on the sondehub-amateur tracker. -# habitat = Habitat Database, for viewing on the HabHub tracker (https://tracker.habhub.org) online_tracker = sondehubamateur # If you want add more profiles, you can do so here, e.g. diff --git a/horusmapper.py b/horusmapper.py index d284f17..2b48985 100644 --- a/horusmapper.py +++ b/horusmapper.py @@ -192,9 +192,8 @@ def client_settings_update(data): chasemapper_config["selected_profile"] ]["online_tracker"] if _tracker == "habitat": - online_uploader = HabitatChaseUploader( - update_rate=chasemapper_config["habitat_update_rate"], - callsign=chasemapper_config["habitat_call"], + logging.error( + "Habitat uploader now deprecated due to Habitat retirement, not starting uploader." ) elif _tracker == "sondehub": online_uploader = SondehubChaseUploader( @@ -962,7 +961,7 @@ def start_listeners(profile): 'telemetry_source_port' (int): Data source port 'car_source_type' (str): Car Position source type (none, horus_udp, gpsd, or station) 'car_source_port' (int): Car Position source port - 'online_tracker' (str): Which online tracker to upload chase-car info to ('habitat' or 'sondehub' or 'sondehubamateur') + 'online_tracker' (str): Which online tracker to upload chase-car info to ('sondehub' or 'sondehubamateur') """ global data_listeners, current_profile, online_uploader, chasemapper_config @@ -986,9 +985,8 @@ def start_listeners(profile): # Start up a new online uploader immediately if uploading is already enabled. if chasemapper_config["habitat_upload_enabled"] == True: if profile["online_tracker"] == "habitat": - online_uploader = HabitatChaseUploader( - update_rate=chasemapper_config["habitat_update_rate"], - callsign=chasemapper_config["habitat_call"], + logging.error( + "Habitat uploader now deprecated due to Habitat retirement, not starting uploader." ) elif profile["online_tracker"] == "sondehub": online_uploader = SondehubChaseUploader( diff --git a/templates/index.html b/templates/index.html index 92fcdaf..1d3ddb9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -680,10 +680,7 @@ var habitat_update_rate = 20000; window.setInterval(function(){ if(document.getElementById("showOtherCars").checked){ - if (chase_config.profiles[chase_config.selected_profile].online_tracker === "habitat"){ - get_habitat_vehicles(); - } - else if (chase_config.profiles[chase_config.selected_profile].online_tracker === "sondehub"){ + if (chase_config.profiles[chase_config.selected_profile].online_tracker === "sondehub"){ get_sondehub_vehicles(); } else if (chase_config.profiles[chase_config.selected_profile].online_tracker === "sondehubamateur"){ @@ -850,7 +847,7 @@ --> -

Habitat Chase Car

+

Chase Car Upload

Show Nearby Chase-Cars:
@@ -858,7 +855,7 @@ Enable Chase-Car Position Upload
- Habitat Call:
+ Online Tracker Callsign:
Update Rate (seconds):