Fix: Calculate bounds correctly

diff --git a/src/libgpx/gpx.php b/src/libgpx/gpx.php
index 1ec64990222251ea59fbff0c4038730e478c205f..219ce06a33936d43be068d4f33705288aaa5497b 100644 (file)
--- a/src/libgpx/gpx.php
+++ b/src/libgpx/gpx.php
@@ -362,7 +362,11 @@ class GPX implements Geographic
       foreach ($list as $geo) {
         $bounds = $geo->getBounds();
         if ($bounds === null) continue;
-        $result = ($result === null ? $bounds : $result->extend($bounds));
+        if ($result === null) {
+          $result = $bounds;
+        } else {
+          $result->extend($bounds);
+        }
       }
     }
     return $result;

diff --git a/src/libgpx/route.php b/src/libgpx/route.php
index e0364a73e0fe85a00df47f454973a66b48e935bc..1c7ab960f9aa5522089c26fd608e76a9b09e98c4 100644 (file)
--- a/src/libgpx/route.php
+++ b/src/libgpx/route.php
@@ -105,7 +105,11 @@ class Route extends DataType
     if ($this->points !== null) {
       foreach ($this->points as $point) {
         $bounds = $point->getBounds();
-        $result = ($result === null ? $bounds : $result->extend($bounds));
+        if ($result === null) {
+          $result = $bounds;
+        } else {
+          $result->extend($bounds);
+        }
       }
     }
     return $result;

diff --git a/src/libgpx/track.php b/src/libgpx/track.php
index 0eb8b4b7f33db38497a93bdf1d69d9f22b223516..0f0ba7143b057f924e5c073c3462744d8c4d010d 100644 (file)
--- a/src/libgpx/track.php
+++ b/src/libgpx/track.php
@@ -121,7 +121,11 @@ class Track extends DataType
     if ($this->segments !== null) {
       foreach ($this->segments as $segment) {
         $bounds = $segment->getBounds();
-        $result = ($result === null ? $bounds : $result->extend($bounds));
+        if ($result === null) {
+          $result = $bounds;
+        } else {
+          $result->extend($bounds);
+        }
       }
     }
     return $result;

diff --git a/src/libgpx/tracksegment.php b/src/libgpx/tracksegment.php
index 92ea5ea69f1d867fcf0ab05d2b4bd4a0a7853bfe..423ab96b04b9290ccae962d47de48de1fa5e8394 100644 (file)
--- a/src/libgpx/tracksegment.php
+++ b/src/libgpx/tracksegment.php
@@ -89,7 +89,11 @@ class TrackSegment
     if ($this->points !== null) {
       foreach ($this->points as $point) {
         $bounds = $point->getBounds();
-        $result = ($result === null ? $bounds : $result->extend($bounds));
+        if ($result === null) {
+          $result = $bounds;
+        } else {
+          $result->extend($bounds);
+        }
       }
     }
     return $result;