Removed deprecated GoogleJsAPI

No longer used by google api.
jqnatividad · Apr 9, 2014 · 6985b5d · 6985b5d
1 parent 10651ca
commit 6985b5d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/Maps_Settings.php b/Maps_Settings.php
@@ -219,12 +219,6 @@
 
 		// Integer. Default tilt when using Google Maps.
 		$GLOBALS['egMapsGMaps3DefaultTilt'] = 0;
-
-		// Google JavaScript Loader API key.
-		// Can be obtained at: https://code.google.com/apis/loader/signup.html
-		// This key is needed when using Google Earth or when using extended
-		// limits for displaying maps or geocoding calls.
-		$GLOBALS['egGoogleJsApiKey'] = '';
 
 		// Show points of interest or not.
 		$GLOBALS['egMapsShowPOI'] = true;

diff --git a/includes/services/GoogleMaps3/Maps_GoogleMaps3.php b/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
@@ -281,8 +281,6 @@ protected function getDependencies() {
 	}
 
 	public static function getApiScript( $langCode, array $urlArgs = array() ) {
-		global $egGoogleJsApiKey;
-
 		$urlArgs = array_merge(
 			array(
 				'language' => self::getMappedLanguageCode( $langCode ),
@@ -291,10 +289,6 @@ public static function getApiScript( $langCode, array $urlArgs = array() ) {
 			$urlArgs
 		);
 
-		if ( $egGoogleJsApiKey !== '' ) {
-			$urlArgs['key'] = $egGoogleJsApiKey;
-		}
-
 		return Html::linkedScript( '//maps.googleapis.com/maps/api/js?' . wfArrayToCgi( $urlArgs ) );
 	}
 
@@ -332,19 +326,4 @@ public function getResourceModules() {
 			array( 'ext.maps.googlemaps3' )
 		);
 	}
-
-	/**
-	 * Returns a list of all config variables that should be passed to the JS.
-	 * 
-	 * @since 1.0.1
-	 * 
-	 * @return array
-	 */
-	public final function getConfigVariables() {
-		return parent::getConfigVariables() 
-			+ array(
-				'egGoogleJsApiKey' => $GLOBALS['egGoogleJsApiKey']
-			);
-	}
-
 }
diff --git a/includes/services/GoogleMaps3/jquery.googlemap.js b/includes/services/GoogleMaps3/jquery.googlemap.js
@@ -448,12 +448,11 @@
 
 		this.setup = function () {
 
-			var showEarth = $.inArray('earth', options.types) !== -1;
+			var showEarth = $.inArray('earth', options.types) !== -1 || options.type == 'earth';
 
 			// If there are any non-Google KML/KMZ layers, load the geoxml library and use it to add these layers.
 			if (showEarth) {
 				this.removeEarthType();
-				showEarth = mw.config.get('egGoogleJsApiKey') !== '';
 			}
 
 			var mapOptions = {
@@ -561,7 +560,7 @@
 
 			if (showEarth) {
 				$.getScript(
-					'https://www.google.com/jsapi?key=' + mw.config.get('egGoogleJsApiKey'),
+					'https://www.google.com/jsapi',
 					function (data, textStatus) {
 						google.load('earth', '1', { callback:function () {
 							mw.loader.using('ext.maps.gm3.earth', function () {