allow setting initial position with get params

[syj.git] / application / controllers / IdxController.php

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 0817fe65c973250a0bc04d6bd5d81f8bcd6436aa..790c8c766348edd0f88205b23670ee96db772c3d 100644 (file)
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -6,24 +6,18 @@ class IdxController extends Zend_Controller_Action
 {
 
     public function init() {
-        $this->view->headScript()->appendFile('js/OpenLayers.js');
-        $this->view->headScript()->appendFile('js/ModifiablePath.js');
-        $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/simplebox.js');
-        $this->view->headScript()->appendFile('js/utils.js');
-        $this->view->headScript()->appendFile('js/syj.js');
-        $this->view->headLink()->appendStylesheet('css/openlayers/style.css');
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/syj.css');
+        $this->_helper->SyjMedias->addScripts('idx');
+        $this->view->headLink()->appendStylesheet('css/olstyle.css', "all");
+        $this->view->headLink()->appendStylesheet('css/generic.css', "all");
+        $this->view->headLink()->appendStylesheet('css/syj.css', "all");
     }
 
     public function rawmode(Syj_Model_Path $path) {
         $this->_helper->SyjReset->resetPlaceHolders();
+        $this->_helper->SyjMedias->addScripts('rawidx');
 
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/syjraw.css');
-        $this->view->headScript()->appendFile('js/OpenLayers.js');
-        $this->view->headScript()->appendFile('js/syjraw.js');
+        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
         $this->view->headTitle($path->displayTitle);
 
         $this->_jsRawLocaleStrings();
@@ -51,8 +45,10 @@ class IdxController extends Zend_Controller_Action
             $path = new Syj_Model_Path();
             if (!$pathMapper->findByUrl($url, $path)) {
                 if (is_numeric($url) and $pathMapper->hasexisted($url)) {
+                    $this->view->message = $this->view->translate("route has been deleted");
                     throw new Syj_Exception_NotFound('Gone', 410);
                 } else {
+                    $this->view->message = $this->view->translate("route does not exist");
                     throw new Syj_Exception_NotFound('Not Found', 404);
                 }
             }
@@ -70,8 +66,17 @@ class IdxController extends Zend_Controller_Action
             $geomform->geom_title->setValue($path->title);
         } else {
             $geomform->setAction('path');
-            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
-            $this->view->headScript()->prependScript((string) $extent);
+
+            $lat = $this->getRequest()->getQuery('lat');
+            $lon = $this->getRequest()->getQuery('lon');
+            $zoom = $this->getRequest()->getQuery('zoom');
+            if (is_numeric ($lat) and is_numeric ($lon) and is_numeric ($zoom)) {
+                $initialpos = array('lat' => (float)$lat, 'lon' => (float)$lon, 'zoom' => (int)$zoom);
+            } else {
+                $initialpos =  $this->_helper->syjGeoip($this->getRequest()->getClientIp(true));
+            }
+
+            $this->view->headScript()->prependScript((string) new phptojs\JsObject('gInitialPos', $initialpos));
             $title = "Show your journey";
         }
 
@@ -82,6 +87,7 @@ class IdxController extends Zend_Controller_Action
                         $this->view->translate('route by <strong>%s</strong>', (string)$path->creator->pseudo);
         }
         $this->view->headTitle($title);
+        $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
         $this->view->geomform = $geomform;
         $this->view->loginform = $loginform;
         $this->view->userform = $userform;
@@ -145,6 +151,9 @@ class IdxController extends Zend_Controller_Action
             'createAction' => __("create"),
             'cloneAction' => __("duplicate"),
             'unsavedConfirmExit' => __("You have an unsaved route"),
+            'notEmptyField' => __("Value is required"),
+            'noResult' => __("no result"),
+            'dragFileError' => __("could not analyze file content"),
             );
     }