Merge pull request #4902 from fredj/getBoundingClientRect

Remove use of goog.style.getClientPosition

src/ol/interaction/pinchrotateinteraction.js

@@ -2,7 +2,6 @@ goog.provide('ol.interaction.PinchRotate');
 
 goog.require('goog.asserts');
 goog.require('goog.functions');
-goog.require('goog.style');
 goog.require('ol');
 goog.require('ol.Coordinate');
 goog.require('ol.ViewHint');
@@ -104,11 +103,10 @@ ol.interaction.PinchRotate.handleDragEvent_ = function(mapBrowserEvent) {
   // rotate anchor point.
   // FIXME: should be the intersection point between the lines:
   //     touch0,touch1 and previousTouch0,previousTouch1
-  var viewportPosition = goog.style.getClientPosition(map.getViewport());
+  var viewportPosition = map.getViewport().getBoundingClientRect();
-  var centroid =
+  var centroid = ol.interaction.Pointer.centroid(this.targetPointers);
-      ol.interaction.Pointer.centroid(this.targetPointers);
+  centroid[0] -= viewportPosition.left;
-  centroid[0] -= viewportPosition.x;
+  centroid[1] -= viewportPosition.top;
-  centroid[1] -= viewportPosition.y;
   this.anchor_ = map.getCoordinateFromPixel(centroid);
 
   // rotate

src/ol/interaction/pinchzoominteraction.js

@@ -2,7 +2,6 @@ goog.provide('ol.interaction.PinchZoom');
 
 goog.require('goog.asserts');
 goog.require('goog.functions');
-goog.require('goog.style');
 goog.require('ol');
 goog.require('ol.Coordinate');
 goog.require('ol.ViewHint');
@@ -89,11 +88,10 @@ ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) {
   var resolution = view.getResolution();
 
   // scale anchor point.
-  var viewportPosition = goog.style.getClientPosition(map.getViewport());
+  var viewportPosition = map.getViewport().getBoundingClientRect();
-  var centroid =
+  var centroid = ol.interaction.Pointer.centroid(this.targetPointers);
-      ol.interaction.Pointer.centroid(this.targetPointers);
+  centroid[0] -= viewportPosition.left;
-  centroid[0] -= viewportPosition.x;
+  centroid[1] -= viewportPosition.top;
-  centroid[1] -= viewportPosition.y;
   this.anchor_ = map.getCoordinateFromPixel(centroid);
 
   // scale, bypass the resolution constraint

test/spec/ol/interaction/drawinteraction.test.js

@@ -47,11 +47,11 @@ describe('ol.interaction.Draw', function() {
   function simulateEvent(type, x, y, opt_shiftKey) {
     var viewport = map.getViewport();
     // calculated in case body has top < 0 (test runner with small window)
-    var position = goog.style.getClientPosition(viewport);
+    var position = viewport.getBoundingClientRect();
     var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
     var event = new ol.pointer.PointerEvent(type, {
-      clientX: position.x + x + width / 2,
+      clientX: position.left + x + width / 2,
-      clientY: position.y + y + height / 2,
+      clientY: position.top + y + height / 2,
       shiftKey: shiftKey
     });
     map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event));
@@ -813,7 +813,6 @@ describe('ol.interaction.Draw', function() {
 
 goog.require('goog.dispose');
 goog.require('ol.events');
-goog.require('goog.style');
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.MapBrowserPointerEvent');

test/spec/ol/interaction/modifyinteraction.test.js

@@ -64,13 +64,13 @@ describe('ol.interaction.Modify', function() {
   function simulateEvent(type, x, y, opt_shiftKey, button) {
     var viewport = map.getViewport();
     // calculated in case body has top < 0 (test runner with small window)
-    var position = goog.style.getClientPosition(viewport);
+    var position = viewport.getBoundingClientRect();
     var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
     var pointerEvent = new ol.pointer.PointerEvent(type, {
       type: type,
       button: button,
-      clientX: position.x + x + width / 2,
+      clientX: position.left + x + width / 2,
-      clientY: position.y + y + height / 2,
+      clientY: position.top + y + height / 2,
       shiftKey: shiftKey
     });
     var event = new ol.MapBrowserPointerEvent(type, map, pointerEvent);
@@ -377,7 +377,6 @@ describe('ol.interaction.Modify', function() {
 
 goog.require('goog.dispose');
 goog.require('ol.events');
-goog.require('goog.style');
 goog.require('ol.Collection');
 goog.require('ol.Feature');
 goog.require('ol.Map');

test/spec/ol/interaction/selectinteraction.test.js

@@ -78,11 +78,11 @@ describe('ol.interaction.Select', function() {
   function simulateEvent(type, x, y, opt_shiftKey) {
     var viewport = map.getViewport();
     // calculated in case body has top < 0 (test runner with small window)
-    var position = goog.style.getClientPosition(viewport);
+    var position = viewport.getBoundingClientRect();
     var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
     var event = new ol.pointer.PointerEvent(type, {
-      clientX: position.x + x + width / 2,
+      clientX: position.left + x + width / 2,
-      clientY: position.y + y + height / 2,
+      clientY: position.top + y + height / 2,
       shiftKey: shiftKey
     });
     map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event));
@@ -392,7 +392,6 @@ describe('ol.interaction.Select', function() {
 });
 
 goog.require('goog.dispose');
-goog.require('goog.style');
 goog.require('ol.Collection');
 goog.require('ol.Feature');
 goog.require('ol.Map');

test/spec/ol/interaction/translateinteraction.test.js

@@ -53,12 +53,12 @@ describe('ol.interaction.Translate', function() {
   function simulateEvent(type, x, y, opt_shiftKey) {
     var viewport = map.getViewport();
     // calculated in case body has top < 0 (test runner with small window)
-    var position = goog.style.getClientPosition(viewport);
+    var position = viewport.getBoundingClientRect();
     var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
     var event = new ol.MapBrowserPointerEvent(type, map,
         new ol.pointer.PointerEvent(type, {
-          clientX: position.x + x + width / 2,
+          clientX: position.left + x + width / 2,
-          clientY: position.y + y + height / 2,
+          clientY: position.top + y + height / 2,
           shiftKey: shiftKey
         }));
     map.handleMapBrowserEvent(event);
@@ -109,7 +109,6 @@ describe('ol.interaction.Translate', function() {
 });
 
 goog.require('goog.dispose');
-goog.require('goog.style');
 goog.require('ol.Collection');
 goog.require('ol.Feature');
 goog.require('ol.Map');