mprins / dokuwiki-plugin-geophp

vendor/funiq/geophp/src/Geometry/Curve.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     public function __construct($components = [], $allowEmptyComponents = false, $allowedComponentType = Point::class)
     {
         if (is_array($components) && count($components) == 1) {
-            throw new InvalidGeometryException("Cannot construct a " . static::class . " with a single point");
+            throw new InvalidGeometryException("Cannot construct a ".static::class." with a single point");
         }
         parent::__construct($components, $allowEmptyComponents, $allowedComponentType);
     }

vendor/funiq/geophp/src/Geometry/Collection.php

Spacing +5 added lines, -5 removed lines

@@ -41,8 +41,8 @@ 
             if ($components[$i] instanceof $allowedComponentType) {
                 if (!$allowEmptyComponents && $components[$i]->isEmpty()) {
                     throw new InvalidGeometryException(
-                        'Cannot create a collection of empty ' .
-                        $components[$i]->geometryType() . 's (' . ($i + 1) . '. component)'
+                        'Cannot create a collection of empty '.
+                        $components[$i]->geometryType().'s ('.($i+1).'. component)'
                     );
                 }
                 if ($components[$i]->hasZ() && !$this->hasZ) {
@@ -56,8 +56,8 @@ 
                     ? gettype($components[$i])
                     : get_class($components[$i]);
                 throw new InvalidGeometryException(
-                    'Cannot create a collection of ' . $componentType .
-                    ' components, expected type is ' . $allowedComponentType
+                    'Cannot create a collection of '.$componentType.
+                    ' components, expected type is '.$allowedComponentType
                 );
             }
         }
@@ -198,7 +198,7 @@ 
      */
     public function geometryN($n)
     {
-        return isset($this->components[$n - 1]) ? $this->components[$n - 1] : null;
+        return isset($this->components[$n-1]) ? $this->components[$n-1] : null;
     }
 
     /**

vendor/funiq/geophp/src/Geometry/LineString.php

Spacing +54 added lines, -54 removed lines

@@ -63,7 +63,7 @@ 
     {
         return $n >= 0
                 ? $this->geometryN($n)
-                : $this->geometryN(count($this->components) - abs($n + 1));
+                : $this->geometryN(count($this->components)-abs($n+1));
     }
 
     public function centroid()
@@ -93,12 +93,12 @@ 
             if ($previousPoint) {
                 // Equivalent to $previousPoint->distance($point) but much faster
                 $segmentLength = sqrt(
-                    pow(($previousPoint->x() - $point->x()), 2) +
-                        pow(($previousPoint->y() - $point->y()), 2)
+                    pow(($previousPoint->x()-$point->x()), 2)+
+                        pow(($previousPoint->y()-$point->y()), 2)
                 );
                 $length += $segmentLength;
-                $x += ($previousPoint->x() + $point->x()) / 2 * $segmentLength;
-                $y += ($previousPoint->y() + $point->y()) / 2 * $segmentLength;
+                $x += ($previousPoint->x()+$point->x()) / 2 * $segmentLength;
+                $y += ($previousPoint->y()+$point->y()) / 2 * $segmentLength;
             }
             $previousPoint = $point;
         }
@@ -127,8 +127,8 @@ 
         foreach ($this->getPoints() as $point) {
             if ($previousPoint) {
                 $length += sqrt(
-                    pow(($previousPoint->x() - $point->x()), 2) +
-                        pow(($previousPoint->y() - $point->y()), 2)
+                    pow(($previousPoint->x()-$point->x()), 2)+
+                        pow(($previousPoint->y()-$point->y()), 2)
                 );
             }
             $previousPoint = $point;
@@ -144,9 +144,9 @@ 
         foreach ($this->getPoints() as $point) {
             if ($previousPoint) {
                 $length += sqrt(
-                    pow(($previousPoint->x() - $point->x()), 2) +
-                        pow(($previousPoint->y() - $point->y()), 2) +
-                        pow(($previousPoint->z() - $point->z()), 2)
+                    pow(($previousPoint->x()-$point->x()), 2)+
+                        pow(($previousPoint->y()-$point->y()), 2)+
+                        pow(($previousPoint->z()-$point->z()), 2)
                 );
             }
             $previousPoint = $point;
@@ -163,28 +163,28 @@ 
         $length = 0.0;
         $rad = M_PI / 180;
         $points = $this->getPoints();
-        $numPoints = $this->numPoints() - 1;
+        $numPoints = $this->numPoints()-1;
         for ($i = 0; $i < $numPoints; ++$i) {
             // Simplified Vincenty formula with equal major and minor axes (a sphere)
             $lat1 = $points[$i]->y() * $rad;
-            $lat2 = $points[$i + 1]->y() * $rad;
+            $lat2 = $points[$i+1]->y() * $rad;
             $lon1 = $points[$i]->x() * $rad;
-            $lon2 = $points[$i + 1]->x() * $rad;
-            $deltaLon = $lon2 - $lon1;
+            $lon2 = $points[$i+1]->x() * $rad;
+            $deltaLon = $lon2-$lon1;
             $d =
                     $radius *
                     atan2(
                         sqrt(
-                            pow(cos($lat2) * sin($deltaLon), 2) +
-                                    pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($deltaLon), 2)
+                            pow(cos($lat2) * sin($deltaLon), 2)+
+                                    pow(cos($lat1) * sin($lat2)-sin($lat1) * cos($lat2) * cos($deltaLon), 2)
                         ),
-                        sin($lat1) * sin($lat2) +
+                        sin($lat1) * sin($lat2)+
                             cos($lat1) * cos($lat2) * cos($deltaLon)
                     );
             if ($points[$i]->is3D()) {
                 $d = sqrt(
-                    pow($d, 2) +
-                        pow($points[$i + 1]->z() - $points[$i]->z(), 2)
+                    pow($d, 2)+
+                        pow($points[$i+1]->z()-$points[$i]->z(), 2)
                 );
             }
 
@@ -201,15 +201,15 @@ 
     {
         $distance = 0.0;
         $points = $this->getPoints();
-        $numPoints = $this->numPoints() - 1;
+        $numPoints = $this->numPoints()-1;
         for ($i = 0; $i < $numPoints; ++$i) {
             $point = $points[$i];
-            $nextPoint = $points[$i + 1];
+            $nextPoint = $points[$i+1];
             $degree = (geoPHP::EARTH_WGS84_SEMI_MAJOR_AXIS *
                     acos(
-                        sin(deg2rad($point->y())) * sin(deg2rad($nextPoint->y())) +
+                        sin(deg2rad($point->y())) * sin(deg2rad($nextPoint->y()))+
                             cos(deg2rad($point->y())) * cos(deg2rad($nextPoint->y())) *
-                            cos(deg2rad(abs($point->x() - $nextPoint->x())))
+                            cos(deg2rad(abs($point->x()-$nextPoint->x())))
                     )
             );
             if (!is_nan($degree)) {
@@ -232,20 +232,20 @@ 
         $length = 0.0;
         $rad = M_PI / 180;
         $points = $this->getPoints();
-        $numPoints = $this->numPoints() - 1;
+        $numPoints = $this->numPoints()-1;
         for ($i = 0; $i < $numPoints; ++$i) {
             // Inverse Vincenty formula
             $lat1 = $points[$i]->y() * $rad;
-            $lat2 = $points[$i + 1]->y() * $rad;
+            $lat2 = $points[$i+1]->y() * $rad;
             $lng1 = $points[$i]->x() * $rad;
-            $lng2 = $points[$i + 1]->x() * $rad;
+            $lng2 = $points[$i+1]->x() * $rad;
 
             $a = geoPHP::EARTH_WGS84_SEMI_MAJOR_AXIS;
             $b = geoPHP::EARTH_WGS84_SEMI_MINOR_AXIS;
             $f = 1 / geoPHP::EARTH_WGS84_FLATTENING;
-            $L  = $lng2 - $lng1;
-            $U1 = atan((1 - $f) * tan($lat1));
-            $U2 = atan((1 - $f) * tan($lat2));
+            $L  = $lng2-$lng1;
+            $U1 = atan((1-$f) * tan($lat1));
+            $U2 = atan((1-$f) * tan($lat2));
             $iterationLimit = 100;
             $lambda         = $L;
             $sinU1 = sin($U1);
@@ -257,38 +257,38 @@ 
                 $cosLambda = cos($lambda);
                 $sinSigma = sqrt(
                     ($cosU2 * $sinLambda) *
-                    ($cosU2 * $sinLambda) +
-                    ($cosU1 * $sinU2 - $sinU1 * $cosU2 * $cosLambda) *
-                    ($cosU1 * $sinU2 - $sinU1 * $cosU2 * $cosLambda)
+                    ($cosU2 * $sinLambda)+
+                    ($cosU1 * $sinU2-$sinU1 * $cosU2 * $cosLambda) *
+                    ($cosU1 * $sinU2-$sinU1 * $cosU2 * $cosLambda)
                 );
                 if ($sinSigma == 0) {
                     return 0.0;
                 }
-                $cosSigma = $sinU1 * $sinU2 + $cosU1 * $cosU2 * $cosLambda;
+                $cosSigma = $sinU1 * $sinU2+$cosU1 * $cosU2 * $cosLambda;
                 $sigma = atan2($sinSigma, $cosSigma);
                 $sinAlpha = $cosU1 * $cosU2 * $sinLambda / $sinSigma;
-                $cosSqAlpha = 1 - $sinAlpha * $sinAlpha;
+                $cosSqAlpha = 1-$sinAlpha * $sinAlpha;
                 $cos2SigmaM = 0;
                 if ($cosSqAlpha <> 0) {
-                    $cos2SigmaM = $cosSigma - 2 * $sinU1 * $sinU2 / $cosSqAlpha;
+                    $cos2SigmaM = $cosSigma-2 * $sinU1 * $sinU2 / $cosSqAlpha;
                 }
-                $C = $f / 16 * $cosSqAlpha * (4 + $f * (4 - 3 * $cosSqAlpha));
+                $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)));
-            } while (abs($lambda - $lambdaP) > 1e-12 && --$iterationLimit > 0);
+                $lambda = $L+(1-$C) * $f * $sinAlpha *
+                    ($sigma+$C * $sinSigma * ($cos2SigmaM+$C * $cosSigma * (-1+2 * $cos2SigmaM * $cos2SigmaM)));
+            } while (abs($lambda-$lambdaP) > 1e-12 && --$iterationLimit > 0);
             if ($iterationLimit == 0) {
                 return null; // 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)));
-            $deltaSigma = $B * $sinSigma * ($cos2SigmaM + $B / 4 *
-                    ($cosSigma * (-1 + 2 * $cos2SigmaM * $cos2SigmaM) - $B / 6
-                        * $cos2SigmaM * (-3 + 4 * $sinSigma * $sinSigma)
-                        * (-3 + 4 * $cos2SigmaM * $cos2SigmaM)));
-
-            $length += $b * $A * ($sigma - $deltaSigma);
+            $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)));
+            $deltaSigma = $B * $sinSigma * ($cos2SigmaM+$B / 4 *
+                    ($cosSigma * (-1+2 * $cos2SigmaM * $cos2SigmaM)-$B / 6
+                        * $cos2SigmaM * (-3+4 * $sinSigma * $sinSigma)
+                        * (-3+4 * $cos2SigmaM * $cos2SigmaM)));
+
+            $length += $b * $A * ($sigma-$deltaSigma);
         }
         // Returns length in meters.
         return $length;
@@ -320,7 +320,7 @@ 
     public function zDifference()
     {
         if ($this->startPoint()->hasZ() && $this->endPoint()->hasZ()) {
-            return abs($this->startPoint()->z() - $this->endPoint()->z());
+            return abs($this->startPoint()->z()-$this->endPoint()->z());
         } else {
             return null;
         }
@@ -341,9 +341,9 @@ 
         $lastEle = $this->startPoint()->z();
         $pointCount = $this->numPoints();
         foreach ($this->getPoints() as $i => $point) {
-            if (abs($point->z() - $lastEle) > $verticalTolerance || $i === $pointCount - 1) {
+            if (abs($point->z()-$lastEle) > $verticalTolerance || $i === $pointCount-1) {
                 if ($point->z() > $lastEle) {
-                    $gain += $point->z() - $lastEle;
+                    $gain += $point->z()-$lastEle;
                 }
                 $lastEle = $point->z();
             }
@@ -366,9 +366,9 @@ 
         $lastEle = $this->startPoint()->z();
         $pointCount = $this->numPoints();
         foreach ($this->getPoints() as $i => $point) {
-            if (abs($point->z() - $lastEle) > $verticalTolerance || $i === $pointCount - 1) {
+            if (abs($point->z()-$lastEle) > $verticalTolerance || $i === $pointCount-1) {
                 if ($point->z() < $lastEle) {
-                    $loss += $lastEle - $point->z();
+                    $loss += $lastEle-$point->z();
                 }
                 $lastEle = $point->z();
             }
@@ -414,7 +414,7 @@ 
         }
         $parts = [];
         for ($i = 1; $i < $numPoints; ++$i) {
-            $segment = [$points[$i - 1], $points[$i]];
+            $segment = [$points[$i-1], $points[$i]];
             $parts[] = $toArray ? $segment : new LineString($segment);
         }
         return $parts;

vendor/funiq/geophp/src/Geometry/MultiPoint.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     {
         $componentCount = count($this->components);
         for ($i = 0; $i < $componentCount; $i++) {
-            for ($j = $i + 1; $j < $componentCount; $j++) {
+            for ($j = $i+1; $j < $componentCount; $j++) {
                 if ($this->components[$i]->equals($this->components[$j])) {
                     return false;
                 }

vendor/funiq/geophp/src/Geometry/Geometry.php

Spacing +11 added lines, -11 removed lines

@@ -333,7 +333,7 @@ 
     public function envelope()
     {
         if ($this->isEmpty()) {
-            $type = geoPHP::CLASS_NAMESPACE . 'Geometry\\' . $this->geometryType();
+            $type = geoPHP::CLASS_NAMESPACE.'Geometry\\'.$this->geometryType();
             return new $type();
         }
         if ($this->geometryType() === Geometry::POINT) {
@@ -372,7 +372,7 @@ 
             $format = str_replace('xdr', '', $format);
         }
 
-        $processorType = geoPHP::CLASS_NAMESPACE . 'Adapter\\' . geoPHP::getAdapterMap()[$format];
+        $processorType = geoPHP::CLASS_NAMESPACE.'Adapter\\'.geoPHP::getAdapterMap()[$format];
         $processor = new $processorType();
         array_unshift($args, $this);
 
@@ -384,7 +384,7 @@ 
 
     public function coordinateDimension()
     {
-        return 2 + ($this->hasZ() ? 1 : 0) + ($this->isMeasured() ? 1 : 0);
+        return 2+($this->hasZ() ? 1 : 0)+($this->isMeasured() ? 1 : 0);
     }
 
     /**
@@ -407,20 +407,20 @@ 
         $p3x = $segment2End->x();
         $p3y = $segment2End->y();
 
-        $s1x = $p1x - $p0x;
-        $s1y = $p1y - $p0y;
-        $s2x = $p3x - $p2x;
-        $s2y = $p3y - $p2y;
+        $s1x = $p1x-$p0x;
+        $s1y = $p1y-$p0y;
+        $s2x = $p3x-$p2x;
+        $s2y = $p3y-$p2y;
 
-        $fps = (-$s2x * $s1y) + ($s1x * $s2y);
-        $fpt = (-$s2x * $s1y) + ($s1x * $s2y);
+        $fps = (-$s2x * $s1y)+($s1x * $s2y);
+        $fpt = (-$s2x * $s1y)+($s1x * $s2y);
 
         if ($fps == 0 || $fpt == 0) {
             return false;
         }
 
-        $s = (-$s1y * ($p0x - $p2x) + $s1x * ($p0y - $p2y)) / $fps;
-        $t = ($s2x * ($p0y - $p2y) - $s2y * ($p0x - $p2x)) / $fpt;
+        $s = (-$s1y * ($p0x-$p2x)+$s1x * ($p0y-$p2y)) / $fps;
+        $t = ($s2x * ($p0y-$p2y)-$s2y * ($p0x-$p2x)) / $fpt;
 
         // Return true if collision is detected
         return ($s > 0 && $s < 1 && $t > 0 && $t < 1);

vendor/funiq/geophp/src/Geometry/Point.php

Spacing +12 added lines, -12 removed lines

@@ -230,7 +230,7 @@ 
     public function equals($geometry)
     {
         return $geometry->geometryType() === Geometry::POINT
-            ? (abs($this->x() - $geometry->x()) <= 1.0E-9 && abs($this->y() - $geometry->y()) <= 1.0E-9)
+            ? (abs($this->x()-$geometry->x()) <= 1.0E-9 && abs($this->y()-$geometry->y()) <= 1.0E-9)
             : false;
     }
 
@@ -265,8 +265,8 @@ 
         }
         if ($geometry->geometryType() == Geometry::POINT) {
             return sqrt(
-                pow(($this->x() - $geometry->x()), 2)
-                + pow(($this->y() - $geometry->y()), 2)
+                pow(($this->x()-$geometry->x()), 2)
+                + pow(($this->y()-$geometry->y()), 2)
             );
         }
         if ($geometry instanceof MultiGeometry) {
@@ -296,27 +296,27 @@ 
                 $y1 = $seg[0]->y();
                 $x2 = $seg[1]->x();
                 $y2 = $seg[1]->y();
-                $px = $x2 - $x1;
-                $py = $y2 - $y1;
-                $d = ($px * $px) + ($py * $py);
+                $px = $x2-$x1;
+                $py = $y2-$y1;
+                $d = ($px * $px)+($py * $py);
                 if ($d == 0) {
                     // Line-segment's endpoints are identical. This is merely a point masquerading as a line-segment.
                     $checkDistance = $this->distance($seg[1]);
                 } else {
                     $x3 = $this->x();
                     $y3 = $this->y();
-                    $u =  ((($x3 - $x1) * $px) + (($y3 - $y1) * $py)) / $d;
+                    $u = ((($x3-$x1) * $px)+(($y3-$y1) * $py)) / $d;
                     if ($u > 1) {
                         $u = 1;
                     }
                     if ($u < 0) {
                         $u = 0;
                     }
-                    $x = $x1 + ($u * $px);
-                    $y = $y1 + ($u * $py);
-                    $dx = $x - $x3;
-                    $dy = $y - $y3;
-                    $checkDistance = sqrt(($dx * $dx) + ($dy * $dy));
+                    $x = $x1+($u * $px);
+                    $y = $y1+($u * $py);
+                    $dx = $x-$x3;
+                    $dy = $y-$y3;
+                    $checkDistance = sqrt(($dx * $dx)+($dy * $dy));
                 }
                 if ($checkDistance === 0.0) {
                     return 0.0;

vendor/funiq/geophp/src/Geometry/MultiGeometry.php

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
         $startPoint = $this->startPoint();
         $endPoint = $this->endPoint();
         if ($startPoint && $endPoint && $startPoint->hasZ() && $endPoint->hasZ()) {
-            return abs($startPoint->z() - $endPoint->z());
+            return abs($startPoint->z()-$endPoint->z());
         } else {
             return null;
         }

vendor/funiq/geophp/src/Geometry/Polygon.php

Spacing +15 added lines, -15 removed lines

@@ -28,8 +28,8 @@ 
         foreach ($this->getComponents() as $i => $component) {
             if ($component->numPoints() < 4) {
                 throw new InvalidGeometryException(
-                    'Cannot create Polygon: Invalid number of points in LinearRing. Found ' .
-                    $component->numPoints() . ', expected more than 3'
+                    'Cannot create Polygon: Invalid number of points in LinearRing. Found '.
+                    $component->numPoints().', expected more than 3'
                 );
             }
             if (!$component->isClosed()) {
@@ -40,8 +40,8 @@ 
                 } else {
                     throw new InvalidGeometryException(
                         'Cannot create Polygon: contains non-closed ring (first point: '
-                            . implode(' ', $component->startPoint()->asArray()) . ', last point: '
-                            . implode(' ', $component->endPoint()->asArray()) . ')'
+                            . implode(' ', $component->startPoint()->asArray()).', last point: '
+                            . implode(' ', $component->endPoint()->asArray()).')'
                     );
                 }
             }
@@ -90,8 +90,8 @@ 
         }
         $a = 0.0;
         foreach ($points as $k => $p) {
-            $j = ($k + 1) % $pointCount;
-            $a = $a + ($p->x() * $points[$j]->y()) - ($p->y() * $points[$j]->x());
+            $j = ($k+1) % $pointCount;
+            $a = $a+($p->x() * $points[$j]->y())-($p->y() * $points[$j]->x());
         }
 
         $area = $signed ? ($a / 2) : abs(($a / 2));
@@ -161,10 +161,10 @@ 
         $x = 0;
         $y = 0;
         foreach ($points as $k => $point) {
-            $j = ($k + 1) % $pointCount;
-            $P = ($point->x() * $points[$j]->y()) - ($point->y() * $points[$j]->x());
-            $x += ($point->x() + $points[$j]->x()) * $P;
-            $y += ($point->y() + $points[$j]->y()) * $P;
+            $j = ($k+1) % $pointCount;
+            $P = ($point->x() * $points[$j]->y())-($point->y() * $points[$j]->x());
+            $x += ($point->x()+$points[$j]->x()) * $P;
+            $y += ($point->y()+$points[$j]->y()) * $P;
         }
         return ['area' => abs($area), 'x' => $x / (6 * $area), 'y' => $y / (6 * $area)];
     }
@@ -212,12 +212,12 @@ 
         if ($this->isEmpty()) {
             return 0;
         }
-        return $this->numGeometries() - 1;
+        return $this->numGeometries()-1;
     }
 
     public function interiorRingN($n)
     {
-        return $this->geometryN($n + 1);
+        return $this->geometryN($n+1);
     }
 
     public function isSimple()
@@ -268,7 +268,7 @@ 
         $intersections = 0;
         $verticesCount = count($vertices);
         for ($i = 1; $i < $verticesCount; $i++) {
-            $vertex1 = $vertices[$i - 1];
+            $vertex1 = $vertices[$i-1];
             $vertex2 = $vertices[$i];
             if (
                 $vertex1->y() == $vertex2->y()
@@ -286,8 +286,8 @@ 
                 && $vertex1->y() != $vertex2->y()
             ) {
                 $xinters =
-                        ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
-                        / ($vertex2->y() - $vertex1->y())
+                        ($point->y()-$vertex1->y()) * ($vertex2->x()-$vertex1->x())
+                        / ($vertex2->y()-$vertex1->y())
                         + $vertex1->x();
                 if ($xinters == $point->x()) {
                     // Check if point is on the polygon boundary (other than horizontal)

vendor/funiq/geophp/src/Exception/UnsupportedMethodException.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function __construct($method, $code = 0, $message = null)
     {
-        $message = 'The method ' . $method . '() is not supported yet.' . ($message ? ' ' . $message : '');
+        $message = 'The method '.$method.'() is not supported yet.'.($message ? ' '.$message : '');
         parent::__construct($message, $code);
     }