auto formatting

pull/3/head
Fionn 2 years ago
parent 1f8979cee8
commit 5bcd588b0f

@ -25,7 +25,7 @@ app.use((err, req: Request, res: Response, next: NextFunction) => {
res.status(500).json({ msg: 'an error occurred' }); res.status(500).json({ msg: 'an error occurred' });
}); });
nodesched.scheduleJob('regenerate data', '*/30 * * * * *', wxService.wrappedGenerateData) nodesched.scheduleJob('regenerate data', '*/30 * * * * *', wxService.wrappedGenerateData);
wxService.wrappedGenerateData(); wxService.wrappedGenerateData();
const server = app.listen(PORT, () => { const server = app.listen(PORT, () => {

@ -15,7 +15,7 @@ export async function getRegion(req: express.Request, res: express.Response, nex
const regionData = regionsService.getRegion(region); const regionData = regionsService.getRegion(region);
if(!regionData) { if (!regionData) {
return next(); return next();
} }

@ -23,4 +23,4 @@ export function getConfig(): WxConfig {
export default { export default {
getConfig, getConfig,
} };

@ -1,6 +1,6 @@
import configService, { WxConfig, WxRegion } from "./config.service"; import configService, { WxConfig, WxRegion } from './config.service';
export function getRegions(): WxConfig["regions"] { export function getRegions(): WxConfig['regions'] {
return configService.getConfig().regions; return configService.getConfig().regions;
} }

@ -1,8 +1,8 @@
import axios from "axios"; import axios from 'axios';
import { WxFix } from "./config.service"; import { WxFix } from './config.service';
import regionsService from "./regions.service"; import regionsService from './regions.service';
const cachedData: {[key: string]: WxData} = {}; const cachedData: { [key: string]: WxData } = {};
const qnhLevelMapping = { const qnhLevelMapping = {
200: 390, 200: 390,
@ -12,7 +12,7 @@ const qnhLevelMapping = {
500: 180, 500: 180,
600: 140, 600: 140,
700: 100, 700: 100,
850: 50 850: 50,
}; };
const necessaryDatapoints = [ const necessaryDatapoints = [
@ -34,10 +34,10 @@ for (const qnh of Object.keys(qnhLevelMapping)) {
} }
interface WxLevelData { interface WxLevelData {
"T(K)": string; 'T(K)': string;
windspeed: string; windspeed: string;
windhdg: string; windhdg: string;
}; }
export interface WxFixData { export interface WxFixData {
coords: { coords: {
@ -68,27 +68,27 @@ export async function getDataAtFix(fix: WxFix, index: number): Promise<WxFixData
const data: WxFixData = { const data: WxFixData = {
coords: { coords: {
lat: String(fix.lat), lat: String(fix.lat),
long: String(fix.lon) long: String(fix.lon),
}, },
levels: {} levels: {},
} };
data.levels["0"] = { data.levels['0'] = {
"T(K)": String(Number(hourlyData?.[`temperature_2m`]?.[index]) + 273.15), 'T(K)': String(Number(hourlyData?.temperature_2m?.[index]) + 273.15),
"windspeed": String(hourlyData?.[`windspeed_10m`]?.[index]), 'windspeed': String(hourlyData?.windspeed_10m?.[index]),
"windhdg": String(hourlyData?.[`winddirection_10m`]?.[index]), 'windhdg': String(hourlyData?.winddirection_10m?.[index]),
}; };
for(const [qnh, fl] of Object.entries(qnhLevelMapping)) { for (const [qnh, fl] of Object.entries(qnhLevelMapping)) {
const temp = Number(hourlyData?.[`temperature_${qnh}hPa`]?.[index]) + 273.15; const temp = Number(hourlyData?.[`temperature_${qnh}hPa`]?.[index]) + 273.15;
const dir = hourlyData?.[`winddirection_${qnh}hPa`]?.[index]; const dir = hourlyData?.[`winddirection_${qnh}hPa`]?.[index];
const speed = hourlyData?.[`windspeed_${qnh}hPa`]?.[index]; const speed = hourlyData?.[`windspeed_${qnh}hPa`]?.[index];
data.levels[String(fl)] = { data.levels[String(fl)] = {
"T(K)": String(temp), 'T(K)': String(temp),
"windspeed": String(speed), 'windspeed': String(speed),
"windhdg": String(dir), 'windhdg': String(dir),
} };
} }
return data; return data;
@ -104,10 +104,10 @@ export async function generateData() {
info: { info: {
date: now.toISOString(), date: now.toISOString(),
datestring: `${now.getUTCDate()}${now.getUTCHours()}`, datestring: `${now.getUTCDate()}${now.getUTCHours()}`,
legal: "Weather data by Open-Meteo.com (https://open-meteo.com)" legal: 'Weather data by Open-Meteo.com (https://open-meteo.com)',
}, },
data: {} data: {},
} };
for (const fix of region.fixes) { for (const fix of region.fixes) {
regionData.data[fix.name] = await getDataAtFix(fix, now.getUTCHours()); regionData.data[fix.name] = await getDataAtFix(fix, now.getUTCHours());
@ -133,4 +133,4 @@ export default {
getWx, getWx,
generateData, generateData,
wrappedGenerateData, wrappedGenerateData,
} };

Loading…
Cancel
Save