diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers')
13 files changed, 472 insertions, 73 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java index dd20a4b957..a89f012fe6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -51,6 +51,7 @@ public class BackgroundLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public BackgroundLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -63,6 +64,7 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundColor() { checkThread(); @@ -91,6 +93,7 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getBackgroundColorTransition() { checkThread(); return nativeGetBackgroundColorTransition(); @@ -101,7 +104,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundColorTransition(TransitionOptions options) { + public void setBackgroundColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetBackgroundColorTransition(options.getDuration(), options.getDelay()); } @@ -111,6 +114,7 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundPattern() { checkThread(); @@ -122,6 +126,7 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getBackgroundPatternTransition() { checkThread(); return nativeGetBackgroundPatternTransition(); @@ -132,7 +137,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundPatternTransition(TransitionOptions options) { + public void setBackgroundPatternTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetBackgroundPatternTransition(options.getDuration(), options.getDelay()); } @@ -142,6 +147,7 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getBackgroundOpacity() { checkThread(); @@ -153,6 +159,7 @@ public class BackgroundLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getBackgroundOpacityTransition() { checkThread(); return nativeGetBackgroundOpacityTransition(); @@ -163,32 +170,38 @@ public class BackgroundLayer extends Layer { * * @param options transition options for Float */ - public void setBackgroundOpacityTransition(TransitionOptions options) { + public void setBackgroundOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetBackgroundOpacityTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetBackgroundColor(); + @NonNull @Keep private native TransitionOptions nativeGetBackgroundColorTransition(); @Keep private native void nativeSetBackgroundColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetBackgroundPattern(); + @NonNull @Keep private native TransitionOptions nativeGetBackgroundPatternTransition(); @Keep private native void nativeSetBackgroundPatternTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetBackgroundOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetBackgroundOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index 4718adc5c1..76f7b2f9fa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -62,6 +62,7 @@ public class CircleLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public CircleLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class CircleLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -82,6 +84,7 @@ public class CircleLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -92,7 +95,7 @@ public class CircleLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -103,7 +106,8 @@ public class CircleLayer extends Layer { * @param filter the expression filter to set * @return This */ - public CircleLayer withFilter(Expression filter) { + @NonNull + public CircleLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -130,6 +134,7 @@ public class CircleLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public CircleLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -142,6 +147,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleRadius() { checkThread(); @@ -153,6 +159,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getCircleRadiusTransition() { checkThread(); return nativeGetCircleRadiusTransition(); @@ -163,7 +170,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleRadiusTransition(TransitionOptions options) { + public void setCircleRadiusTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleRadiusTransition(options.getDuration(), options.getDelay()); } @@ -173,6 +180,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleColor() { checkThread(); @@ -201,6 +209,7 @@ public class CircleLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getCircleColorTransition() { checkThread(); return nativeGetCircleColorTransition(); @@ -211,7 +220,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleColorTransition(TransitionOptions options) { + public void setCircleColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleColorTransition(options.getDuration(), options.getDelay()); } @@ -221,6 +230,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleBlur() { checkThread(); @@ -232,6 +242,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getCircleBlurTransition() { checkThread(); return nativeGetCircleBlurTransition(); @@ -242,7 +253,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleBlurTransition(TransitionOptions options) { + public void setCircleBlurTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleBlurTransition(options.getDuration(), options.getDelay()); } @@ -252,6 +263,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleOpacity() { checkThread(); @@ -263,6 +275,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getCircleOpacityTransition() { checkThread(); return nativeGetCircleOpacityTransition(); @@ -273,7 +286,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleOpacityTransition(TransitionOptions options) { + public void setCircleOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleOpacityTransition(options.getDuration(), options.getDelay()); } @@ -283,6 +296,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getCircleTranslate() { checkThread(); @@ -294,6 +308,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getCircleTranslateTransition() { checkThread(); return nativeGetCircleTranslateTransition(); @@ -304,7 +319,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float[] */ - public void setCircleTranslateTransition(TransitionOptions options) { + public void setCircleTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleTranslateTransition(options.getDuration(), options.getDelay()); } @@ -314,6 +329,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleTranslateAnchor() { checkThread(); @@ -325,6 +341,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchScale() { checkThread(); @@ -336,6 +353,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchAlignment() { checkThread(); @@ -347,6 +365,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeWidth() { checkThread(); @@ -358,6 +377,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getCircleStrokeWidthTransition() { checkThread(); return nativeGetCircleStrokeWidthTransition(); @@ -368,7 +388,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeWidthTransition(TransitionOptions options) { + public void setCircleStrokeWidthTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleStrokeWidthTransition(options.getDuration(), options.getDelay()); } @@ -378,6 +398,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleStrokeColor() { checkThread(); @@ -406,6 +427,7 @@ public class CircleLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getCircleStrokeColorTransition() { checkThread(); return nativeGetCircleStrokeColorTransition(); @@ -416,7 +438,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleStrokeColorTransition(TransitionOptions options) { + public void setCircleStrokeColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleStrokeColorTransition(options.getDuration(), options.getDelay()); } @@ -426,6 +448,7 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeOpacity() { checkThread(); @@ -437,6 +460,7 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getCircleStrokeOpacityTransition() { checkThread(); return nativeGetCircleStrokeOpacityTransition(); @@ -447,86 +471,105 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeOpacityTransition(TransitionOptions options) { + public void setCircleStrokeOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetCircleRadius(); + @NonNull @Keep private native TransitionOptions nativeGetCircleRadiusTransition(); @Keep private native void nativeSetCircleRadiusTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleColor(); + @NonNull @Keep private native TransitionOptions nativeGetCircleColorTransition(); @Keep private native void nativeSetCircleColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleBlur(); + @NonNull @Keep private native TransitionOptions nativeGetCircleBlurTransition(); @Keep private native void nativeSetCircleBlurTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetCircleOpacityTransition(); @Keep private native void nativeSetCircleOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetCircleTranslateTransition(); @Keep private native void nativeSetCircleTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleTranslateAnchor(); + @NonNull @Keep private native Object nativeGetCirclePitchScale(); + @NonNull @Keep private native Object nativeGetCirclePitchAlignment(); + @NonNull @Keep private native Object nativeGetCircleStrokeWidth(); + @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeWidthTransition(); @Keep private native void nativeSetCircleStrokeWidthTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleStrokeColor(); + @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeColorTransition(); @Keep private native void nativeSetCircleStrokeColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetCircleStrokeOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java index 339b25b3f7..864d1d5a20 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java @@ -62,6 +62,7 @@ public class FillExtrusionLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public FillExtrusionLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class FillExtrusionLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -82,6 +84,7 @@ public class FillExtrusionLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -92,7 +95,7 @@ public class FillExtrusionLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -103,7 +106,8 @@ public class FillExtrusionLayer extends Layer { * @param filter the expression filter to set * @return This */ - public FillExtrusionLayer withFilter(Expression filter) { + @NonNull + public FillExtrusionLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -130,6 +134,7 @@ public class FillExtrusionLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public FillExtrusionLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -142,6 +147,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionOpacity() { checkThread(); @@ -153,6 +159,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getFillExtrusionOpacityTransition() { checkThread(); return nativeGetFillExtrusionOpacityTransition(); @@ -163,7 +170,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionOpacityTransition(TransitionOptions options) { + public void setFillExtrusionOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionOpacityTransition(options.getDuration(), options.getDelay()); } @@ -173,6 +180,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionColor() { checkThread(); @@ -201,6 +209,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getFillExtrusionColorTransition() { checkThread(); return nativeGetFillExtrusionColorTransition(); @@ -211,7 +220,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for String */ - public void setFillExtrusionColorTransition(TransitionOptions options) { + public void setFillExtrusionColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionColorTransition(options.getDuration(), options.getDelay()); } @@ -221,6 +230,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getFillExtrusionTranslate() { checkThread(); @@ -232,6 +242,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getFillExtrusionTranslateTransition() { checkThread(); return nativeGetFillExtrusionTranslateTransition(); @@ -242,7 +253,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float[] */ - public void setFillExtrusionTranslateTransition(TransitionOptions options) { + public void setFillExtrusionTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionTranslateTransition(options.getDuration(), options.getDelay()); } @@ -252,6 +263,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionTranslateAnchor() { checkThread(); @@ -263,6 +275,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionPattern() { checkThread(); @@ -274,6 +287,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getFillExtrusionPatternTransition() { checkThread(); return nativeGetFillExtrusionPatternTransition(); @@ -284,7 +298,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for String */ - public void setFillExtrusionPatternTransition(TransitionOptions options) { + public void setFillExtrusionPatternTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionPatternTransition(options.getDuration(), options.getDelay()); } @@ -294,6 +308,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionHeight() { checkThread(); @@ -305,6 +320,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getFillExtrusionHeightTransition() { checkThread(); return nativeGetFillExtrusionHeightTransition(); @@ -315,7 +331,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionHeightTransition(TransitionOptions options) { + public void setFillExtrusionHeightTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionHeightTransition(options.getDuration(), options.getDelay()); } @@ -325,6 +341,7 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionBase() { checkThread(); @@ -336,6 +353,7 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getFillExtrusionBaseTransition() { checkThread(); return nativeGetFillExtrusionBaseTransition(); @@ -346,62 +364,75 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionBaseTransition(TransitionOptions options) { + public void setFillExtrusionBaseTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillExtrusionBaseTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetFillExtrusionOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionOpacityTransition(); @Keep private native void nativeSetFillExtrusionOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillExtrusionColor(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionColorTransition(); @Keep private native void nativeSetFillExtrusionColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillExtrusionTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionTranslateTransition(); @Keep private native void nativeSetFillExtrusionTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillExtrusionTranslateAnchor(); + @NonNull @Keep private native Object nativeGetFillExtrusionPattern(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionPatternTransition(); @Keep private native void nativeSetFillExtrusionPatternTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillExtrusionHeight(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionHeightTransition(); @Keep private native void nativeSetFillExtrusionHeightTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillExtrusionBase(); + @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionBaseTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java index 295ffd3963..14c80c044c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -62,6 +62,7 @@ public class FillLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public FillLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class FillLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -82,6 +84,7 @@ public class FillLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -92,7 +95,7 @@ public class FillLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -103,7 +106,8 @@ public class FillLayer extends Layer { * @param filter the expression filter to set * @return This */ - public FillLayer withFilter(Expression filter) { + @NonNull + public FillLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -130,6 +134,7 @@ public class FillLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public FillLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -142,6 +147,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getFillAntialias() { checkThread(); @@ -153,6 +159,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillOpacity() { checkThread(); @@ -164,6 +171,7 @@ public class FillLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getFillOpacityTransition() { checkThread(); return nativeGetFillOpacityTransition(); @@ -174,7 +182,7 @@ public class FillLayer extends Layer { * * @param options transition options for Float */ - public void setFillOpacityTransition(TransitionOptions options) { + public void setFillOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillOpacityTransition(options.getDuration(), options.getDelay()); } @@ -184,6 +192,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillColor() { checkThread(); @@ -212,6 +221,7 @@ public class FillLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getFillColorTransition() { checkThread(); return nativeGetFillColorTransition(); @@ -222,7 +232,7 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillColorTransition(TransitionOptions options) { + public void setFillColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillColorTransition(options.getDuration(), options.getDelay()); } @@ -232,6 +242,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillOutlineColor() { checkThread(); @@ -260,6 +271,7 @@ public class FillLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getFillOutlineColorTransition() { checkThread(); return nativeGetFillOutlineColorTransition(); @@ -270,7 +282,7 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillOutlineColorTransition(TransitionOptions options) { + public void setFillOutlineColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillOutlineColorTransition(options.getDuration(), options.getDelay()); } @@ -280,6 +292,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getFillTranslate() { checkThread(); @@ -291,6 +304,7 @@ public class FillLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getFillTranslateTransition() { checkThread(); return nativeGetFillTranslateTransition(); @@ -301,7 +315,7 @@ public class FillLayer extends Layer { * * @param options transition options for Float[] */ - public void setFillTranslateTransition(TransitionOptions options) { + public void setFillTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillTranslateTransition(options.getDuration(), options.getDelay()); } @@ -311,6 +325,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillTranslateAnchor() { checkThread(); @@ -322,6 +337,7 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillPattern() { checkThread(); @@ -333,6 +349,7 @@ public class FillLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getFillPatternTransition() { checkThread(); return nativeGetFillPatternTransition(); @@ -343,56 +360,68 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillPatternTransition(TransitionOptions options) { + public void setFillPatternTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetFillPatternTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetFillAntialias(); + @NonNull @Keep private native Object nativeGetFillOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetFillOpacityTransition(); @Keep private native void nativeSetFillOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillColor(); + @NonNull @Keep private native TransitionOptions nativeGetFillColorTransition(); @Keep private native void nativeSetFillColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillOutlineColor(); + @NonNull @Keep private native TransitionOptions nativeGetFillOutlineColorTransition(); @Keep private native void nativeSetFillOutlineColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetFillTranslateTransition(); @Keep private native void nativeSetFillTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetFillTranslateAnchor(); + @NonNull @Keep private native Object nativeGetFillPattern(); + @NonNull @Keep private native TransitionOptions nativeGetFillPatternTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java index 796f6a28bb..730471190c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java @@ -62,6 +62,7 @@ public class HeatmapLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public HeatmapLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class HeatmapLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -82,6 +84,7 @@ public class HeatmapLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -92,7 +95,7 @@ public class HeatmapLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -103,7 +106,8 @@ public class HeatmapLayer extends Layer { * @param filter the expression filter to set * @return This */ - public HeatmapLayer withFilter(Expression filter) { + @NonNull + public HeatmapLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -130,6 +134,7 @@ public class HeatmapLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public HeatmapLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -142,6 +147,7 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapRadius() { checkThread(); @@ -153,6 +159,7 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getHeatmapRadiusTransition() { checkThread(); return nativeGetHeatmapRadiusTransition(); @@ -163,7 +170,7 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapRadiusTransition(TransitionOptions options) { + public void setHeatmapRadiusTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHeatmapRadiusTransition(options.getDuration(), options.getDelay()); } @@ -173,6 +180,7 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapWeight() { checkThread(); @@ -184,6 +192,7 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapIntensity() { checkThread(); @@ -195,6 +204,7 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getHeatmapIntensityTransition() { checkThread(); return nativeGetHeatmapIntensityTransition(); @@ -205,7 +215,7 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapIntensityTransition(TransitionOptions options) { + public void setHeatmapIntensityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHeatmapIntensityTransition(options.getDuration(), options.getDelay()); } @@ -215,6 +225,7 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHeatmapColor() { checkThread(); @@ -243,6 +254,7 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapOpacity() { checkThread(); @@ -254,6 +266,7 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getHeatmapOpacityTransition() { checkThread(); return nativeGetHeatmapOpacityTransition(); @@ -264,38 +277,46 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapOpacityTransition(TransitionOptions options) { + public void setHeatmapOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHeatmapOpacityTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetHeatmapRadius(); + @NonNull @Keep private native TransitionOptions nativeGetHeatmapRadiusTransition(); @Keep private native void nativeSetHeatmapRadiusTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetHeatmapWeight(); + @NonNull @Keep private native Object nativeGetHeatmapIntensity(); + @NonNull @Keep private native TransitionOptions nativeGetHeatmapIntensityTransition(); @Keep private native void nativeSetHeatmapIntensityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetHeatmapColor(); + @NonNull @Keep private native Object nativeGetHeatmapOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetHeatmapOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index d548d2c9f6..22df96f2c6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -62,6 +62,7 @@ public class HillshadeLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public HillshadeLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class HillshadeLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -83,6 +85,7 @@ public class HillshadeLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public HillshadeLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -95,6 +98,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHillshadeIlluminationDirection() { checkThread(); @@ -106,6 +110,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeIlluminationAnchor() { checkThread(); @@ -117,6 +122,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHillshadeExaggeration() { checkThread(); @@ -128,6 +134,7 @@ public class HillshadeLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getHillshadeExaggerationTransition() { checkThread(); return nativeGetHillshadeExaggerationTransition(); @@ -138,7 +145,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for Float */ - public void setHillshadeExaggerationTransition(TransitionOptions options) { + public void setHillshadeExaggerationTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHillshadeExaggerationTransition(options.getDuration(), options.getDelay()); } @@ -148,6 +155,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeShadowColor() { checkThread(); @@ -176,6 +184,7 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getHillshadeShadowColorTransition() { checkThread(); return nativeGetHillshadeShadowColorTransition(); @@ -186,7 +195,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeShadowColorTransition(TransitionOptions options) { + public void setHillshadeShadowColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHillshadeShadowColorTransition(options.getDuration(), options.getDelay()); } @@ -196,6 +205,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeHighlightColor() { checkThread(); @@ -224,6 +234,7 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getHillshadeHighlightColorTransition() { checkThread(); return nativeGetHillshadeHighlightColorTransition(); @@ -234,7 +245,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeHighlightColorTransition(TransitionOptions options) { + public void setHillshadeHighlightColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHillshadeHighlightColorTransition(options.getDuration(), options.getDelay()); } @@ -244,6 +255,7 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeAccentColor() { checkThread(); @@ -272,6 +284,7 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getHillshadeAccentColorTransition() { checkThread(); return nativeGetHillshadeAccentColorTransition(); @@ -282,47 +295,57 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeAccentColorTransition(TransitionOptions options) { + public void setHillshadeAccentColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetHillshadeAccentColorTransition(options.getDuration(), options.getDelay()); } + @NonNull @Keep private native Object nativeGetHillshadeIlluminationDirection(); + @NonNull @Keep private native Object nativeGetHillshadeIlluminationAnchor(); + @NonNull @Keep private native Object nativeGetHillshadeExaggeration(); + @NonNull @Keep private native TransitionOptions nativeGetHillshadeExaggerationTransition(); @Keep private native void nativeSetHillshadeExaggerationTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetHillshadeShadowColor(); + @NonNull @Keep private native TransitionOptions nativeGetHillshadeShadowColorTransition(); @Keep private native void nativeSetHillshadeShadowColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetHillshadeHighlightColor(); + @NonNull @Keep private native TransitionOptions nativeGetHillshadeHighlightColorTransition(); @Keep private native void nativeSetHillshadeHighlightColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetHillshadeAccentColor(); + @NonNull @Keep private native TransitionOptions nativeGetHillshadeAccentColorTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index b17c4a661a..ea89330c95 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.Keep; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -50,11 +51,13 @@ public abstract class Layer { } } + @NonNull public String getId() { checkThread(); return nativeGetId(); } + @NonNull public PropertyValue<String> getVisibility() { checkThread(); return new PaintPropertyValue<>("visibility", (String) nativeGetVisibility()); @@ -84,9 +87,11 @@ public abstract class Layer { @Keep protected native void finalize() throws Throwable; + @NonNull @Keep protected native String nativeGetId(); + @NonNull @Keep protected native Object nativeGetVisibility(); @@ -99,15 +104,18 @@ public abstract class Layer { @Keep protected native void nativeSetFilter(Object[] filter); + @NonNull @Keep protected native JsonElement nativeGetFilter(); @Keep protected native void nativeSetSourceLayer(String sourceLayer); + @NonNull @Keep protected native String nativeGetSourceLayer(); + @NonNull @Keep protected native String nativeGetSourceId(); @@ -127,7 +135,8 @@ public abstract class Layer { return nativePtr; } - private Object convertValue(Object value) { + @Nullable + private Object convertValue(@Nullable Object value) { if (value != null && value instanceof Expression) { return ((Expression) value).toArray(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java index f6022f836a..662d7c7ea7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -62,6 +62,7 @@ public class LineLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public LineLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class LineLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -82,6 +84,7 @@ public class LineLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -92,7 +95,7 @@ public class LineLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -103,7 +106,8 @@ public class LineLayer extends Layer { * @param filter the expression filter to set * @return This */ - public LineLayer withFilter(Expression filter) { + @NonNull + public LineLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -130,6 +134,7 @@ public class LineLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public LineLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -142,6 +147,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineCap() { checkThread(); @@ -153,6 +159,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineJoin() { checkThread(); @@ -164,6 +171,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineMiterLimit() { checkThread(); @@ -175,6 +183,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineRoundLimit() { checkThread(); @@ -186,6 +195,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineOpacity() { checkThread(); @@ -197,6 +207,7 @@ public class LineLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getLineOpacityTransition() { checkThread(); return nativeGetLineOpacityTransition(); @@ -207,7 +218,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineOpacityTransition(TransitionOptions options) { + public void setLineOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineOpacityTransition(options.getDuration(), options.getDelay()); } @@ -217,6 +228,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineColor() { checkThread(); @@ -245,6 +257,7 @@ public class LineLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getLineColorTransition() { checkThread(); return nativeGetLineColorTransition(); @@ -255,7 +268,7 @@ public class LineLayer extends Layer { * * @param options transition options for String */ - public void setLineColorTransition(TransitionOptions options) { + public void setLineColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineColorTransition(options.getDuration(), options.getDelay()); } @@ -265,6 +278,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getLineTranslate() { checkThread(); @@ -276,6 +290,7 @@ public class LineLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getLineTranslateTransition() { checkThread(); return nativeGetLineTranslateTransition(); @@ -286,7 +301,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float[] */ - public void setLineTranslateTransition(TransitionOptions options) { + public void setLineTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineTranslateTransition(options.getDuration(), options.getDelay()); } @@ -296,6 +311,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineTranslateAnchor() { checkThread(); @@ -307,6 +323,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineWidth() { checkThread(); @@ -318,6 +335,7 @@ public class LineLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getLineWidthTransition() { checkThread(); return nativeGetLineWidthTransition(); @@ -328,7 +346,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineWidthTransition(TransitionOptions options) { + public void setLineWidthTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineWidthTransition(options.getDuration(), options.getDelay()); } @@ -338,6 +356,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineGapWidth() { checkThread(); @@ -349,6 +368,7 @@ public class LineLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getLineGapWidthTransition() { checkThread(); return nativeGetLineGapWidthTransition(); @@ -359,7 +379,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineGapWidthTransition(TransitionOptions options) { + public void setLineGapWidthTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineGapWidthTransition(options.getDuration(), options.getDelay()); } @@ -369,6 +389,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineOffset() { checkThread(); @@ -380,6 +401,7 @@ public class LineLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getLineOffsetTransition() { checkThread(); return nativeGetLineOffsetTransition(); @@ -390,7 +412,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineOffsetTransition(TransitionOptions options) { + public void setLineOffsetTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineOffsetTransition(options.getDuration(), options.getDelay()); } @@ -400,6 +422,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineBlur() { checkThread(); @@ -411,6 +434,7 @@ public class LineLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getLineBlurTransition() { checkThread(); return nativeGetLineBlurTransition(); @@ -421,7 +445,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineBlurTransition(TransitionOptions options) { + public void setLineBlurTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineBlurTransition(options.getDuration(), options.getDelay()); } @@ -431,6 +455,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getLineDasharray() { checkThread(); @@ -442,6 +467,7 @@ public class LineLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getLineDasharrayTransition() { checkThread(); return nativeGetLineDasharrayTransition(); @@ -452,7 +478,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float[] */ - public void setLineDasharrayTransition(TransitionOptions options) { + public void setLineDasharrayTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLineDasharrayTransition(options.getDuration(), options.getDelay()); } @@ -462,6 +488,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLinePattern() { checkThread(); @@ -473,6 +500,7 @@ public class LineLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getLinePatternTransition() { checkThread(); return nativeGetLinePatternTransition(); @@ -483,7 +511,7 @@ public class LineLayer extends Layer { * * @param options transition options for String */ - public void setLinePatternTransition(TransitionOptions options) { + public void setLinePatternTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetLinePatternTransition(options.getDuration(), options.getDelay()); } @@ -493,6 +521,7 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineGradient() { checkThread(); @@ -516,102 +545,126 @@ public class LineLayer extends Layer { } } + @NonNull @Keep private native Object nativeGetLineCap(); + @NonNull @Keep private native Object nativeGetLineJoin(); + @NonNull @Keep private native Object nativeGetLineMiterLimit(); + @NonNull @Keep private native Object nativeGetLineRoundLimit(); + @NonNull @Keep private native Object nativeGetLineOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetLineOpacityTransition(); @Keep private native void nativeSetLineOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineColor(); + @NonNull @Keep private native TransitionOptions nativeGetLineColorTransition(); @Keep private native void nativeSetLineColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetLineTranslateTransition(); @Keep private native void nativeSetLineTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineTranslateAnchor(); + @NonNull @Keep private native Object nativeGetLineWidth(); + @NonNull @Keep private native TransitionOptions nativeGetLineWidthTransition(); @Keep private native void nativeSetLineWidthTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineGapWidth(); + @NonNull @Keep private native TransitionOptions nativeGetLineGapWidthTransition(); @Keep private native void nativeSetLineGapWidthTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineOffset(); + @NonNull @Keep private native TransitionOptions nativeGetLineOffsetTransition(); @Keep private native void nativeSetLineOffsetTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineBlur(); + @NonNull @Keep private native TransitionOptions nativeGetLineBlurTransition(); @Keep private native void nativeSetLineBlurTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineDasharray(); + @NonNull @Keep private native TransitionOptions nativeGetLineDasharrayTransition(); @Keep private native void nativeSetLineDasharrayTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLinePattern(); + @NonNull @Keep private native TransitionOptions nativeGetLinePatternTransition(); @Keep private native void nativeSetLinePatternTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetLineGradient(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java index 6936c302b2..4c2cc855a8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java @@ -17,6 +17,7 @@ public class PropertyValue<T> { private static final String TAG = "Mbgl-PropertyValue"; + @NonNull public final String name; public final T value; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java index 792ea1193c..f2c5b03a27 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -62,6 +62,7 @@ public class RasterLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public RasterLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -72,6 +73,7 @@ public class RasterLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -83,6 +85,7 @@ public class RasterLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public RasterLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -95,6 +98,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterOpacity() { checkThread(); @@ -106,6 +110,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterOpacityTransition() { checkThread(); return nativeGetRasterOpacityTransition(); @@ -116,7 +121,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterOpacityTransition(TransitionOptions options) { + public void setRasterOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterOpacityTransition(options.getDuration(), options.getDelay()); } @@ -126,6 +131,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterHueRotate() { checkThread(); @@ -137,6 +143,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterHueRotateTransition() { checkThread(); return nativeGetRasterHueRotateTransition(); @@ -147,7 +154,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterHueRotateTransition(TransitionOptions options) { + public void setRasterHueRotateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterHueRotateTransition(options.getDuration(), options.getDelay()); } @@ -157,6 +164,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterBrightnessMin() { checkThread(); @@ -168,6 +176,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterBrightnessMinTransition() { checkThread(); return nativeGetRasterBrightnessMinTransition(); @@ -178,7 +187,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterBrightnessMinTransition(TransitionOptions options) { + public void setRasterBrightnessMinTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterBrightnessMinTransition(options.getDuration(), options.getDelay()); } @@ -188,6 +197,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterBrightnessMax() { checkThread(); @@ -199,6 +209,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterBrightnessMaxTransition() { checkThread(); return nativeGetRasterBrightnessMaxTransition(); @@ -209,7 +220,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterBrightnessMaxTransition(TransitionOptions options) { + public void setRasterBrightnessMaxTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterBrightnessMaxTransition(options.getDuration(), options.getDelay()); } @@ -219,6 +230,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterSaturation() { checkThread(); @@ -230,6 +242,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterSaturationTransition() { checkThread(); return nativeGetRasterSaturationTransition(); @@ -240,7 +253,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterSaturationTransition(TransitionOptions options) { + public void setRasterSaturationTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterSaturationTransition(options.getDuration(), options.getDelay()); } @@ -250,6 +263,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterContrast() { checkThread(); @@ -261,6 +275,7 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getRasterContrastTransition() { checkThread(); return nativeGetRasterContrastTransition(); @@ -271,7 +286,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterContrastTransition(TransitionOptions options) { + public void setRasterContrastTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetRasterContrastTransition(options.getDuration(), options.getDelay()); } @@ -281,6 +296,7 @@ public class RasterLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getRasterResampling() { checkThread(); @@ -292,69 +308,84 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterFadeDuration() { checkThread(); return (PropertyValue<Float>) new PropertyValue("raster-fade-duration", nativeGetRasterFadeDuration()); } + @NonNull @Keep private native Object nativeGetRasterOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetRasterOpacityTransition(); @Keep private native void nativeSetRasterOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterHueRotate(); + @NonNull @Keep private native TransitionOptions nativeGetRasterHueRotateTransition(); @Keep private native void nativeSetRasterHueRotateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterBrightnessMin(); + @NonNull @Keep private native TransitionOptions nativeGetRasterBrightnessMinTransition(); @Keep private native void nativeSetRasterBrightnessMinTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterBrightnessMax(); + @NonNull @Keep private native TransitionOptions nativeGetRasterBrightnessMaxTransition(); @Keep private native void nativeSetRasterBrightnessMaxTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterSaturation(); + @NonNull @Keep private native TransitionOptions nativeGetRasterSaturationTransition(); @Keep private native void nativeSetRasterSaturationTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterContrast(); + @NonNull @Keep private native TransitionOptions nativeGetRasterContrastTransition(); @Keep private native void nativeSetRasterContrastTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetRasterResampling(); + @NonNull @Keep private native Object nativeGetRasterFadeDuration(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index 81d5bcfd8c..0cbbc17d98 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -64,6 +64,7 @@ public class SymbolLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public SymbolLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -74,6 +75,7 @@ public class SymbolLayer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,6 +86,7 @@ public class SymbolLayer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -94,7 +97,7 @@ public class SymbolLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -105,7 +108,8 @@ public class SymbolLayer extends Layer { * @param filter the expression filter to set * @return This */ - public SymbolLayer withFilter(Expression filter) { + @NonNull + public SymbolLayer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -132,6 +136,7 @@ public class SymbolLayer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public SymbolLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -144,6 +149,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getSymbolPlacement() { checkThread(); @@ -155,6 +161,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getSymbolSpacing() { checkThread(); @@ -166,6 +173,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getSymbolAvoidEdges() { checkThread(); @@ -177,6 +185,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getSymbolZOrder() { checkThread(); @@ -188,6 +197,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconAllowOverlap() { checkThread(); @@ -199,6 +209,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconIgnorePlacement() { checkThread(); @@ -210,6 +221,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconOptional() { checkThread(); @@ -221,6 +233,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconRotationAlignment() { checkThread(); @@ -232,6 +245,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconSize() { checkThread(); @@ -243,6 +257,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconTextFit() { checkThread(); @@ -254,6 +269,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconTextFitPadding() { checkThread(); @@ -265,6 +281,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconImage() { checkThread(); @@ -276,6 +293,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconRotate() { checkThread(); @@ -287,6 +305,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconPadding() { checkThread(); @@ -298,6 +317,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconKeepUpright() { checkThread(); @@ -309,6 +329,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconOffset() { checkThread(); @@ -320,6 +341,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconAnchor() { checkThread(); @@ -331,6 +353,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconPitchAlignment() { checkThread(); @@ -342,6 +365,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextPitchAlignment() { checkThread(); @@ -353,6 +377,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextRotationAlignment() { checkThread(); @@ -364,6 +389,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextField() { checkThread(); @@ -393,6 +419,7 @@ public class SymbolLayer extends Layer { * @return property wrapper value around String * @see Expression#format(Expression.FormatEntry...) */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Formatted> getFormattedTextField() { checkThread(); @@ -404,6 +431,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String[]> getTextFont() { checkThread(); @@ -415,6 +443,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextSize() { checkThread(); @@ -426,6 +455,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextMaxWidth() { checkThread(); @@ -437,6 +467,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextLineHeight() { checkThread(); @@ -448,6 +479,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextLetterSpacing() { checkThread(); @@ -459,6 +491,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextJustify() { checkThread(); @@ -470,6 +503,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextAnchor() { checkThread(); @@ -481,6 +515,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextMaxAngle() { checkThread(); @@ -492,6 +527,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextRotate() { checkThread(); @@ -503,6 +539,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextPadding() { checkThread(); @@ -514,6 +551,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextKeepUpright() { checkThread(); @@ -525,6 +563,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextTransform() { checkThread(); @@ -536,6 +575,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getTextOffset() { checkThread(); @@ -547,6 +587,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextAllowOverlap() { checkThread(); @@ -558,6 +599,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextIgnorePlacement() { checkThread(); @@ -569,6 +611,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextOptional() { checkThread(); @@ -580,6 +623,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconOpacity() { checkThread(); @@ -591,6 +635,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getIconOpacityTransition() { checkThread(); return nativeGetIconOpacityTransition(); @@ -601,7 +646,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconOpacityTransition(TransitionOptions options) { + public void setIconOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconOpacityTransition(options.getDuration(), options.getDelay()); } @@ -611,6 +656,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconColor() { checkThread(); @@ -639,6 +685,7 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getIconColorTransition() { checkThread(); return nativeGetIconColorTransition(); @@ -649,7 +696,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setIconColorTransition(TransitionOptions options) { + public void setIconColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconColorTransition(options.getDuration(), options.getDelay()); } @@ -659,6 +706,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconHaloColor() { checkThread(); @@ -687,6 +735,7 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getIconHaloColorTransition() { checkThread(); return nativeGetIconHaloColorTransition(); @@ -697,7 +746,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setIconHaloColorTransition(TransitionOptions options) { + public void setIconHaloColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconHaloColorTransition(options.getDuration(), options.getDelay()); } @@ -707,6 +756,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconHaloWidth() { checkThread(); @@ -718,6 +768,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getIconHaloWidthTransition() { checkThread(); return nativeGetIconHaloWidthTransition(); @@ -728,7 +779,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconHaloWidthTransition(TransitionOptions options) { + public void setIconHaloWidthTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconHaloWidthTransition(options.getDuration(), options.getDelay()); } @@ -738,6 +789,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconHaloBlur() { checkThread(); @@ -749,6 +801,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getIconHaloBlurTransition() { checkThread(); return nativeGetIconHaloBlurTransition(); @@ -759,7 +812,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconHaloBlurTransition(TransitionOptions options) { + public void setIconHaloBlurTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconHaloBlurTransition(options.getDuration(), options.getDelay()); } @@ -769,6 +822,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconTranslate() { checkThread(); @@ -780,6 +834,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getIconTranslateTransition() { checkThread(); return nativeGetIconTranslateTransition(); @@ -790,7 +845,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float[] */ - public void setIconTranslateTransition(TransitionOptions options) { + public void setIconTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetIconTranslateTransition(options.getDuration(), options.getDelay()); } @@ -800,6 +855,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconTranslateAnchor() { checkThread(); @@ -811,6 +867,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextOpacity() { checkThread(); @@ -822,6 +879,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getTextOpacityTransition() { checkThread(); return nativeGetTextOpacityTransition(); @@ -832,7 +890,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextOpacityTransition(TransitionOptions options) { + public void setTextOpacityTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextOpacityTransition(options.getDuration(), options.getDelay()); } @@ -842,6 +900,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextColor() { checkThread(); @@ -870,6 +929,7 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getTextColorTransition() { checkThread(); return nativeGetTextColorTransition(); @@ -880,7 +940,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setTextColorTransition(TransitionOptions options) { + public void setTextColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextColorTransition(options.getDuration(), options.getDelay()); } @@ -890,6 +950,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextHaloColor() { checkThread(); @@ -918,6 +979,7 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ + @NonNull public TransitionOptions getTextHaloColorTransition() { checkThread(); return nativeGetTextHaloColorTransition(); @@ -928,7 +990,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setTextHaloColorTransition(TransitionOptions options) { + public void setTextHaloColorTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextHaloColorTransition(options.getDuration(), options.getDelay()); } @@ -938,6 +1000,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextHaloWidth() { checkThread(); @@ -949,6 +1012,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getTextHaloWidthTransition() { checkThread(); return nativeGetTextHaloWidthTransition(); @@ -959,7 +1023,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextHaloWidthTransition(TransitionOptions options) { + public void setTextHaloWidthTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextHaloWidthTransition(options.getDuration(), options.getDelay()); } @@ -969,6 +1033,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextHaloBlur() { checkThread(); @@ -980,6 +1045,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ + @NonNull public TransitionOptions getTextHaloBlurTransition() { checkThread(); return nativeGetTextHaloBlurTransition(); @@ -990,7 +1056,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextHaloBlurTransition(TransitionOptions options) { + public void setTextHaloBlurTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextHaloBlurTransition(options.getDuration(), options.getDelay()); } @@ -1000,6 +1066,7 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getTextTranslate() { checkThread(); @@ -1011,6 +1078,7 @@ public class SymbolLayer extends Layer { * * @return transition options for Float[] */ + @NonNull public TransitionOptions getTextTranslateTransition() { checkThread(); return nativeGetTextTranslateTransition(); @@ -1021,7 +1089,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float[] */ - public void setTextTranslateTransition(TransitionOptions options) { + public void setTextTranslateTransition(@NonNull TransitionOptions options) { checkThread(); nativeSetTextTranslateTransition(options.getDuration(), options.getDelay()); } @@ -1031,234 +1099,298 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextTranslateAnchor() { checkThread(); return (PropertyValue<String>) new PropertyValue("text-translate-anchor", nativeGetTextTranslateAnchor()); } + @NonNull @Keep private native Object nativeGetSymbolPlacement(); + @NonNull @Keep private native Object nativeGetSymbolSpacing(); + @NonNull @Keep private native Object nativeGetSymbolAvoidEdges(); + @NonNull @Keep private native Object nativeGetSymbolZOrder(); + @NonNull @Keep private native Object nativeGetIconAllowOverlap(); + @NonNull @Keep private native Object nativeGetIconIgnorePlacement(); + @NonNull @Keep private native Object nativeGetIconOptional(); + @NonNull @Keep private native Object nativeGetIconRotationAlignment(); + @NonNull @Keep private native Object nativeGetIconSize(); + @NonNull @Keep private native Object nativeGetIconTextFit(); + @NonNull @Keep private native Object nativeGetIconTextFitPadding(); + @NonNull @Keep private native Object nativeGetIconImage(); + @NonNull @Keep private native Object nativeGetIconRotate(); + @NonNull @Keep private native Object nativeGetIconPadding(); + @NonNull @Keep private native Object nativeGetIconKeepUpright(); + @NonNull @Keep private native Object nativeGetIconOffset(); + @NonNull @Keep private native Object nativeGetIconAnchor(); + @NonNull @Keep private native Object nativeGetIconPitchAlignment(); + @NonNull @Keep private native Object nativeGetTextPitchAlignment(); + @NonNull @Keep private native Object nativeGetTextRotationAlignment(); + @NonNull @Keep private native Object nativeGetTextField(); + @NonNull @Keep private native Object nativeGetTextFont(); + @NonNull @Keep private native Object nativeGetTextSize(); + @NonNull @Keep private native Object nativeGetTextMaxWidth(); + @NonNull @Keep private native Object nativeGetTextLineHeight(); + @NonNull @Keep private native Object nativeGetTextLetterSpacing(); + @NonNull @Keep private native Object nativeGetTextJustify(); + @NonNull @Keep private native Object nativeGetTextAnchor(); + @NonNull @Keep private native Object nativeGetTextMaxAngle(); + @NonNull @Keep private native Object nativeGetTextRotate(); + @NonNull @Keep private native Object nativeGetTextPadding(); + @NonNull @Keep private native Object nativeGetTextKeepUpright(); + @NonNull @Keep private native Object nativeGetTextTransform(); + @NonNull @Keep private native Object nativeGetTextOffset(); + @NonNull @Keep private native Object nativeGetTextAllowOverlap(); + @NonNull @Keep private native Object nativeGetTextIgnorePlacement(); + @NonNull @Keep private native Object nativeGetTextOptional(); + @NonNull @Keep private native Object nativeGetIconOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetIconOpacityTransition(); @Keep private native void nativeSetIconOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconColor(); + @NonNull @Keep private native TransitionOptions nativeGetIconColorTransition(); @Keep private native void nativeSetIconColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconHaloColor(); + @NonNull @Keep private native TransitionOptions nativeGetIconHaloColorTransition(); @Keep private native void nativeSetIconHaloColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconHaloWidth(); + @NonNull @Keep private native TransitionOptions nativeGetIconHaloWidthTransition(); @Keep private native void nativeSetIconHaloWidthTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconHaloBlur(); + @NonNull @Keep private native TransitionOptions nativeGetIconHaloBlurTransition(); @Keep private native void nativeSetIconHaloBlurTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetIconTranslateTransition(); @Keep private native void nativeSetIconTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetIconTranslateAnchor(); + @NonNull @Keep private native Object nativeGetTextOpacity(); + @NonNull @Keep private native TransitionOptions nativeGetTextOpacityTransition(); @Keep private native void nativeSetTextOpacityTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextColor(); + @NonNull @Keep private native TransitionOptions nativeGetTextColorTransition(); @Keep private native void nativeSetTextColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextHaloColor(); + @NonNull @Keep private native TransitionOptions nativeGetTextHaloColorTransition(); @Keep private native void nativeSetTextHaloColorTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextHaloWidth(); + @NonNull @Keep private native TransitionOptions nativeGetTextHaloWidthTransition(); @Keep private native void nativeSetTextHaloWidthTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextHaloBlur(); + @NonNull @Keep private native TransitionOptions nativeGetTextHaloBlurTransition(); @Keep private native void nativeSetTextHaloBlurTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextTranslate(); + @NonNull @Keep private native TransitionOptions nativeGetTextTranslateTransition(); @Keep private native void nativeSetTextTranslateTransition(long duration, long delay); + @NonNull @Keep private native Object nativeGetTextTranslateAnchor(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java index 2a25302aed..dbd6d77761 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java @@ -1,6 +1,8 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.Keep; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; /** * Resembles transition property from the style specification. @@ -54,7 +56,7 @@ public class TransitionOptions { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) { return true; } @@ -77,6 +79,7 @@ public class TransitionOptions { return result; } + @NonNull @Override public String toString() { return "TransitionOptions{" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs index c6ae12b028..a11852be68 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -86,6 +86,7 @@ public class <%- camelize(type) %>Layer extends Layer { * @param sourceLayer the source layer to set * @return This */ + @NonNull public <%- camelize(type) %>Layer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -98,6 +99,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return id of the source */ + @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -110,6 +112,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return sourceLayer the source layer to get */ + @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -120,7 +123,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(Expression filter) { + public void setFilter(@NonNull Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -131,7 +134,8 @@ public class <%- camelize(type) %>Layer extends Layer { * @param filter the expression filter to set * @return This */ - public <%- camelize(type) %>Layer withFilter(Expression filter) { + @NonNull + public <%- camelize(type) %>Layer withFilter(@NonNull Expression filter) { setFilter(filter); return this; } @@ -159,6 +163,7 @@ public class <%- camelize(type) %>Layer extends Layer { * @param properties the var-args properties * @return This */ + @NonNull public <%- camelize(type) %>Layer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -172,6 +177,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return property wrapper value around <%- propertyType(property) %> */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() { checkThread(); @@ -206,6 +212,7 @@ public class <%- camelize(type) %>Layer extends Layer { * @return property wrapper value around <%- propertyType(property) %> * @see Expression#format(Expression.FormatEntry...) */ + @NonNull @SuppressWarnings("unchecked") public PropertyValue<Formatted> getFormatted<%- camelize(property.name) %>() { checkThread(); @@ -238,6 +245,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return transition options for <%- propertyType(property) %> */ + @NonNull public TransitionOptions get<%- camelize(property.name) %>Transition() { checkThread(); return nativeGet<%- camelize(property.name) %>Transition(); @@ -248,7 +256,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @param options transition options for <%- propertyType(property) %> */ - public void set<%- camelize(property.name) %>Transition(TransitionOptions options) { + public void set<%- camelize(property.name) %>Transition(@NonNull TransitionOptions options) { checkThread(); nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay()); } @@ -256,10 +264,12 @@ public class <%- camelize(type) %>Layer extends Layer { <% } -%> <% for (const property of properties) { -%> + @NonNull @Keep private native Object nativeGet<%- camelize(property.name) %>(); <% if (property.transition) { -%> + @NonNull @Keep private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); |