Merge branch 'master' of https://github.com/allenhwkim/angularjs-google-maps

Author: allenhwkim

build/scripts/ng-map.js

@@ -572,7 +572,7 @@ angular.module('ngMap', []);
 
 	  scope.$watch('[' + varsToWatch.join(',') + ']', function() {
 	    customMarker.setContent(orgHtml, scope);
-	  });
+	  }, true);
 
 	  customMarker.setContent(element[0].innerHTML, scope);
 	  var classNames = element[0].firstElementChild.className;
@@ -3213,4 +3213,4 @@ angular.module('ngMap', []);
 
 
 	return 'ngMap';
-}));
+}));

controllers/map-controller.js

@@ -102,6 +102,9 @@
       for (var k2 in vm.map.customMarkers) {
         bounds.extend(vm.map.customMarkers[k2].getPosition());
       }
+	  if (vm.mapOptions.maximumZoom) {
+		  vm.enableMaximumZoomCheck = true; //enable zoom check after resizing for markers
+	  }
       vm.map.fitBounds(bounds);
     };
 
@@ -210,6 +213,18 @@
           $parse($attrs.mapInitialized)($scope, {map: vm.map});
         }
       });
+	  
+	  //add maximum zoom listeners if zoom-to-include-markers and and maximum-zoom are valid attributes
+	  if (mapOptions.zoomToIncludeMarkers && mapOptions.maximumZoom) {
+	    google.maps.event.addListener(vm.map, 'zoom_changed', function() {
+          if (vm.enableMaximumZoomCheck == true) {
+			vm.enableMaximumZoomCheck = false;
+	        google.maps.event.addListenerOnce(vm.map, 'bounds_changed', function() { 
+		      vm.map.setZoom(Math.min(mapOptions.maximumZoom, vm.map.getZoom())); 
+		    });
+	  	  }
+	    });
+	  }
     };
 
     $scope.google = google; //used by $scope.eval to avoid eval()

directives/custom-marker.js

@@ -151,7 +151,7 @@
 
 	  scope.$watch('[' + varsToWatch.join(',') + ']', function() {
 	    customMarker.setContent(orgHtml, scope);
-	  });
+	  }, true);
 
 	  customMarker.setContent(element[0].innerHTML, scope);
 	  var classNames = element[0].firstElementChild.className;

testapp/places-auto-complete.html

@@ -39,6 +39,6 @@
     Location: {{vm.place.geometry.location}}<br/>
   </div>
   address : {{vm.address}}
-  <map></ng-map>
+  <ng-map></ng-map>
 </body>
 </html>