Tidy up the Google Street View setup. (Much Simpler now, and with no extraneous warning messages anywhere)

4 files changed, 52 insertions, 436 deletions

diff --git a/modules/googlemap/placehierarchy.php b/modules/googlemap/placehierarchy.php
index 15629ac62f..2329c0f21f 100644
--- a/modules/googlemap/placehierarchy.php
+++ b/modules/googlemap/placehierarchy.php
@@ -167,20 +167,6 @@ function create_map() {
 		->execute(array($levelm))
 		->fetch(PDO::FETCH_ASSOC);
 
-	if (!isset($latlng)) {
-	// ?
-	} else {
-		if ($latlng['sv_lati']==null && WT_USER_IS_ADMIN && $STREETVIEW && $level > 0) {
-			echo '<div class="warning ', ($TEXT_DIRECTION=='ltr' ? 'ltr': 'rtl'),'"><b>', WT_I18N::translate('No Street View coordinates are saved yet.'), '</b><br /><br />';
-			echo '<ul>';
-			echo '<li>', WT_I18N::translate('If no Street View is displayed in the pane below right, drag the "Pegman" in the Map pane to the right to a blue street on the map.'), '</li>';
-			echo '<li>', WT_I18N::translate('When the Street View is displayed, adjust as necessary to enable the required view.'), 
-						 WT_I18N::translate('(Right mouse click the Steet View pane to toggle Street View navigation arrows.)'), '</li>';
-			echo '<li>', WT_I18N::translate('When the required view is displayed, click the Save View button.'), '</li>';
-			echo '<ul></div>';
-		}
-	}
-
 	echo '<div id="place_map" style="border: 1px solid gray; width: ', $GOOGLEMAP_PH_XSIZE, 'px; height: ', $GOOGLEMAP_PH_YSIZE, 'px; ';
 	echo "background-image: url('images/loading.gif'); background-position: center; background-repeat: no-repeat; overflow: hidden;\"></div>";
 	echo '<script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>';
@@ -253,60 +239,39 @@ function create_map() {
 				$sv_zoom	= $latlng['sv_zoom'];		// StreetView Point of View Zoom (0, 1, 2 or 3)
 				
 				// If Streetview coordinates are stored, bring up the regular Streetview -------
-				if ($latlng['sv_lati']!=null) {
-					$_map = WT_I18N::translate('Google Maps');
-					$_reset = WT_I18N::translate('Reset');
-						$_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View');
-					?>
-					<div>
-					<iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
-					</div>
-					<?php			
-						$list_latlon = (
-							translate_fact('LATI')."<input name='sv_latiText' id='sv_latiText' type='text' style='width:50px; background:none; border:none;' value='".$sv_lat."' />".
-							translate_fact('LONG')."<input name='sv_longText' id='sv_longText' type='text' style='width:49px; background:none; border:none;' value='".$sv_lng."' />".
-							WT_I18N::translate('Bearing')."<input name='sv_bearText' id='sv_bearText' type='text' style='width:46px; background:none; border:none;' value='".$sv_dir."' />".
-							WT_I18N::translate('Elevation')."<input name='sv_elevText' id='sv_elevText' type='text' style='width:30px; background:none; border:none;' value='".$sv_pitch."'	/>".
-							WT_I18N::translate('Zoom')."<input name='sv_zoomText' id='sv_zoomText' type='text' style='width:30px; background:none; border:none;' value='".$sv_zoom."' />
-						");
-						if (WT_USER_IS_ADMIN) {
-							echo "<table align=\"center\" style=\"margin-left:6px; border:solid 1px black; width:522px; margin-top:-28px; background:#cccccc; \">";
-						} else {
-							echo "<table align=\"center\" style=\"display:none; \">";
-						}
-						echo "<tr><td>\n";
-						echo "<form style=\"text-align:left; margin-left:5px; font:11px verdana; color:blue;\" method=\"post\" action=\"\">";
-						echo $list_latlon;
-						echo "<input type=\"submit\" name=\"Submit\" onClick=\"update_sv_params($placeid);\" value=\"", WT_I18N::translate('Save'), "\">";
-						echo "</form>";
-						echo "</td></tr>\n";
-						echo "</table>\n";	
-			
-				// Else, if Admin, bring up StreetView adjustment Map --------------------------
-				} else if (WT_USER_IS_ADMIN) {
-					$sv_lat = $pl_lati;	// Place Latitude
-					$sv_lng = $pl_long;	// Place Longitude
-					?>
-					<iframe style="background:transparent; margin-top:-2px; margin-left: 2px; width:530px;height:650px;padding:0;border:solid 0px black" src="<?php echo WT_MODULES_DIR; ?>googlemap/wt_v3_street_view_setup.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
-					<?php			
-					if (WT_USER_IS_ADMIN) {
-						$list_latlon = (
-							translate_fact('LATI')."<input name='sv_latiText' id='sv_latiText' type='text' style='width:62px; background:none; border:none;' value='".$sv_lat."' />".
-							translate_fact('LONG')."<input name='sv_longText' id='sv_longText' type='text' style='width:62px; background:none; border:none;' value='".$sv_lng."' />".
-							/* I18N: compass bearing (in degrees) */ WT_I18N::translate('Bearing')."<input name='sv_bearText' id='sv_bearText' type='text' style='width:43px; background:none; border:none;' value='".$sv_dir."' />".
-							/* I18N: angle of elevation (in degrees) */ WT_I18N::translate('Elevation')."<input name='sv_elevText' id='sv_elevText' type='text' style='width:43px; background:none; border:none;' value='".$sv_pitch."' />".
-							WT_I18N::translate('Zoom')."<input name='sv_zoomText' id='sv_zoomText' type='text' style='width:26px; background:none; border:none;' value='".$sv_zoom."' />
-						");
-						echo '<table align="center" style="margin-left:6px; border:1px solid black; width:522px; margin-top:-18px; background:#cccccc; ">';
-						echo '<tr><td>';
-						echo '<form style="text-align:left; margin-left:5px; font:11px verdana; color:blue;" method="post" action="">';
-						echo $list_latlon;
-						echo '<input type="submit" name="Submit" onClick="update_sv_params(', $placeid, ');" value="', WT_I18N::translate('Save'), '">';
-						echo '</form>';
-						echo '</td></tr>';
-						echo '</table>';			
-					}		
-				}		
+				if ($latlng['sv_lati']==null) {
+						$sv_lat = $pl_lati;	// Place Latitude
+						$sv_lng = $pl_long;	// Place Longitude
+				}
+				
+				$_map = WT_I18N::translate('Google Maps');
+				$_reset = WT_I18N::translate('Reset');
+					$_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View');
+				?>
+				<div>
+				<iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
+				</div>
+				
+				<?php			
+				$list_latlon = (
+					translate_fact('LATI')."<input name='sv_latiText' id='sv_latiText' type='text' style='width:42px; background:none; border:none;' value='".$sv_lat."' />".
+					translate_fact('LONG')."<input name='sv_longText' id='sv_longText' type='text' style='width:42px; background:none; border:none;' value='".$sv_lng."' />".
+					WT_I18N::translate('Bearing')."<input name='sv_bearText' id='sv_bearText' type='text' style='width:46px; background:none; border:none;' value='".$sv_dir."' />".
+					WT_I18N::translate('Elevation')."<input name='sv_elevText' id='sv_elevText' type='text' style='width:30px; background:none; border:none;' value='".$sv_pitch."'	/>".
+					WT_I18N::translate('Zoom')."<input name='sv_zoomText' id='sv_zoomText' type='text' style='width:30px; background:none; border:none;' value='".$sv_zoom."' />
+				");
+				if (WT_USER_IS_ADMIN) {
+					echo "<table align=\"center\" style=\"margin-left:6px; border:solid 1px black; width:522px; margin-top:-28px; background:#cccccc; \">";
+				} else {
+					echo "<table align=\"center\" style=\"display:none; \">";
+				}
+				echo "<tr><td>\n";
+				echo "<form style=\"text-align:left; margin-left:5px; font:11px verdana; color:blue;\" method=\"post\" action=\"\">";
+				echo $list_latlon;
+				echo "<input type=\"submit\" name=\"Submit\" onClick=\"update_sv_params($placeid);\" value=\"", WT_I18N::translate('Save'), "\">";
+				echo "</form>";
+				echo "</td></tr>\n";
+				echo "</table>\n";	
 			}
 		}
 		// Next line puts Place hierarchy on new row -----
diff --git a/modules/googlemap/places_edit.php b/modules/googlemap/places_edit.php
index 11322132fa..5f3b2f4607 100644
--- a/modules/googlemap/places_edit.php
+++ b/modules/googlemap/places_edit.php
@@ -278,15 +278,6 @@ $api="v3";
 		</td>
 	</tr>
 	<tr>
-		<td class="optionbox center" colspan="2">
-		<?php
-			if ($api=="v3") {
-		 		echo WT_I18N::translate('Drag the Marker in the Map above, or use parameters below, to re-position the place location');
-			}
-		?>
-		</td>
-	</tr>
-	<tr>
 		<td class="descriptionbox"><?php echo translate_fact('PLAC'), help_link('PLE_PLACES','googlemap'); ?></td>
 		 <td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo htmlspecialchars($place_name); ?>" size="25" class="address_input" />
 		<div id="INDI_PLAC_pop" style="display: inline;">
diff --git a/modules/googlemap/wt_v3_street_view.php b/modules/googlemap/wt_v3_street_view.php
index 5d0c484e8a..f4e837865a 100644
--- a/modules/googlemap/wt_v3_street_view.php
+++ b/modules/googlemap/wt_v3_street_view.php
@@ -124,12 +124,15 @@ function initialize() {
    			style: google.maps.NavigationControlStyle.SMALL			// ANDROID, DEFAULT, SMALL, ZOOM_PAN
       	},
       	streetViewControl: false,									// Show Pegman or not
-      	scrollwheel: false     		
+      	scrollwheel: true     		
 	};
 	
     var map = new google.maps.Map(document.getElementById('mapCanvas'), mapOptions);
 
     var bearing = b;
+    if (bearing < 0) {
+    	bearing=bearing+360;
+    }
     var pitch = p;
     var svzoom = m;
     
@@ -144,16 +147,16 @@ function initialize() {
       	new google.maps.Point(26, 36)
     );
 
-//  	var shape = {
-//      	coord: [1, 1, 1, 20, 18, 20, 18 , 1],
-//     	type: 'poly'
-//  	};
+  	var shape = {
+      	coord: [1, 1, 1, 20, 18, 20, 18 , 1],
+     	type: 'poly'
+  	};
  	
   	var marker = new google.maps.Marker({
-        //icon: image,
-        //shape: shape, 
-    	//position: latLng,
-    	title: 'Drag me to a Street',
+        icon: image,
+        // shape: shape, 
+    	position: latLng,
+    	title: 'Drag me to a Blue Street',
     	map: map,
     	draggable: true
   	});
@@ -195,7 +198,7 @@ function initialize() {
 	panorama = new google.maps.StreetViewPanorama(document.getElementById("mapCanvas"), panoramaOptions);
 	panorama.setPosition(latLng);
 
-/*	
+
     	// Enable navigator contol and address control to be toggled with right mouse button -------
 		var aLink = document.createElement('a');
 		aLink.href = "javascript:void(0)"; onmousedown=function(e) {
@@ -211,9 +214,11 @@ function initialize() {
   				}
   				if (clickType!=1) {
 					if (panorama.get('addressControl') == false) {
+						panorama.set('navigationControl', false);
 						panorama.set('addressControl', true);
 						panorama.set('linksControl', true);
 					} else {
+						panorama.set('navigationControl', false);
 						panorama.set('addressControl', false);
 						panorama.set('linksControl', false);
 					}
@@ -228,7 +233,7 @@ function initialize() {
 		};
 		panorama.controls[google.maps.ControlPosition.TOP_RIGHT].push(aLink);
 		// -----------------------------------------------------------------------------------------
-*/
+
 
   	// Update current position info.
   	updateMarkerPosition(latLng);
@@ -402,7 +407,9 @@ google.maps.event.addDomListener(window, 'load', initialize);
   		</form>
   	</div>
   		
-  	<div id="mapCanvas"></div>
+  	<div id="mapCanvas">
+  	
+  	</div>
 
   	<div id="infoPanel">
     	<!-- <b>Marker status:</b> -->
diff --git a/modules/googlemap/wt_v3_street_view_setup.php b/modules/googlemap/wt_v3_street_view_setup.php
deleted file mode 100644
index 0641ab87b2..0000000000
--- a/modules/googlemap/wt_v3_street_view_setup.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/**
- * Displays the streetview map setup page
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2010  PGV Development Team. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Googlemaps v3
- * @version $Id$
- *
- * @author Brian Holland (windmillway)
- */
- ?>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title>Google Maps JavaScript API V3: Street View Layer</title>
-    <script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
-    <script type="text/javascript">
-    
-
-    
-	var qsParm = new Array();
-	function qs() {
-		var query = window.location.search.substring(1);
-		var parms = query.split('&');
-		for (var i=0; i<parms.length; i++) {
-			var pos = parms[i].indexOf('=');
-			if (pos > 0) {
-				var key = parms[i].substring(0,pos);
-				var val = parms[i].substring(pos+1);
-				qsParm[key] = val;
-			}
-		}
-	} 	
-	qsParm['x'] = null;
-	qsParm['y'] = null;
-	qs();
-    
-    var map;
-    
-	function roundNumber(num, dec) {
-		var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
-		return result;
-	}
-    
-    function initialize() {
-    	
-		var x = qsParm['x'];
-    	var y = qsParm['y'];
-    	var b = parseFloat(qsParm['b']);
-    	var p = parseFloat(qsParm['p']);
-    	var m = parseFloat(qsParm['m']);
-    
-      	var sv_location = new google.maps.LatLng(y, x);
-   	
-		var mapOptions = {
-			zoom: 14,
-			center: sv_location,
-			mapTypeId: google.maps.MapTypeId.ROADMAP,					// ROADMAP, SATELLITE, HYBRID, TERRAIN
-			mapTypeControlOptions: {
-				style: google.maps.MapTypeControlStyle.DROPDOWN_MENU 	// DEFAULT, DROPDOWN_MENU, HORIZONTAL_BAR
-			},
-			navigationControl: true,
-      		navigationControlOptions: {
-   				position: google.maps.ControlPosition.TOP_RIGHT,		// BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc
-   				style: google.maps.NavigationControlStyle.SMALL			// ANDROID, DEFAULT, SMALL, ZOOM_PAN
-      		},
-      		streetViewControl: true,									// Show Pegman or not
-      		scrollwheel: false
-      		
-		};
-      	map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
-
-
-    	// === Next, get the map's default panorama and set up some defaults. ======================
-    	var bearing = b;
-    	var pitch = p;
-    	var svzoom = m;
-    	
-    	// --- First check if Browser supports html5 ---
-    	var browserName=navigator.appName;
-    	if (browserName=="Microsoft Internet Explorer") {
-    	    var render_type = '';
-    	} else {
-    	   	var render_type = 'html5';
-    	}
-
-		// --- Create the panorama ---   	 	
-      	var panoramaOptions = {
-      		navigationControl: false,
-      		navigationControlOptions: {
-      			position: google.maps.ControlPosition.TOP_LEFT,			// BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc
-      			style: google.maps.NavigationControlStyle.ANDROID  		// ANDROID, DEFAULT, SMALL, ZOOM_PAN
-      		},
-      		linksControl: false,
-      		addressControl: false,
-      		addressControlOptions: {
-      			style: {
-      				// display: 'none',									// USE CSS notation here
-      				// backgroundColor: 'red'
-      			}
-      		},
-        	position: sv_location,
-        	mode: render_type, 
-       		pov: {
-          		heading: 0,
-          		pitch: 0,
-          		zoom: 1
-          		//heading: bearing,
-          		//pitch: pitch,
-          		//zoom: svzoom
-        	}
-      	};  
-      	var panorama = new google.maps.StreetViewPanorama(document.getElementById("pano"),panoramaOptions);
-      	
-    	map.setStreetView(panorama);
-    	
-    	// Enable navigator contol and address control to be toggled with right mouse button -------
-		var aLink = document.createElement('a');
-		aLink.href = "javascript:void(0)"; onmousedown=function(e) {
- 			if (parseInt(navigator.appVersion)>3) {
-  				var clickType=1;
-  				if (navigator.appName=="Netscape") {
-  					clickType=e.which;
-  				} else {
-  					clickType=event.button;
-  				}
-  				if (clickType==1) {
-  					self.status='Left button!';
-  				}
-  				if (clickType!=1) {
-					if (panorama.get('addressControl') == false) {
-						panorama.set('addressControl', true);
-						panorama.set('linksControl', true);
-					} else {
-						panorama.set('addressControl', false);
-						panorama.set('linksControl', false);
-					}
-  				}
- 			}
- 			return true;
-			if (parseInt(navigator.appVersion)>3) {
- 				document.onmousedown = mouseDown;
- 			if (navigator.appName=="Netscape") 
-  				document.captureEvents(Event.MOUSEDOWN);
-			}
-		};
-		panorama.controls[google.maps.ControlPosition.TOP_RIGHT].push(aLink);
-		// -----------------------------------------------------------------------------------------
-		
-		google.maps.event.addListener(panorama, 'pov_changed', function() {
-			povLevel = panorama.getPov();
-        	parent.document.getElementById('sv_bearText').value = roundNumber(povLevel.heading, 2)+"\u00B0";
-        	parent.document.getElementById('sv_elevText').value = roundNumber(povLevel.pitch, 2)+"\u00B0";
-        	parent.document.getElementById('sv_zoomText').value = roundNumber(povLevel.zoom, 2);
-		});	
-		google.maps.event.addListener(panorama, 'position_changed', function() {
-			pos = panorama.getPosition();		
-        	parent.document.getElementById('sv_latiText').value = pos.lat()+"\u00B0";
-        	parent.document.getElementById('sv_longText').value = pos.lng()+"\u00B0";
-		});	
-		
-		//==========================================================================================
-		//  CREATE THE MAP PANE STREETVIEW BLUE STREETS
-		//======================================================================================
-		//	First lets create the Traffic ImageMap
-		//--------------------------------------------------------------------------------------
-		var traffic = new google.maps.ImageMapType({
-			getTileUrl: function(coord, zoom) {
-				var X = coord.x % (1 << zoom);  // wrap
-				return "http://mt3.google.com/mapstt?" +
-					"zoom=" + zoom + "&x=" + X + "&y=" + coord.y + "&client=api";
-			},
-			tileSize: new google.maps.Size(256, 256),
-			isPng: true
-		});
-		//======================================================================================
-		//	Now add the ImageMapType overlay to the map
-		//--------------------------------------------------------------------------------------
-		map.overlayMapTypes.push(traffic);
-		map.overlayMapTypes.push(null);
-		//======================================================================================
-		//	Now create the StreetView ImageMap
-		//--------------------------------------------------------------------------------------
-		// http://cbk0.google.com/cbk?output=overlay&zoom=12&x=2045&y=1361&cb_client=api
-		var street = new google.maps.ImageMapType({
-			getTileUrl: function(coord, zoom) {
-				var X = coord.x % (1 << zoom);  // wrap
-				return "http://cbk0.google.com/cbk?output=overlay&" +
-					"zoom=" + zoom + "&x=" + X + "&y=" + coord.y + "&cb_client=api";
-			},
-			tileSize: new google.maps.Size(256, 256),
-			isPng: true
-		});
-		//======================================================================================
-		//  Add the Street view Image Map
-		//--------------------------------------------------------------------------------------
-		map.overlayMapTypes.setAt(1, street);
-		//==========================================================================================
-	
-    }
-    
-	function resetview() {
-		initialize();
-	}
-    
-    // Instead of handling events directly in the tags attributes (ie. <body onload="...">),
-    // listen to the events programmatically:
-	google.maps.event.addDomListener(window, 'load', initialize);
-
-    </script>
-</head>
-  
-<body>  
-  	<style>
-
-  	#butt1, #butt2 {
-  		width:90px;
-  	}
-  	#map_canvas {
-    	width: 520px;
-    	height: 250px;
-    	margin: 0 auto;
-    	margin-top: -10px;
-		border:1px solid black;
-  	}
-  	#warning {
-    	margin: 0 auto;
-    	width: 520px;
-    	height: 100px;
-		border:0px solid black;
-		text-align: left;
-		font: 12px verdana; color:red;
-		padding-left: 4px;
-		margin-top:-5px;
-		font-weight: normal;
-  	}
-  	#warning h5 {
-  		font: 11px verdana; color:red;
-  		font-weight: normal;
-  	}
-  	#pano {
-    	margin: 0 auto;
-  		margin-top:3px;
-    	width: 520px;
-    	height: 350px;
-		border:1px solid black;
-  	}
-  	/*
-  	#inputs {
-    	margin: 0 auto;
-  		background: #cccccc; 
-  		margin-top: 0px; 
-  		width: 510px; 
-  		height: 15px;
-  		padding-bottom: 10px; 
-  		border:1px solid grey;
-  	}
-  	#inputs form {
-  		margin-left: -8px;
-  		font: 11px verdana; color:blue;
-  	}
-*/
-  	#inputs form input {
-  		background: #cccccc;
-  	}
-  	div {
-  		text-align: center;
-  	}
-  	</style>
-  	
-  	<div id="toggle">
-  		<form name="myForm" title="myForm">
-  			<!-- <input id="butt1" name ="butt1" type="button" value="Map" onclick="toggleStreetView();"></input> -->
-  				<input id="butt2" name ="butt2" type="button" value="Reset" onclick="resetview();"></input>
-  		</form>
-  	</div>
-
-    <div id="map_canvas"> </div>
-<!--    
-	<div id="warning">
-	<h5>
-		<b>No Streetview coordinates are saved yet.</b><br />
-		a. 	If no Streetview is displayed below, drag the "Pegman" to a "blue" Street on the map. <br />
-		b. 	When the Streetview is displayed, adjust as necessary to enable the required view. <br />
-			&nbsp;&nbsp;&nbsp; (Right mouse click to toggle Street view navigation arrows.) <br /> 
-		c. 	When the required view is displayed, click the button "Save View".
-	</h5>
-	</div>
--->
-	<div id="pano"></div>
-	
-<!--
-    <div id="inputs">
-	<?php
-/*
-		$placeid	= "";			// Placelocation place id
-		$sv_lat		= "";			// StreetView Point of View Latitude
-		$sv_lng 	= "";			// StreetView Point of View Longitude	
-		$sv_bear 	= "0&#176;";	// StreetView Point of View Bearing/Heading/Yaw	(degrees from North)
-		$sv_elev	= "0&#176;";	// StreetView Point of View Elevation/Pitch 	(+90 to -90 degrees (+=down, -=up)
-		$sv_zoom	= "1";			// StreetView Point of View Zoom 				(0.00 to 5.00 )
-
- 		$list_latlon = ("
-			lati<input 		name='sv_latiText' id='sv_latiText' type='text' style='width:67px; border:none;' value='' 	/>
-			long<input 		name='sv_longText' id='sv_longText' type='text' style='width:67px; border:none;' value='' 	/>
-			bear<input 		name='sv_bearText' id='sv_bearText' type='text' style='width:50px; border:none;' value='".$sv_bear."' 	/>&nbsp;
-			elev<input 		name='sv_elevText' id='sv_elevText' type='text' style='width:43px; border:none;' value='".$sv_elev."' 	/>
-			zoom<input 		name='sv_zoomText' id='sv_zoomText' type='text' style='width:26px; border:none;' value='".$sv_zoom."'	/>
-			&nbsp;
-		");
-	
-		echo "<table>";
-		echo "<tr><td align=\"center\">\n";
-			echo "<form method=\"post\" action=\"\">";
-			echo "&nbsp; ".$list_latlon;
-			echo "<input style=\"background:white;\"type=\"submit\" name=\"Submit\" id=\"Submit\" onClick=\"update_sv_params($placeid);\" value=\"Save View\">";
-			echo "</form>";
-		echo "</td></tr>\n";
-		echo "</table>\n";
-*/
-	?>
-	</div>
--->
-
-</body>  
-</html>