diff --git a/googlemaps/google.maps-tests.ts b/googlemaps/google.maps-tests.ts index 23931850d..9b10c40ad 100644 --- a/googlemaps/google.maps-tests.ts +++ b/googlemaps/google.maps-tests.ts @@ -115,4 +115,28 @@ var icon: google.maps.Icon = { scaledSize: new google.maps.Size(32, 32), size: new google.maps.Size(32, 32), url: "dummy" -} \ No newline at end of file +}; + +/***** MapTypeStyle *****/ + +var mapTypeStyle: google.maps.MapTypeStyle ={ + featureType: 'all', +}; + +var mapTypeStyle: google.maps.MapTypeStyle ={ + featureType: 'administrative.country', + elementType: 'all', + stylers: [], +}; + +var mapTypeStyle: google.maps.MapTypeStyle ={ + featureType: 'landscape.natural', + elementType: 'geometry', + stylers: [], +}; + +var mapTypeStyle: google.maps.MapTypeStyle ={ + featureType: 'poi.school', + elementType: 'labels', + stylers: [], +}; diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts index 2250527c3..9fa61ddab 100644 --- a/googlemaps/google.maps.d.ts +++ b/googlemaps/google.maps.d.ts @@ -209,23 +209,23 @@ declare module google.maps { /***** Data *****/ export class Data extends MVCObject { - constructor(options?: Data.DataOptions); - add(feature: Data.Feature|Data.FeatureOptions): Data.Feature; - addGeoJson(geoJson: Object, options?: Data.GeoJsonOptions): Data.Feature[]; - contains(feature: Data.Feature): boolean; - forEach(callback: (feature: Data.Feature) => void): void; - getFeatureById(id: number|string): Data.Feature; + constructor(options?: google.maps.Data.DataOptions); + add(feature: google.maps.Data.Feature|google.maps.Data.FeatureOptions): google.maps.Data.Feature; + addGeoJson(geoJson: Object, options?: google.maps.Data.GeoJsonOptions): google.maps.Data.Feature[]; + contains(feature: google.maps.Data.Feature): boolean; + forEach(callback: (feature:google.maps.Data.Feature) => void): void; + getFeatureById(id: number|string): google.maps.Data.Feature; getMap(): Map; - getStyle(): Data.StylingFunction|Data.StyleOptions; - loadGeoJson(url: string, options?: Data.GeoJsonOptions, callback?: (features: Data.Feature[]) => void): void; - overrideStyle(feature: Data.Feature, style: Data.StyleOptions): void; - remove(feature: Data.Feature): void; - revertStyle(feature?: Data.Feature): void; + getStyle(): google.maps.Data.StylingFunction|google.maps.Data.StyleOptions; + loadGeoJson(url: string, options?: google.maps.Data.GeoJsonOptions, callback?: (features:google.maps.Data.Feature[]) => void): void; + overrideStyle(feature: google.maps.Data.Feature, style: google.maps.Data.StyleOptions): void; + remove(feature: google.maps.Data.Feature): void; + revertStyle(feature?: google.maps.Data.Feature): void; setMap(map: Map): void; - setStyle(style: Data.StylingFunction|Data.StyleOptions): void; + setStyle(style: google.maps.Data.StylingFunction|google.maps.Data.StyleOptions): void; toGeoJson(callback: (feature: Object) => void): void; } - + export module Data { export interface DataOptions { map?: Map; @@ -261,8 +261,8 @@ declare module google.maps { getProperty(name: string): any; removeProperty(name: string): void; setGeometry(newGeometry: Data.Geometry|LatLng): void; // TODO LatLngLiteral - setProperty(name: string, newValue: any): void - toGeoJson(callback: (feature: Object) => void): void + setProperty(name: string, newValue: any): void; + toGeoJson(callback: (feature: Object) => void): void; } export interface FeatureOptions { @@ -1204,8 +1204,8 @@ declare module google.maps { } export interface MapTypeStyle { - elementType?: MapTypeStyleElementType; - featureType?: MapTypeStyleFeatureType; + elementType?: string|MapTypeStyleElementType; + featureType?: string|MapTypeStyleFeatureType; stylers?: MapTypeStyler[]; }