w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-08-15 00:47:32 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Oops, "type" was a bad choice of field name

Browse Source
This commit is contained in:
Ian Renton
2026-08-14 17:59:15 +01:00
parent 12c2e66c64
commit efec8e220e
29 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sig_ref.py
+1 -1
View File
@@ -13,7 +13,7 @@ class SIGRef:
# Name of the reference, e.g. "Null Country Park", if known.
name: str | None = None
# Type of the reference, e.g. "Park", if known.
type: str | None = None
ref_type: str | None = None
# URL to look up more information about the reference, if known.
url: str | None = None
# Latitude of the reference, in degrees, if known.
providers/sigrefdata/arlhs.py
+1 -1
View File
@@ -21,7 +21,7 @@ class ARLHS(FileDownloadSIGRefDataProvider):
if "ARLHS" in row and row["ARLHS"] != "":
ref_id = row["ARLHS"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Name"] if "Name" in row else None,
type="Lighthouse",
ref_type="Lighthouse",
url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
latitude=float(row["Latitude"]) if "Latitude" in row and row[
"Latitude"] != "" else None,
providers/sigrefdata/dme.py
+1 -1
View File
@@ -27,7 +27,7 @@ class DME(LocalFileSIGRefDataProvider):
"LONGITUD_ETRS89_REGCAN95") else None
ref = SIGRef(sig=self.SIG, id=ref_id,
type="Town",
ref_type="Town",
name=row["NOMBRE_ACTUAL"] + ", " + row["PROVINCIA"],
latitude=latitude,
longitude=longitude)
providers/sigrefdata/gma.py
+1 -1
View File
@@ -20,7 +20,7 @@ class GMA(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
ref_id = row["Reference"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Name"] if "Name" in row else None,
type="Summit",
ref_type="Summit",
url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
latitude=float(row["Latitude"]) if "Latitude" in row and row[
"Latitude"] != "" else None,
providers/sigrefdata/illw.py
+1 -1
View File
@@ -21,7 +21,7 @@ class ILLW(FileDownloadSIGRefDataProvider):
if "ILLW" in row and row["ILLW"] != "":
ref_id = row["ILLW"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Name"] if "Name" in row else None,
type="Lighthouse",
ref_type="Lighthouse",
url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
latitude=float(row["Latitude"]) if "Latitude" in row and row[
"Latitude"] != "" else None,
providers/sigrefdata/iota.py
+1 -1
View File
@@ -32,7 +32,7 @@ class IOTA(FileDownloadSIGRefDataProvider):
logging.debug(f"Error converting lat/lon to locator for an IOTA reference %f %f", latitude, longitude)
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=ref["name"],
type="Island", grid=grid, latitude=latitude, longitude=longitude))
ref_type="Island", grid=grid, latitude=latitude, longitude=longitude))
# Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
# of the data in this case
providers/sigrefdata/llota.py
+1 -1
View File
@@ -26,7 +26,7 @@ class LLOTA(FileDownloadSIGRefDataProvider):
ll = locator_to_latlong(grid)
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=str(ref["name"]),
type="Lake",
ref_type="Lake",
url="https://llota.app/list/ref/" + ref_id,
grid=grid,
latitude=ll[0],
providers/sigrefdata/mota.py
+1 -1
View File
@@ -20,7 +20,7 @@ class MOTA(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()[1:]):
ref_id = row["Reference"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Name"] if "Name" in row else None,
type="Mill",
ref_type="Mill",
url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
latitude=float(row["Latitude"]) if "Latitude" in row and row[
"Latitude"] != "" else None,
providers/sigrefdata/pnp_kml_sig_ref_data_provider.py
+1 -1
View File
@@ -36,7 +36,7 @@ class ParksNPeaksKMLSIGRefDataProvider(FileDownloadSIGRefDataProvider):
longitude, latitude = placemark.geometry.x, placemark.geometry.y
ref = SIGRef(sig=self.sig_name, id=ref_id, name=placemark.name,
type="Park",
ref_type="Park",
url="https://parksnpeaks.org/getPark.php?actPark=" + ref_id,
latitude=latitude,
longitude=longitude)
providers/sigrefdata/pota.py
+1 -1
View File
@@ -20,7 +20,7 @@ class POTA(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
ref_id = row["reference"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["name"] if "name" in row else None,
type="Park",
ref_type="Park",
url="https://pota.app/#/park/" + ref_id,
grid=row["grid"] if "grid" in row else None,
latitude=float(row["latitude"]) if "latitude" in row and row[
providers/sigrefdata/siota.py
+1 -1
View File
@@ -20,7 +20,7 @@ class SIOTA(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
ref_id = row["SILO_CODE"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["NAME"] if "NAME" in row else None,
type="Silo",
ref_type="Silo",
grid=row["LOCATOR"] if "LOCATOR" in row else None,
latitude=float(row["LAT"]) if "LAT" in row else None,
longitude=float(row["LNG"]) if "LNG" in row else None))
providers/sigrefdata/sota.py
+1 -1
View File
@@ -25,7 +25,7 @@ class SOTA(FileDownloadSIGRefDataProvider):
longitude = float(row["Longitude"]) if "Longitude" in row and row["Longitude"] != "" else None
altitude = float(row["AltM"]) if "AltM" in row and row["AltM"] != "" else None
ref = SIGRef(sig=self.SIG, id=ref_id, name=row["SummitName"] if "SummitName" in row else None,
type="Summit",
ref_type="Summit",
url="https://www.sotadata.org.uk/en/summit/" + ref_id,
latitude=latitude,
longitude=longitude,
providers/sigrefdata/toilets.py
+1 -1
View File
@@ -19,7 +19,7 @@ class Toilets(LocalFileSIGRefDataProvider):
csv_data = _f.read()
dr = csv.DictReader(csv_data.splitlines())
for row in dr:
new_data.append(SIGRef(sig=self.SIG, id=row["ref"], name=row["ref"], type="Toilet",
new_data.append(SIGRef(sig=self.SIG, id=row["ref"], name=row["ref"], ref_type="Toilet",
latitude=float(row["lat"]), longitude=float(row["lon"])))
# Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest
providers/sigrefdata/towers.py
+1 -1
View File
@@ -20,7 +20,7 @@ class Towers(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines(), delimiter=";"):
ref_id = row["Ref"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Nazev"] if "Nazev" in row else None,
type="Tower",
ref_type="Tower",
url="https://wwtota.com/seznam/karta_rozhledny.php?ref=" + ref_id,
grid=row["Lokator"] if "Lokator" in row and row["Lokator"] != "" else None,
latitude=float(row["Lat"]) if "Lat" in row and row["Lat"] != "" else None,
providers/sigrefdata/wca.py
+1 -1
View File
@@ -37,7 +37,7 @@ class WCA(FileDownloadSIGRefDataProvider):
logging.debug(f"Encountered dodgy formatting in WCA CSV, skipping location data for %s", ref_id)
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["CLEAN NAME"] if "CLEAN NAME" in row else None,
type="Castle",
ref_type="Castle",
url="https://www.cqgma.org/zinfo.php?ref=" + ref_id,
latitude=latitude,
longitude=longitude,
providers/sigrefdata/wota.py
+1 -1
View File
@@ -26,7 +26,7 @@ class WOTA(FileDownloadSIGRefDataProvider):
url = "https://www.wota.org.uk/MM_LDO-" + str(number + 214)
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=feature["properties"]["title"], url=url,
type="Summit",
ref_type="Summit",
grid=feature["properties"]["qthLocator"],
latitude=feature["geometry"]["coordinates"][1],
longitude=feature["geometry"]["coordinates"][0],
providers/sigrefdata/wwbota.py
+1 -1
View File
@@ -20,7 +20,7 @@ class WWBOTA(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
ref_id = row["Reference"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["Name"] if "Name" in row else None,
type="Bunker",
ref_type="Bunker",
url="https://bunkerwiki.org/?s=" + ref_id if ref_id.startswith("B/G") else None,
grid=row["Locator"] if "Locator" in row and row["Locator"] != "" else None,
latitude=float(row["Lat"]) if "Lat" in row and row["Lat"] != "" else None,
providers/sigrefdata/wwff.py
+1 -1
View File
@@ -20,7 +20,7 @@ class WWFF(FileDownloadSIGRefDataProvider):
for row in csv.DictReader(http_response.content.decode("utf-8-sig").splitlines()):
ref_id = row["reference"]
new_data.append(SIGRef(sig=self.SIG, id=ref_id, name=row["name"] if "name" in row else None,
type="Park",
ref_type="Park",
url="https://wwff.co/directory/?showRef=" + ref_id,
grid=row["iaruLocator"] if "iaruLocator" in row and row[
"iaruLocator"] != "-" else None,
providers/sigrefdata/zlota.py
+1 -1
View File
@@ -26,7 +26,7 @@ class ZLOTA(FileDownloadSIGRefDataProvider):
longitude = ref["longitude"]
new_ref = SIGRef(sig=self.SIG, id=ref_id, name=ref["name"],
type=ref["asset_type"].title,
ref_type=ref["asset_type"].title,
url="https://ontheair.nz/assets/" + ref_id.replace("/", "_"),
latitude=latitude,
longitude=longitude)
server/handlers/api/alerts.py
+11
View File
@@ -1,4 +1,5 @@
import copy
import inspect
import logging
from datetime import datetime
from typing import Any
@@ -52,6 +53,7 @@ class APIAlertsHandler(tornado.web.RequestHandler):
data = get_alert_list_with_filters(self._alerts, query_params)
if credentials:
data = self._enrich(data, credentials)
find_bad_values(data)
self.write(safe_json_dumps(data))
self.set_status(200)
except ValueError as e:
@@ -64,6 +66,15 @@ class APIAlertsHandler(tornado.web.RequestHandler):
self.set_header("Cache-Control", "no-store")
self.set_header("Content-Type", "application/json")
def find_bad_values(obj, path="data"):
if isinstance(obj, dict):
for k, v in obj.items():
find_bad_values(v, f"{path}[{k!r}]")
elif isinstance(obj, (list, tuple)):
for i, v in enumerate(obj):
find_bad_values(v, f"{path}[{i}]")
elif inspect.isbuiltin(obj) or inspect.ismethod(obj) or inspect.isfunction(obj):
print(f"Found bad value at {path}: {obj!r}")
class APIAlertsStreamHandler(tornado_eventsource.handler.EventSourceHandler):
"""API request handler for /api/v2/alerts/stream"""
static/apidocs/openapi.yml
+2 -2
View File
@@ -26,7 +26,7 @@ info:
* GET `/options` now returns `spot_submit_providers`, a map of SIG names to the names of providers that support upstream spot submission for that SIG. (This allows clients to present the user with options of where a new spot can be sent to.)
* Added `sig_ref_data_providers`, `static_data_providers` and `callsign_data_providers` to `/status` response
* Added `callsign_data_providers` and `spot_providers_enabled_by_default` to `/options` response
* SIG Refs now have `type` and `altitude` parameters
* SIG Refs now have `ref_type` and `altitude` parameters
#### Upgrading a client from v1 to v2 API endpoints
@@ -997,7 +997,7 @@ components:
type: string
description: SIG reference name
example: Null Country Park
type:
ref_type:
type: string
description: SIG reference type
example: Park
templates/add_spot.html
+1 -1
View File
@@ -76,7 +76,7 @@
</div>
<script src="/static/js/add-spot.js?v=1786726043"></script>
<script src="/static/js/add-spot.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/alerts.html
+1 -1
View File
@@ -82,7 +82,7 @@
</div>
<script src="/static/js/alerts.js?v=1786726043"></script>
<script src="/static/js/alerts.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/bands.html
+2 -2
View File
@@ -79,8 +79,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1786726043"></script>
<script src="/static/js/bands.js?v=1786726043"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786726755"></script>
<script src="/static/js/bands.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/base.html
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1786726043" type="text/css">
<link rel="stylesheet" href="/static/css/style.css?v=1786726755" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
<script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
<script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
<script src="/static/js/utils.js?v=1786726043"></script>
<script src="/static/js/ui-ham.js?v=1786726043"></script>
<script src="/static/js/geo.js?v=1786726043"></script>
<script src="/static/js/common.js?v=1786726043"></script>
<script src="/static/js/utils.js?v=1786726755"></script>
<script src="/static/js/ui-ham.js?v=1786726755"></script>
<script src="/static/js/geo.js?v=1786726755"></script>
<script src="/static/js/common.js?v=1786726755"></script>
{% end %}
{% block body %}
<div class="container">
templates/conditions.html
+1 -1
View File
@@ -284,7 +284,7 @@
</div>
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/static/js/conditions.js?v=1786726043"></script>
<script src="/static/js/conditions.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/map.html
+2 -2
View File
@@ -112,8 +112,8 @@
<script src="/static/vendor/js/leaflet-cqzones.js"></script>
<script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786726043"></script>
<script src="/static/js/map.js?v=1786726043"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786726755"></script>
<script src="/static/js/map.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/spots.html
+2 -2
View File
@@ -118,8 +118,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1786726043"></script>
<script src="/static/js/spots.js?v=1786726043"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786726755"></script>
<script src="/static/js/spots.js?v=1786726755"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/status.html
+1 -1
View File
@@ -86,7 +86,7 @@
</div>
</div>
<script src="/static/js/status.js?v=1786726043"></script>
<script src="/static/js/status.js?v=1786726755"></script>
<script>
$(document).ready(function () {
$("#nav-link-status").addClass("active");