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

diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index bb969e8..af9d104 100644
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -1,5 +1,5 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class PathController extends Zend_Controller_Action
@@ -8,7 +8,7 @@ class PathController extends Zend_Controller_Action
         $formData = $this->_helper->SyjPostData->getPostData('Syj_Form_Geom');
         $path = new Syj_Model_Path();
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if (!$user and !$formData["geom_accept"]) {
             throw new Syj_Exception_Request();
         }
@@ -16,8 +16,14 @@ class PathController extends Zend_Controller_Action
         $path->creatorIp = $this->getRequest()->getClientIp(true);
 
         $this->save($path, $formData);
-        $data = array('redirect' => "idx/" . (string)$path->id);
-        $this->_helper->SyjApi->setCode(201)->setBodyJson($data);
+
+        $redirecturl = "idx/" . (string)$path->id;
+        if ($this->getRequest()->isXmlHttpRequest()) {
+            $data = array('redirect' => $redirecturl);
+            $this->_helper->SyjApi->setCode(201)->setBodyJson($data);
+        } else {
+            $this->_helper->SyjApi->setRedirect($redirecturl, 303);
+        }
     }
 
     public function updateAction() {
@@ -46,7 +52,7 @@ class PathController extends Zend_Controller_Action
             }
         }
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if (!$path->isCreator($user)) {
             throw new Syj_Exception_Forbidden();
         }
@@ -55,14 +61,36 @@ class PathController extends Zend_Controller_Action
 
     public function save(Syj_Model_Path $path, $formData) {
         /* setting geom property */
-        $decoder = new gisconverter\WKT();
-        try {
-            $geom = $decoder->geomFromText($formData["geom_data"]);
-        } catch (gisconverter\CustomException $e) {
-            throw new Syj_Exception_Request();
+        $geom = null;
+        foreach (array("WKT", "KML", "GPX", "geoJSON") as $dectype) {
+            $classname = 'gisconverter\\' . $dectype;
+            $decoder = new $classname();
+            try {
+                $geom = $decoder->geomFromText($formData["geom_data"]);
+            } catch (Exception $e) {
+            }
+            if ($geom) {
+                break;
+            }
+        }
+        if (!$geom) {
+            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_Request();
+            throw new Syj_Exception_InvalidGeomUpload();
         }
         $path->geom = $geom;
 
@@ -74,20 +102,7 @@ class PathController extends Zend_Controller_Action
 
         /* now, saving !*/
         $pathMapper = new Syj_Model_PathMapper();
-        try {
-            $pathMapper->save ($path);
-        } catch(Zend_Db_Statement_Exception $e) {
-            if ($e->getCode() == 23505) { // 23505: Unique violation throw new Syj_Exception_Request();
-                $message = $e->getMessage();
-                if (strpos($message, 'paths_geom_key') !== false) {
-                    throw new Syj_Exception_Request("uniquepath");
-                } else {
-                    throw $e;
-                }
-            } else {
-                throw $e;
-            }
-        }
+        $pathMapper->save ($path);
     }
 
 }