fix(services/content/flights): proper typings

Author: ythecombinator

src/components/pages/about/flight-map.tsx

@@ -1,12 +1,11 @@
-import { useMotionValue, useSpring, useTransform } from 'framer-motion';
 import 'leaflet/dist/leaflet.css';
 import { useTheme } from 'next-themes';
 import dynamic from 'next/dynamic';
 import { useState } from 'react';
 
 import { Airline, Flight } from 'services/content/flights';
 
-import { airportCoordinates, getAirlineColor, getTileUrl } from 'utils/flights';
+import { AirportCode, airportCoordinates, getAirlineColor, getTileUrl } from 'utils/flights';
 import { classNames } from 'utils/styles';
 
 import Tooltip from 'components/shared/tooltip';
@@ -55,18 +54,12 @@ function AirlineSelector({ airlines, selectedAirline, setSelectedAirline, isDark
 
 interface MapProps {
   flights: Flight[];
-  airports: string[];
+  airports: Array<AirportCode>;
   isDarkMode: boolean;
 }
 
 function Map({ flights, airports, isDarkMode }: MapProps) {
   const [hoveredFlight, setHoveredFlight] = useState<number | null>(null);
-  const x = useMotionValue(0);
-
-  const config = { damping: 5, stiffness: 100 };
-  const rotate = useSpring(useTransform(x, [-100, 100], [-45, 45]), config);
-  const translateX = useSpring(useTransform(x, [-100, 100], [-47, 47]), config);
-
   return (
     <MapContainer center={[20, 0]} zoom={2} className="absolute inset-0 w-full h-full">
       <TileLayer
@@ -137,7 +130,7 @@ function Map({ flights, airports, isDarkMode }: MapProps) {
 interface FlightMapProps {
   flights: Flight[];
   airlines: Airline[];
-  airports: string[];
+  airports: AirportCode[];
 }
 
 export default function FlightMap({ flights, airlines, airports }: FlightMapProps) {

src/data/currency.json

@@ -1,17 +1,17 @@
 {
   "CZK": {
-    "timestamp": 1726323987664,
+    "timestamp": 1727572583111,
     "base": "CZK",
     "rates": {
-      "USD": 0.044067,
-      "EUR": 0.039762,
-      "GBP": 0.033578,
-      "JPY": 6.20612615,
-      "BRL": 0.245231,
-      "AUD": 0.065732,
-      "CAD": 0.059915,
-      "CHF": 0.03742,
-      "INR": 3.696372
+      "USD": 0.044418,
+      "EUR": 0.03976,
+      "GBP": 0.03322,
+      "JPY": 6.3142563,
+      "BRL": 0.241362,
+      "AUD": 0.064271,
+      "CAD": 0.060068,
+      "CHF": 0.037365,
+      "INR": 3.718504
     }
   }
 }

src/services/content/flights.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
-import { airlineNames } from 'utils/flights';
+import { AirlineCode, airlineNames, AirportCode } from 'utils/flights';
 
 //  ---------------------------------------------------------------------------
 //  UTILS
@@ -14,16 +14,16 @@ const DATA_SRC = join(process.cwd(), 'src/data/flights.txt');
 //  ---------------------------------------------------------------------------
 
 export interface Flight {
-  airline: keyof typeof airlineNames;
+  airline: AirlineCode;
   flightNumber: string;
-  origin: string;
-  destination: string;
+  origin: AirportCode;
+  destination: AirportCode;
   departureTime: string;
   arrivalTime: string;
 }
 
 export interface Airline {
-  code: keyof typeof airlineNames;
+  code: AirlineCode;
   name: string;
 }
 
@@ -53,7 +53,14 @@ export default class FlightsContentService {
       .map((line) => {
         const [, , , , , , , airline, flightNumber, , origin, destination, departureTime, arrivalTime] =
           line.split(';');
-        return { airline, flightNumber, origin, destination, departureTime, arrivalTime };
+        return {
+          airline: airline as AirlineCode,
+          origin: origin as AirportCode,
+          destination: destination as AirportCode,
+          flightNumber,
+          departureTime,
+          arrivalTime,
+        };
       })
       .filter((flight) => flight.airline && flight.flightNumber && flight.origin && flight.destination);
   }
@@ -62,7 +69,7 @@ export default class FlightsContentService {
   //  getters
   //  ---------------------------------------------------------------------------
 
-  public getAirlines(): Airline[] {
+  public getAirlines() {
     const airlineSet = new Set(this.flights.map((flight) => flight.airline));
 
     return Array.from(airlineSet).map((code) => ({
@@ -72,7 +79,7 @@ export default class FlightsContentService {
   }
 
   public getAirports() {
-    const airportSet = new Set<string>();
+    const airportSet = new Set<AirportCode>();
 
     this.flights.forEach((flight) => {
       airportSet.add(flight.origin);

src/utils/flights.ts

@@ -45,7 +45,7 @@ export const airportCoordinates = {
   LHR: [51.47, -0.4543],
   NTE: [47.1531, -1.6111],
   ASR: [38.7704, 35.495],
-} as const;
+} as const satisfies Record<string, [number, number]>;
 
 export const airlineColors: { [key: string]: string } = {
   AD: '#D81B60', // Azul Brazilian Airlines
@@ -117,3 +117,10 @@ export const getTileUrl = (isDarkMode: boolean) =>
   isDarkMode
     ? 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png'
     : 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+
+//  ---------------------------------------------------------------------------
+//  Types
+//  ---------------------------------------------------------------------------
+
+export type AirportCode = keyof typeof airportCoordinates;
+export type AirlineCode = keyof typeof airlineNames;