From 6c6399ea925cd6f5672aff869aaa7a503a357ee6 Mon Sep 17 00:00:00 2001 From: Grant Hutchins Date: Mon, 28 Nov 2016 10:29:09 -0600 Subject: [PATCH 1/2] google-maps: Use correct type for callback argument Fixes https://github.com/DefinitelyTyped/DefinitelyTyped/issues/11509 Also, update tests to be more realistic. Signed-off-by: Jon West Signed-off-by: Grant Hutchins --- google-maps/google-maps-tests.ts | 33 +++++++++++++++++++++++++------- google-maps/index.d.ts | 3 ++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/google-maps/google-maps-tests.ts b/google-maps/google-maps-tests.ts index c723a9ded3..3f55b1de55 100644 --- a/google-maps/google-maps-tests.ts +++ b/google-maps/google-maps-tests.ts @@ -1,9 +1,19 @@ import GoogleMapsLoader = require('google-maps'); - -GoogleMapsLoader.load(function(google) { - var loadedMap = google.maps.Map; + +GoogleMapsLoader.load(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.KEY = 'qwertyuiopasdfghjklzxcvbnm'; @@ -17,11 +27,20 @@ GoogleMapsLoader.LIBRARIES = ['geometry', 'places']; GoogleMapsLoader.LANGUAGE = 'fr'; -GoogleMapsLoader.release(function() { +GoogleMapsLoader.release(function () { console.log('No google maps api around'); }); -GoogleMapsLoader.onLoad(function(google) { - var loadedMap = google.maps.Map; - console.log('I just loaded google maps api'); +GoogleMapsLoader.onLoad(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 + }); }); diff --git a/google-maps/index.d.ts b/google-maps/index.d.ts index f5c28f1581..4167de72e5 100644 --- a/google-maps/index.d.ts +++ b/google-maps/index.d.ts @@ -6,8 +6,9 @@ /// 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; From 63631e0ef2e7427c4a901a613dbe52ad14b7d267 Mon Sep 17 00:00:00 2001 From: Grant Hutchins Date: Tue, 29 Nov 2016 09:04:10 -0600 Subject: [PATCH 2/2] google-maps: Support version 3.2.1 Signed-off-by: Kurtis Seebaldt --- google-maps/google-maps-tests.ts | 51 ++++++++++++++------------------ google-maps/index.d.ts | 18 +++++++---- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/google-maps/google-maps-tests.ts b/google-maps/google-maps-tests.ts index 3f55b1de55..a6af09776c 100644 --- a/google-maps/google-maps-tests.ts +++ b/google-maps/google-maps-tests.ts @@ -1,37 +1,16 @@ - - import GoogleMapsLoader = require('google-maps'); -GoogleMapsLoader.load(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.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'); -}); - -GoogleMapsLoader.onLoad(function (google) { +var callback: GoogleMapsLoader.CallBack = function (google) { var uluru = {lat: -25.363, lng: 131.044}; var map = new google.maps.Map(document.getElementById('map'), { @@ -43,4 +22,20 @@ GoogleMapsLoader.onLoad(function (google) { position: uluru, map: map }); +}; + + +GoogleMapsLoader.createLoader(); + +var isLoaded: boolean = GoogleMapsLoader.isLoaded(); + +GoogleMapsLoader.load(callback); +GoogleMapsLoader.release(callback); + +GoogleMapsLoader.onLoad(function () { + console.log("loaded!") }); + +var url: string = GoogleMapsLoader.createUrl(); + +GoogleMapsLoader.makeMock(); diff --git a/google-maps/index.d.ts b/google-maps/index.d.ts index 4167de72e5..86a9e137e7 100644 --- a/google-maps/index.d.ts +++ b/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 , Giedrius Grabauskas // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -10,17 +10,25 @@ declare namespace GoogleMapsLoader { interface CallBack { (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; + 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;