Merge pull request #330 from kuvelas/master

fix: test for null marker passed in to _getInfoWindowTemplate

Author: dapriett

src/map-view-common.ts

@@ -237,10 +237,12 @@ export abstract class MapViewBase extends View implements MapView {
     }
 
     public _getInfoWindowTemplate(marker: MarkerBase): KeyedTemplate {
-        const templateKey = marker.infoWindowTemplate;
-        for (let i = 0, length = this._infoWindowTemplates.length; i < length; i++) {
-            if (this._infoWindowTemplates[i].key === templateKey) {
-                return this._infoWindowTemplates[i];
+        if(marker){
+            const templateKey = marker.infoWindowTemplate;
+            for (let i = 0, length = this._infoWindowTemplates.length; i < length; i++) {
+                if (this._infoWindowTemplates[i].key === templateKey) {
+                    return this._infoWindowTemplates[i];
+                }
             }
         }
         return this._defaultInfoWindowTemplate;
@@ -575,4 +577,4 @@ export class CircleBase extends ShapeBase implements Circle {
     public strokeWidth: number;
     public strokeColor: Color;
     public fillColor: Color;
-}
+}