Use dedicated function to prepare PlPage for maps.

[platal.git] / modules / geoloc.php

diff --git a/modules/geoloc.php b/modules/geoloc.php
index 42abc79..6952510 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,89 +24,42 @@ class GeolocModule extends PLModule
     function handlers()
     {
         return array(
-            'geoloc'             => $this->make_hook('default', AUTH_COOKIE),
-            'admin/geoloc'           => $this->make_hook('admin', AUTH_MDP, 'admin'),
-            'admin/geoloc/dynamap'   => $this->make_hook('admin_dynamap', AUTH_MDP, 'admin'),
+            'map'      => $this->make_hook('map',      AUTH_COOKIE),
+            'map/ajax' => $this->make_hook('map_ajax', AUTH_COOKIE)
         );
     }
 
-    function handler_default(&$page, $action = null, $subaction = null)
+    static public function prepare_map(PlPage $page)
     {
         global $globals;
-
-        $set = new UserSet();
-        $set->addMod('geoloc', 'Geolocalisation', true);
-        $set->apply('geoloc', $page, $action, $subaction);
+        $page->changeTpl('geoloc/index.tpl');
+        $map_url = $globals->maps->dynamic_map . '?&sensor=false&v=' . $globals->maps->api_version . '&language=' . $globals->maps->language;
+        $page->addJsLink($map_url, false);
+        $page->addJsLink('maps.js');
+        $page->addJsLink('markerclusterer_packed.js');
+        $page->addJsLink('markerwithlabel_packed.js');
+        $page->assign('pl_extra_header', '<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />');
     }
 
-    function handler_admin(&$page, $action = false) {
-        $page->changeTpl('geoloc/admin.tpl');
-        require_once("geoloc.inc.php");
-        $page->setTitle('Administration - Geolocalisation');
-
-        $nb_synchro = 0;
-
-        if (Env::has('id') && is_numeric(Env::v('id'))) {
-            if (synchro_city(Env::v('id'))) $nb_synchro ++;
-        }
-
-        if ($action == 'missinglat') {
-            $res = XDB::iterRow("SELECT id FROM geoloc_city WHERE lat = 0 AND lon = 0");
-            while ($a = $res->next()) if (synchro_city($a[0])) $nb_synchro++;
-        }
-
-        if ($nb_synchro)
-            $page->trigSuccess(($nb_synchro > 1)?($nb_synchro." villes ont été synchronisées"):"Une ville a été synchronisée");
-
-        $res = XDB::query("SELECT COUNT(*) FROM geoloc_city WHERE lat = 0 AND lon = 0");
-        $page->assign("nb_missinglat", $res->fetchOneCell());
+    function handler_map($page)
+    {
+        self::prepare_map($page);
     }
 
-    function handler_admin_dynamap(&$page, $action = false) {
-        $page->changeTpl('geoloc/admin_dynamap.tpl');
-
-        if ($action == 'cities_not_on_map') {
-            require_once('geoloc.inc.php');
-            if (!fix_cities_not_on_map(20))
-                $page->trigError("Impossible d'accéder au webservice");
-            else
-                $refresh = true;
-        }
-
-        if ($action == 'smallest_maps') {
-            require_once('geoloc.inc.php');
-            set_smallest_levels();
-        }
-
-        if ($action == 'precise_coordinates') {
-            XDB::execute("UPDATE  adresses AS a
-                      INNER JOIN  geoloc_city AS c ON(a.cityid = c.id)
-                             SET  a.glat = c.lat / 100000, a.glng = c.lon / 100000");
-        }
-
-        if ($action == 'newmaps') {
-            require_once('geoloc.inc.php');
-            if (!get_new_maps(Env::v('url')))
-                $page->trigError("Impossible d'accéder aux nouvelles cartes");
-        }
-
-        $countMissing = XDB::query("SELECT COUNT(*) FROM geoloc_city AS c LEFT JOIN geoloc_city_in_maps AS m ON(c.id = m.city_id) WHERE m.city_id IS NULL");
-        $missing = $countMissing->fetchOneCell();
-
-        $countNoSmallest = XDB::query("SELECT SUM(IF(infos = 'smallest',1,0)) AS n FROM geoloc_city_in_maps GROUP BY city_id ORDER BY n");
-        $noSmallest = $countNoSmallest->fetchOneCell() == 0;
-
-        $countNoCoordinates = XDB::query("SELECT COUNT(*) FROM adresses WHERE cityid IS NOT NULL AND glat = 0 AND glng = 0");
-        $noCoordinates = $countNoCoordinates->fetchOneCell();
-
-        if (isset($refresh) && $missing) {
-            $page->assign("pl_extra_header", "<meta http-equiv='Refresh' content='3'/>");
-        }
-        $page->assign("nb_cities_not_on_map", $missing);
-        $page->assign("no_smallest", $noSmallest);
-        $page->assign("no_coordinates", $noCoordinates);
+    function handler_map_ajax($page)
+    {
+        $data = XDB::rawFetchAllAssoc('SELECT  pa.latitude, pa.longitude, GROUP_CONCAT(DISTINCT p.hrpid SEPARATOR \',\') AS hrpid,
+                                               GROUP_CONCAT(pd.promo SEPARATOR \',\') AS promo,
+                                               GROUP_CONCAT(DISTINCT CONCAT(pd.private_name, \' (\', pd.promo, \')\') SEPARATOR \',\') AS name
+                                         FROM  profile_addresses AS pa
+                                   INNER JOIN  profiles          AS p  ON (pa.pid = p.pid)
+                                   INNER JOIN  profile_display   AS pd ON (pd.pid = pa.pid)
+                                        WHERE  pa.type = \'home\' AND pa.latitude IS NOT NULL AND pa.longitude IS NOT NULL
+                                     GROUP BY  pa.latitude, pa.longitude');
+        $page->jsonAssign('data', $data);
+
+        return PL_JSON;
     }
-
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: