From b6407b4f66dd6aed54c00661b8e827d979d1fe09 Mon Sep 17 00:00:00 2001 From: Ian Renton Date: Mon, 9 Mar 2026 10:46:28 +0000 Subject: [PATCH] Don't block PNP spots from other programmes like WWFF, as there are known to be WWFF spots on PNP that are not also on Spotline --- spotproviders/parksnpeaks.py | 12 +++++------- templates/about.html | 2 +- templates/add_spot.html | 4 ++-- templates/alerts.html | 4 ++-- templates/bands.html | 6 +++--- templates/base.html | 8 ++++---- templates/map.html | 6 +++--- templates/spots.html | 6 +++--- templates/status.html | 4 ++-- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/spotproviders/parksnpeaks.py b/spotproviders/parksnpeaks.py index 2048785..566e6e7 100644 --- a/spotproviders/parksnpeaks.py +++ b/spotproviders/parksnpeaks.py @@ -54,12 +54,10 @@ class ParksNPeaks(HTTPSpotProvider): if "actLocation" in source_spot and source_spot["actLocation"] != "": spot.sig_refs[0].name = source_spot["actLocation"] - # Log a warning for the developer if PnP gives us an unknown programme we've never seen before - if spot.sig_refs and spot.sig_refs[0].sig not in ["POTA", "SOTA", "WWFF", "SIOTA", "ZLOTA", "KRMNPA"]: - logging.warning("PNP spot found with sig " + spot.sig + ", developer needs to add support for this!") + # Log a warning for the developer if PnP gives us an unknown programme we've never seen before + if sig not in ["POTA", "SOTA", "WWFF", "SIOTA", "ZLOTA", "KRMNPA"]: + logging.warning("PNP spot found with sig " + sig + ", developer needs to add support for this!") - # If this is POTA, SOTA, WWFF or ZLOTA data we already have it through other means, so ignore. Otherwise, - # add to the spot list. - if not spot.sig_refs or spot.sig_refs[0].sig not in ["POTA", "SOTA", "WWFF", "ZLOTA"]: - new_spots.append(spot) + # Add new spot to the list + new_spots.append(spot) return new_spots diff --git a/templates/about.html b/templates/about.html index e159419..546314b 100644 --- a/templates/about.html +++ b/templates/about.html @@ -66,7 +66,7 @@

This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.

- + {% end %} \ No newline at end of file diff --git a/templates/add_spot.html b/templates/add_spot.html index 80a6432..1641404 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -69,8 +69,8 @@ - - + + {% end %} \ No newline at end of file diff --git a/templates/alerts.html b/templates/alerts.html index 25cf897..97bd949 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -56,8 +56,8 @@ - - + + {% end %} \ No newline at end of file diff --git a/templates/bands.html b/templates/bands.html index afd7e54..f3a100a 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -62,9 +62,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index bb89aff..3935bde 100644 --- a/templates/base.html +++ b/templates/base.html @@ -46,10 +46,10 @@ crossorigin="anonymous"> - - - - + + + + diff --git a/templates/map.html b/templates/map.html index 33d2e06..2c2377f 100644 --- a/templates/map.html +++ b/templates/map.html @@ -70,9 +70,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/spots.html b/templates/spots.html index 3c8f586..3e21804 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -87,9 +87,9 @@ - - - + + + {% end %} \ No newline at end of file diff --git a/templates/status.html b/templates/status.html index 9ff96fc..08e238c 100644 --- a/templates/status.html +++ b/templates/status.html @@ -3,8 +3,8 @@
- - + + {% end %} \ No newline at end of file