Merge pull request #60 from trafficland/feature/icon_update_without_destroy

Feature/icon update without destroy

Author: nlaplante

dist/angular-google-maps.js

@@ -435,6 +435,16 @@ angular.module('google-maps')
                         }
                     }, true);
 
+                    scope.$watch('icon', function (newValue, oldValue) {
+                        if (newValue !== oldValue) {
+                            marker.icon = newValue;
+                            marker.setMap(null);   
+                            marker.setMap(mapCtrl.getMap());
+                            marker.setPosition(new google.maps.LatLng(scope.coords.latitude, scope.coords.longitude));
+                            marker.setVisible(scope.coords.latitude !== null && scope.coords.longitude !== null);
+                        }
+                    }, true);
+
                     // remove marker on scope $destroy
                     scope.$on("$destroy", function () {
                         marker.setMap(null);
@@ -545,14 +555,16 @@ angular.module("google-maps").
             show: '&show',
             templateUrl: '=templateurl',
             templateParameter: '=templateparameter',
-            isIconVisibleOnClick: '=isiconvisibleonclick'
+            isIconVisibleOnClick: '=isiconvisibleonclick',
+            closeClick: '&closeclick'           //scope glue to gmap InfoWindow closeclick
           },
           link: function (scope, element, attrs, ctrls) {
               $timeout(function () {
 
-                  if (!angular.isDefined(attrs.isiconvisibleonclick)) {
-                        scope.isIconVisibleOnClick = true;
-                  }
+                  var isIconVisibleOnClick = true;
+
+                  if (angular.isDefined(attrs.isiconvisibleonclick)) 
+                        isIconVisibleOnClick = scope.isIconVisibleOnClick;
 
                   var mapCtrl = ctrls[0],
                       markerCtrl = ctrls.length > 1 ? ctrls[1] : null;
@@ -579,12 +591,13 @@ angular.module("google-maps").
 
                           initialMarkerVisibility = markerInstance.getVisible();
 
-                          markerInstance.setVisible(scope.isIconVisibleOnClick);
+                          markerInstance.setVisible(isIconVisibleOnClick);
                       });
 
                       // Set visibility of marker back to what it was before opening the window
                       google.maps.event.addListener(win, 'closeclick', function () {
                         markerInstance.setVisible(initialMarkerVisibility);
+                        scope.closeClick();
                       });
                   }
 
@@ -621,7 +634,7 @@ angular.module("google-maps").
                         // If we're initially showing the marker and it's not yet visible, show it.
                         showWindow();
                     }
-                  });
+                  },true);
               }, 50);
           }
         };

dist/angular-google-maps.min.js

@@ -121,6 +121,16 @@ angular.module('google-maps')
                         }
                     }, true);
 
+                    scope.$watch('icon', function (newValue, oldValue) {
+                        if (newValue !== oldValue) {
+                            marker.icon = newValue;
+                            marker.setMap(null);   
+                            marker.setMap(mapCtrl.getMap());
+                            marker.setPosition(new google.maps.LatLng(scope.coords.latitude, scope.coords.longitude));
+                            marker.setVisible(scope.coords.latitude !== null && scope.coords.longitude !== null);
+                        }
+                    }, true);
+
                     // remove marker on scope $destroy
                     scope.$on("$destroy", function () {
                         marker.setMap(null);

src/directives/marker.js

@@ -57,14 +57,16 @@ angular.module("google-maps").
             show: '&show',
             templateUrl: '=templateurl',
             templateParameter: '=templateparameter',
-            isIconVisibleOnClick: '=isiconvisibleonclick'
+            isIconVisibleOnClick: '=isiconvisibleonclick',
+            closeClick: '&closeclick'           //scope glue to gmap InfoWindow closeclick
           },
           link: function (scope, element, attrs, ctrls) {
               $timeout(function () {
 
-                  if (!angular.isDefined(attrs.isiconvisibleonclick)) {
-                        scope.isIconVisibleOnClick = true;
-                  }
+                  var isIconVisibleOnClick = true;
+
+                  if (angular.isDefined(attrs.isiconvisibleonclick)) 
+                        isIconVisibleOnClick = scope.isIconVisibleOnClick;
 
                   var mapCtrl = ctrls[0],
                       markerCtrl = ctrls.length > 1 ? ctrls[1] : null;
@@ -91,12 +93,13 @@ angular.module("google-maps").
 
                           initialMarkerVisibility = markerInstance.getVisible();
 
-                          markerInstance.setVisible(scope.isIconVisibleOnClick);
+                          markerInstance.setVisible(isIconVisibleOnClick);
                       });
 
                       // Set visibility of marker back to what it was before opening the window
                       google.maps.event.addListener(win, 'closeclick', function () {
                         markerInstance.setVisible(initialMarkerVisibility);
+                        scope.closeClick();
                       });
                   }
 
@@ -133,7 +136,7 @@ angular.module("google-maps").
                         // If we're initially showing the marker and it's not yet visible, show it.
                         showWindow();
                     }
-                  });
+                  },true);
               }, 50);
           }
         };