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 29e142d27772b8b87364d9cfc57af851936fc07d..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', "all");
+        $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', 'all');
         $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
-        $this->view->headScript()->appendFile('js/OpenLayers.js');
-        $this->view->headScript()->appendFile('js/syjraw.js');
         $this->view->headTitle($path->displayTitle);
 
         $this->_jsRawLocaleStrings();
@@ -72,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";
         }
 
@@ -84,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;
@@ -149,7 +153,7 @@ class IdxController extends Zend_Controller_Action
             'unsavedConfirmExit' => __("You have an unsaved route"),
             'notEmptyField' => __("Value is required"),
             'noResult' => __("no result"),
-            'dragFileError' => __("could not read content of file"),
+            'dragFileError' => __("could not analyze file content"),
             );
     }