mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-08-08 19:41:41 +00:00
Merge branch '95-send-spots-to-xota' into 2.0-pre
# Conflicts: # README.md # core/config.py # server/handlers/api/addspot.py # server/handlers/api/lookups.py # server/handlers/api/options.py # server/webserver.py # spothole.py # static/apidocs/openapi.yml
This commit is contained in:
+3
-3
@@ -20,7 +20,7 @@ function loadSpots() {
|
||||
if (evtSource != null) {
|
||||
evtSource.close();
|
||||
}
|
||||
$.getJSON('/api/v1/spots' + buildQueryString(), function (jsonData) {
|
||||
$.ajax({url: '/api/v2/spots' + buildQueryString(), dataType: 'json', headers: getCredentialHeaders(), success: function (jsonData) {
|
||||
// Store data
|
||||
spots = jsonData;
|
||||
// Update bands display
|
||||
@@ -35,7 +35,7 @@ function startSSEConnection() {
|
||||
if (evtSource != null) {
|
||||
evtSource.close();
|
||||
}
|
||||
evtSource = new EventSource('/api/v1/spots/stream' + buildQueryString());
|
||||
evtSource = new EventSource('/api/v2/spots/stream' + buildQueryString());
|
||||
|
||||
evtSource.onmessage = function (event) {
|
||||
const newSpot = JSON.parse(event.data);
|
||||
@@ -273,7 +273,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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user