diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-12-15 16:57:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 16:57:30 +0100 |
| commit | f95b4838ea816b9da0c151a953a1f98f97c79a39 (patch) | |
| tree | 62dc4ef675259e070fd48aad00f07c775796b5dc /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox | |
| parent | 13e7672f851fd5085104701e75550b93214dc7bf (diff) | |
| download | qtlocation-mapboxgl-f95b4838ea816b9da0c151a953a1f98f97c79a39.tar.gz | |
[android] - move min/max zoom to transform class, cleanup usage of double vs float, renaming for parity (#7306)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox')
4 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java index ca72db598a..849f6da077 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java @@ -39,8 +39,8 @@ public class MaxMinZoomActivity extends AppCompatActivity implements OnMapReadyC @Override public void onMapReady(MapboxMap map) { mapboxMap = map; - mapboxMap.setMinZoom(3); - mapboxMap.setMaxZoom(5); + mapboxMap.setMinZoomPreference(3); + mapboxMap.setMaxZoomPreference(5); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java index e97f21327e..5b1fd8f2a5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java @@ -51,8 +51,8 @@ public class MapFragmentActivity extends AppCompatActivity implements OnMapReady LatLng dc = new LatLng(38.90252, -77.02291); - options.minZoom(9); - options.maxZoom(11); + options.minZoomPreference(9); + options.maxZoomPreference(11); options.camera(new CameraPosition.Builder() .target(dc) .zoom(11) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java index 03444a871d..17dd8659d6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java @@ -54,8 +54,8 @@ public class SupportMapFragmentActivity extends AppCompatActivity implements OnM LatLng dc = new LatLng(38.90252, -77.02291); - options.minZoom(9); - options.maxZoom(11); + options.minZoomPreference(9); + options.maxZoomPreference(11); options.camera(new CameraPosition.Builder() .target(dc) .zoom(11) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java index cc080eb5f0..785217486f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/OfflineActivity.java @@ -247,7 +247,7 @@ public class OfflineActivity extends AppCompatActivity // Definition LatLngBounds bounds = mapboxMap.getProjection().getVisibleRegion().latLngBounds; double minZoom = mapboxMap.getCameraPosition().zoom; - double maxZoom = mapboxMap.getMaxZoom(); + double maxZoom = mapboxMap.getMaxZoomLevel(); float pixelRatio = this.getResources().getDisplayMetrics().density; OfflineTilePyramidRegionDefinition definition = new OfflineTilePyramidRegionDefinition( STYLE_URL, bounds, minZoom, maxZoom, pixelRatio); |