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

Timestamp:

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

Author:

grum

Message:

implement feature:1950

File:

• extensions/GMaps/js/gmapsPicture.js (modified) (8 diffs)

extensions/GMaps/js/gmapsPicture.js

@@ -40 +40 @@
               }
             ),
-      marker = new google.maps.Marker(
-                  {
-                    position:latlng,
-                    map: map,
-                    title:properties.markerTitle
-                  }
-                );
-
+      marker = null;
+
+  if(gmaps.geolocated)
+  {
+    marker= new google.maps.Marker(
+      {
+        position:latlng,
+        map: map,
+        title:properties.markerTitle
+      }
+    );
+  }
 
   re=/^mS(\d\d)_.*/i;
@@ -53 +57 @@
   if(iM!=null) iM=new Number(iM[1]);
 
-  if(iM!=null)
+  if(iM!=null && marker!=null)
   {
     var markerImg = new google.maps.MarkerImage('plugins/GMaps/img/'+properties.markerImg,
@@ -84 +88 @@
   properties.gMap=map;
   properties.gMapCenter=latlng;
+}
+
+/**
+ * if picture is geolocated, center map on geolocation
+ * otherwise, try to center on the kml file (by fitting bounds)
+ */
+function centerMap(map)
+{
+  if(gmaps.geolocated)
+  {
+    map.gMap.setCenter(map.gMapCenter);
+  }
+  else
+  {
+    fitKmlBounds(map);
+  }
+}
+
+/**
+ * if map have a kml file, fit to kml bounds
+ */
+function fitKmlBounds(map)
+{
+  if(map.gMap!=null) map.gMap.fitBounds(map.gMap.kmlFile.getDefaultViewport());
 }
 
@@ -127 +155 @@
       tabId='tab'+tabId.toUpperCase().substring(0,1)+tabId.substr(1);
       $("#"+tabId+" a").bind('click', function ()
-       {
+        {
           if(viewportInitialized.meta==false)
           {
@@ -135 +163 @@
               {
                 google.maps.event.trigger(gmaps.maps[i].gMap, 'resize');
-                gmaps.maps[i].gMap.setCenter(gmaps.maps[1].gMapCenter);
+                centerMap(gmaps.maps[i]);
                 $('#'+gmaps.maps[i].id+' span, #'+gmaps.maps[i].id+' a').css('font-size', '55.0%');
               }
@@ -141 +169 @@
             viewportInitialized.meta=true;
           }
-       }
+        }
       );
     }
@@ -167 +195 @@
               if(viewportInitialized.icon==false && gmaps.currentMapLoadIndex!=-1)
               {
-                google.maps.event.trigger(gmaps.maps[gmaps.currentMapLoadIndex].gMap, 'resize');
-                gmaps.maps[gmaps.currentMapLoadIndex].gMap.setCenter(gmaps.maps[gmaps.currentMapLoadIndex].gMapCenter);
-                $('#iGMapsIcon span, #iGMapsIcon 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);
+
+                google.maps.event.trigger(gmaps.maps[gmaps.currentMapLoadIndex].gMap, 'resize');
+                centerMap(gmaps.maps[gmaps.currentMapLoadIndex]);
+                $('#iGMapsIcon span, #iGMapsIcon a').css('font-size', '55.0%');
                 viewportInitialized.icon=true;
               }
@@ -198 +227 @@
       );
 
-      $('div.gmapsPopup div.ui-dialog-titlebar')
-      .append('<a href="#" id="gmapsCenterMap" style="display:none;" onclick="gmaps.maps[gmaps.currentMapLoadIndex].gMap.setCenter(gmaps.maps[gmaps.currentMapLoadIndex].gMapCenter); $(this).css(\'display\', \'none\').blur(); return(false);">'+
-              '<span>&bull;</span></a>');
-      $('#gmapsCenterMap').attr('title', gmaps.lang.centermap);
+      if(gmaps.geolocated)
+      {
+        $('div.gmapsPopup div.ui-dialog-titlebar')
+        .append('<a href="#" id="gmapsCenterMap" style="display:none;" onclick="centerMap(gmaps.maps[gmaps.currentMapLoadIndex]); $(this).css(\'display\', \'none\').blur(); return(false);">'+
+                '<span>&bull;</span></a>');
+        $('#gmapsCenterMap').attr('title', gmaps.lang.centermap);
+      }
 
       if(gmaps.maps[gmaps.currentMapLoadIndex].gMap.kmlFile!=null)
       {
         $('div.gmapsPopup div.ui-dialog-titlebar')
-          .append('<a href="#" id="gmapsBoundKml" onclick="gmaps.maps[gmaps.currentMapLoadIndex].gMap.fitBounds(gmaps.maps[gmaps.currentMapLoadIndex].gMap.kmlFile.getDefaultViewport()); $(this).css(\'display\', \'none\').blur(); return(false);">'+
+          .append('<a href="#" id="gmapsBoundKml" onclick="fitKmlBounds(gmaps.maps[gmaps.currentMapLoadIndex]); $(this).css(\'display\', \'none\').blur(); return(false);">'+
                   '<span>&sim;</span></a>');
         $('#gmapsBoundKml').attr('title', gmaps.lang.boundkml);