merge linestrings for gpx containting multiple trkseg elements.

diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index 394da6921cac13042844cc78e0a5e4d99a839041..af9d104fb2efb3bb5e78d9d3dfc0ef8492d11e12 100644 (file)
--- 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();
         }
 
             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();
         }
         if ($geom::name != "LineString") {
             throw new Syj_Exception_InvalidGeomUpload();
         }

diff --git a/public/js/syj.js b/public/js/syj.js
index 7864fe9309575aa371e0109b49bc78816c6a82de..8f5f509020fd0f6251055213aa3d050169f963fe 100644 (file)
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -372,7 +372,7 @@ var SYJView = {
                     this.messenger.setMessage(SyjStrings.uploadFileError, "warn");
                 }.bind(this);
                 reader.onload = function(evt) {
                     this.messenger.setMessage(SyjStrings.uploadFileError, "warn");
                 }.bind(this);
                 reader.onload = function(evt) {

-                    var data = null, results = null, engine = null, vector = null, i = 0, formats = ['KML', 'GPX', 'GeoJSON'];
+                    var data = null, results = null, engine = null, vector = null, i = 0, format = null, formats = ['KML', 'GPX', 'GeoJSON'];

 
                     $("geom_upload_container").removeClassName("disabled");
                     $("geom_upload").disabled = false;
 
                     $("geom_upload_container").removeClassName("disabled");
                     $("geom_upload").disabled = false;


@@ -383,7 +383,8 @@ var SYJView = {
                     data = evt.target.result;
 
                     for (i = 0; i < formats.length; i++) {
                     data = evt.target.result;
 
                     for (i = 0; i < formats.length; i++) {

-                        engine = new OpenLayers.Format[formats[i]]({ internalProjection: Mercator, externalProjection: WGS84 });
+                        format = formats[i];
+                        engine = new OpenLayers.Format[format]({ internalProjection: Mercator, externalProjection: WGS84 });

                         try {
                             results = engine.read(data);
                         } catch(e) {
                         try {
                             results = engine.read(data);
                         } catch(e) {


@@ -402,6 +403,12 @@ var SYJView = {
                         readerror();
                         return;
                     }
                         readerror();
                         return;
                     }

+                    // merge linestrings for gpx containting multiple trkseg elements.
+                    if (format === 'GPX') {
+                      for (i = 1; i < results.length; i++) {
+                        vector.geometry.addComponents(results[i].geometry.components);
+                      }
+                    }

                     this.viewLayer.addFeatures([vector]);
                     this.map.zoomToExtent(this.viewLayer.getDataExtent());
 
                     this.viewLayer.addFeatures([vector]);
                     this.map.zoomToExtent(this.viewLayer.getDataExtent());