FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup SI Unit classes and interface for REST responses; fixes to a few METAR parsing issues

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-07-15 15:14:40 -04:00
parent 466d04caf7
commit 06d8f11ca3
33 changed files with 399 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Resources/Flight.php
View File

@@ -3,9 +3,8 @@
namespace App\Http\Resources;
use App\Support\Units\Distance;
use Illuminate\Http\Resources\Json\Resource;
class Flight extends Resource
class Flight extends Response
{
/**
* Set the fields on the flight object
@@ -24,19 +23,19 @@ class Flight extends Resource
public function toArray($request)
{
$flight = parent::toArray($request);
$res = parent::toArray($request);
$flight['ident'] = $this->ident;
$res['ident'] = $this->ident;
// Return multiple measures so the client can pick what they want
if ($this->distance instanceof Distance) {
$flight['distance'] = $this->distance->units;
}
$this->checkUnitFields($res, [
'distance',
]);
$flight['airline'] = new Airline($this->airline);
$flight['subfleets'] = Subfleet::collection($this->subfleets);
$flight['fields'] = $this->setFields();
$res['airline'] = new Airline($this->airline);
$res['subfleets'] = Subfleet::collection($this->subfleets);
$res['fields'] = $this->setFields();
return $flight;
return $res;
}
}