Updated Registration Column name and distance achievement units

app/Http/Controllers/SearchController.php

@@ -58,12 +58,17 @@ class SearchController extends Controller
     {
         $q = request('q', '');
         $len = strlen($q);
-        $includeInactive = request()->boolean('include_inactive');
+        $showClosed = request()->boolean('show_closed');
+        $showNoCode = request()->boolean('show_no_code');
 
         if ($len < 3) return [];
 
         return Airport::with('region.country')
-            ->when(!$includeInactive, fn($query) => $query->where('active', true))
+            ->when(!$showClosed, fn($query) => $query->where('active', true))
+            ->when(!$showNoCode, fn($query) => $query->where(function ($sub) {
+                $sub->whereNotNull('iata_code')
+                    ->orWhereNotNull('icao_code');
+            }))
             ->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))
@@ -71,18 +76,25 @@ class SearchController extends Controller
                     ->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])
+                    CASE
+                        WHEN active THEN 0
+                        ELSE 1
+                    END
+                ")
+                            ->orderByRaw("
+                    CASE
+                        WHEN iata_code IS NOT NULL AND icao_code IS NOT NULL THEN 0
+                        WHEN iata_code IS NOT NULL OR icao_code IS NOT NULL THEN 1
+                        ELSE 2
+                    END
+                ")
+                            ->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) => [

app/Http/Middleware/HandleInertiaRequests.php

@@ -58,6 +58,7 @@ class HandleInertiaRequests extends Middleware
                 ->whereNull('expires_at')
                 ->orWhere('expires_at', '>', now())
                 ->count(),
+            'carto_api_key' => config('services.carto.key'),
         ];
     }
 }

app/Services/Achievements/Checkers/GeneralFlyingChecker.php

@@ -19,7 +19,7 @@ class GeneralFlyingChecker extends BaseChecker
 
         // --- Boolean achievements ---
 
-        $this->awardIf($allLoggedFlightsCount >= 1, 'general_flying.first_flight');
+        $this->awardIf($allLoggedFlightsCount >= 1, 'number_of_flights.first_flight');
 
         $this->awardIf(
             $flights->contains(fn ($f) => $f->isDomestic()),
@@ -69,10 +69,10 @@ class GeneralFlyingChecker extends BaseChecker
             'general_flying.domestic_two_countries'
         );
 
-        $this->awardProgress($count,'general_flying.10_flights');
-        $this->awardProgress($count,'general_flying.50_flights');
-        $this->awardProgress($count,'general_flying.100_flights');
-        $this->awardProgress($count,'general_flying.500_flights');
-        $this->awardProgress($count,'general_flying.1000_flights');
+        $this->awardProgress($count,'number_of_flights.10_flights');
+        $this->awardProgress($count,'number_of_flights.50_flights');
+        $this->awardProgress($count,'number_of_flights.100_flights');
+        $this->awardProgress($count,'number_of_flights.500_flights');
+        $this->awardProgress($count,'number_of_flights.1000_flights');
     }
 }

app/Settings/SettingsRegistry.php

@@ -133,7 +133,7 @@ class SettingsRegistry
                 'category' => 'FlightsGoneBy Settings',
                 'type'     => 'multiselect',
                 'label'    => 'Which columns to show on the Departure Board',
-                'default'  => ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined'],
+                'default'  => ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'aircraft_registration', 'class_seat_combined'],
                 'options'  => [
                     ['value' => 'airline', 'label' => 'Airline Logo w/ Info Popup'],
                     ['value' => 'airline.name', 'label' => 'Airline Name'],
@@ -148,7 +148,7 @@ class SettingsRegistry
                     ['value' => 'duration', 'label' => 'Duration'],
                     ['value' => 'distance', 'label' => 'Distance'],
                     ['value' => 'aircraft', 'label' => 'Aircraft Designator w/ Info Popup'],
-                    ['value' => 'registration', 'label' => 'Aircraft Registration'],
+                    ['value' => 'aircraft_registration', 'label' => 'Aircraft Registration'],
                     ['value' => 'aircraft.manufacturer_code', 'label' => 'Aircraft Manufacturer'],
                     ['value' => 'aircraft.model_full_name', 'label' => 'Aircraft Model'],
                     ['value' => 'flight_class', 'label' => 'Class'],

config/services.php

@@ -18,6 +18,10 @@ return [
         'key' => env('POSTMARK_API_KEY'),
     ],
 
+    'carto' => [
+      'key' => env('CARTO_API_KEY'),
+    ],
+
     'resend' => [
         'key' => env('RESEND_API_KEY'),
     ],

database/migrations/2026_09_15_045243_update_column_settings.php

@@ -0,0 +1,65 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $this->renameDepartureBoardColumn('registration', 'aircraft_registration');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $this->renameDepartureBoardColumn('aircraft_registration', 'registration');
+    }
+
+    /**
+     * Walk every user's settings JSON and rename a value inside
+     * departure_board_columns, if present.
+     */
+    private function renameDepartureBoardColumn(string $from, string $to): void
+    {
+        DB::table('users')
+            ->select('id', 'settings')
+            ->whereNotNull('settings')
+            ->orderBy('id')
+            ->chunkById(500, function ($users) use ($from, $to) {
+                foreach ($users as $user) {
+                    $settings = json_decode($user->settings, true);
+
+                    // Skip rows with malformed/empty JSON rather than blowing up the migration.
+                    if (! is_array($settings) || ! isset($settings['departure_board_columns'])) {
+                        continue;
+                    }
+
+                    if (! is_array($settings['departure_board_columns'])) {
+                        continue;
+                    }
+
+                    $columns = $settings['departure_board_columns'];
+                    $key = array_search($from, $columns, true);
+
+                    if ($key === false) {
+                        continue; // nothing to change for this user
+                    }
+
+                    $columns[$key] = $to;
+                    $settings['departure_board_columns'] = $columns;
+
+                    DB::table('users')
+                        ->where('id', $user->id)
+                        ->update([
+                            'settings' => json_encode($settings),
+                        ]);
+                }
+            });
+    }
+};

resources/js/Components/FlightsGoneBy/AchievementCard.vue

@@ -9,12 +9,6 @@ import ButtonLink from "@/Components/FlightsGoneBy/ButtonLink.vue";
 import Distance from "@/Components/Distance.vue";
 import FormattedNumber from "@/Components/FormattedNumber.vue";
 
-const distanceAchievements = [
-    'general_flying.circumference_of_the_earth',
-    'general_flying.to_the_moon',
-    'general_flying.gigametre'
-];
-
 const props = defineProps<{
     achievement: Achievement
     userAchievement?: UserAchievement
@@ -22,6 +16,20 @@ const props = defineProps<{
     distanceUnit? : "mi" | "km" | "nm"
 }>()
 
+const dynamicDistanceUnit = computed(() => {
+    if(props.achievement.internal_name == 'distance.million_miles'){
+        return 'mi'
+    }
+
+    if(props.achievement.internal_name == 'distance.million_kilometers'){
+        return 'km'
+    }
+
+    return props.distanceUnit ?? 'km';
+})
+
+
+
 const progress = computed(() => {
     if (!props.achievement.progressive || !props.achievement.threshold) return null
     const current = props.userAchievement?.progress ?? 0
@@ -92,9 +100,9 @@ const unlocked = computed(() => {
 
                     <template v-if="achievement.progressive && progress">
                         <div class="progress-label">
-                            <span v-if="distanceAchievements.includes(achievement.internal_name)">
-                                <Distance :unit="distanceUnit" :showUnits="false" :value="Math.min(progress.current, progress.threshold)" /> /
-                                <Distance :unit="distanceUnit" :value="progress.threshold" />
+                            <span v-if="achievement.category?.internal_name == 'distance'">
+                                <Distance :unit="dynamicDistanceUnit" :showUnits="false" :value="Math.min(progress.current, progress.threshold)" /> /
+                                <Distance :unit="dynamicDistanceUnit" :value="progress.threshold" />
                             </span>
                             <span v-else>
                                 <FormattedNumber :value="Math.min(progress.current, progress.threshold)" /> /

resources/js/Components/FlightsGoneBy/AirportSearchBox.vue

@@ -12,10 +12,14 @@ 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 showClosed = ref(false)
+const showNoCode = ref(false)
 const lastQuery = ref('')
+const menuOpen = ref(false)
 
 const onFocus = () => {
+    menuOpen.value = true
+
     nextTick(() => {
         const input = autocompleteRef.value?.$el?.querySelector('input')
         input?.select()
@@ -35,14 +39,15 @@ const searchAirports = async (query: string) => {
     const { data } = await axios.get('/search/airports', {
         params: {
             q: query,
-            include_inactive: includeInactive.value ? 1 : undefined,
+            show_closed: showClosed.value ? 1 : undefined,
+            show_no_code: showNoCode.value ? 1 : undefined,
         },
     })
     airportOptions.value = data
 }
 
-// Re-run the last search when the checkbox is toggled, so results update immediately
-watch(includeInactive, () => {
+// Re-run the last search when either checkbox is toggled, so results update immediately
+watch([showClosed, showNoCode], () => {
     if (lastQuery.value) searchAirports(lastQuery.value)
 })
 </script>
@@ -51,6 +56,7 @@ watch(includeInactive, () => {
     <v-autocomplete
         ref="autocompleteRef"
         v-model="model"
+        v-model:menu="menuOpen"
         :label="label ?? 'Airport'"
         :items="airportOptions"
         :error-messages="errorMessages"
@@ -62,6 +68,7 @@ watch(includeInactive, () => {
         clearable
         hide-no-data
         return-object
+        autocomplete="off"
         :custom-filter="() => true"
     >
         <template #prepend-inner>
@@ -69,6 +76,27 @@ watch(includeInactive, () => {
             <span v-if="model" :class="`fi fi-${model.country_code}`"></span>
             </span>
         </template>
+
+        <template #prepend-item>
+            <div class="px-4 py-1 d-flex align-center" style="gap: 16px;" @mousedown.prevent>
+                <v-checkbox
+                    v-model="showClosed"
+                    label="Show Closed Airports"
+                    density="compact"
+                    hide-details
+                    style="flex: none; transform: scale(0.65); transform-origin: left center;"
+                />
+                <v-checkbox
+                    v-model="showNoCode"
+                    label="Show Airports with No Code"
+                    density="compact"
+                    hide-details
+                    style="flex: none; transform: scale(0.65); transform-origin: left center;"
+                />
+            </div>
+            <v-divider class="mt-1" />
+        </template>
+
         <template #item="{ item, props: itemProps }">
             <v-list-item v-bind="itemProps">
                 <template #prepend>

resources/js/Components/FlightsGoneBy/DepartureBoard.vue

@@ -17,7 +17,7 @@ const props = defineProps<{
 const page = usePage<SharedProps>().props
 const ITEMS_PER_PAGE = 25
 
-const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined', 'note']
+const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'aircraft_registration', 'class_seat_combined', 'note']
 const columnsToShow = computed(() => page.auth.user?.resolved_settings?.departure_board_columns ?? defaultColumns)
 const showColumn = (column: string) => columnsToShow.value.includes(column)
 
@@ -38,7 +38,7 @@ const allHeaders = [
     { title: 'MODEL', key: 'aircraft.model_full_name', sortable: true },
     { title: 'AIRCRAFT', key: 'aircraft.display_name_short', sortable: true },
     { title: 'AIRCRAFT', key: 'aircraft', sortable: true },
-    { title: 'REG', key: 'registration', sortable: true },
+    { title: 'REG', key: 'aircraft_registration', sortable: true },
     { title: 'CLASS', key: 'flight_class', sortable: true },
     { title: 'CLASS', key: 'class_seat_combined', sortable: true },
     { title: 'SEAT TYPE', key: 'seat_type_id', sortable: true },
@@ -70,7 +70,7 @@ const customKeySort = {
     aircraft: (a: Flight['aircraft'], b: Flight['aircraft']) => (a?.designator ?? '').localeCompare(b?.designator ?? ''),
     duration: (a: any, b: any) => (a ?? 0) - (b ?? 0),
     departure_airport: (a: Flight['departure_airport'], b: Flight['departure_airport']) => (a?.display_code ?? '').localeCompare(b?.display_code ?? ''),
-    arrival_airport: (a: Flight['arrival_airport'], b: Flight['arrival_airport']) => (a?.display_code ?? '').localeCompare(b?.display_code ?? '')
+    arrival_airport: (a: Flight['arrival_airport'], b: Flight['arrival_airport']) => (a?.display_code ?? '').localeCompare(b?.display_code ?? ''),
 }
 
 const sortBy = ref<DataTableSortItem[]>([])

resources/js/Components/FlightsGoneBy/DepartureBoardTableRow.vue

@@ -41,7 +41,6 @@ const reasonBadgeVariant = (reason: string) => {
 }
 
 const showColumn = (column: string) => props.columnsToShow.includes(column)
-console.log(props.columnsToShow)
 </script>
 
 <template>
@@ -138,7 +137,7 @@ console.log(props.columnsToShow)
             </AircraftToolTip>
         </td>
 
-        <td v-if="showColumn('registration')" class="v-data-table__td registration-cell">
+        <td v-if="showColumn('aircraft_registration')" class="v-data-table__td registration-cell">
             <Mono muted smaller v-if="flight.aircraft_registration">{{ flight.aircraft_registration }}</Mono>
         </td>
 

resources/js/Components/FlightsGoneBy/FlightMap.vue

@@ -50,6 +50,7 @@ import {useUpdateSetting} from "@/Composables/useUpdateSetting";
 import {usePage} from "@inertiajs/vue3";
 
 
+
 type LngLat = [number, number]
 
 interface RouteFlightBucket {
@@ -290,6 +291,7 @@ export default defineComponent({
         const { updateSetting } = useUpdateSetting()
         const page = usePage<SharedProps>().props
 
+        const carto_key = page.carto_api_key
 
         let map:        maplibregl.Map    | null = null
         let popup:      maplibregl.Popup  | null = null
@@ -736,10 +738,10 @@ export default defineComponent({
                                 maxzoom:  19,
                                 attribution: cartoAttribution.value,
                                 tiles: [
-                                    'https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
-                                    'https://b.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
-                                    'https://c.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
-                                    'https://d.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png',
+                                    `https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
+                                    `https://b.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
+                                    `https://c.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
+                                    `https://d.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png?key=${carto_key}`,
                                 ],
                             },
                         },

resources/js/Types/types.d.ts

@@ -110,6 +110,7 @@ export type SharedProps = import('@inertiajs/core').PageProps & {
     logo_api_url: string
     achievement_notifications: Notification[]
     unread_notification_count: number
+    carto_api_key: string
 }
 export interface AchievementDifficulty {
     id: number