v1.4.2

tombatossals · Dec 2, 2015 · bb64f31 · bb64f31
2 parents 60b31a1 + b35745e
commit bb64f31
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 24 deletions.
diff --git a/dist/angular-openlayers-directive.js b/dist/angular-openlayers-directive.js
@@ -514,15 +514,17 @@ angular.module('openlayers-directive').directive('olLayer', ["$log", "$q", "olMa
                         }
 
                         //set min resolution
-                        if (isDefined(properties.minResolution) &&
-                            !equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMinResolution(properties.minResolution);
+                        if (!equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.minResolution)) {
+                                olLayer.setMinResolution(properties.minResolution);
+                            }
                         }
 
                         //set max resolution
-                        if (isDefined(properties.maxResolution) &&
-                            !equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMaxResolution(properties.maxResolution);
+                        if (!equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.maxResolution)) {
+                                olLayer.setMaxResolution(properties.maxResolution);
+                            }
                         }
                     }
                 }, true);

diff --git a/dist/angular-openlayers-directive.min.js b/dist/angular-openlayers-directive.min.js
diff --git a/dist/angular-openlayers-directive.min.no-header.js b/dist/angular-openlayers-directive.min.no-header.js
diff --git a/dist/angular-openlayers-directive.pre.js b/dist/angular-openlayers-directive.pre.js
@@ -514,15 +514,17 @@ angular.module('openlayers-directive').directive('olLayer', function($log, $q, o
                         }
 
                         //set min resolution
-                        if (isDefined(properties.minResolution) &&
-                            !equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMinResolution(properties.minResolution);
+                        if (!equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.minResolution)) {
+                                olLayer.setMinResolution(properties.minResolution);
+                            }
                         }
 
                         //set max resolution
-                        if (isDefined(properties.maxResolution) &&
-                            !equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMaxResolution(properties.maxResolution);
+                        if (!equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.maxResolution)) {
+                                olLayer.setMaxResolution(properties.maxResolution);
+                            }
                         }
                     }
                 }, true);

diff --git a/examples/043-layers-bing-maps-example.html b/examples/043-layers-bing-maps-example.html
@@ -4,7 +4,6 @@
     <script src="../bower_components/openlayers3/build/ol.js"></script>
     <script src="../bower_components/angular/angular.min.js"></script>
     <script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
-    <script src="../bower_components/openlayers3/build/ol.js"></script>
     <script src="../dist/angular-openlayers-directive.js"></script>
     <link rel="stylesheet" href="../bower_components/openlayers3/build/ol.css" />
     <script>

diff --git a/package.json b/package.json
@@ -61,5 +61,5 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "main": "dist/angular-openlayers-directive",
-  "version": "1.4.1"
+  "version": "1.4.2"
 }
diff --git a/src/directives/layer.js b/src/directives/layer.js
@@ -205,15 +205,17 @@ angular.module('openlayers-directive').directive('olLayer', function($log, $q, o
                         }
 
                         //set min resolution
-                        if (isDefined(properties.minResolution) &&
-                            !equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMinResolution(properties.minResolution);
+                        if (!equals(properties.minResolution, oldProperties.minResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.minResolution)) {
+                                olLayer.setMinResolution(properties.minResolution);
+                            }
                         }
 
                         //set max resolution
-                        if (isDefined(properties.maxResolution) &&
-                            !equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
-                            olLayer.setMaxResolution(properties.maxResolution);
+                        if (!equals(properties.maxResolution, oldProperties.maxResolution) || isNewLayer(olLayer)) {
+                            if (isDefined(properties.maxResolution)) {
+                                olLayer.setMaxResolution(properties.maxResolution);
+                            }
                         }
                     }
                 }, true);