X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FGeomController.php;h=b01837c8c50c218e20cb452c59ffc6ff3bebe4dc;hb=9f80d909c85ea324ed3337348b6e83ec39b70a78;hp=3f14df907137d7cbab2ec8a83f695ba3d140b653;hpb=c18437388d1810a4f7e8f692d748473feeaebe00;p=syj.git

diff --git a/application/controllers/GeomController.php b/application/controllers/GeomController.php
index 3f14df9..b01837c 100644
--- a/application/controllers/GeomController.php
+++ b/application/controllers/GeomController.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 GeomController extends Zend_Controller_Action
@@ -28,12 +28,14 @@ class GeomController extends Zend_Controller_Action
         }
 
         if (!$pathMapper->find($idx, $path)) {
-            if ($pathMapper->hasexisted($idx)) {
-                $api->setCode(410);
-            } else {
-                $api->setCode(404);
+            if (!$pathMapper->findByTitle($idx, $path)) {
+                if ($pathMapper->hasexisted($idx)) {
+                    $api->setCode(410);
+                } else {
+                    $api->setCode(404);
+                }
+                return;
             }
-            return;
         }
 
         switch ($ext) {
@@ -56,9 +58,11 @@ class GeomController extends Zend_Controller_Action
         $data .= '<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">';
         $data .= '<Placemark>';
         if ($path->creator) {
-            $data .= '<atom:author><atom:name>' . htmlspecialchars($path->creator->pseudo) . '</atom:name></atom:author>';
+            $data .= '<atom:author><atom:name>'
+                        . htmlspecialchars($path->creator->pseudo, ENT_COMPAT, "UTF-8")
+                        . '</atom:name></atom:author>';
         }
-        $data .= '<name>' . htmlspecialchars($path->displayTitle) . '</name>';
+        $data .= '<name>' . htmlspecialchars($path->displayTitle, ENT_COMPAT, "UTF-8") . '</name>';
         $data .= $path->geom->toKML();
         $data .= '</Placemark>';
         $data .= '</kml>';
@@ -72,22 +76,22 @@ class GeomController extends Zend_Controller_Action
         $data .= '<gpx creator="syj" version="1.0" xmlns="http://www.topografix.com/GPX/1/0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">';
         $data .= '<trk>';
         if ($path->creator) {
-            $data .= '<author>' . htmlspecialchars($path->creator->pseudo) . '</author>';
+            $data .= '<author>' . htmlspecialchars($path->creator->pseudo, ENT_COMPAT, "UTF-8") . '</author>';
         }
-        $data .= '<name>' . htmlspecialchars($path->displayTitle) . '</name>';
+        $data .= '<name>' . htmlspecialchars($path->displayTitle, ENT_COMPAT, "UTF-8") . '</name>';
         $data .= $path->geom->toGPX();
         $data .= '</trk>';
         $data .= '</gpx>';
 
         $api = $this->_helper->SyjApi;
-        $api->setCheckIfNoneMatch(true)->setContentType('application/octet-stream')->setBody($data);
+        $api->setCheckIfNoneMatch(true)->setContentType('application/gpx+xml')->setBody($data);
     }
 
     protected function json(Syj_Model_Path $path) {
-        $data = array('geom' => (string)$path->geom,
-                  'title' => (string)$path->displayTitle);
+        $data = json_decode($path->geom->toGeoJSON());
+        $data->title = (string)$path->displayTitle;
         if ($path->creator) {
-            $data['creator'] = (string)$path->creator->pseudo;
+            $data->creator = (string)$path->creator->pseudo;
         }
         $api = $this->_helper->SyjApi;
         $api->setCheckIfNoneMatch(true)->setBodyJson($data);