diff --git a/config-example.yml b/config-example.yml index 56e8c74..9f70b0a 100644 --- a/config-example.yml +++ b/config-example.yml @@ -27,42 +27,57 @@ spot-providers: - class: "POTA" name: "POTA" enabled: true + - class: "SOTA" name: "SOTA" enabled: true + - class: "WWFF" name: "WWFF" enabled: true + - class: "WWBOTA" name: "WWBOTA" enabled: true + - class: "GMA" name: "GMA" enabled: true + # GMA requires an API key to fetch spots. After creating an account on cqgma.org, email support and request one. + api-key: "" + - class: "HEMA" name: "HEMA" enabled: true + - class: "ParksNPeaks" name: "ParksNPeaks" enabled: true + - class: "ZLOTA" name: "ZLOTA" enabled: true + - class: "WOTA" name: "WOTA" enabled: true + - class: "LLOTA" name: "LLOTA" enabled: true + - class: "WWTOTA" name: "WWTOTA" enabled: true + - class: "Tiles" name: "Tiles" enabled: true + - class: "APRSIS" name: "APRS-IS" enabled: false + - class: "DXCluster" name: "HRD Cluster" enabled: true @@ -78,6 +93,7 @@ spot-providers: # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not # all clusters sent RBN spots anyway. allow_rbn_spots: false + - class: "DXCluster" name: "W3LPL Cluster" enabled: false @@ -93,6 +109,7 @@ spot-providers: # sure you aren't also separately connecting to RBN directly, otherwise you may get duplicate spots.) Note that not # all clusters sent RBN spots anyway. allow_rbn_spots: false + - class: "RBN" name: "RBN CW/RTTY" enabled: false @@ -102,15 +119,18 @@ spot-providers: # received by Spothole but not shown on the web UI unless the user explicitly turns it on. For that behaviour, # set enabled to true, but enabled-by-default-in-web-ui to false. enabled-by-default-in-web-ui: false + - class: "RBN" name: "RBN FT8" enabled: false port: 7001 enabled-by-default-in-web-ui: false + - class: "UKPacketNet" name: "UK Packet Radio Net" enabled: false enabled-by-default-in-web-ui: false + - class: "XOTA" name: "39C3 TOTA" enabled: false @@ -120,9 +140,10 @@ spot-providers: # programmes and so different URLs provide different programmes. sig: "TOTA" locations-csv: "datafiles/39c3-tota.csv" + - class: "XOTA" name: "EH23 TOTA" - enabled: true + enabled: false url: "wss://eh23.totawatch.de/api/spot/live" sig: "TOTA" locations-csv: "datafiles/eh23-tota.csv" @@ -133,21 +154,27 @@ alert-providers: - class: "POTA" name: "POTA" enabled: true + - class: "SOTA" name: "SOTA" enabled: true + - class: "WWFF" name: "WWFF" enabled: true + - class: "ParksNPeaks" name: "ParksNPeaks" enabled: true + - class: "WOTA" name: "WOTA" enabled: true + - class: "BOTA" name: "BOTA" enabled: true + - class: "NG3K" name: "NG3K" enabled: true @@ -159,12 +186,15 @@ solar-condition-providers: - class: "HamQSL" name: "HamQSL" enabled: true + - class: "NOAA3dayForecast" name: "NOAA 3-day Forecast" enabled: true + - class: "GIROIonosonde" name: "GIRO Ionosonde Data" enabled: true + - class: "KC2GProp" name: "KC2G Propagation Data" enabled: true diff --git a/spotproviders/gma.py b/spotproviders/gma.py index a795ae0..1ef30e2 100644 --- a/spotproviders/gma.py +++ b/spotproviders/gma.py @@ -19,7 +19,12 @@ class GMA(HTTPSpotProvider): REF_INFO_URL_ROOT = "https://www.cqgma.org/api/ref/?" def __init__(self, provider_config): - super().__init__(provider_config, self.SPOTS_URL, self.POLL_INTERVAL_SEC) + # Ensure there is an API key in our config, and set up the query URL using it + self.api_key = provider_config.get("api-key", "") + if self.api_key != "": + super().__init__(provider_config, self.SPOTS_URL + "?key=" + self.api_key, self.POLL_INTERVAL_SEC) + else: + logging.warning("GMA spot provider configured but no api key was provided, this API will not be queried.") def _http_response_to_spots(self, http_response): new_spots = [] diff --git a/templates/add_spot.html b/templates/add_spot.html index c4dba3e..756b4ce 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -76,7 +76,7 @@ - + diff --git a/templates/alerts.html b/templates/alerts.html index 7c55794..aded168 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -75,7 +75,7 @@ - + diff --git a/templates/bands.html b/templates/bands.html index bf6e0d7..b961655 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -77,8 +77,8 @@ - - + + diff --git a/templates/base.html b/templates/base.html index 385547c..90e96ef 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,6 @@ {% extends "skeleton.html" %} {% block head_extra %} - + @@ -10,10 +10,10 @@ - - - - + + + + {% end %} {% block body %}
diff --git a/templates/conditions.html b/templates/conditions.html index 37432dc..d31f987 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -284,7 +284,7 @@
- + diff --git a/templates/map.html b/templates/map.html index 8df89d8..d7feb6c 100644 --- a/templates/map.html +++ b/templates/map.html @@ -95,8 +95,8 @@ - - + + diff --git a/templates/spots.html b/templates/spots.html index ebe9514..63e8b81 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -116,8 +116,8 @@ - - + + diff --git a/templates/status.html b/templates/status.html index d0a22ef..6b6ac69 100644 --- a/templates/status.html +++ b/templates/status.html @@ -59,7 +59,7 @@ - +