Fix ZLOTA location lookup

providers/sigrefdata/zlota.py

@@ -22,16 +22,16 @@ class ZLOTA(FileDownloadSIGRefDataProvider):
         if isinstance(data, list):
             for ref in data:
                 ref_id = ref["code"]
-                latitude = ref["y"]
+                latitude = ref["latitude"]
-                longitude = ref["x"]
+                longitude = ref["longitude"]
 
-                ref = SIGRef(sig=self.SIG, id=ref_id, name=ref["name"],
+                new_ref = SIGRef(sig=self.SIG, id=ref_id, name=ref["name"],
                                           url="https://ontheair.nz/assets/" + ref_id.replace("/", "_"),
                                           latitude=latitude,
                                           longitude=longitude)
                 if latitude and longitude:
-                    ref.grid = latlong_to_locator(latitude, longitude, 6)
+                    ref.new_ref = latlong_to_locator(latitude, longitude, 6)
-                new_data.append(ref)
+                new_data.append(new_ref)
 
                 # 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/spot/zlota.py

@@ -12,7 +12,6 @@ class ZLOTA(HTTPSpotProvider):
 
     POLL_INTERVAL_SEC = 120
     SPOTS_URL = "https://ontheair.nz/api/spots?zlota_only=true"
-    LIST_URL = "https://ontheair.nz/assets/assets.json"
 
     def __init__(self, provider_config):
         super().__init__("ZLOTA", provider_config, self.SPOTS_URL, self.POLL_INTERVAL_SEC)

templates/add_spot.html

@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1786628955"></script>
+<script src="/static/js/add-spot.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/alerts.html

@@ -82,7 +82,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1786628955"></script>
+<script src="/static/js/alerts.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/bands.html

@@ -79,8 +79,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786628955"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786714362"></script>
-<script src="/static/js/bands.js?v=1786628955"></script>
+<script src="/static/js/bands.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1786628955" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1786714362" 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=1786628955"></script>
+<script src="/static/js/utils.js?v=1786714362"></script>
-<script src="/static/js/ui-ham.js?v=1786628955"></script>
+<script src="/static/js/ui-ham.js?v=1786714362"></script>
-<script src="/static/js/geo.js?v=1786628955"></script>
+<script src="/static/js/geo.js?v=1786714362"></script>
-<script src="/static/js/common.js?v=1786628955"></script>
+<script src="/static/js/common.js?v=1786714362"></script>
 {% end %}
 {% block body %}
 <div class="container">

templates/conditions.html

@@ -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=1786628955"></script>
+<script src="/static/js/conditions.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -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=1786628955"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786714362"></script>
-<script src="/static/js/map.js?v=1786628955"></script>
+<script src="/static/js/map.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/spots.html

@@ -118,8 +118,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786628955"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786714362"></script>
-<script src="/static/js/spots.js?v=1786628955"></script>
+<script src="/static/js/spots.js?v=1786714362"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/status.html

@@ -86,7 +86,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1786628955"></script>
+<script src="/static/js/status.js?v=1786714362"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");