ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4902 from fredj/getBoundingClientRect

Browse Source 
Remove use of goog.style.getClientPosition
This commit is contained in:
Frédéric Junod
2016-02-25 11:05:56 +01:00
parent d190d27534 edf2096b1b
commit fa180cfa13
6 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/interaction/pinchrotateinteraction.js
View File

@@ -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 centroid =
ol.interaction.Pointer.centroid(this.targetPointers);
centroid[0] -= viewportPosition.x;
centroid[1] -= viewportPosition.y;
var viewportPosition = map.getViewport().getBoundingClientRect();
var centroid = ol.interaction.Pointer.centroid(this.targetPointers);
centroid[0] -= viewportPosition.left;
centroid[1] -= viewportPosition.top;
this.anchor_ = map.getCoordinateFromPixel(centroid);
// rotate

10
src/ol/interaction/pinchzoominteraction.js
View File

@@ -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 centroid =
ol.interaction.Pointer.centroid(this.targetPointers);
centroid[0] -= viewportPosition.x;
centroid[1] -= viewportPosition.y;
var viewportPosition = map.getViewport().getBoundingClientRect();
var centroid = ol.interaction.Pointer.centroid(this.targetPointers);
centroid[0] -= viewportPosition.left;
centroid[1] -= viewportPosition.top;
this.anchor_ = map.getCoordinateFromPixel(centroid);
// scale, bypass the resolution constraint