Stop fudging the server-side handling instructions for "add spot" into the spot data structure itself, instead break them out into a new area. This is a breaking change to the API so all API endpoints have been bumped to v2.

webassets/js/add-spot.js

@@ -29,7 +29,7 @@ const PROVIDER_CREDENTIAL_SCHEMAS = {
 // Load server options. Once a successful callback is made from this, we can populate the choice boxes in the form and load
 // any saved values from local storage.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function (jsonData) {
+    $.getJSON('/api/v2/options', function (jsonData) {
         // Store options
         options = jsonData;
 
@@ -203,6 +203,7 @@ function addSpot() {
         const comment = $("#comment").val();
         const de = $("#de-call").val().toUpperCase();
 
+        // Prepare the spot object for the server
         const spot = {};
         if (dx !== "") {
             spot["dx_call"] = dx;
@@ -240,6 +241,19 @@ function addSpot() {
         }
         spot["time"] = moment.utc().valueOf() / 1000.0;
 
+        // Prepare "handling" structure to tell the server what to do with this spot
+        const handling = {};
+
+        // Add CAPTCHA token if reCAPTCHA is loaded
+        if (window._recaptchaWidgetId !== undefined) {
+            const token = grecaptcha.getResponse(window._recaptchaWidgetId);
+            if (!token) {
+                showAddSpotError("Please complete the CAPTCHA to submit upstream.");
+                return;
+            }
+            handling["captcha_token"] = token;
+        }
+
         // Upstream submission
         const submitUpstream = $("#submit-upstream").is(":checked");
         const upstreamProviderName = getSelectedUpstreamProvider();
@@ -261,24 +275,13 @@ function addSpot() {
                 return;
             }
 
-            const creds = loadCredentials(upstreamProviderName);
-            spot["submit_upstream"] = true;
-            spot["upstream_provider"] = upstreamProviderName;
-            spot["upstream_credentials"] = creds;
-
-            // Add CAPTCHA token if reCAPTCHA is loaded
-            if (window._recaptchaWidgetId !== undefined) {
-                const token = grecaptcha.getResponse(window._recaptchaWidgetId);
-                if (!token) {
-                    showAddSpotError("Please complete the CAPTCHA to submit upstream.");
-                    return;
-                }
-                spot["captcha_token"] = token;
-            }
+            handling["submit_upstream"] = true;
+            handling["upstream_provider"] = upstreamProviderName;
+            handling["upstream_credentials"] = loadCredentials(upstreamProviderName);
         }
 
-        $.ajax("/api/v1/spot", {
-            data: JSON.stringify(spot),
+        $.ajax("/api/v2/spot", {
+            data: JSON.stringify({spot, handling}),
             contentType: 'application/json',
             type: 'POST',
             timeout: 10000,

webassets/js/alerts.js

@@ -6,7 +6,7 @@ let alerts = [];
 
 // Load alerts and populate the table.
 function loadAlerts() {
-    $.getJSON('/api/v1/alerts' + buildQueryString(false), function (jsonData) {
+    $.getJSON('/api/v2/alerts' + buildQueryString(false), function (jsonData) {
         // Store last updated time
         lastUpdateTime = moment.utc();
         updateRefreshDisplay();
@@ -280,7 +280,7 @@ function addAlertRowsToTable(tbody, alerts) {
 
 // Load server options. Once a successful callback is made from this, we then query alerts.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function (jsonData) {
+    $.getJSON('/api/v2/options', function (jsonData) {
         // Store options
         options = jsonData;
 

webassets/js/bands.js

@@ -12,7 +12,7 @@ BAND_COLUMN_SPOT_DIV_HEIGHT_PX = BAND_COLUMN_FONT_SIZE * 1.6;
 
 // Load spots and populate the bands display.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
+    $.getJSON('/api/v2/spots' + buildQueryString(false), function (jsonData) {
         // Store last updated time
         lastUpdateTime = moment.utc();
         updateRefreshDisplay();
@@ -229,7 +229,7 @@ function removeDuplicatesForBandPanel(spotList) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function (jsonData) {
+    $.getJSON('/api/v2/options', function (jsonData) {
         // Store options
         options = jsonData;
 

webassets/js/conditions.js

@@ -10,7 +10,7 @@ let ionosondeChart = null;
 
 // Load solar conditions
 function loadSolarConditions() {
-    $.getJSON('/api/v1/solar', function (jsonData) {
+    $.getJSON('/api/v2/solar', function (jsonData) {
 
         // HF
 
@@ -660,7 +660,7 @@ function dxStatsContientChanged() {
 
 // Fetch DX stats from the API and render
 function loadDxStats() {
-    $.getJSON('/api/v1/dxstats', function (jsonData) {
+    $.getJSON('/api/v2/dxstats', function (jsonData) {
         dxStatsData = jsonData;
         renderDxStats();
     });

webassets/js/map.js

@@ -28,7 +28,7 @@ let firstLoad = true;
 
 // Load spots and populate the map.
 function loadSpots() {
-    $.getJSON('/api/v1/spots' + buildQueryString(true), function (jsonData) {
+    $.getJSON('/api/v2/spots' + buildQueryString(true), function (jsonData) {
         // Store data
         spots = jsonData;
         // Update map
@@ -194,7 +194,7 @@ function getTooltipText(s) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function (jsonData) {
+    $.getJSON('/api/v2/options', function (jsonData) {
         // Store options
         options = jsonData;
 

webassets/js/spots.js

@@ -20,7 +20,7 @@ function loadSpots() {
     }
 
     // Make the new query
-    $.getJSON('/api/v1/spots' + buildQueryString(false), function (jsonData) {
+    $.getJSON('/api/v2/spots' + buildQueryString(false), function (jsonData) {
         // Store data
         spots = jsonData;
         // Update table
@@ -39,7 +39,7 @@ function startSSEConnection() {
     if (evtSource != null) {
         evtSource.close();
     }
-    evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString(true));
+    evtSource = new EventSource('/api/v2/spots/stream' + buildQueryString(true));
 
     evtSource.onmessage = function (event) {
         // Get the new spot
@@ -418,7 +418,7 @@ function createNewTableRowsForSpot(s, highlightNew) {
 // Load server options. Once a successful callback is made from this, we then query spots and set up the timer to query
 // spots repeatedly.
 function loadOptions() {
-    $.getJSON('/api/v1/options', function (jsonData) {
+    $.getJSON('/api/v2/options', function (jsonData) {
         // Store options
         options = jsonData;
 

webassets/js/status.js

@@ -1,6 +1,6 @@
 // Load server status
 function loadStatus() {
-    $.getJSON('/api/v1/status', function (jsonData) {
+    $.getJSON('/api/v2/status', function (jsonData) {
         $("#software-version").text(jsonData["software-version"]);
         $("#server-owner-callsign").text(jsonData["server-owner-callsign"]);
         $("#up-since").text(moment().subtract(jsonData["uptime"], 'seconds').fromNow());