getMap checks on markerchildmodel should only happen if it is expected to be drawn immediatley. Clustering the drawing is delayed. issue #772 #783

Author: nmccready

dist/angular-google-maps.js

@@ -1409,6 +1409,8 @@ Nicholas McCready - https://twitter.com/nmccready
       ClustererMarkerManager = (function(_super) {
         __extends(ClustererMarkerManager, _super);
 
+        ClustererMarkerManager.type = 'ClustererMarkerManager';
+
         function ClustererMarkerManager(gMap, opt_markers, opt_options, opt_events) {
           var self;
           this.opt_events = opt_events;
@@ -1423,6 +1425,7 @@ Nicholas McCready - https://twitter.com/nmccready
           this.addMany = __bind(this.addMany, this);
           this.add = __bind(this.add, this);
           ClustererMarkerManager.__super__.constructor.call(this);
+          this.type = ClustererMarkerManager.type;
           self = this;
           this.opt_options = opt_options;
           if ((opt_options != null) && opt_markers === void 0) {
@@ -1568,6 +1571,8 @@ Nicholas McCready - https://twitter.com/nmccready
 
         MarkerManager.include(FitHelper);
 
+        MarkerManager.type = 'MarkerManager';
+
         function MarkerManager(gMap, opt_markers, opt_options) {
           this.getGMarkers = __bind(this.getGMarkers, this);
           this.fit = __bind(this.fit, this);
@@ -1579,6 +1584,7 @@ Nicholas McCready - https://twitter.com/nmccready
           this.addMany = __bind(this.addMany, this);
           this.add = __bind(this.add, this);
           MarkerManager.__super__.constructor.call(this);
+          this.type = MarkerManager.type;
           this.gMap = gMap;
           this.gMarkers = new PropMap();
           this.$log = Logger;
@@ -2273,7 +2279,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   angular.module("google-maps.directives.api.models.child".ns()).factory("MarkerChildModel".ns(), [
-    "ModelKey".ns(), "GmapUtil".ns(), "Logger".ns(), "EventsHelper".ns(), "PropertyAction".ns(), "MarkerOptions".ns(), "IMarker".ns(), function(ModelKey, GmapUtil, $log, EventsHelper, PropertyAction, MarkerOptions, IMarker) {
+    "ModelKey".ns(), "GmapUtil".ns(), "Logger".ns(), "EventsHelper".ns(), "PropertyAction".ns(), "MarkerOptions".ns(), "IMarker".ns(), "MarkerManager".ns(), function(ModelKey, GmapUtil, $log, EventsHelper, PropertyAction, MarkerOptions, IMarker, MarkerManager) {
       var MarkerChildModel, keys;
       keys = ['coords', 'icon', 'options', 'fit'];
       MarkerChildModel = (function(_super) {
@@ -2526,13 +2532,13 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
             this.gMarker.key = this.id;
           }
           this.gMarkerManager.add(this.gMarker);
-          if (this.gMarker && this.gMarker.getMap()) {
+          if (this.gMarker && (this.gMarker.getMap() || this.gMarkerManager.type !== MarkerManager.type)) {
             this.deferred.resolve(this.gMarker);
           } else {
             if (!this.gMarker) {
               this.deferred.reject("gMarker is null");
             }
-            if (!this.gMarker.getMap()) {
+            if (!(this.gMarker.getMap() && this.gMarkerManager.type === MarkerManager.type)) {
               this.deferred.reject("gMarker has no map");
             }
           }

dist/angular-google-maps.min.js

@@ -15,7 +15,7 @@
       <ui-gmap-google-map center="map.center" zoom="map.zoom"
       draggable="true" options="options" bounds="map.bounds">
           <ui-gmap-markers models="randomMarkers" coords="'self'"
-          icon="'icon'" fit='true' click="'onClick'" events="markersEvents">
+          icon="'icon'" fit='true' click="'onClick'" events="markersEvents" doCluster='true'>
               <ui-gmap-windows show="'show'">
                   <div ng-non-bindable>{{text}}</div>
               </ui-gmap-windows>

example/issue-772-info-window-show-state.html

@@ -1,8 +1,10 @@
 angular.module("google-maps.directives.api.managers".ns())
 .factory "ClustererMarkerManager".ns(), ["Logger".ns(), "FitHelper".ns(), "PropMap".ns(), ($log, FitHelper, PropMap) ->
   class ClustererMarkerManager extends FitHelper
+    @type = 'ClustererMarkerManager'
     constructor: (gMap, opt_markers, opt_options, @opt_events) ->
       super()
+      @type = ClustererMarkerManager.type
       self = @
       @opt_options = opt_options
       if opt_options? and opt_markers == undefined
@@ -84,4 +86,4 @@ angular.module("google-maps.directives.api.managers".ns())
       throw "GMarkers out of Sync in MarkerClusterer" if @getGMarkers().length != @propMapGMarkers.length
 
   ClustererMarkerManager
-]
+]

src/coffee/directives/api/managers/clusterer-marker-manager.coffee

@@ -2,8 +2,10 @@ angular.module("google-maps.directives.api.managers".ns())
 .factory "MarkerManager".ns(), ["Logger".ns(), "FitHelper".ns(), "PropMap".ns(), (Logger, FitHelper, PropMap) ->
   class MarkerManager extends FitHelper
     @include FitHelper
+    @type = 'MarkerManager'
     constructor: (gMap, opt_markers, opt_options) ->
       super()
+      @type = MarkerManager.type
       @gMap = gMap
       @gMarkers = new PropMap()
       @$log = Logger

src/coffee/directives/api/managers/marker-manager.coffee

@@ -1,8 +1,8 @@
 angular.module("google-maps.directives.api.models.child".ns())
 .factory "MarkerChildModel".ns(), [ "ModelKey".ns(), "GmapUtil".ns(),
   "Logger".ns(), "EventsHelper".ns(),"PropertyAction".ns(),
-  "MarkerOptions".ns(), "IMarker".ns(),
-  (ModelKey, GmapUtil, $log, EventsHelper, PropertyAction, MarkerOptions, IMarker) ->
+  "MarkerOptions".ns(), "IMarker".ns(), "MarkerManager".ns(),
+  (ModelKey, GmapUtil, $log, EventsHelper, PropertyAction, MarkerOptions, IMarker, MarkerManager) ->
     keys = ['coords', 'icon', 'options', 'fit']
     class MarkerChildModel extends ModelKey
       @include GmapUtil
@@ -149,11 +149,11 @@ angular.module("google-maps.directives.api.models.child".ns())
         @gMarker.key = @id if @id?
         @gMarkerManager.add @gMarker
 
-        if @gMarker and @gMarker.getMap()
+        if @gMarker and (@gMarker.getMap() or @gMarkerManager.type != MarkerManager.type)
           @deferred.resolve @gMarker
         else
           @deferred.reject "gMarker is null" unless @gMarker
-          @deferred.reject "gMarker has no map" unless @gMarker.getMap()
+          @deferred.reject "gMarker has no map" unless @gMarker.getMap() and @gMarkerManager.type == MarkerManager.type
 
         if @model[@fitKey]
           @gMarkerManager.fit()