diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-20 17:52:16 +0100 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-11-29 13:24:42 +0100 |
commit | c9add3646ea80654a3e2a2e81d750a92f7c8e999 (patch) | |
tree | 63070dabb7d70befbd242fdc330f618529674aa4 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java | |
parent | d54bc6af40b2b6bca78b20c4be5c67207663e87d (diff) | |
download | qtlocation-mapboxgl-c9add3646ea80654a3e2a2e81d750a92f7c8e999.tar.gz |
[android] remove default zoom level restrictions when activating the location component
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java index fe4f62fe9f..7b465fbdfc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java @@ -313,12 +313,12 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV private void styleScaling(@NonNull LocationComponentOptions options) { for (String layerId : layerMap) { Layer layer = mapboxMap.getLayer(layerId); - if (layer != null && layer instanceof SymbolLayer) { + if (layer instanceof SymbolLayer) { layer.setProperties( iconSize( interpolate(linear(), zoom(), - stop(options.minZoom(), options.minZoomIconScale()), - stop(options.maxZoom(), options.maxZoomIconScale()) + stop(mapboxMap.getMinZoomLevel(), options.minZoomIconScale()), + stop(mapboxMap.getMaxZoomLevel(), options.maxZoomIconScale()) ) ) ); @@ -342,7 +342,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV refreshSource(); } - @Nullable + @NonNull private String buildIconString(@Nullable String bitmapName, @NonNull String drawableName) { if (bitmapName != null) { return bitmapName; |