Urgent add carto API key

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
+                    CASE
-            WHEN active THEN 0
+                        WHEN active THEN 0
-            ELSE 1
+                        ELSE 1
-        END
+                    END
-    ")
+                ")
-            ->orderByRaw("
+                            ->orderByRaw("
-        CASE
+                    CASE
-            WHEN icao_code = ? THEN 0
+                        WHEN iata_code IS NOT NULL AND icao_code IS NOT NULL THEN 0
-            WHEN iata_code = ? THEN 1
+                        WHEN iata_code IS NOT NULL OR icao_code IS NOT NULL THEN 1
-            ELSE 2
+                        ELSE 2
-        END
+                    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) => [

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'),
         ];
     }
 }

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'),
     ],

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
+// Re-run the last search when either checkbox is toggled, so results update immediately
-watch(includeInactive, () => {
+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/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://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',
+                                    `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',
+                                    `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',
+                                    `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