From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 8 Jun 2011 07:55:12 +0000 (+0200)
Subject: Fixes maps related js files fetch.
X-Git-Tag: xorg/1.1.2~39
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cb84e82c5d5a08e60f98088e7b18fc8c28a31fab;p=platal.git

Fixes maps related js files fetch.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/Makefile b/Makefile
index 4cc834f..90b2ec8 100644
--- a/Makefile
+++ b/Makefile
@@ -243,13 +243,13 @@ $(JSTREE_PATH):
 ##
 ## Maps auxiliary scripts
 ##
-maps: htdocs/javascript/markerclusterer_packed.js htdocs/javascript/markerwithlabel_packed.js
+maps: htdocs/javascript/markerclusterer.js htdocs/javascript/markerwithlabel.js
 
-htdocs/javascript/markerclusterer_packed.js:
-	wget http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_packed.js -O htdocs/javascript/markerclusterer_packed.js
+htdocs/javascript/markerclusterer.js:
+	wget http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_compiled.js -O htdocs/javascript/markerclusterer.js
 
-htdocs/javascript/markerwithlabel_packed.js:
-	wget http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1.4/src/markerwithlabel_packed.js -O htdocs/javascript/markerwithlabel_packed.js
+htdocs/javascript/markerwithlabel.js:
+	wget http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1.4/src/markerwithlabel_packed.js -O htdocs/javascript/markerwithlabel.js
 
 ##
 ## lists rpc
diff --git a/modules/geoloc.php b/modules/geoloc.php
index 762e1ac..4db76cd 100644
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -36,8 +36,8 @@ class GeolocModule extends PLModule
         $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->addJsLink('markerclusterer.js');
+        $page->addJsLink('markerwithlabel.js');
         $page->assign('pl_extra_header', '<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />');
     }