diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-10 10:36:46 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-12 18:40:29 +0200 |
commit | 617742710852a5a958a13f2b659f8c307973e49d (patch) | |
tree | 5dbda0cc3bc6c0eb22eac350fcd954ab7606ea21 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java | |
parent | a436fd233f325ddca571e3c61641588e8166a6b4 (diff) | |
download | qtlocation-mapboxgl-617742710852a5a958a13f2b659f8c307973e49d.tar.gz |
[android] - infer nullity
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 | 19 |
1 files changed, 10 insertions, 9 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 da3144eea1..88a29b3927 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 @@ -73,7 +73,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV LocationLayerController(MapboxMap mapboxMap, LayerSourceProvider layerSourceProvider, LayerFeatureProvider featureProvider, LayerBitmapProvider bitmapProvider, - LocationComponentOptions options) { + @NonNull LocationComponentOptions options) { this.mapboxMap = mapboxMap; this.layerSourceProvider = layerSourceProvider; this.bitmapProvider = bitmapProvider; @@ -192,7 +192,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV return isHidden; } - private void setLayerVisibility(String layerId, boolean visible) { + private void setLayerVisibility(@NonNull String layerId, boolean visible) { Layer layer = mapboxMap.getLayer(layerId); if (layer != null) { String targetVisibility = visible ? VISIBLE : NONE; @@ -202,7 +202,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV } } - private void addLayers(String idBelowLayer) { + private void addLayers(@NonNull String idBelowLayer) { addSymbolLayer(BEARING_LAYER, idBelowLayer); addSymbolLayer(FOREGROUND_LAYER, BEARING_LAYER); addSymbolLayer(BACKGROUND_LAYER, FOREGROUND_LAYER); @@ -210,7 +210,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV addAccuracyLayer(); } - private void addSymbolLayer(String layerId, String beforeLayerId) { + private void addSymbolLayer(@NonNull String layerId, @NonNull String beforeLayerId) { Layer layer = layerSourceProvider.generateLayer(layerId); addLayerToMap(layer, beforeLayerId); } @@ -220,12 +220,12 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV addLayerToMap(accuracyLayer, BACKGROUND_LAYER); } - private void addLayerToMap(Layer layer, @NonNull String idBelowLayer) { + private void addLayerToMap(@NonNull Layer layer, @NonNull String idBelowLayer) { mapboxMap.addLayerBelow(layer, idBelowLayer); layerMap.add(layer.getId()); } - private void setBearingProperty(String propertyId, float bearing) { + private void setBearingProperty(@NonNull String propertyId, float bearing) { locationFeature.addNumberProperty(propertyId, bearing); refreshSource(); } @@ -276,7 +276,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV mapboxMap.addImage(BACKGROUND_STALE_ICON, backgroundStaleBitmap); } - private void styleShadow(LocationComponentOptions options) { + private void styleShadow(@NonNull LocationComponentOptions options) { mapboxMap.addImage(SHADOW_ICON, bitmapProvider.generateShadowBitmap(options)); } @@ -310,7 +310,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV mapboxMap.addImage(FOREGROUND_STALE_ICON, foregroundBitmapStale); } - private void styleScaling(LocationComponentOptions options) { + private void styleScaling(@NonNull LocationComponentOptions options) { for (String layerId : layerMap) { Layer layer = mapboxMap.getLayer(layerId); if (layer != null && layer instanceof SymbolLayer) { @@ -342,6 +342,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV refreshSource(); } + @Nullable private String buildIconString(@Nullable String bitmapName, @NonNull String drawableName) { if (bitmapName != null) { return bitmapName; @@ -361,7 +362,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV // Map click event // - boolean onMapClick(LatLng point) { + boolean onMapClick(@NonNull LatLng point) { PointF screenLoc = mapboxMap.getProjection().toScreenLocation(point); List<Feature> features = mapboxMap.queryRenderedFeatures(screenLoc, BACKGROUND_LAYER, |