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 | |
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')
4 files changed, 2 insertions, 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 index 0c11a4220e..5fcf206a5a 100644 --- 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 final class MapFragment extends Fragment implements OnMapReadyCallback { 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 final class MapFragment extends Fragment implements OnMapReadyCallback { for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) { onMapReadyCallback.onMapReady(mapboxMap); } - map.setVisibility(View.VISIBLE); } /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index c072ec8237..8aa4c7fd09 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -68,7 +68,6 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback { 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 class SupportMapFragment extends Fragment implements OnMapReadyCallback { 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 index 7fa85ae550..84a601039f 100644 --- 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 @@ final class Transform implements MapView.OnMapChangedListener { 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 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 |