fix(addressMarker): address marker shouldn't have lat lng

Vheissu · Mar 28, 2017 · c64a00b · c64a00b
1 parent 82a3d35
commit c64a00b
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 12 deletions.
diff --git a/dist/amd/google-maps.js b/dist/amd/google-maps.js
diff --git a/dist/amd/google-maps.js.map b/dist/amd/google-maps.js.map
diff --git a/dist/commonjs/google-maps.js b/dist/commonjs/google-maps.js
diff --git a/dist/commonjs/google-maps.js.map b/dist/commonjs/google-maps.js.map
diff --git a/dist/es2015/google-maps.js b/dist/es2015/google-maps.js
diff --git a/dist/es2015/google-maps.js.map b/dist/es2015/google-maps.js.map
diff --git a/dist/native-modules/google-maps.js b/dist/native-modules/google-maps.js
diff --git a/dist/native-modules/google-maps.js.map b/dist/native-modules/google-maps.js.map
diff --git a/dist/system/google-maps.js b/dist/system/google-maps.js
diff --git a/dist/system/google-maps.js.map b/dist/system/google-maps.js.map
diff --git a/src/google-maps.ts b/src/google-maps.ts
@@ -43,6 +43,10 @@ const isAddressMarker = (marker: Marker): marker is AddressMarker => {
     return (<AddressMarker>marker).address !== undefined;
 }
 
+const isLatLongMarker = (marker: Marker): marker is LatLongMarker => {
+    return (<LatLongMarker>marker).latitude !== undefined && (<LatLongMarker>marker).longitude !== undefined;
+}
+
 export type Marker = AddressMarker | LatLongMarker;
 
 @noView()
@@ -470,7 +474,7 @@ export class GoogleMaps {
         this._mapPromise.then(() => {
             Promise.all<LatLongMarker>(
                 newValue.map(marker => {
-                    if (isAddressMarker(marker)) {
+                    if (isAddressMarker(marker) && !isLatLongMarker(marker)) {
                         return this.addressMarkerToMarker(marker);
                     } else {
                         return marker;