diff --strip-trailing-cr -ru zenphoto_1.2.9_stock/zp-core/zp-extensions/google_maps/phoogle.php zenphoto/zp-core/zp-extensions/google_maps/phoogle.php
--- zenphoto_1.2.9_stock/zp-core/zp-extensions/google_maps/phoogle.php	2010-03-01 06:52:26.000000000 +0100
+++ zenphoto/zp-core/zp-extensions/google_maps/phoogle.php	2010-04-07 23:32:39.000000000 +0200
@@ -249,6 +249,9 @@
 				case 'Large':
 					$this->controlType = 'map.addControl(new GLargeMapControl());';
 					break;
+				case 'Large3D':
+					$this->controlType = 'map.addControl(new GLargeMapControl3D());';
+					break;
 				default:
 					$this->controlType = $controlmap;
 			}
@@ -305,7 +308,6 @@
 		<div id="map" style="width: <?php echo $this->mapWidth; ?>px; height: <?php echo $this->mapHeight; ?>px">
 		</div>
 		<script type="text/javascript">
-		function showmap(){
 	   	if (GBrowserIsCompatible()) {
 	   		
     		map = new GMap2(document.getElementById("map"), {backgroundColor:'<?php echo $this->backGround; ?>'});
@@ -393,8 +395,6 @@
 					var text = document.createTextNode("<?php echo gettext('Your browser is not compatible with Google maps'); ?>");
 					document.getElementById("map").appendChild(text);
 				}
-			}
-			window.onload = showmap;
 			</script>
 		<?php
 	}
diff --strip-trailing-cr -ru zenphoto_1.2.9_stock/zp-core/zp-extensions/google_maps.php zenphoto/zp-core/zp-extensions/google_maps.php
--- zenphoto_1.2.9_stock/zp-core/zp-extensions/google_maps.php	2010-03-01 06:52:26.000000000 +0100
+++ zenphoto/zp-core/zp-extensions/google_maps.php	2010-04-10 19:45:37.000000000 +0200
@@ -117,6 +117,28 @@
 }
 
 /**
+ * Return true is there is at least one image with GPS informations
+ * in the album. It don't search in the sub-albums
+ *
+ *
+ * @return bool
+ */
+function hasAlbumMapData() {
+        global $_zp_current_album;
+        if ( getNumImages() > 0 ) {
+                $all_images=$_zp_current_album->getImages(0);
+                foreach( $all_images as $image ) {
+                        $imageClass=newImage($_zp_current_album,$image);
+                        $exif=$imageClass->getMetaData();
+                        if(!empty($exif['EXIFGPSLatitude']) && !empty($exif['EXIFGPSLongitude'])){
+                               return true;
+                        }
+               }
+        }
+return false;
+}
+
+/**
  * Adds a geoPoint after first insuring it uses periods for the decimal separator
  *
  * @param string $lat Latitude of the point
@@ -296,7 +318,7 @@
 				if($exif['EXIFGPSLongitudeRef'] == 'W'){  $long = '-' . $long; }
 				$infoHTML = '<a href="' . htmlspecialchars(getImageLinkURL()) . '"><img src="' .
 					htmlspecialchars(getImageThumb()) . '" alt="' . getImageDesc() . '" ' .
-					'style=" margin-left: 30%; margin-right: 10%; border: 0px; " /></a>' . getImageDesc();
+					'style=" margin-left: 30%; margin-right: 10%; border: 0px; " /></a><p align=center >' . getImageDesc()."</p>";
 				addPoint($lat, $long, js_encode($infoHTML));
 			}
 		}
@@ -321,4 +343,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>