feat(build): 'maxbounds' updated to work with leaflet 0.7.1

tombatossals · Dec 27, 2013 · fe57501 · fe57501
1 parent b2f541c
commit fe57501
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 39 deletions.
diff --git a/dist/angular-leaflet-directive.js b/dist/angular-leaflet-directive.js
@@ -39,11 +39,6 @@ angular.module("leaflet-directive", []).directive('leaflet', function ($q, leafl
                 genDispatchMapEvent = leafletEvents.genDispatchMapEvent,
                 mapEvents = leafletEvents.getAvailableMapEvents();
 
-            // If we are going to set maxbounds, undefine the minZoom property
-            if (isDefined(scope.maxbounds)) {
-                defaults.minZoom = undefined;
-            }
-
             // Set width and height if they are defined
             if (isDefined(attrs.width)) {
                 if (isNaN(attrs.width)) {
@@ -965,17 +960,18 @@ angular.module("leaflet-directive").directive('maxbounds', function ($log, leafl
 
             controller.getMap().then(function(map) {
                 leafletScope.$watch("maxbounds", function (maxbounds) {
-                    // Unset any previous maxbounds
-                    map.setMaxBounds();
-                    map.fire("zoomlevelschange");
-
                     if (!isValidBounds(maxbounds)) {
+                        // Unset any previous maxbounds
+                        map.setMaxBounds();
                         return;
                     }
-                    map.setMaxBounds( [
+                    var bounds = [
                         [ maxbounds.southWest.lat, maxbounds.southWest.lng ],
                         [ maxbounds.northEast.lat, maxbounds.northEast.lng ]
-                    ]);
+                    ];
+
+                    map.setMaxBounds(bounds);
+                    map.fitBounds(bounds);
                 });
             });
         }

diff --git a/dist/angular-leaflet-directive.min.js b/dist/angular-leaflet-directive.min.js
diff --git a/examples/maxbounds-example.html b/examples/maxbounds-example.html
@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html ng-app="demoapp">
   <head>
-    <script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
+    <script src="http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js"></script>
     <script src="../dist/angular-leaflet-directive.min.js"></script>
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.css" />
-    <!--[if lte IE 8]>
-        <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.ie.css" />
-    <![endif]-->
+    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css" />
     <script>
         angular.module("demoapp", ["leaflet-directive"]);
         function DemoController($scope, leafletData) {
@@ -45,10 +42,7 @@
             };
 
             angular.extend($scope, {
-                maxbounds: {},
-                defaults: {
-                    minZoom: 4
-                }
+                maxbounds: {}
             });
 
         };
@@ -68,7 +62,7 @@
         <button ng-click="maxbounds={}">Unset maxbounds</button>
     </form>
 
-    <leaflet maxbounds="maxbounds" defaults="defaults"></leaflet>
+    <leaflet maxbounds="maxbounds"></leaflet>
     <p ng-show="maxbounds.northEast" class="result">Maxbounds: NE(lat: {{ maxbounds.northEast.lat }}, lng: {{ maxbounds.northEast.lng }}) SW(lat: {{ maxbounds.southWest.lat }}, lng: {{ maxbounds.southWest.lng }})</p>
   </body>
 </html>
diff --git a/src/directives/leaflet.js b/src/directives/leaflet.js
@@ -35,11 +35,6 @@ angular.module("leaflet-directive", []).directive('leaflet', function ($q, leafl
                 genDispatchMapEvent = leafletEvents.genDispatchMapEvent,
                 mapEvents = leafletEvents.getAvailableMapEvents();
 
-            // If we are going to set maxbounds, undefine the minZoom property
-            if (isDefined(scope.maxbounds)) {
-                defaults.minZoom = undefined;
-            }
-
             // Set width and height if they are defined
             if (isDefined(attrs.width)) {
                 if (isNaN(attrs.width)) {

diff --git a/src/directives/maxbounds.js b/src/directives/maxbounds.js
@@ -12,17 +12,18 @@ angular.module("leaflet-directive").directive('maxbounds', function ($log, leafl
 
             controller.getMap().then(function(map) {
                 leafletScope.$watch("maxbounds", function (maxbounds) {
-                    // Unset any previous maxbounds
-                    map.setMaxBounds();
-                    map.fire("zoomlevelschange");
-
                     if (!isValidBounds(maxbounds)) {
+                        // Unset any previous maxbounds
+                        map.setMaxBounds();
                         return;
                     }
-                    map.setMaxBounds( [
+                    var bounds = [
                         [ maxbounds.southWest.lat, maxbounds.southWest.lng ],
                         [ maxbounds.northEast.lat, maxbounds.northEast.lng ]
-                    ]);
+                    ];
+
+                    map.setMaxBounds(bounds);
+                    map.fitBounds(bounds);
                 });
             });
         }

diff --git a/test/unit/maxboundsDirectiveSpec.js b/test/unit/maxboundsDirectiveSpec.js
@@ -20,11 +20,8 @@ describe('Directive: leaflet', function() {
         $rootScope.$apply();
     }));
 
-    it('should unset the minzoom if maxbounds specified', function() {
+    it('should change the center if maxbounds specified', function() {
         angular.extend($rootScope, {
-            defaults: {
-                minZoom: 4,
-            },
             maxbounds: {
                 southWest: {
                     lat: 52.14823737817847,
@@ -34,6 +31,9 @@ describe('Directive: leaflet', function() {
                     lat: 52.31645452105213,
                     lng: 21.233139038085938
                 }
+            },
+            defaults: {
+                zoomAnimation: false
             }
         });
         var element = angular.element('<leaflet defaults="defaults" maxbounds="maxbounds"></leaflet>');
@@ -43,7 +43,8 @@ describe('Directive: leaflet', function() {
             leafletMap = map;
         });
         $rootScope.$digest();
-        expect(leafletMap.getMinZoom()).toEqual(0);
+        expect(leafletMap.getCenter().lat).toBe(52.23242563023071);
+        expect(leafletMap.getCenter().lng).toBe(21.013412475585938);
     });
 
 });