v1.20.2

tombatossals · Feb 14, 2018 · 6946357 · 6946357
2 parents 09753cb + 58d87da
commit 6946357
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ branches:
 notifications:
   email: false
 node_js:
-  - '4.1'
+  - '6.1'
 before_install:
   - npm i -g npm@^2.0.0
   - npm install -g grunt-cli

diff --git a/bower.json b/bower.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "angular": "1.4.9",
     "angular-sanitize": "1.4.9",
-    "openlayers": "https://github.com/openlayers/ol3/releases/download/v3.16.0/v3.16.0-dist.zip"
+    "openlayers": "https://github.com/openlayers/ol3/releases/download/v4.3.4/v4.3.4-dist.zip"
   },
   "devDependencies": {
     "jquery": "*",

diff --git a/dist/angular-openlayers-directive.js b/dist/angular-openlayers-directive.js
@@ -314,7 +314,7 @@ angular.module('openlayers-directive').directive('olCenter', ["$log", "$location
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(moveEndEventKey);
+                    ol.Observable.unByKey(moveEndEventKey);
                 });
             });
         }
@@ -661,7 +661,7 @@ angular.module('openlayers-directive').directive('olView', ["$log", "$q", "olDat
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(rotationEventKey);
+                    ol.Observable.unByKey(rotationEventKey);
                 });
 
             });
@@ -2122,11 +2122,10 @@ angular.module('openlayers-directive').factory('olHelpers', ["$q", "$log", "$htt
         setCenter: function(view, projection, newCenter, map) {
 
             if (map && view.getCenter()) {
-                var pan = ol.animation.pan({
+                view.animate({
                     duration: 150,
-                    source: (view.getCenter())
+                    center: view.getCenter()
                 });
-                map.beforeRender(pan);
             }
 
             if (newCenter.projection === projection) {
@@ -2138,11 +2137,11 @@ angular.module('openlayers-directive').factory('olHelpers', ["$q", "$log", "$htt
         },
 
         setZoom: function(view, zoom, map) {
-            var z = ol.animation.zoom({
+            view.animate({
                 duration: 150,
-                resolution: map.getView().getResolution()
+                resolution: map.getView().getResolution(),
+                zoom: zoom
             });
-            map.beforeRender(z);
             view.setZoom(zoom);
         },
 

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
@@ -314,7 +314,7 @@ angular.module('openlayers-directive').directive('olCenter', function($log, $loc
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(moveEndEventKey);
+                    ol.Observable.unByKey(moveEndEventKey);
                 });
             });
         }
@@ -661,7 +661,7 @@ angular.module('openlayers-directive').directive('olView', function($log, $q, ol
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(rotationEventKey);
+                    ol.Observable.unByKey(rotationEventKey);
                 });
 
             });
@@ -2122,11 +2122,10 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
         setCenter: function(view, projection, newCenter, map) {
 
             if (map && view.getCenter()) {
-                var pan = ol.animation.pan({
+                view.animate({
                     duration: 150,
-                    source: (view.getCenter())
+                    center: view.getCenter()
                 });
-                map.beforeRender(pan);
             }
 
             if (newCenter.projection === projection) {
@@ -2138,11 +2137,11 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
         },
 
         setZoom: function(view, zoom, map) {
-            var z = ol.animation.zoom({
+            view.animate({
                 duration: 150,
-                resolution: map.getView().getResolution()
+                resolution: map.getView().getResolution(),
+                zoom: zoom
             });
-            map.beforeRender(z);
             view.setZoom(zoom);
         },
 

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "angular": "~1.4.8",
     "angular-sanitize": "~1.4.8",
-    "openlayers": "~3.18.1"
+    "openlayers": "~4.3.4"
   },
   "devDependencies": {
     "grunt": "~0.4.5",
@@ -52,7 +52,7 @@
     "karma-script-launcher": "~0.1.0",
     "load-grunt-config": "^0.17.1",
     "matchdep": "~0.3.0",
-    "phantomjs": "^1.9.18",
+    "phantomjs": "^2.1.0",
     "protractor": "~2.5.0",
     "publish-latest": "^1.1.2",
     "semantic-release": "^4.3.5"
@@ -66,5 +66,5 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "main": "dist/angular-openlayers-directive",
-  "version": "1.20.1"
+  "version": "1.20.2"
 }
diff --git a/src/directives/center.js b/src/directives/center.js
@@ -179,7 +179,7 @@ angular.module('openlayers-directive').directive('olCenter', function($log, $loc
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(moveEndEventKey);
+                    ol.Observable.unByKey(moveEndEventKey);
                 });
             });
         }

diff --git a/src/directives/view.js b/src/directives/view.js
@@ -46,7 +46,7 @@ angular.module('openlayers-directive').directive('olView', function($log, $q, ol
                 });
 
                 olScope.$on('$destroy', function() {
-                    map.unByKey(rotationEventKey);
+                    ol.Observable.unByKey(rotationEventKey);
                 });
 
             });

diff --git a/src/services/olHelpers.js b/src/services/olHelpers.js
@@ -868,11 +868,10 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
         setCenter: function(view, projection, newCenter, map) {
 
             if (map && view.getCenter()) {
-                var pan = ol.animation.pan({
+                view.animate({
                     duration: 150,
-                    source: (view.getCenter())
+                    center: view.getCenter()
                 });
-                map.beforeRender(pan);
             }
 
             if (newCenter.projection === projection) {
@@ -884,11 +883,11 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
         },
 
         setZoom: function(view, zoom, map) {
-            var z = ol.animation.zoom({
+            view.animate({
                 duration: 150,
-                resolution: map.getView().getResolution()
+                resolution: map.getView().getResolution(),
+                zoom: zoom
             });
-            map.beforeRender(z);
             view.setZoom(zoom);
         },
-Original file line number
+Diff line change
@@ Expand Up @@
                     });
                     olScope.$on('$destroy', function() {
-                        map.unByKey(moveEndEventKey);
+                        ol.Observable.unByKey(moveEndEventKey);
                     });
                 });
             }
@@ Expand Down @@