Merge branch 'release-agua' into 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
mapbox · Jan 25, 2018 · da7759a · da7759a
2 parents b6747a8 + 0ebc2ee
commit da7759a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -68,7 +68,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     super.onCreateView(inflater, container, savedInstanceState);
     Context context = inflater.getContext();
     map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
-    map.setVisibility(View.INVISIBLE);
     return map;
   }
 
@@ -91,7 +90,6 @@ public void onMapReady(MapboxMap mapboxMap) {
     for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
       onMapReadyCallback.onMapReady(mapboxMap);
     }
-    map.setVisibility(View.VISIBLE);
   }
 
   /**

diff --git a/...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -68,7 +68,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     super.onCreateView(inflater, container, savedInstanceState);
     Context context = inflater.getContext();
     map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
-    map.setVisibility(View.INVISIBLE);
     return map;
   }
 
@@ -91,7 +90,6 @@ public void onMapReady(MapboxMap mapboxMap) {
     for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
       onMapReadyCallback.onMapReady(mapboxMap);
     }
-    map.setVisibility(View.VISIBLE);
   }
 
   /**

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -261,7 +261,7 @@ void setZoom(double zoom, @NonNull PointF focalPoint) {
     setZoom(zoom, focalPoint, 0, false);
   }
 
-  void setZoom(double zoom, @NonNull PointF focalPoint, long duration, boolean isAnimator) {
+  void setZoom(double zoom, @NonNull PointF focalPoint, long duration, final boolean isAnimator) {
     if (mapView != null) {
       mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
         @Override

diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm
@@ -76,7 +76,7 @@ - (instancetype)initWithImage:(nullable MGLImage *)image scale:(CGFloat)scale po
 - (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