diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-25 14:39:18 -0500 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-25 14:39:18 -0500 |
commit | da7759a273c096117e513b249741355865f9af8e (patch) | |
tree | f30e65b6143b3d726eb0ea1fc87856f8289d9ecd /platform/darwin/src/MGLMapSnapshotter.mm | |
parent | b6747a84f4ba6bd48ab2d461e04cffa7fc8d5348 (diff) | |
parent | 0ebc2ee91fa7f96a5cf3f4538b64d1835f08c81a (diff) | |
download | qtlocation-mapboxgl-da7759a273c096117e513b249741355865f9af8e.tar.gz |
Merge branch 'release-agua' into masterupstream/fabian-release-agua-master
# Conflicts:
# include/mbgl/style/conversion/layer.hpp
# platform/android/MapboxGLAndroidSDK/build.gradle
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
Diffstat (limited to 'platform/darwin/src/MGLMapSnapshotter.mm')
-rw-r--r-- | platform/darwin/src/MGLMapSnapshotter.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm index 967706ac2e..f03bd70c86 100644 --- a/platform/darwin/src/MGLMapSnapshotter.mm +++ b/platform/darwin/src/MGLMapSnapshotter.mm @@ -76,7 +76,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64; - (CGPoint)pointForCoordinate:(CLLocationCoordinate2D)coordinate { mbgl::ScreenCoordinate sc = _pointForFn(MGLLatLngFromLocationCoordinate2D(coordinate)); - return CGPointMake(sc.x * self.scale, sc.y * self.scale); + return CGPointMake(sc.x, sc.y); } @end |