Empty set handling and date fixes

pull/4/head
Rob Hedgpeth 2020-02-11 08:26:41 +09:00
rodzic 4d87ac63a6
commit 8190f660fe
3 zmienionych plików z 21 dodań i 14 usunięć

Wyświetl plik

@ -8,12 +8,12 @@ const pool = mariadb.createPool({
password: process.env.DB_PASS,
port: process.env.DB_PORT,
multipleStatements: true,
connectionLimit: 5,
timezone: 'UTC',
connectionLimit: 5
/*timezone: 'UTC',
dateStrings: [
'DATE',
'DATETIME'
]
]*/
});

Wyświetl plik

@ -14,6 +14,7 @@ router.get("/", async (req, res, next) => {
// ignore time offsets
let formattedDate = formatDate(year,month,day);
//let formattedDate = date;
let conn;
try {
@ -63,7 +64,7 @@ router.get("/", async (req, res, next) => {
t.fl_date = ? and \
t.origin = ? and \
t.dest = ?";
var results = await conn.query(query, [month,day,origin,dest,year,month,day,month,day,origin,dest,formattedDate,origin,dest]);
if (results.length > 0) {

Wyświetl plik

@ -60,8 +60,14 @@ router.get("/", async (req, res, next) => {
fh.day = day(t.fl_date)";
var results = await conn.query(query);
var analyzedResults = analyzeResults(results);
res.send(analyzedResults);
if (results.length > 0) {
var analyzedResults = analyzeResults(results);
res.send(analyzedResults);
}
else {
res.send(results);
}
} catch (err) {
console.log(err);
throw err;
@ -74,7 +80,7 @@ router.get("/", async (req, res, next) => {
function analyzeResults(items) {
items.forEach(item => {
let forecast = forecasts[item.origin + "_" + item.fl_date];
// Catch all in case the forecast hasn't been updated
if (forecast === undefined) {
forecast = {
@ -116,19 +122,19 @@ function round(value, precision) {
// You can either tie into an existing Weather Forecast API
// or provide hard-coded lookups like the following.
var forecasts = {
"ORD_2020-02-09": {
"ORD_2020-02-27": {
description: "Snow",
icon: "snow",
temp_low: "28°F",
temp_high: "29°F",
precip_probability: 0.6,
temp_low: "-2°C",
temp_high: "-1°C",
precip_probability: .6,
wind_speed: 15
},
"LAX_2020-02-11": {
"LAX_2020-02-28": {
description: "Clear",
icon: "clear-day",
temp_low: "56°F",
temp_high: "65°F",
temp_low: "13°C",
temp_high: "15°C",
precip_probability: 0,
wind_speed: 5
}