Changeset 7479 for extensions/GMaps/js/gmapsCategory.js

Timestamp:

Oct 29, 2010, 3:01:40 PM (14 years ago)

Author:

grum

Message:

implement feature:1950

File:

• extensions/GMaps/js/gmapsCategory.js (modified) (6 diffs)

extensions/GMaps/js/gmapsCategory.js

@@ -51 +51 @@
       }
     );
+    kmlFile.setMap(map);
   }
   else
@@ -203 +204 @@
       {
         case 'G':
-          marker.info.imgTn[index]='./galleries/'.marker.info.imgTn[index].substr(1);
+          marker.info.imgTn[index]='./galleries/'+marker.info.imgTn[index].substr(1);
           break;
         case 'U':
-          marker.info.imgTn[index]='./upload/'.marker.info.imgTn[index].substr(1);
+          marker.info.imgTn[index]='./upload/'+marker.info.imgTn[index].substr(1);
           break;
       }
@@ -362 +363 @@
     google.maps.event.trigger(gmaps.maps[gmaps.currentMapLoadIndex].gMap, 'resize');
 
-
-    if(gmaps.maps[gmaps.currentMapLoadIndex].fitToBounds)
-    {
-      fitToBounds(gmaps.bounds)
-    }
-    else
-    {
-      gmaps.maps[gmaps.currentMapLoadIndex].gMap.setCenter(gmaps.bounds.getCenter());
-    }
-
     // reduce copyright size... ^_^
     $('#'+gmaps.maps[gmaps.currentMapLoadIndex].id+' span, #'+gmaps.maps[gmaps.currentMapLoadIndex].id+' a').css('font-size', '55.0%');
 
-    if(gmaps.maps[gmaps.currentMapLoadIndex].gMap.kmlFile!=null)
-      gmaps.maps[gmaps.currentMapLoadIndex].gMap.kmlFile.setMap(gmaps.maps[gmaps.currentMapLoadIndex].gMap);
+
+    if(gmaps.geolocated)
+    {
+      if(gmaps.maps[gmaps.currentMapLoadIndex].fitToBounds)
+      {
+        fitToBounds(gmaps.bounds);
+      }
+      else
+      {
+        gmaps.maps[gmaps.currentMapLoadIndex].gMap.setCenter(gmaps.bounds.getCenter());
+      }
+    }
+    else
+    {
+      fitToBounds(gmaps.maps[gmaps.currentMapLoadIndex].gMap.kmlFile.getDefaultViewport());
+    }
 
     google.maps.event.addListener(
@@ -406 +411 @@
   if(gmaps.currentMapLoadIndex>-1) loadMarkers(gmaps.maps[gmaps.currentMapLoadIndex].gMap);
 }
+
 
 $(window).load(function ()
@@ -448 +454 @@
       /*
        * initialize map on the server side (call the 'public.maps.init'
-       * function
+       * function)
        */
       $.ajax(
@@ -484 +490 @@
       ).data('index', i);
 
-      $('div.gmapsPopup div.ui-dialog-titlebar')
-      .append('<a href="#" id="gmapsBoundMap" style="display:none;" onclick="fitToBounds(gmaps.bounds); $(this).css(\'display\', \'none\').blur(); return(false);">'+
-              '<span>&there4;</span></a>');
-      $('#gmapsBoundMap').attr('title', gmaps.lang.boundmap);
+      if(gmaps.geolocated)
+      {
+        $('div.gmapsPopup div.ui-dialog-titlebar')
+        .append('<a href="#" id="gmapsBoundMap" style="display:none;" onclick="fitToBounds(gmaps.bounds); $(this).css(\'display\', \'none\').blur(); return(false);">'+
+                '<span>&there4;</span></a>');
+        $('#gmapsBoundMap').attr('title', gmaps.lang.boundmap);
+      }
 
       if(gmaps.maps[i].gMap.kmlFile!=null)