swen100 / geoPHP

src/Geometry/LineString.php

Spacing +12 added lines, -12 removed lines

@@ -79,16 +79,16 @@ 
         $y = 0;
         $length = 0.0;
         $points = $this->getPoints();
-        $numPoints = count($points)-1;
-        for ($i=0; $i<$numPoints; ++$i) {
+        $numPoints = count($points) - 1;
+        for ($i = 0; $i < $numPoints; ++$i) {
             $currX = $points[$i]->getX();
             $currY = $points[$i]->getY();
-            $nextX = $points[$i+1]->getX();
-            $nextY = $points[$i+1]->getY();
+            $nextX = $points[$i + 1]->getX();
+            $nextY = $points[$i + 1]->getY();
             
             $dx = $nextX - $currX;
             $dy = $nextY - $currY;
-            $segmentLength = sqrt($dx*$dx + $dy*$dy);
+            $segmentLength = sqrt($dx * $dx + $dy * $dy);
             $length += $segmentLength;
             $x += ($currX + $nextX) / 2 * $segmentLength;
             $y += ($currY + $nextY) / 2 * $segmentLength;
@@ -114,11 +114,11 @@ 
         
         $length = 0.0;
         $points = $this->getPoints();
-        $numPoints = count($points)-1;
-        for ($i=0; $i<$numPoints; ++$i) {
+        $numPoints = count($points) - 1;
+        for ($i = 0; $i < $numPoints; ++$i) {
             $length += sqrt(
-                pow(($points[$i]->getX() - $points[$i+1]->getX()), 2) +
-                pow(($points[$i]->getY() - $points[$i+1]->getY()), 2)
+                pow(($points[$i]->getX() - $points[$i + 1]->getX()), 2) +
+                pow(($points[$i]->getY() - $points[$i + 1]->getY()), 2)
             );
         }
         
@@ -270,14 +270,14 @@ 
                 $C = $f / 16 * $cosSqAlpha * (4 + $f * (4 - 3 * $cosSqAlpha));
                 $lambdaP = $lambda;
                 $lambda = $L + (1 - $C) * $f * $sinAlpha *
-                    ($sigma + $C * $sinSigma * ($cos2SigmaM + $C * $cosSigma * (- 1 + 2 * $cos2SigmaM * $cos2SigmaM)));
+                    ($sigma + $C * $sinSigma * ($cos2SigmaM + $C * $cosSigma * (-1 + 2 * $cos2SigmaM * $cos2SigmaM)));
             } while (abs($lambda - $lambdaP) > 1e-12 && --$iterationLimit > 0);
             if ($iterationLimit == 0) {
                 return 0.0; // not converging
             }
             $uSq = $cosSqAlpha * ($a * $a - $b * $b) / ($b * $b);
-            $A = 1 + $uSq / 16384 * (4096 + $uSq * (- 768 + $uSq * (320 - 175 * $uSq)));
-            $B = $uSq / 1024 * (256 + $uSq * (- 128 + $uSq * (74 - 47 * $uSq)));
+            $A = 1 + $uSq / 16384 * (4096 + $uSq * (-768 + $uSq * (320 - 175 * $uSq)));
+            $B = $uSq / 1024 * (256 + $uSq * (-128 + $uSq * (74 - 47 * $uSq)));
             $deltaSigma = $B * $sinSigma * ($cos2SigmaM + $B / 4 *
                     ($cosSigma * (-1 + 2 * $cos2SigmaM * $cos2SigmaM) - $B / 6
                         * $cos2SigmaM * (-3 + 4 * $sinSigma * $sinSigma)

src/Geometry/Polygon.php

Indentation +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
         
         // all rings (LineStrings) have to be valid itself
         /**
- * @var \geoPHP\Geometry\LineString $ring
+         * @var \geoPHP\Geometry\LineString $ring
 */
         foreach ($this->components as $ring) {
             if ($ring->isEmpty()) {

Spacing +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
             if (!$ring->isValid()) {
                 return false;
             }
-            $wkt = str_ireplace(['LINESTRING(',')'], '', $ring->asText());
+            $wkt = str_ireplace(['LINESTRING(', ')'], '', $ring->asText());
             $pts = array_unique(array_map('trim', explode(',', $wkt)));
             if (count($pts) < 3) {
                 return false;

src/Geometry/Collection.php

Spacing +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
                 }
             } else {
                 $componentType = gettype($components[$i]) !== 'object' ?
-                    gettype($components[$i]) :
-                    get_class($components[$i]);
+                    gettype($components[$i]) : get_class($components[$i]);
                 
                 throw new InvalidGeometryException(
                     'Cannot create a collection of ' . $componentType . ' components, ' .

src/Geometry/Point.php

Spacing +3 added lines, -3 removed lines

@@ -250,9 +250,9 @@
     public function equals(Geometry $geometry): bool
     {
         return $geometry->geometryType() === Geometry::POINT
-            ? ( abs(($this->getX()??0) - ($geometry->getX()??0)) <= 1.0E-9 &&
-                abs(($this->getY()??0) - ($geometry->getY()??0)) <= 1.0E-9 &&
-                abs(($this->getZ()??0) - ($geometry->getZ()??0)) <= 1.0E-9)
+            ? (abs(($this->getX() ?? 0) - ($geometry->getX() ?? 0)) <= 1.0E-9 &&
+                abs(($this->getY() ?? 0) - ($geometry->getY() ?? 0)) <= 1.0E-9 &&
+                abs(($this->getZ() ?? 0) - ($geometry->getZ() ?? 0)) <= 1.0E-9)
             : false;
     }
 

src/Geometry/Curve.php

Spacing +2 added lines, -4 removed lines

@@ -120,10 +120,8 @@
     public function boundary(): Geometry
     {
         return $this->isEmpty() ?
-                new LineString() :
-                ($this->isClosed() ?
-                    new MultiPoint() :
-                    new MultiPoint([$this->startPoint(), $this->endPoint()])
+                new LineString() : ($this->isClosed() ?
+                    new MultiPoint() : new MultiPoint([$this->startPoint(), $this->endPoint()])
                 );
     }
 

src/Adapter/GPX.php

Spacing +4 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
     public function read(string $gpx, array $allowedElements = []): Geometry
     {
         // Converts XML tags to lower-case (DOMDocument functions are case sensitive)
-        $gpx = preg_replace_callback("/(<\/?\w+)(.*?>)/", function ($m) {
+        $gpx = preg_replace_callback("/(<\/?\w+)(.*?>)/", function($m) {
             return strtolower($m[1]) . $m[2];
         }, $gpx);
 
@@ -217,14 +217,13 @@ 
                     $points[] = $this->parsePoint($trkpt);
                 }
                 // Avoids creating invalid LineString
-                if (count($points)>1) {
+                if (count($points) > 1) {
                     $segments[] = new LineString($points);
                 }
             }
             if (!empty($segments)) {
                 $track = count($segments) === 1 ?
-                   $segments[0] :
-                   new MultiLineString($segments);
+                   $segments[0] : new MultiLineString($segments);
                 $track->setData($this->parseNodeProperties($trk, $this->gpxTypes->get('trkType')));
                 $track->setData('gpxType', 'track');
                 $tracks[] = $track;
@@ -440,7 +439,7 @@ 
     {
         $metadata = self::processGeometryData($geometry, $this->gpxTypes->get('metadataType'));
         $metadata = empty($metadata) || !in_array('metadataType', $this->gpxTypes->get('gpxType')) ?
-            '' : "<metadata>\n" . $metadata. "</metadata>\n\n";
+            '' : "<metadata>\n" . $metadata . "</metadata>\n\n";
         $wayPoints = $routes = $tracks = "";
 
         foreach ($geometry->getComponents() as $component) {

src/Adapter/WKT.php

Spacing +2 added lines, -2 removed lines

@@ -198,7 +198,7 @@ 
          * MULTIPOINT (1 2, 3 4)
          */
         foreach (explode(',', $dataString) as $part) {
-            $points[] =  $this->parsePoint(trim($part, ' ()'));
+            $points[] = $this->parsePoint(trim($part, ' ()'));
         }
         return new MultiPoint($points);
     }
@@ -218,7 +218,7 @@ 
         $m = [];
         if (preg_match_all('/(\([^(]+?\)|EMPTY)/', $dataString, $m)) {
             foreach ($m[1] as $part) {
-                $lines[] =  $this->parseLineString(trim($part, ' ()'));
+                $lines[] = $this->parseLineString(trim($part, ' ()'));
             }
         }
         return new MultiLineString($lines);

src/Adapter/OSM.php

Indentation +1 added lines, -1 removed lines

@@ -548,7 +548,7 @@
                 if (isset($errContext['http_response_header'])) {
                     foreach ($errContext['http_response_header'] as $line) {
                         if (strpos($line, 'Error: ') > -1) {
-                              throw new \Exception($line);
+                                throw new \Exception($line);
                         }
                     }
                 }

Spacing +1 added lines, -1 removed lines

@@ -544,7 +544,7 @@
     {
         /** @noinspection PhpUnusedParameterInspection */
         set_error_handler(
-            function ($errNO, $errStr, $errFile, $errLine, $errContext) {
+            function($errNO, $errStr, $errFile, $errLine, $errContext) {
                 if (isset($errContext['http_response_header'])) {
                     foreach ($errContext['http_response_header'] as $line) {
                         if (strpos($line, 'Error: ') > -1) {

src/Adapter/BinaryReader.php

Spacing +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
     {
         $bin = fread($this->buffer, $length);
         return $this->isLittleEndian() ?
-            array_values(unpack("d*", $bin)) :
-            array_reverse(unpack("d*", strrev($bin)));
+            array_values(unpack("d*", $bin)) : array_reverse(unpack("d*", strrev($bin)));
     }
 
     /**