dvdoug / PHPCoord

src/Cartesian.php

Doc Comments +3 added lines, -3 removed lines

@@ -41,9 +41,9 @@
 
     /**
      * Cartesian constructor.
-     * @param int $x
-     * @param int $y
-     * @param int $z
+     * @param double $x
+     * @param double $y
+     * @param double $z
      * @param RefEll $refEll
      */
     public function __construct(float $x, float $y, float $z, RefEll $refEll)

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
  * @package PHPCoord
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**
@@ -116,7 +116,7 @@ 
             $phi = atan(($this->z + ($this->refEll->getEcc() * $v * sin($phi))) / $p);
         } while (abs($phi - $phi1) >= 0.00001);
 
-        $h = (int)round($p / cos($phi) - $v);
+        $h = (int) round($p / cos($phi) - $v);
 
         $phi = rad2deg($phi);
 

src/OSRef.php

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
  * @author Jonathan Stott
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**
@@ -92,17 +92,17 @@ 
     {
 
         //first (major) letter is the 500km grid sq, origin at -1000000, -500000
-        $majorEasting = strpos(self::GRID_LETTERS, $ref[0]) % 5  * 500000 - 1000000;
+        $majorEasting = strpos(self::GRID_LETTERS, $ref[0]) % 5 * 500000 - 1000000;
         $majorNorthing = (floor(strpos(self::GRID_LETTERS, $ref[0]) / 5)) * 500000 - 500000;
 
         //second (minor) letter is 100km grid sq, origin at 0,0 of this square
-        $minorEasting = strpos(self::GRID_LETTERS, $ref[1]) % 5  * 100000;
+        $minorEasting = strpos(self::GRID_LETTERS, $ref[1]) % 5 * 100000;
         $minorNorthing = (floor(strpos(self::GRID_LETTERS, $ref[1]) / 5)) * 100000;
 
         $easting = $majorEasting + $minorEasting + (substr($ref, 2, 3) * 100);
         $northing = $majorNorthing + $minorNorthing + (substr($ref, 5, 3) * 100);
 
-        return new static((int)$easting, (int)$northing);
+        return new static((int) $easting, (int) $northing);
     }
 
     /**
@@ -116,24 +116,24 @@ 
 
         $halfLength = $length / 2;
 
-        $easting = str_pad((string)$this->x, 6, '0', STR_PAD_LEFT);
-        $northing = str_pad((string)$this->y, 6, '0', STR_PAD_LEFT);
+        $easting = str_pad((string) $this->x, 6, '0', STR_PAD_LEFT);
+        $northing = str_pad((string) $this->y, 6, '0', STR_PAD_LEFT);
 
 
         $adjustedX = $this->x + 1000000;
         $adjustedY = $this->y + 500000;
         $majorSquaresEast = floor($adjustedX / 500000);
         $majorSquaresNorth = floor($adjustedY / 500000);
-        $majorLetterIndex = (int)(5 * $majorSquaresNorth + $majorSquaresEast);
+        $majorLetterIndex = (int) (5 * $majorSquaresNorth + $majorSquaresEast);
         $majorLetter = substr(self::GRID_LETTERS, $majorLetterIndex, 1);
 
         //second (minor) letter is 100km grid sq, origin at 0,0 of this square
         $minorSquaresEast = $easting[0] % 5;
         $minorSquaresNorth = $northing[0] % 5;
-        $minorLetterIndex = (int)(5 * $minorSquaresNorth + $minorSquaresEast);
+        $minorLetterIndex = (int) (5 * $minorSquaresNorth + $minorSquaresEast);
         $minorLetter = substr(self::GRID_LETTERS, $minorLetterIndex, 1);
 
-        return $majorLetter . $minorLetter . substr($easting, 1, $halfLength) . substr($northing, 1, $halfLength);
+        return $majorLetter.$minorLetter.substr($easting, 1, $halfLength).substr($northing, 1, $halfLength);
     }
 
     /**

src/ITMRef.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * @package PHPCoord
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**

src/LatLng.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * @author Jonathan Stott
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**
@@ -120,7 +120,7 @@ 
 
         $d = acos(sin($latFrom) * sin($latTo) + cos($latFrom) * cos($latTo) * cos($lngTo - $lngFrom)) * $er;
 
-        return (int)round($d);
+        return (int) round($d);
     }
 
 
@@ -375,7 +375,7 @@ 
     {
         $asWGS84 = $this->toWGS84();
 
-        $longitudeZone = (int)(($asWGS84->getLng() + 180) / 6) + 1;
+        $longitudeZone = (int) (($asWGS84->getLng() + 180) / 6) + 1;
 
         // Special zone for Norway
         if ($asWGS84->getLat() >= 56 && $asWGS84->getLat() < 64 && $asWGS84->getLng() >= 3 && $asWGS84->getLng() < 12) {
@@ -422,7 +422,7 @@ 
         }
 
         $zones = "CDEFGHJKLMNPQRSTUVWXX";
-        $zoneIndex = (int)(($latitude + 80) / 8);
+        $zoneIndex = (int) (($latitude + 80) / 8);
         return $zones[$zoneIndex];
     }
 
@@ -484,8 +484,8 @@ 
         $V = $v / 6 * pow($cosLat, 3) * ($v / $p - $tanLatSq);
         $VI = $v / 120 * pow($cosLat, 5) * (5 - 18 * $tanLatSq + pow($tanLatSq, 2) + 14 * $hSq - 58 * $tanLatSq * $hSq);
 
-        $E = (int)round($originEasting + $IV * $longMinusOrigin + $V * pow($longMinusOrigin, 3) + $VI * pow($longMinusOrigin, 5));
-        $N = (int)round($I + $II * pow($longMinusOrigin, 2) + $III * pow($longMinusOrigin, 4) + $IIIA * pow($longMinusOrigin, 6));
+        $E = (int) round($originEasting + $IV * $longMinusOrigin + $V * pow($longMinusOrigin, 3) + $VI * pow($longMinusOrigin, 5));
+        $N = (int) round($I + $II * pow($longMinusOrigin, 2) + $III * pow($longMinusOrigin, 4) + $IIIA * pow($longMinusOrigin, 6));
 
         return array('E' => $E, 'N' => $N);
     }

src/UTMRef.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @author Jonathan Stott
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**

src/RefEll.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @author Jonathan Stott
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**

src/IrishGridRef.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
  * @package PHPCoord
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**
@@ -87,8 +87,8 @@ 
     public static function fromSixFigureReference($ref): IrishGridRef
     {
 
-        $easting = (int)strpos(self::GRID_LETTERS, $ref[0]) % 5  * 100000 + (substr($ref, 1, 3) * 100);
-        $northing = (int)(floor(strpos(self::GRID_LETTERS, $ref[0]) / 5)) * 100000 + (substr($ref, 4, 3) * 100);
+        $easting = (int) strpos(self::GRID_LETTERS, $ref[0]) % 5 * 100000 + (substr($ref, 1, 3) * 100);
+        $northing = (int) (floor(strpos(self::GRID_LETTERS, $ref[0]) / 5)) * 100000 + (substr($ref, 4, 3) * 100);
 
         return new IrishGridRef($easting, $northing);
     }
@@ -102,16 +102,16 @@ 
     public function toSixFigureReference(): string
     {
 
-        $easting = str_pad((string)$this->x, 6, '0', STR_PAD_LEFT);
-        $northing = str_pad((string)$this->y, 6, '0', STR_PAD_LEFT);
+        $easting = str_pad((string) $this->x, 6, '0', STR_PAD_LEFT);
+        $northing = str_pad((string) $this->y, 6, '0', STR_PAD_LEFT);
 
         //100km grid sq, origin at 0,0
         $minorSquaresEast = $easting[0] % 5;
         $minorSquaresNorth = $northing[0] % 5;
-        $minorLetterIndex = (int)(5 * $minorSquaresNorth + $minorSquaresEast);
+        $minorLetterIndex = (int) (5 * $minorSquaresNorth + $minorSquaresEast);
         $minorLetter = substr(self::GRID_LETTERS, $minorLetterIndex, 1);
 
-        return $minorLetter . substr($easting, 1, 3) . substr($northing, 1, 3);
+        return $minorLetter.substr($easting, 1, 3).substr($northing, 1, 3);
     }
 
     /**

src/TransverseMercator.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * @author Jonathan Stott
  * @author Doug Wright
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace PHPCoord;
 
 /**
@@ -232,8 +232,8 @@ 
         }
 
         //Because this is a 2D grid, we can use simple Pythagoras
-        $distanceX = $to->getX()-$this->getX();
-        $distanceY = $to->getY()-$this->getY();
+        $distanceX = $to->getX() - $this->getX();
+        $distanceY = $to->getY() - $this->getY();
 
         return (int) round(pow(pow($distanceX, 2) + pow($distanceY, 2), 0.5));