Changeset 178 for trunk

Timestamp:

09/21/2008 12:18:10 AM (4 years ago)

Author:

winner

Message:

Fix: choosing from config file the enabled google map types.
Add: psysical google map type.
Add: google maps localization.
Fix: reduce IE memory leaks from google maps (GUnload function).

Location:

trunk

Files:

• config-sample/config.php (modified) (2 diffs)
• globals/functions.php (modified) (3 diffs)
• templates/basic/includes/pages/gmap/gmap_js.tpl (modified) (1 diff)

trunk/config-sample/config.php

@@ -72 +72 @@
                 'maps_available' => array(
                         'satellite' => true,
-                        'normal' => false,
-                        'hybrid' => false,
-                        //Sample scripts for custom image map server can be found in the tools subdirectory
+                        'normal' => true,
+                        'hybrid' => true,
+                                                'physical' => true,
+
+                                                //Sample scripts for custom image map server can be found in the tools subdirectory
                         /*'custom_maps' => array(
                               0 => array(
@@ -87 +89 @@
                                         ),
                                 ),*/
-                        'default' => 'satellite'
+                        
+                        'default' => 'hybrid'
                         ),
                 'api' => '2.66',

trunk/globals/functions.php

@@ -337 +337 @@
 
 function include_gmap($javascript) {
-        global $main, $vars;
+        global $main, $vars, $lang;
         $dirname = dirname($_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF']);
         $gmap_key = $vars['gmap']['keys'][$dirname];
@@ -345 +345 @@
         if ($gmap_key == '') return FALSE;
 
-        $main->html->head->add_script("text/javascript", "http://".$vars['gmap']['server']."/maps?file=api&v=".$vars['gmap']['api']."&key=".$gmap_key);
+        $main->html->head->add_script("text/javascript", "http://".$vars['gmap']['server']."/maps?file=api&v=".$vars['gmap']['api']."&key=".$gmap_key."&hl=".$lang["iso639"]);
         $main->html->head->add_script("text/javascript", $javascript);
         $main->html->head->add_extra(
@@ -355 +355 @@
         
         $main->html->body->tags['onload'] = "gmap_onload()";    
+    $main->html->body->tags['onunload'] = "GUnload()"; //added to reduce IE memory leaks
         return TRUE;
 }

trunk/templates/basic/includes/pages/gmap/gmap_js.tpl

@@ -131 +131 @@
                 {/foreach}
                 {literal}
-                var map_types = [{/literal}{$map_types|upper}{literal}];
-                map = new GMap2(document.getElementById("map"));
-                if(map_types.length > 1)
-                                map.addControl(new GMapTypeControl());
-                map.addControl(new GLargeMapControl());
-                //map.addControl(new GOverviewMapControl());
+        gmapOptions = {
+                mapTypes: [{/literal}{$map_types|upper}{literal}]
+        }
+        map = new GMap2(document.getElementById("map"), gmapOptions);
+        if(gmapOptions.mapTypes.length > 1)
+                        map.addControl(new GMapTypeControl());
+        map.addControl(new GLargeMapControl());
+        //map.addControl(new GOverviewMapControl());
                 var center = new GLatLng({/literal}{$center_latitude}{literal},{/literal}{$center_longitude}{literal});
                 if ('{/literal}{$zoom}{literal}' != '') {