# HG changeset patch
# User Sebastian Kruse <skruse@mpiwg-berlin.mpg.de>
# Date 1354532819 -3600
# Node ID 5ef409e34638364e94e3b26554855e2a2d1774b5
# Parent  24c45a9048f2b27ed21a2448ca5d13d3ae1981db
Bump GMaps API to version 3

diff -r 24c45a9048f2 -r 5ef409e34638 war/Sti.html
--- 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>
diff -r 24c45a9048f2 -r 5ef409e34638 war/scripts/sti/STIMap.js
--- 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 ){