From 1e5786baeffd436ef5b9b912912b185d76d8410e Mon Sep 17 00:00:00 2001
From: Jan Trejbal <jan.trejbal@gmail.com>
Date: Thu, 18 Jun 2015 14:17:16 +0200
Subject: [PATCH 1/4] Fix MapTypeStyle (elementType and featureType accept only
 string)

---
 googlemaps/google.maps.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index 2250527c3..fdd5eeaf2 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -225,7 +225,7 @@ declare module google.maps {
         setStyle(style: Data.StylingFunction|Data.StyleOptions): void;
         toGeoJson(callback: (feature: Object) => void): void;
     }
-        
+
     export module Data {
         export interface DataOptions {
             map?: Map;
@@ -1204,8 +1204,8 @@ declare module google.maps {
     }
 
     export interface MapTypeStyle {
-        elementType?: MapTypeStyleElementType;
-        featureType?: MapTypeStyleFeatureType;
+        elementType?: string|MapTypeStyleElementType;
+        featureType?: string|MapTypeStyleFeatureType;
         stylers?: MapTypeStyler[];
     }
 

From 98c5ba0d560efae32b801ca47533ecfef932a94f Mon Sep 17 00:00:00 2001
From: Jan Trejbal <jan.trejbal@gmail.com>
Date: Thu, 18 Jun 2015 02:59:04 +0200
Subject: [PATCH 2/4] Add missing semicolons

---
 googlemaps/google.maps.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index fdd5eeaf2..1b0844f7b 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -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 {

From 17f143452612e442dcbd36fb80e37673ca71a9c7 Mon Sep 17 00:00:00 2001
From: Jan Trejbal <jan.trejbal@gmail.com>
Date: Thu, 18 Jun 2015 03:06:43 +0200
Subject: [PATCH 3/4] Fix PhpStorm lexical analysis

---
 googlemaps/google.maps.d.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index 1b0844f7b..9fa61ddab 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -209,20 +209,20 @@ 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;
     }
 

From 689ee644bbc032d226e646c881cfb76bda8fcffb Mon Sep 17 00:00:00 2001
From: Jan Trejbal <jan.trejbal@gmail.com>
Date: Thu, 18 Jun 2015 03:16:27 +0200
Subject: [PATCH 4/4] Add tests

---
 googlemaps/google.maps-tests.ts | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

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: [],
+};