mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-08-11 15:11:41 +00:00
Merge branch 'main' into 2.0-pre
# Conflicts: # core/config.py # core/status_reporter.py # server/handlers/api/options.py # static/js/bands.js # static/js/map.js # static/js/spots.js # templates/status.html
This commit is contained in:
@@ -54,16 +54,22 @@ class APIOptionsHandler(tornado.web.RequestHandler):
|
||||
map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["alert_providers"])))
|
||||
callsign_data_providers = list(
|
||||
map(lambda p: p["name"], filter(lambda p: p["enabled"], self._status_data["callsign_data_providers"])))
|
||||
spot_providers_enabled_by_default = list(
|
||||
map(lambda p: p["name"], filter(lambda p: p["enabled"] and p["enabled_by_default_in_web_ui"], self._status_data["spot_providers"])))
|
||||
|
||||
# If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
|
||||
# one of our providers.
|
||||
if ALLOW_SPOTTING:
|
||||
spot_providers.append("API")
|
||||
spot_providers_enabled_by_default.append("API")
|
||||
|
||||
|
||||
options = {"bands": BANDS,
|
||||
"modes": ALL_MODES,
|
||||
"mode_types": MODE_TYPES,
|
||||
"sigs": SIGS,
|
||||
"spot_providers": spot_providers,
|
||||
"spot-providers-enabled-by-default": spot_providers_enabled_by_default,
|
||||
"alert_providers": alert_providers,
|
||||
"callsign_data_providers": callsign_data_providers,
|
||||
"continents": CONTINENTS,
|
||||
|
||||
Reference in New Issue
Block a user