Cleanup

client/src/components/AirQuality.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import {ref, onMounted} from 'vue';
-import {api} from '../../services/api';
+import {api} from '../services/api';
 import MetricRow from './MetricRow.vue';
 
 const d = ref<any>(null);

client/src/components/MapView.vue

@@ -15,7 +15,7 @@ import { fromLonLat, toLonLat } from 'ol/proj'
 import { Style, Fill, Stroke, Circle as CircleStyle } from 'ol/style'
 import 'ol/ol.css'
 
-const current = ref([0, 0]);
+const current = ref({latitude: 0, longitude: 0});
 const props  = defineProps<{ dark: boolean }>()
 const mapEl  = ref<HTMLDivElement>()
 const showOverlays = ref(false)
@@ -60,7 +60,7 @@ function buildWindSrc(lat: number, lon: number, zoom: number) {
 
 function syncWindSrc() {
 	const view   = map.getView()
-	const center = toLonLat(view.getCenter()!)
+	const center: any = toLonLat(view.getCenter()!)
 	windSrc.value = buildWindSrc(center[1], center[0], view.getZoom() ?? 8)
 }
 

client/src/components/MetricChart.vue

@@ -1,53 +1,48 @@
 <script setup lang="ts">
-import { computed, ref, onMounted } from 'vue'
+import {computed, ref, onMounted} from 'vue';
-import { Line } from 'vue-chartjs'
+import {Line} from 'vue-chartjs';
 import {
 	Chart as ChartJS, CategoryScale, LinearScale, PointElement,
 	LineElement, Tooltip, Legend, Filler, type ChartOptions
-} from 'chart.js'
+} from 'chart.js';
-import { METRICS, formatValue } from '../services/units'
+import {METRICS, formatValue} from '../services/units';
-import { fetchHistoricHourly } from '../services/weather'
+import type {DataRow} from '../services/api';
-import type { DataRow } from '../services/api'
+import {api} from '../services/api';
-import { api } from '../services/api'
 
-ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Tooltip, Legend, Filler)
+ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Tooltip, Legend, Filler);
 
-const props = defineProps<{ metricKey: string; currentData: DataRow }>()
+const props = defineProps<{metricKey: string; currentData: DataRow}>();
 
-const historic  = ref<DataRow[]>([])
+const historic = ref<DataRow[]>([]);
-const forecast  = ref<DataRow[]>([])
+const forecast = ref<DataRow[]>([]);
-const loading   = ref(true)
+const loading = ref(true);
-const meta      = computed(() => METRICS[props.metricKey])
+const meta = computed(() => METRICS[props.metricKey]);
 
 onMounted(async () => {
-  const now   = new Date()
+	const start = new Date(Date.now() - 24 * 3600000);
-  const start = new Date(now.getTime() - 24 * 3600000).toISOString()
+	const end = new Date(Date.now() + 48 * 3600000);
-  const end   = new Date(now.getTime() + 48 * 3600000).toISOString()
+	const hourly = await api.hourly(start, end);
-  const [hist, fore] = await Promise.allSettled([
+	historic.value = hourly.filter((h: any) => new Date(h.time).getTime() <= Date.now());
-    fetchHistoricHourly(start, now.toISOString()),
+	forecast.value = hourly.filter((h: any) => new Date(h.time).getTime() > Date.now());
-    api.hourly(now.toISOString(), end),
+	loading.value = false;
-  ])
+});
-  if (hist.status === 'fulfilled') historic.value = hist.value.filter(r => r[props.metricKey] != null)
-  if (fore.status === 'fulfilled') forecast.value = fore.value.filter(r => r[props.metricKey] != null)
-  loading.value = false
-})
 
 const nowLabel = computed(() => {
-  const d = new Date()
+	const d = new Date();
-  return `${d.getHours().toString().padStart(2,'0')}:${d.getMinutes().toString().padStart(2,'0')}`
+	return `${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
-})
+});
 
 const chartData = computed(() => {
-  const color   = meta.value?.color ?? '#38bdf8'
+	const color = meta.value?.color ?? '#38bdf8';
-  const histLabels = historic.value.map(r  => r.time as string)
+	const histLabels = historic.value.map(r => r.time as string);
-  const foreLabels = forecast.value.map(r  => r.time as string)
+	const foreLabels = forecast.value.map(r => r.time as string);
-  const histVals   = historic.value.map(r  => r[props.metricKey] as number)
+	const histVals = historic.value.map(r => r[props.metricKey] as number);
-  const foreVals   = forecast.value.map(r  => r[props.metricKey] as number)
+	const foreVals = forecast.value.map(r => r[props.metricKey] as number);
-  const currentVal = props.currentData[props.metricKey] as number | null
+	const currentVal = props.currentData[props.metricKey] as number | null;
 
-  const allLabels = [...histLabels, nowLabel.value, ...foreLabels]
+	const allLabels = [...histLabels, nowLabel.value, ...foreLabels];
-  const histData  = [...histVals, currentVal, ...foreVals.map(() => null)]
+	const histData = [...histVals, currentVal, ...foreVals.map(() => null)];
-  const foreData  = [...histVals.map(() => null), currentVal, ...foreVals]
+	const foreData = [...histVals.map(() => null), currentVal, ...foreVals];
 
 	return {
 		labels: allLabels,
@@ -87,8 +82,8 @@ const chartData = computed(() => {
 				spanGaps: false,
 			}
 		]
-  }
+	};
-})
+});
 
 const chartOptions = computed<ChartOptions<'line'>>(() => ({
 	responsive: true,
@@ -109,8 +104,8 @@ const chartOptions = computed<ChartOptions<'line'>>(() => ({
 				maxTicksLimit: 12,
 				maxRotation: 0,
 				callback(val, i) {
-          const lbl = this.getLabelForValue(i)
+					const lbl = this.getLabelForValue(i);
-          return lbl?.length === 5 && lbl.endsWith(':00') ? lbl : ''
+					return lbl?.length === 5 && lbl.endsWith(':00') ? lbl : '';
 				}
 			},
 			grid: {color: 'var(--border)'},
@@ -132,7 +127,7 @@ const chartOptions = computed<ChartOptions<'line'>>(() => ({
 			}
 		}
 	}
-}))
+}));
 </script>
 
 <style scoped lang="scss">

client/src/components/Sun.vue

@@ -45,12 +45,12 @@ const arc = computed(() => {
 	});
 
 	const splitIdx = Math.round(pct * 200);
-	const { x: cx, y: cy } = pts[splitIdx];
+	const { x: cx, y: cy } = <any>pts[splitIdx];
 
 	// Filled traveled path: close down to horizon baseline for fill
 	const traveledPts = pts.slice(0, splitIdx + 1);
 	const filledPath = traveledPts.map((p, i) => `${i === 0 ? 'M' : 'L'}${p.x.toFixed(1)},${p.y.toFixed(1)}`).join(' ')
-		+ ` L${traveledPts[traveledPts.length - 1].x.toFixed(1)},${HORIZON}`
+		+ ` L${(<any>traveledPts[traveledPts.length - 1]).x.toFixed(1)},${HORIZON}`
 		+ ` L${x1},${HORIZON} Z`;
 
 	// Remaining path stroke only

server/src/server.mjs

@@ -13,7 +13,6 @@ import {getADSB, getAirTrafficHistory, getShapes, initAircraftDb} from './adsb.m
 import {getWeatherCondition} from './openweather.mjs';
 import {lastForecast, getForecast, forecastTTL} from './forecast.mjs';
 import {dailyWeather, hourlyWeather} from './openmeteo.mjs';
-import {init} from 'express/lib/application.js';
 // import {Aurora} from './aurora.mjs';
 
 // ── Uncaught error handlers ───────────────────────────────────────────────────