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

This commit is contained in:
Ian Renton
2026-03-09 10:46:28 +00:00
parent 30c6222fa0
commit b6407b4f66
9 changed files with 25 additions and 27 deletions

View File

@@ -55,11 +55,9 @@ class ParksNPeaks(HTTPSpotProvider):
spot.sig_refs[0].name = 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 # 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"]: if 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!") 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 new spot to the list
# 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) new_spots.append(spot)
return new_spots return new_spots

View File

@@ -66,7 +66,7 @@
<p>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.</p> <p>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.</p>
</div> </div>
<script src="/js/common.js?v=1773052898"></script> <script src="/js/common.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -69,8 +69,8 @@
</div> </div>
<script src="/js/common.js?v=1773052898"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/add-spot.js?v=1773052898"></script> <script src="/js/add-spot.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -56,8 +56,8 @@
</div> </div>
<script src="/js/common.js?v=1773052899"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/alerts.js?v=1773052899"></script> <script src="/js/alerts.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -62,9 +62,9 @@
<script> <script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %}; let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script> </script>
<script src="/js/common.js?v=1773052898"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/spotsbandsandmap.js?v=1773052898"></script> <script src="/js/spotsbandsandmap.js?v=1773053188"></script>
<script src="/js/bands.js?v=1773052898"></script> <script src="/js/bands.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -46,10 +46,10 @@
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script>
<script src="https://misc.ianrenton.com/jsutils/utils.js?v=1773052898"></script> <script src="https://misc.ianrenton.com/jsutils/utils.js?v=1773053188"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1773052898"></script> <script src="https://misc.ianrenton.com/jsutils/storage.js?v=1773053188"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1773052898"></script> <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1773053188"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1773052898"></script> <script src="https://misc.ianrenton.com/jsutils/geo.js?v=1773053188"></script>
</head> </head>
<body> <body>

View File

@@ -70,9 +70,9 @@
<script> <script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %}; let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script> </script>
<script src="/js/common.js?v=1773052899"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/spotsbandsandmap.js?v=1773052899"></script> <script src="/js/spotsbandsandmap.js?v=1773053188"></script>
<script src="/js/map.js?v=1773052899"></script> <script src="/js/map.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -87,9 +87,9 @@
<script> <script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %}; let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script> </script>
<script src="/js/common.js?v=1773052898"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/spotsbandsandmap.js?v=1773052898"></script> <script src="/js/spotsbandsandmap.js?v=1773053188"></script>
<script src="/js/spots.js?v=1773052898"></script> <script src="/js/spots.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}

View File

@@ -3,8 +3,8 @@
<div id="status-container" class="row row-cols-1 row-cols-md-4 g-4 mt-4"></div> <div id="status-container" class="row row-cols-1 row-cols-md-4 g-4 mt-4"></div>
<script src="/js/common.js?v=1773052898"></script> <script src="/js/common.js?v=1773053188"></script>
<script src="/js/status.js?v=1773052898"></script> <script src="/js/status.js?v=1773053188"></script>
<script>$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --></script> <script>$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %} {% end %}