summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-01-10 23:38:09 -0800
committerMinh Nguyễn <mxn@1ec5.org>2016-01-14 00:39:56 -0800
commitac4b1b7479fe5d60f1112d5a47846a498af5c8a5 (patch)
tree4a507f0d5725bfd24880461e87090c09f72959cf /platform
parentd26b956a48dc2da9333b40d8d2c4371c63b372a2 (diff)
downloadqtlocation-mapboxgl-ac4b1b7479fe5d60f1112d5a47846a498af5c8a5.tar.gz
[core] Standardize transform origin
All Transform methods that take a PrecisionPoint now assume a “flipped” origin at the upper-left corner of the view. Previously, some methods assumed an origin at the lower-left corner.
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java2
-rw-r--r--platform/ios/src/MGLMapView.mm2
-rw-r--r--platform/osx/src/MGLMapView.mm2
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index 0f3c82a043..7347f6ec04 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -3471,7 +3471,7 @@ public final class MapView extends FrameLayout {
// around gesture
mNativeMapView.setBearing(bearing,
detector.getFocusX() / mScreenDensity,
- (getHeight() - detector.getFocusY()) / mScreenDensity);
+ detector.getFocusY() / mScreenDensity);
} else {
// around center map
mNativeMapView.setBearing(bearing,
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 8b034c3e15..96bb7bcdb4 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1119,7 +1119,7 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
}
mbgl::PrecisionPoint center([rotate locationInView:rotate.view].x,
- self.bounds.size.height - [rotate locationInView:rotate.view].y);
+ [rotate locationInView:rotate.view].y);
_mbglMap->setBearing(newDegrees, center);
[self notifyMapChange:mbgl::MapChangeRegionIsChanging];
diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
index 829c3cade6..82e5e20c1c 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/osx/src/MGLMapView.mm
@@ -1239,7 +1239,7 @@ public:
_directionAtBeginningOfGesture = self.direction;
} else if (gestureRecognizer.state == NSGestureRecognizerStateChanged) {
NSPoint rotationPoint = [gestureRecognizer locationInView:self];
- mbgl::PrecisionPoint center(rotationPoint.x, rotationPoint.y);
+ mbgl::PrecisionPoint center(rotationPoint.x, self.bounds.size.height - rotationPoint.y);
_mbglMap->setBearing(_directionAtBeginningOfGesture + gestureRecognizer.rotationInDegrees, center);
} else if (gestureRecognizer.state == NSGestureRecognizerStateEnded
|| gestureRecognizer.state == NSGestureRecognizerStateCancelled) {