X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fcontrollers%2FPathController.php;fp=application%2Fcontrollers%2FPathController.php;h=af9d104fb2efb3bb5e78d9d3dfc0ef8492d11e12;hp=394da6921cac13042844cc78e0a5e4d99a839041;hb=7504b7ccb77a798b20f4dbb003a90bcaee702124;hpb=150c38ebcad7e451aca5350cf5c8047d65a3af72

diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index 394da69..af9d104 100644
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -77,6 +77,18 @@ class PathController extends Zend_Controller_Action
             throw new Syj_Exception_InvalidGeomUpload();
         }
 
+        // merge linestrings for gpx containting multiple trkseg elements.
+        if ($classname == 'gisconverter\\GPX' && $geom::name == 'GeometryCollection') {
+          $geomstring = "";
+          foreach (array_filter($geom->components, function ($geom) {
+            return $geom::name == "LineString";
+          }) as $linestring) {
+            $geomstring .= str_replace("<trkseg>", "",
+                              str_replace("</trkseg>", "", $linestring->toGPX()));
+          }
+          $geom = $decoder->geomFromText("<trkseg>" . $geomstring . "</trkseg>");
+        }
+
         if ($geom::name != "LineString") {
             throw new Syj_Exception_InvalidGeomUpload();
         }