eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-18 09:39:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

remove additional jquery ajax requests

Browse Source
This commit is contained in:
Matt Walsh
2020-10-01 21:35:49 -05:00
parent 5a766a809d
commit 456af1b09a
11 changed files with 86 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/scripts/modules/radar.js
View File

@@ -59,15 +59,10 @@ class Radar extends WeatherDisplay {
let radarHtml;
try {
// get a list of available radars
radarHtml = await $.ajaxCORS({
type: 'GET',
url: baseUrl,
dataType: 'text',
crossDomain: true,
});
radarHtml = await utils.fetch.text(baseUrl, {cors: true});
} catch (e) {
console.error('Unable to get list of radars');
console.error(e.status, e.responseJSON);
console.log('Unable to get list of radars');
console.error(e);
this.setStatus(STATUS.failed);
return;
}
@@ -143,19 +138,13 @@ class Radar extends WeatherDisplay {
context.imageSmoothingEnabled = false;
// get the image
const [blob, status, xhr] = await (()=>new Promise((resolve, reject) => {
$.ajaxCORS({
type: 'GET',
url: baseUrl + url,
xhrFields: {
responseType: 'blob',
},
crossDomain: true,
success: (blob, status, xhr) => resolve([blob,status,xhr]),
error: (xhr, status, e) => reject(e),
});
const response = await fetch(utils.cors.rewriteUrl(baseUrl + url));
}))();
// test response
if (!response.ok) throw new Error(`Unable to fetch radar error ${response.status} ${response.statusText} from ${response.url}`);
// get the blob
const blob = await response.blob();
// store the time
const timeMatch = url.match(/_(\d{4})(\d\d)(\d\d)_(\d\d)(\d\d)_/);
@@ -171,7 +160,7 @@ class Radar extends WeatherDisplay {
zone: 'UTC',
}).setZone();
} else {
time = DateTime.fromHTTP(xhr.getResponseHeader('Last-Modified')).setZone();
time = DateTime.fromHTTP(response.headers.get('last-modified')).setZone();
}
// assign to an html image element