feat: add coordinates to airport model

at the moment, the coordinates are not used for something yet, but they may be needed for a map fix #194
daveroverts · Jan 2, 2022 · 151d5f9 · 151d5f9
1 parent f261c51
commit 151d5f9
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 0 deletions.
diff --git a/app/Http/Requests/Airport/Admin/StoreAirport.php b/app/Http/Requests/Airport/Admin/StoreAirport.php
@@ -17,6 +17,8 @@ public function rules()
             'icao' => 'required:string|unique:airports|size:4',
             'iata' => 'required:string|unique:airports,iata|size:3',
             'name' => 'required:string',
+            'latitude' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
+            'longitude' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
         ];
     }
 
@@ -31,6 +33,8 @@ public function attributes()
             'icao' => __('ICAO'),
             'iata' => __('IATA'),
             'name' => __('Name'),
+            'latitude' => __('Latitude'),
+            'longitude' => __('Longitude'),
         ];
     }
 }
diff --git a/app/Http/Requests/Airport/Admin/UpdateAirport.php b/app/Http/Requests/Airport/Admin/UpdateAirport.php
@@ -17,6 +17,8 @@ public function rules()
             'icao' => 'required:string|between:4,4',
             'iata' => 'required:string|between:3,3',
             'name' => 'required:string',
+            'latitude' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
+            'longitude' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
         ];
     }
 
@@ -31,6 +33,8 @@ public function attributes()
             'icao' => __('ICAO'),
             'iata' => __('IATA'),
             'name' => __('Name'),
+            'latitude' => __('Latitude'),
+            'longitude' => __('Longitude'),
         ];
     }
 }
diff --git a/app/Imports/AirportsImport.php b/app/Imports/AirportsImport.php
@@ -30,6 +30,8 @@ public function model(array $row)
             'icao' => $row['icao'],
             'iata' => $row['iata'],
             'name' => $row['name'],
+            'latitude' => $row['lat'],
+            'longitude' => $row['lon'],
         ]);
     }
 
@@ -39,6 +41,8 @@ public function rules(): array
             'icao' => ['required', 'string', Rule::unique('airports', 'icao')],
             'iata' => ['required', 'string', Rule::unique('airports', 'iata')],
             'name' => ['required', 'string'],
+            'lat' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
+            'lon' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
         ];
     }
 

diff --git a/database/factories/AirportFactory.php b/database/factories/AirportFactory.php
@@ -26,6 +26,8 @@ public function definition()
             'icao' => $this->faker->unique()->regexify('[A-Z]{4}'),
             'iata' => $this->faker->unique()->regexify('[A-Z]{3}'),
             'name' => $this->faker->name . ' Airport',
+            'latitude' => $this->faker->latitude(),
+            'longitude' => $this->faker->longitude(),
         ];
     }
 }
diff --git a/database/migrations/2022_01_02_125521_add_coordinates_in_airports.php b/database/migrations/2022_01_02_125521_add_coordinates_in_airports.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCoordinatesInAirports extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('airports', function (Blueprint $table) {
+            $table->double('longitude')->after('name')->nullable();
+            $table->double('latitude')->after('name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('airports', function (Blueprint $table) {
+            $table->dropColumn(['latitude', 'longitude']);
+        });
+    }
+}
diff --git a/resources/views/airport/admin/form.blade.php b/resources/views/airport/admin/form.blade.php
@@ -16,6 +16,8 @@
                         <x-form-input name="icao" :label="__('ICAO')" required maxlength="4" />
                         <x-form-input name="iata" :label="__('IATA')" required maxlength="3" />
                         <x-form-input name="name" :label="__('Name')" required />
+                        <x-form-input name="latitude" :label="__('Latitude')" />
+                        <x-form-input name="longitude" :label="__('Longitude')" />
 
                         <x-form-submit>
                             @if ($airport->id)