holm/the-glorious-startpage
1
0
Fork 0
forked from extern/the-glorious-startpage
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modularize fetching openweathermap data

Browse Source
This commit is contained in:
Gerome Matilla 2020-06-12 15:32:02 +08:00
parent c7b55d2e38
commit 53026c94b4
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/weather-screen.js
View File

@ -146,21 +146,30 @@ class WeatherScreen {
this._setWeatherValue(wLoc, wDesc, wIcon, rise, set, upd);
}
getWeatherData = (appID, cityID, units) => {
const requestString = `https://api.openweathermap.org/data/2.5/weather?APPID=${appID}&id=${cityID}&units=${units}`;
_fetchOpenWeatherMapDate = (requestStr, callback) => {
const requestString = requestStr;
const request = new XMLHttpRequest();
request.open('GET', requestString, true);
request.onload = e => {
if (request.readyState === 4 && request.status === 200 && request.status < 400) {
this._tempSymbol = (units === 'metric') ? '°C' : '°F';
this._processWeatherData(JSON.parse(request.response));
callback(JSON.parse(request.response));
} else {
this._setErrValue();
};
};
request.send();
}
getWeatherData = (appID, cityID, units) => {
const requestString = `https://api.openweathermap.org/data/2.5/weather?APPID=${appID}&id=${cityID}&units=${units}`;
this._tempSymbol = (units === 'metric') ? '°C' : '°F';
this._fetchOpenWeatherMapDate(requestString, this._processWeatherData);
};
@ -168,17 +177,9 @@ class WeatherScreen {
const requestString = `https://api.openweathermap.org/data/2.5/forecast?APPID=${appID}&id=${cityID}&units=${units}`;
const request = new XMLHttpRequest();
request.open('GET', requestString, true);
request.onload = e => {
if (request.readyState === 4 && request.status === 200 && request.status < 400) {
this._tempSymbol = (units === 'metric') ? '°C' : '°F';
this._processForecastData(JSON.parse(request.response));
} else {
this._setErrValue();
};
};
request.send();
this._tempSymbol = (units === 'metric') ? '°C' : '°F';
this._fetchOpenWeatherMapDate(requestString, this._processForecastData);
}
_processForecastData = data => {