Skip to content

Commit 492cfec

Browse files
committed
fix(AirportImport): fix majority of airports not importing
Initially, only coordinates with 6 decimals where accepted, now it's increased to 10
1 parent 6e2f000 commit 492cfec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/Http/Requests/Airport/Admin/StoreAirport.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public function rules()
1717
'icao' => 'required:string|unique:airports|size:4',
1818
'iata' => 'required:string|unique:airports,iata|size:3',
1919
'name' => 'required:string',
20-
'latitude' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
21-
'longitude' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
20+
'latitude' => ['required', 'regex:/^[-]?((([0-8]?[0-9])(\.(\d{1,10}))?)|(90(\.0+)?))$/'],
21+
'longitude' => ['required', 'regex:/^[-]?((((1[0-7][0-9])|([0-9]?[0-9]))(\.(\d{1,10}))?)|180(\.0+)?)/'],
2222
];
2323
}
2424

app/Http/Requests/Airport/Admin/UpdateAirport.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public function rules()
1717
'icao' => 'required:string|between:4,4',
1818
'iata' => 'required:string|between:3,3',
1919
'name' => 'required:string',
20-
'latitude' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
21-
'longitude' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
20+
'latitude' => ['required', 'regex:/^[-]?((([0-8]?[0-9])(\.(\d{1,10}))?)|(90(\.0+)?))$/'],
21+
'longitude' => ['required', 'regex:/^[-]?((((1[0-7][0-9])|([0-9]?[0-9]))(\.(\d{1,10}))?)|180(\.0+)?)/'],
2222
];
2323
}
2424

app/Imports/AirportsImport.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public function rules(): array
4242
'icao' => ['required', 'string', Rule::unique('airports', 'icao')],
4343
'iata' => ['required', 'string', Rule::unique('airports', 'iata')],
4444
'name' => ['required', 'string'],
45-
'lat' => ['required', 'regex:/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
46-
'lon' => ['required', 'regex:/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,6})?))$/'],
45+
'lat' => ['required', 'regex:/^[-]?((([0-8]?[0-9])(\.(\d{1,10}))?)|(90(\.0+)?))$/'],
46+
'lon' => ['required', 'regex:/^[-]?((((1[0-7][0-9])|([0-9]?[0-9]))(\.(\d{1,10}))?)|180(\.0+)?)/'],
4747
];
4848
}
4949

0 commit comments

Comments
 (0)