Merge pull request 'Add a flight arc on the map for flights with same departing and arrival airport' (#19) from add-same-point-flights into main

Reviewed-on: #19

app/Console/Commands/PopulateAirportTimezones.php

@@ -17,10 +17,7 @@ class PopulateAirportTimezones extends Command
      */
     public function handle()
     {
-        Airport::where(function ($query) {
-            $query->whereNull('timezone')
-                ->orWhere('timezone', 'Undefined');
-        })->chunkById(100, function ($airports) {
+        Airport::whereNull('timezone')->chunkById(100, function ($airports) {
             foreach ($airports as $airport) {
                 $zoneName = null;
                 $attempts = 0;

app/Http/Controllers/SearchController.php

@@ -58,38 +58,28 @@ class SearchController extends Controller
     {
         $q = request('q', '');
         $len = strlen($q);
-        $includeInactive = request()->boolean('include_inactive');
 
         if ($len < 3) return [];
 
         return Airport::with('region.country')
-            ->when(!$includeInactive, fn($query) => $query->where('active', true))
             ->when($len === 3, fn($query) => $query->where('iata_code', 'ilike', $q))
             ->when($len >= 4, fn($query) => $query->where(function ($sub) use ($q, $len) {
                 $sub->when($len === 4, fn($s) => $s->where('icao_code', 'ilike', $q))
                     ->orWhere('name', 'ilike', "%{$q}%")
                     ->orWhere('municipality', 'ilike', "%{$q}%");
-            }))
-            ->orderByRaw("
-        CASE
-            WHEN active THEN 0
-            ELSE 1
-        END
-    ")
-            ->orderByRaw("
-        CASE
-            WHEN icao_code = ? THEN 0
-            WHEN iata_code = ? THEN 1
-            ELSE 2
-        END
-    ", [$q, $q])
+            })->orderByRaw("
+            CASE
+                WHEN icao_code = ? THEN 0
+                WHEN iata_code = ? THEN 1
+                ELSE 2
+            END
+        ", [$q, $q]))
             ->limit(15)
-            ->get(['id', 'name', 'municipality', 'iata_code', 'icao_code', 'region_id', 'active'])
-            ->map(fn(Airport $airport) => [
+            ->get(['id', 'name', 'municipality', 'iata_code', 'icao_code', 'region_id'])
+            ->map(fn($airport) => [
                 'value'        => $airport->id,
                 'title'        => $airport->display_name,
                 'country_code' => strtolower($airport->region->country->code),
-                'active'       => $airport->active,
             ])
             ->values();
     }

app/Models/Airport.php

@@ -20,14 +20,12 @@ class Airport extends Model
         'icao_code',
         'iata_code',
         'local_code',
-        'active',
     ];
 
     protected $casts = [
         'latitude_deg'  => 'float',
         'longitude_deg' => 'float',
         'elevation_ft'  => 'integer',
-        'active'        => 'boolean',
     ];
 
     protected $appends = [
@@ -39,8 +37,6 @@ class Airport extends Model
         'LHR', 'LGW', 'STN', 'LTN', 'LCY', 'SEN',
     ];
 
-
-
     protected function displayName() : Attribute{
         return Attribute::make(
             get: function () {
@@ -57,11 +53,6 @@ class Airport extends Model
         );
     }
 
-    public function scopeActive($query)
-    {
-        return $query->where('active', true);
-    }
-
     public function region(): BelongsTo
     {
         return $this->belongsTo(Region::class);

database/migrations/2026_08_22_031806_add_historic_airports.php

@@ -1,133 +0,0 @@
-<?php
-
-use App\Models\Airport;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('airports', function (Blueprint $table) {
-            $table->boolean('active')->default(true);
-        });
-
-        Airport::whereIataCode('TXL')->update(['active' => false]);
-        $this->importCsv();
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('airports', function (Blueprint $table) {
-            $table->dropColumn('active');
-        });
-    }
-
-    private function importCsv(): void
-    {
-        $path = storage_path('app/private/seed_data/airports.csv');
-
-        if (! file_exists($path)) {
-            throw new \RuntimeException("Airports CSV not found at: {$path}");
-        }
-
-        $handle = fopen($path, 'rb');
-
-        if ($handle === false) {
-            throw new \RuntimeException("Failed to open airports CSV at: {$path}");
-        }
-
-        // Skip header row
-        fgetcsv($handle);
-
-        $regionMap = DB::table('regions')->pluck('id', 'code')->all();
-
-        $batch     = [];
-        $batchSize = 500;
-        $now       = now()->toDateTimeString();
-
-        while (($row = fgetcsv($handle)) !== false) {
-            if (count($row) < 19) {
-                continue;
-            }
-
-            // id, ident, type, name, latitude_deg, longitude_deg, elevation_ft,
-            // continent, iso_country, iso_region, municipality, scheduled_service,
-            // icao_code, iata_code, gps_code, local_code, home_link, wikipedia_link, keywords
-            [
-                ,
-                ,
-                $type,
-                $name,
-                $latitudeDeg,
-                $longitudeDeg,
-                $elevationFt,
-                ,
-                ,
-                $isoRegion,
-                $municipality,
-                ,
-                $icaoCode,
-                $iataCode,
-                ,
-                $localCode,
-            ] = $row;
-
-            $icaoCode = trim(str_replace(["\r", "\n"], '', $icaoCode));
-            $iataCode = trim(str_replace(["\r", "\n"], '', $iataCode));
-
-            // Only importing airports with no IATA/ICAO code — coded airports are already in the DB
-            if ($icaoCode !== '' || $iataCode !== '') {
-                continue;
-            }
-
-            $type = trim($type);
-            $name = trim($name);
-            $localCode = trim($localCode);
-            $isoRegion = trim($isoRegion);
-
-            if (! isset($regionMap[$isoRegion])) {
-                continue;
-            }
-
-            $elevationFt = trim($elevationFt);
-
-            $batch[] = [
-                'type'              => $type,
-                'name'              => $name,
-                'latitude_deg'      => (float) trim($latitudeDeg),
-                'longitude_deg'     => (float) trim($longitudeDeg),
-                'elevation_ft'      => $elevationFt !== '' ? (int) $elevationFt : null,
-                'region_id'         => $regionMap[$isoRegion],
-                'municipality'      => trim($municipality) !== '' ? trim($municipality) : null,
-                'icao_code'         => null,
-                'iata_code'         => null,
-                'local_code'        => $localCode !== '' ? $localCode : null,
-                'timezone'          => 'Undefined',
-                'active'            => $type !== 'closed',
-                'created_at'        => $now,
-                'updated_at'        => $now,
-            ];
-
-            echo "Added: {$name}\n";
-
-            if (count($batch) >= $batchSize) {
-                DB::table('airports')->insert($batch);
-                $batch = [];
-            }
-        }
-
-        fclose($handle);
-
-        if (! empty($batch)) {
-            DB::table('airports')->insert($batch);
-        }
-    }
-};

resources/js/Components/FlightsGoneBy/AirportSearchBox.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, nextTick, watch } from 'vue'
+import { ref, nextTick } from 'vue'
 import axios from 'axios'
 
 const props = defineProps<{
@@ -12,8 +12,6 @@ const model = defineModel<{ value: number, title: string, country_code: string }
 
 const airportOptions = ref(props.prefilledOptions ?? [])
 const autocompleteRef = ref<any>(null)
-const includeInactive = ref(true)
-const lastQuery = ref('')
 
 const onFocus = () => {
     nextTick(() => {
@@ -23,8 +21,6 @@ const onFocus = () => {
 }
 
 const searchAirports = async (query: string) => {
-    lastQuery.value = query
-
     if (!query || query.length < 2) {
         airportOptions.value = props.prefilledOptions ?? []
         return
@@ -32,19 +28,9 @@ const searchAirports = async (query: string) => {
 
     if (query === model.value?.title) return
 
-    const { data } = await axios.get('/search/airports', {
-        params: {
-            q: query,
-            include_inactive: includeInactive.value ? 1 : undefined,
-        },
-    })
+    const { data } = await axios.get('/search/airports', { params: { q: query } })
     airportOptions.value = data
 }
-
-// Re-run the last search when the checkbox is toggled, so results update immediately
-watch(includeInactive, () => {
-    if (lastQuery.value) searchAirports(lastQuery.value)
-})
 </script>
 
 <template>
@@ -76,6 +62,7 @@ watch(includeInactive, () => {
                         <span :class="`fi fi-${item.country_code}`"></span>
                     </span>
                 </template>
+
             </v-list-item>
         </template>
     </v-autocomplete>

resources/js/Components/FlightsGoneBy/FlightMap.vue

@@ -370,13 +370,37 @@ export default defineComponent({
             link.click()
         }
 
+        function loopPoints(origin: LngLat, radiusDeg = 0.2, steps = 48): LngLat[] {
+            const [lng, lat] = origin
+
+            // Widen the longitude radius to compensate for mercator distortion at this latitude
+            const lngRadius = radiusDeg / Math.max(Math.cos(lat * Math.PI / 180), 0.15)
+
+            // Center the loop above the origin so the airport point sits at the bottom of the loop
+            const centerLat = lat + radiusDeg
+
+            const points: LngLat[] = []
+            for (let i = 0; i <= steps; i++) {
+                const theta = (i / steps) * Math.PI * 2
+                points.push([
+                    lng + Math.sin(theta) * lngRadius,
+                    centerLat - radiusDeg * Math.cos(theta),
+                ])
+            }
+            return points // first and last point === origin, at the bottom of the loop
+        }
+
         const getArc = (flight: Flight): LngLat[] => {
             const key = routeKey(flight.departure_airport, flight.arrival_airport)
             if (!arcCache.has(key)) {
-                arcCache.set(key, greatCirclePoints(
-                    [flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg],
-                    [flight.arrival_airport.longitude_deg,   flight.arrival_airport.latitude_deg],
-                ))
+                const isSameAirport = flight.departure_airport.id === flight.arrival_airport.id
+
+                arcCache.set(key, isSameAirport
+                    ? loopPoints([flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg])
+                    : greatCirclePoints(
+                        [flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg],
+                        [flight.arrival_airport.longitude_deg,   flight.arrival_airport.latitude_deg],
+                    ))
             }
             return arcCache.get(key)!
         }
@@ -666,8 +690,10 @@ export default defineComponent({
                 ? { top: 20, bottom: 20, left: 55, right: 55 }
                 : { top: 60, bottom: 60, left: 60, right: 60 }
 
-            const lngs = props.flights.flatMap(f => [f.departure_airport.longitude_deg, f.arrival_airport.longitude_deg])
-            const lats = props.flights.flatMap(f => [f.departure_airport.latitude_deg,  f.arrival_airport.latitude_deg])
+            // Use full arc/loop geometry, not just endpoints, so loops aren't clipped
+            const allPoints = props.flights.flatMap(getArc)
+            const lngs = allPoints.map(p => p[0])
+            const lats = allPoints.map(p => p[1])
 
             const minLat = Math.min(...lats)
             const maxLat = Math.max(...lats)
@@ -689,7 +715,6 @@ export default defineComponent({
             }
             map!.fitBounds([[minLng, minLat], [maxLng, maxLat]], { padding, duration: 0 })
         }
-
         // ── Map init ──────────────────────────────────────────────────────────
 
         const initMap = (): void => {