<?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
}
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) {
$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>';
$api->setCheckIfNoneMatch(true)->setContentType('application/vnd.google-earth.kml+xml')->setBody($data);
}
+ protected function gpx(Syj_Model_Path $path) {
+ $data = '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL; // <? <-- vim syntax goes crazy
+ $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, ENT_COMPAT, "UTF-8") . '</author>';
+ }
+ $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/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);