v1.4.2

w-zz-w-zz-w · w-zz-w-zz-w · commit bb64f3113348 · 2015-12-02T20:06:18.000Z
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);

Original file line number	Diff line number	Diff line change
`@@ -514,15 +514,17 @@ angular.module('openlayers-directive').directive('olLayer', ["$log", "$q", "olMa`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`//set min resolution`
`517`		`- if (isDefined(properties.minResolution) &&`
`518`		`- !equals(properties.minResolution, oldProperties.minResolution) \|\| isNewLayer(olLayer)) {`
`519`		`- olLayer.setMinResolution(properties.minResolution);`
	`517`	`+ if (!equals(properties.minResolution, oldProperties.minResolution) \|\| isNewLayer(olLayer)) {`
	`518`	`+ if (isDefined(properties.minResolution)) {`
	`519`	`+ olLayer.setMinResolution(properties.minResolution);`
	`520`	`+ }`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`//set max resolution`
`523`		`- if (isDefined(properties.maxResolution) &&`
`524`		`- !equals(properties.maxResolution, oldProperties.maxResolution) \|\| isNewLayer(olLayer)) {`
`525`		`- olLayer.setMaxResolution(properties.maxResolution);`
	`524`	`+ if (!equals(properties.maxResolution, oldProperties.maxResolution) \|\| isNewLayer(olLayer)) {`
	`525`	`+ if (isDefined(properties.maxResolution)) {`
	`526`	`+ olLayer.setMaxResolution(properties.maxResolution);`
	`527`	`+ }`
`526`	`528`	`}`
`527`	`529`	`}`
`528`	`530`	`}, true);`
Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,5 @@`
`61`	`61`	`"semantic-release": "semantic-release pre && npm publish && semantic-release post"`
`62`	`62`	`},`
`63`	`63`	`"main": "dist/angular-openlayers-directive",`
`64`		`- "version": "1.4.1"`
	`64`	`+ "version": "1.4.2"`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,15 +205,17 @@ angular.module('openlayers-directive').directive('olLayer', function($log, $q, o`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`//set min resolution`
`208`		`- if (isDefined(properties.minResolution) &&`
`209`		`- !equals(properties.minResolution, oldProperties.minResolution) \|\| isNewLayer(olLayer)) {`
`210`		`- olLayer.setMinResolution(properties.minResolution);`
	`208`	`+ if (!equals(properties.minResolution, oldProperties.minResolution) \|\| isNewLayer(olLayer)) {`
	`209`	`+ if (isDefined(properties.minResolution)) {`
	`210`	`+ olLayer.setMinResolution(properties.minResolution);`
	`211`	`+ }`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`//set max resolution`
`214`		`- if (isDefined(properties.maxResolution) &&`
`215`		`- !equals(properties.maxResolution, oldProperties.maxResolution) \|\| isNewLayer(olLayer)) {`
`216`		`- olLayer.setMaxResolution(properties.maxResolution);`
	`215`	`+ if (!equals(properties.maxResolution, oldProperties.maxResolution) \|\| isNewLayer(olLayer)) {`
	`216`	`+ if (isDefined(properties.maxResolution)) {`
	`217`	`+ olLayer.setMaxResolution(properties.maxResolution);`
	`218`	`+ }`
`217`	`219`	`}`
`218`	`220`	`}`
`219`	`221`	`}, true);`