Mercurial > hg > STI-GWT

changeset 34:5ef409e34638

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump GMaps API to version 3
author Sebastian Kruse <skruse@mpiwg-berlin.mpg.de>
date Mon, 03 Dec 2012 12:06:59 +0100
parents 24c45a9048f2
children 18fc3a30e993
files war/Sti.html war/scripts/sti/STIMap.js
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/war/Sti.html	Fri Nov 30 17:03:17 2012 +0100
+++ b/war/Sti.html	Mon Dec 03 12:06:59 2012 +0100
@@ -38,7 +38,7 @@
     <script src="scripts/sti/clustering.js"></script>
     <script src="scripts/sti/kruskal.js"></script>
     <script src='http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.1'></script>        
-    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=AIzaSyCHBMq6Ndi9Kcq5w9jwP9DWKJlxRuIPQmI" type="text/javascript"></script>
+    <script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
     <script src="scripts/OpenLayers/OpenLayers.js"></script>
     <script src="scripts/ucsv/ucsv-1.1.0-min.js"></script>
   </head>
--- a/war/scripts/sti/STIMap.js	Fri Nov 30 17:03:17 2012 +0100
+++ b/war/scripts/sti/STIMap.js	Mon Dec 03 12:06:59 2012 +0100
@@ -644,10 +644,10 @@
 		
 
 		if( this.core.props.googleMaps ){
-        this.baseLayers.push( new OpenLayers.Layer.Google("Google Physical", {type: G_PHYSICAL_MAP, 'sphericalMercator': true} ) );        
+        this.baseLayers.push( new OpenLayers.Layer.Google("Google Physical", {type: google.maps.MapTypeId.TERRAIN, 'sphericalMercator': true} ) );        
 		this.baseLayers.push( new OpenLayers.Layer.Google( 'Google Streets', { 'sphericalMercator': true } ) );
-		this.baseLayers.push( new OpenLayers.Layer.Google( 'Google Satellite', { type: G_SATELLITE_MAP, 'sphericalMercator': true } ) );
-		this.baseLayers.push( new OpenLayers.Layer.Google( 'Google Hybrid', { type: G_HYBRID_MAP, 'sphericalMercator': true } ) );
+		this.baseLayers.push( new OpenLayers.Layer.Google( 'Google Satellite', { type: google.maps.MapTypeId.SATELLITE, 'sphericalMercator': true } ) );
+		this.baseLayers.push( new OpenLayers.Layer.Google( 'Google Hybrid', { type: google.maps.MapTypeId.HYBRID, 'sphericalMercator': true } ) );
 		}
 		
 		if( this.core.props.bingMaps ){