Merge branch 'main' into 95-send-spots-to-xota

README.md

@@ -74,7 +74,7 @@ a mapping exists.
 | `map-center-lon` | Numeric (decimal)       | (auto)  | `?map-center-lon=-0.1`  | Sets the initial longitude of the map centre on the map page. If omitted, the map auto-fits to the loaded spots.                                                      |
 | `map-zoom`       | Numeric (integer)       | (auto)  | `?map-zoom=6`           | Sets the initial zoom level of the map on the map page. If omitted, the map auto-fits to the loaded spots.                                                            |
 
-More will be added soon to allow customisation of filters and other display properties.
+See the comment at the end of the next section regarding reliability and uptime of the "main" server.
 
 ## Writing your own client
 
@@ -95,7 +95,13 @@ Various approaches exist to writing your own client, but in general:
 * Refer to the provided HTML/JS interface for a reference on different approaches. For example, the "map" and "bands"
   pages simply query the main spot API on a timer, whereas the main/spots page combines this approach with using the
   Server-Sent Events (SSE) endpoint to update live.
-* Let me know if you get stuck, I'm happy to help!
+* Let me know if you get stuck, I'm happy to help.
+
+Remember, here at Spothole Inc. we offer an industry-standard "five nines" uptime on our server, with our own unique
+twist: we don't tell you which side of the decimal point the nines start! (Translation: This is a hobby project.
+`spothole.app` runs on the same server as my blog and other stuff. It might go down without warning. By all means base
+your own project on data from the main server if you like, but if you want any control over reliability and downtime,
+please run your own copy instead.)
 
 ## Running your own copy
 

spotproviders/gma.py

@@ -24,6 +24,7 @@ class GMA(HTTPSpotProvider):
     def _http_response_to_spots(self, http_response):
         new_spots = []
         # Iterate through source data
+        if "RCD" in http_response.json():
             for source_spot in http_response.json()["RCD"]:
                 # Convert to our spot format
                 spot = Spot(source=self.name,
@@ -88,6 +89,9 @@ class GMA(HTTPSpotProvider):
                     except:
                         logging.warning("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot[
                             "REF"] + ", ignoring this spot for now")
+        else:
+            logging.warning("The GMA API returned an unexpected response.")
+
         return new_spots
 
     def can_submit_spot(self, sig):

templates/add_spot.html

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

templates/alerts.html

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

templates/bands.html

@@ -77,8 +77,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1781954233"></script>
-<script src="/js/bands.js?v=1781954233"></script>
+<script src="/js/spotsbandsandmap.js?v=1781958515"></script>
+<script src="/js/bands.js?v=1781958515"></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="/css/style.css?v=1781954233" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1781958515" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1781954233"></script>
-<script src="/js/ui-ham.js?v=1781954233"></script>
-<script src="/js/geo.js?v=1781954233"></script>
-<script src="/js/common.js?v=1781954233"></script>
+<script src="/js/utils.js?v=1781958515"></script>
+<script src="/js/ui-ham.js?v=1781958515"></script>
+<script src="/js/geo.js?v=1781958515"></script>
+<script src="/js/common.js?v=1781958515"></script>
 {% end %}
 {% block body %}
 <div class="container">

templates/conditions.html

@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1781954233"></script>
+<script src="/js/conditions.js?v=1781958515"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

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

templates/spots.html

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

templates/status.html

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