Merge pull request #12955 from nertzy/google-maps-improvements

Google maps improvements

google-maps/google-maps-tests.ts

@@ -1,27 +1,41 @@
-
-
 import GoogleMapsLoader = require('google-maps');
- 
-GoogleMapsLoader.load(function(google) {
-    var loadedMap = google.maps.Map;
-});
 
+GoogleMapsLoader.URL = 'https://maps.googleapis.com/maps/api/js';
 GoogleMapsLoader.KEY = 'qwertyuiopasdfghjklzxcvbnm';
-
-GoogleMapsLoader.CLIENT = 'yourclientkey';
-GoogleMapsLoader.VERSION = '3.14';
-
-GoogleMapsLoader.SENSOR = true;
-
 GoogleMapsLoader.LIBRARIES = ['geometry', 'places'];
-
+GoogleMapsLoader.CLIENT = 'yourclientkey';
+GoogleMapsLoader.CHANNEL = 'myChannel';
 GoogleMapsLoader.LANGUAGE = 'fr';
+GoogleMapsLoader.REGION = 'GB';
+GoogleMapsLoader.VERSION = '3.14';
+GoogleMapsLoader.WINDOW_CALLBACK_NAME = '__google_maps_api_provider_initializator__';
 
-GoogleMapsLoader.release(function() {
-    console.log('No google maps api around');
+var callback: GoogleMapsLoader.CallBack = function (google) {
+    var uluru = {lat: -25.363, lng: 131.044};
+
+    var map = new google.maps.Map(document.getElementById('map'), {
+        zoom: 4,
+        center: uluru
+    });
+
+    var marker = new google.maps.Marker({
+        position: uluru,
+        map: map
+    });
+};
+
+
+GoogleMapsLoader.createLoader();
+
+var isLoaded: boolean = GoogleMapsLoader.isLoaded();
+
+GoogleMapsLoader.load(callback);
+GoogleMapsLoader.release(callback);
+
+GoogleMapsLoader.onLoad(function () {
+    console.log("loaded!")
 });
 
-GoogleMapsLoader.onLoad(function(google) {
-    var loadedMap = google.maps.Map;
-    console.log('I just loaded google maps api');
-});
+var url: string = GoogleMapsLoader.createUrl();
+
+GoogleMapsLoader.makeMock();

google-maps/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for google-maps 3.1.0
+// Type definitions for google-maps 3.2.1
 // Project: https://www.npmjs.com/package/google-maps
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,20 +6,29 @@
 /// <reference types="googlemaps" />
 
 declare namespace GoogleMapsLoader {
+    type google = { maps: typeof google.maps };
     interface CallBack {
-        (google: { maps: { Map: google.maps.Map } }): void;
+        (google: google): void;
     }
+
     export var KEY: string;
-    export var CLIENT: string;
-    export var VERSION: string;
-    export var SENSOR: boolean;
+    export var URL: string;
     export var LIBRARIES: Array<string>;
+    export var CLIENT: string;
+    export var CHANNEL: string;
     export var LANGUAGE: string;
+    export var REGION: string;
+    export var VERSION: string;
+    export var WINDOW_CALLBACK_NAME: string;
+
     export function release(callBack: Function): void;
     export function onLoad(callBack?: CallBack): void;
     export function load(callBack?: CallBack): void;
     export function isLoaded(): boolean;
-
+    export function createLoader(): void;
+    export function createUrl(): string;
+    export function makeMock(): void;
 }
+
 export = GoogleMapsLoader;
 export as namespace GoogleMapsLoader;