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

Move internal unit definitions to config file #189

Browse Source
This commit is contained in:
Nabeel Shahzad 2018-02-11 20:19:02 -06:00
parent 4eef254688
commit fd4407a798
8 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Flight.php
View File

@ -85,7 +85,7 @@ class Flight extends BaseModel
try {
$distance = (float) $this->attributes['distance'];
return new Distance($distance, Distance::STORAGE_UNIT);
return new Distance($distance, config('phpvms.internal_units.distance'));
} catch (NonNumericValue $e) {
return 0;
} catch (NonStringUnitName $e) {
@ -100,7 +100,9 @@ class Flight extends BaseModel
public function setDistanceAttribute($value)
{
if($value instanceof Distance) {
$this->attributes['distance'] = $value->toUnit(Distance::STORAGE_UNIT);
$this->attributes['distance'] = $value->toUnit(
config('phpvms.internal_units.distance')
);
} else {
$this->attributes['distance'] = $value;
}

11
app/Models/Pirep.php
View File

@ -115,7 +115,7 @@ class Pirep extends BaseModel
try {
$distance = (float) $this->attributes['distance'];
return new Distance($distance, Distance::STORAGE_UNIT);
return new Distance($distance, config('phpvms.internal_units.distance'));
} catch (NonNumericValue $e) {
return 0;
} catch (NonStringUnitName $e) {
@ -130,7 +130,8 @@ class Pirep extends BaseModel
public function setDistanceAttribute($value): void
{
if ($value instanceof Distance) {
$this->attributes['distance'] = $value->toUnit(Distance::STORAGE_UNIT);
$this->attributes['distance'] = $value->toUnit(
config('phpvms.internal_units.distance'));
} else {
$this->attributes['distance'] = $value;
}
@ -148,7 +149,7 @@ class Pirep extends BaseModel
try {
$distance = (float) $this->attributes['planned_distance'];
return new Distance($distance, Distance::STORAGE_UNIT);
return new Distance($distance, config('phpvms.internal_units.distance'));
} catch (NonNumericValue $e) {
return 0;
} catch (NonStringUnitName $e) {
@ -163,7 +164,9 @@ class Pirep extends BaseModel
public function setPlannedDistanceAttribute($value)
{
if ($value instanceof Distance) {
$this->attributes['planned_distance'] = $value->toUnit(Distance::STORAGE_UNIT);
$this->attributes['planned_distance'] = $value->toUnit(
config('phpvms.internal_units.distance')
);
} else {
$this->attributes['planned_distance'] = $value;
}

9
app/Support/Units/Altitude.php
View File

@ -9,11 +9,6 @@ use Illuminate\Contracts\Support\Arrayable;
*/
class Altitude extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arrayable
{
/**
* The unit that this is stored as
*/
public const STORAGE_UNIT = 'feet';
/**
* @return string
*/
@ -40,6 +35,8 @@ class Altitude extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arr
*/
public function toArray()
{
return round($this->toUnit(self::STORAGE_UNIT), 2);
return round($this->toUnit(
config('phpvms.internal_units.altitude')
), 2);
}
}

9
app/Support/Units/Distance.php
View File

@ -9,11 +9,6 @@ use Illuminate\Contracts\Support\Arrayable;
*/
class Distance extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arrayable
{
/**
* The unit that this is stored as
*/
public const STORAGE_UNIT = 'nmi';
/**
* @return string
*/
@ -41,6 +36,8 @@ class Distance extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arr
*/
public function toArray()
{
return round($this->toUnit(self::STORAGE_UNIT), 2);
return round($this->toUnit(
config('phpvms.internal_units.distance')
), 2);
}
}

4
app/Support/Units/Mass.php
View File

@ -41,6 +41,8 @@ class Mass extends \PhpUnitsOfMeasure\PhysicalQuantity\Mass implements Arrayable
*/
public function toArray()
{
return round($this->toUnit(self::STORAGE_UNIT), 2);
return round($this->toUnit(
config('phpvms.internal_units.mass')
), 2);
}
}

11
app/Support/Units/Velocity.php
View File

@ -9,11 +9,6 @@ use Illuminate\Contracts\Support\Arrayable;
*/
class Velocity extends \PhpUnitsOfMeasure\PhysicalQuantity\Velocity implements Arrayable
{
/**
* The unit that this is stored as
*/
public const STORAGE_UNIT = 'knot';
/**
* @return string
*/
@ -30,7 +25,7 @@ class Velocity extends \PhpUnitsOfMeasure\PhysicalQuantity\Velocity implements A
public function toObject()
{
return [
'knot' => round($this->toUnit('knot'), 2),
'knots' => round($this->toUnit('knots'), 2),
'km/h' => round($this->toUnit('km/h'), 2),
];
}
@ -40,6 +35,8 @@ class Velocity extends \PhpUnitsOfMeasure\PhysicalQuantity\Velocity implements A
*/
public function toArray()
{
return round($this->toUnit(self::STORAGE_UNIT), 2);
return round($this->toUnit(
config('phpvms.internal_units.velocity')
), 2);
}
}

9
app/Support/Units/Volume.php
View File

@ -9,11 +9,6 @@ use Illuminate\Contracts\Support\Arrayable;
*/
class Volume extends \PhpUnitsOfMeasure\PhysicalQuantity\Volume implements Arrayable
{
/**
* The unit that this is stored as
*/
public const STORAGE_UNIT = 'gal';
/**
* @return string
*/
@ -40,6 +35,8 @@ class Volume extends \PhpUnitsOfMeasure\PhysicalQuantity\Volume implements Array
*/
public function toArray()
{
return round($this->toUnit(self::STORAGE_UNIT), 2);
return round($this->toUnit(
config('phpvms.internal_units.volume')
), 2);
}
}

13
config/phpvms.php
View File

@ -46,4 +46,17 @@ return [
* URL to the latest version file
*/
'version_file' => 'http://downloads.phpvms.net/VERSION',
/**
* DO NOT CHANGE THESE! It will result in messed up data
* The setting you're looking for is in the admin panel,
* under settings, for the display units
*/
'internal_units' => [
'altitude' => 'feet',
'distance' => 'nmi',
'mass' => 'lbs',
'velocity' => 'knots',
'volume' => 'gallons',
],
];