diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers')
8 files changed, 1050 insertions, 4 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 0f1265f1a1..978fa29ef8 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * The background color or pattern of the map. * @@ -75,6 +77,23 @@ public class BackgroundLayer extends Layer { } } + /** + * Get the BackgroundColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getBackgroundColorTransition() { + return nativeGetBackgroundColorTransition(); + } + + /** + * Set the BackgroundColor property transition options + * + * @param options transition options for String + */ + public void setBackgroundColorTransition(TransitionOptions options) { + nativeSetBackgroundColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the BackgroundPattern property @@ -87,6 +106,24 @@ public class BackgroundLayer extends Layer { } /** + * Get the BackgroundPattern property transition options + * + * @return transition options for String + */ + public TransitionOptions getBackgroundPatternTransition() { + return nativeGetBackgroundPatternTransition(); + } + + /** + * Set the BackgroundPattern property transition options + * + * @param options transition options for String + */ + public void setBackgroundPatternTransition(TransitionOptions options) { + nativeSetBackgroundPatternTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the BackgroundOpacity property * * @return property wrapper value around Float @@ -96,12 +133,41 @@ public class BackgroundLayer extends Layer { return (PropertyValue<Float>) new PropertyValue("background-opacity", nativeGetBackgroundOpacity()); } + /** + * Get the BackgroundOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getBackgroundOpacityTransition() { + return nativeGetBackgroundOpacityTransition(); + } + + /** + * Set the BackgroundOpacity property transition options + * + * @param options transition options for Float + */ + public void setBackgroundOpacityTransition(TransitionOptions options) { + nativeSetBackgroundOpacityTransition(options.getDuration(), options.getDelay()); + } + private native Object nativeGetBackgroundColor(); + private native TransitionOptions nativeGetBackgroundColorTransition(); + + private native void nativeSetBackgroundColorTransition(long duration, long delay); + private native Object nativeGetBackgroundPattern(); + private native TransitionOptions nativeGetBackgroundPatternTransition(); + + private native void nativeSetBackgroundPatternTransition(long duration, long delay); + private native Object nativeGetBackgroundOpacity(); + private native TransitionOptions nativeGetBackgroundOpacityTransition(); + + private native void nativeSetBackgroundOpacityTransition(long duration, long delay); @Override protected native void finalize() throws Throwable; 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 43ec255e81..d5cc80f7e9 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * A filled circle. * @@ -101,6 +103,24 @@ public class CircleLayer extends Layer { } /** + * Get the CircleRadius property transition options + * + * @return transition options for Float + */ + public TransitionOptions getCircleRadiusTransition() { + return nativeGetCircleRadiusTransition(); + } + + /** + * Set the CircleRadius property transition options + * + * @param options transition options for Float + */ + public void setCircleRadiusTransition(TransitionOptions options) { + nativeSetCircleRadiusTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the CircleColor property * * @return property wrapper value around String @@ -126,6 +146,23 @@ public class CircleLayer extends Layer { } } + /** + * Get the CircleColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getCircleColorTransition() { + return nativeGetCircleColorTransition(); + } + + /** + * Set the CircleColor property transition options + * + * @param options transition options for String + */ + public void setCircleColorTransition(TransitionOptions options) { + nativeSetCircleColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the CircleBlur property @@ -138,6 +175,24 @@ public class CircleLayer extends Layer { } /** + * Get the CircleBlur property transition options + * + * @return transition options for Float + */ + public TransitionOptions getCircleBlurTransition() { + return nativeGetCircleBlurTransition(); + } + + /** + * Set the CircleBlur property transition options + * + * @param options transition options for Float + */ + public void setCircleBlurTransition(TransitionOptions options) { + nativeSetCircleBlurTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the CircleOpacity property * * @return property wrapper value around Float @@ -148,6 +203,24 @@ public class CircleLayer extends Layer { } /** + * Get the CircleOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getCircleOpacityTransition() { + return nativeGetCircleOpacityTransition(); + } + + /** + * Set the CircleOpacity property transition options + * + * @param options transition options for Float + */ + public void setCircleOpacityTransition(TransitionOptions options) { + nativeSetCircleOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the CircleTranslate property * * @return property wrapper value around Float[] @@ -158,6 +231,24 @@ public class CircleLayer extends Layer { } /** + * Get the CircleTranslate property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getCircleTranslateTransition() { + return nativeGetCircleTranslateTransition(); + } + + /** + * Set the CircleTranslate property transition options + * + * @param options transition options for Float[] + */ + public void setCircleTranslateTransition(TransitionOptions options) { + nativeSetCircleTranslateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the CircleTranslateAnchor property * * @return property wrapper value around String @@ -188,6 +279,24 @@ public class CircleLayer extends Layer { } /** + * Get the CircleStrokeWidth property transition options + * + * @return transition options for Float + */ + public TransitionOptions getCircleStrokeWidthTransition() { + return nativeGetCircleStrokeWidthTransition(); + } + + /** + * Set the CircleStrokeWidth property transition options + * + * @param options transition options for Float + */ + public void setCircleStrokeWidthTransition(TransitionOptions options) { + nativeSetCircleStrokeWidthTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the CircleStrokeColor property * * @return property wrapper value around String @@ -213,6 +322,23 @@ public class CircleLayer extends Layer { } } + /** + * Get the CircleStrokeColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getCircleStrokeColorTransition() { + return nativeGetCircleStrokeColorTransition(); + } + + /** + * Set the CircleStrokeColor property transition options + * + * @param options transition options for String + */ + public void setCircleStrokeColorTransition(TransitionOptions options) { + nativeSetCircleStrokeColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the CircleStrokeOpacity property @@ -224,26 +350,75 @@ public class CircleLayer extends Layer { return (PropertyValue<Float>) new PropertyValue("circle-stroke-opacity", nativeGetCircleStrokeOpacity()); } + /** + * Get the CircleStrokeOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getCircleStrokeOpacityTransition() { + return nativeGetCircleStrokeOpacityTransition(); + } + + /** + * Set the CircleStrokeOpacity property transition options + * + * @param options transition options for Float + */ + public void setCircleStrokeOpacityTransition(TransitionOptions options) { + nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay()); + } + private native Object nativeGetCircleRadius(); + private native TransitionOptions nativeGetCircleRadiusTransition(); + + private native void nativeSetCircleRadiusTransition(long duration, long delay); + private native Object nativeGetCircleColor(); + private native TransitionOptions nativeGetCircleColorTransition(); + + private native void nativeSetCircleColorTransition(long duration, long delay); + private native Object nativeGetCircleBlur(); + private native TransitionOptions nativeGetCircleBlurTransition(); + + private native void nativeSetCircleBlurTransition(long duration, long delay); + private native Object nativeGetCircleOpacity(); + private native TransitionOptions nativeGetCircleOpacityTransition(); + + private native void nativeSetCircleOpacityTransition(long duration, long delay); + private native Object nativeGetCircleTranslate(); + private native TransitionOptions nativeGetCircleTranslateTransition(); + + private native void nativeSetCircleTranslateTransition(long duration, long delay); + private native Object nativeGetCircleTranslateAnchor(); private native Object nativeGetCirclePitchScale(); private native Object nativeGetCircleStrokeWidth(); + private native TransitionOptions nativeGetCircleStrokeWidthTransition(); + + private native void nativeSetCircleStrokeWidthTransition(long duration, long delay); + private native Object nativeGetCircleStrokeColor(); + private native TransitionOptions nativeGetCircleStrokeColorTransition(); + + private native void nativeSetCircleStrokeColorTransition(long duration, long delay); + private native Object nativeGetCircleStrokeOpacity(); + private native TransitionOptions nativeGetCircleStrokeOpacityTransition(); + + private native void nativeSetCircleStrokeOpacityTransition(long duration, long delay); @Override protected native void finalize() throws Throwable; 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 8989f3a2ec..b765aa6642 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * A filled polygon with an optional stroked border. * @@ -111,6 +113,24 @@ public class FillLayer extends Layer { } /** + * Get the FillOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getFillOpacityTransition() { + return nativeGetFillOpacityTransition(); + } + + /** + * Set the FillOpacity property transition options + * + * @param options transition options for Float + */ + public void setFillOpacityTransition(TransitionOptions options) { + nativeSetFillOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the FillColor property * * @return property wrapper value around String @@ -136,6 +156,23 @@ public class FillLayer extends Layer { } } + /** + * Get the FillColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getFillColorTransition() { + return nativeGetFillColorTransition(); + } + + /** + * Set the FillColor property transition options + * + * @param options transition options for String + */ + public void setFillColorTransition(TransitionOptions options) { + nativeSetFillColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the FillOutlineColor property @@ -163,6 +200,23 @@ public class FillLayer extends Layer { } } + /** + * Get the FillOutlineColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getFillOutlineColorTransition() { + return nativeGetFillOutlineColorTransition(); + } + + /** + * Set the FillOutlineColor property transition options + * + * @param options transition options for String + */ + public void setFillOutlineColorTransition(TransitionOptions options) { + nativeSetFillOutlineColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the FillTranslate property @@ -175,6 +229,24 @@ public class FillLayer extends Layer { } /** + * Get the FillTranslate property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getFillTranslateTransition() { + return nativeGetFillTranslateTransition(); + } + + /** + * Set the FillTranslate property transition options + * + * @param options transition options for Float[] + */ + public void setFillTranslateTransition(TransitionOptions options) { + nativeSetFillTranslateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the FillTranslateAnchor property * * @return property wrapper value around String @@ -194,20 +266,57 @@ public class FillLayer extends Layer { return (PropertyValue<String>) new PropertyValue("fill-pattern", nativeGetFillPattern()); } + /** + * Get the FillPattern property transition options + * + * @return transition options for String + */ + public TransitionOptions getFillPatternTransition() { + return nativeGetFillPatternTransition(); + } + + /** + * Set the FillPattern property transition options + * + * @param options transition options for String + */ + public void setFillPatternTransition(TransitionOptions options) { + nativeSetFillPatternTransition(options.getDuration(), options.getDelay()); + } + private native Object nativeGetFillAntialias(); private native Object nativeGetFillOpacity(); + private native TransitionOptions nativeGetFillOpacityTransition(); + + private native void nativeSetFillOpacityTransition(long duration, long delay); + private native Object nativeGetFillColor(); + private native TransitionOptions nativeGetFillColorTransition(); + + private native void nativeSetFillColorTransition(long duration, long delay); + private native Object nativeGetFillOutlineColor(); + private native TransitionOptions nativeGetFillOutlineColorTransition(); + + private native void nativeSetFillOutlineColorTransition(long duration, long delay); + private native Object nativeGetFillTranslate(); + private native TransitionOptions nativeGetFillTranslateTransition(); + + private native void nativeSetFillTranslateTransition(long duration, long delay); + private native Object nativeGetFillTranslateAnchor(); private native Object nativeGetFillPattern(); + private native TransitionOptions nativeGetFillPatternTransition(); + + private native void nativeSetFillPatternTransition(long duration, long delay); @Override protected native void finalize() throws Throwable; 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 6992c22ace..575b582988 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * A stroked line. * @@ -141,6 +143,24 @@ public class LineLayer extends Layer { } /** + * Get the LineOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getLineOpacityTransition() { + return nativeGetLineOpacityTransition(); + } + + /** + * Set the LineOpacity property transition options + * + * @param options transition options for Float + */ + public void setLineOpacityTransition(TransitionOptions options) { + nativeSetLineOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineColor property * * @return property wrapper value around String @@ -166,6 +186,23 @@ public class LineLayer extends Layer { } } + /** + * Get the LineColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getLineColorTransition() { + return nativeGetLineColorTransition(); + } + + /** + * Set the LineColor property transition options + * + * @param options transition options for String + */ + public void setLineColorTransition(TransitionOptions options) { + nativeSetLineColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the LineTranslate property @@ -178,6 +215,24 @@ public class LineLayer extends Layer { } /** + * Get the LineTranslate property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getLineTranslateTransition() { + return nativeGetLineTranslateTransition(); + } + + /** + * Set the LineTranslate property transition options + * + * @param options transition options for Float[] + */ + public void setLineTranslateTransition(TransitionOptions options) { + nativeSetLineTranslateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineTranslateAnchor property * * @return property wrapper value around String @@ -198,6 +253,24 @@ public class LineLayer extends Layer { } /** + * Get the LineWidth property transition options + * + * @return transition options for Float + */ + public TransitionOptions getLineWidthTransition() { + return nativeGetLineWidthTransition(); + } + + /** + * Set the LineWidth property transition options + * + * @param options transition options for Float + */ + public void setLineWidthTransition(TransitionOptions options) { + nativeSetLineWidthTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineGapWidth property * * @return property wrapper value around Float @@ -208,6 +281,24 @@ public class LineLayer extends Layer { } /** + * Get the LineGapWidth property transition options + * + * @return transition options for Float + */ + public TransitionOptions getLineGapWidthTransition() { + return nativeGetLineGapWidthTransition(); + } + + /** + * Set the LineGapWidth property transition options + * + * @param options transition options for Float + */ + public void setLineGapWidthTransition(TransitionOptions options) { + nativeSetLineGapWidthTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineOffset property * * @return property wrapper value around Float @@ -218,6 +309,24 @@ public class LineLayer extends Layer { } /** + * Get the LineOffset property transition options + * + * @return transition options for Float + */ + public TransitionOptions getLineOffsetTransition() { + return nativeGetLineOffsetTransition(); + } + + /** + * Set the LineOffset property transition options + * + * @param options transition options for Float + */ + public void setLineOffsetTransition(TransitionOptions options) { + nativeSetLineOffsetTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineBlur property * * @return property wrapper value around Float @@ -228,6 +337,24 @@ public class LineLayer extends Layer { } /** + * Get the LineBlur property transition options + * + * @return transition options for Float + */ + public TransitionOptions getLineBlurTransition() { + return nativeGetLineBlurTransition(); + } + + /** + * Set the LineBlur property transition options + * + * @param options transition options for Float + */ + public void setLineBlurTransition(TransitionOptions options) { + nativeSetLineBlurTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LineDasharray property * * @return property wrapper value around Float[] @@ -238,6 +365,24 @@ public class LineLayer extends Layer { } /** + * Get the LineDasharray property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getLineDasharrayTransition() { + return nativeGetLineDasharrayTransition(); + } + + /** + * Set the LineDasharray property transition options + * + * @param options transition options for Float[] + */ + public void setLineDasharrayTransition(TransitionOptions options) { + nativeSetLineDasharrayTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the LinePattern property * * @return property wrapper value around String @@ -247,6 +392,24 @@ public class LineLayer extends Layer { return (PropertyValue<String>) new PropertyValue("line-pattern", nativeGetLinePattern()); } + /** + * Get the LinePattern property transition options + * + * @return transition options for String + */ + public TransitionOptions getLinePatternTransition() { + return nativeGetLinePatternTransition(); + } + + /** + * Set the LinePattern property transition options + * + * @param options transition options for String + */ + public void setLinePatternTransition(TransitionOptions options) { + nativeSetLinePatternTransition(options.getDuration(), options.getDelay()); + } + private native Object nativeGetLineCap(); private native Object nativeGetLineJoin(); @@ -257,24 +420,59 @@ public class LineLayer extends Layer { private native Object nativeGetLineOpacity(); + private native TransitionOptions nativeGetLineOpacityTransition(); + + private native void nativeSetLineOpacityTransition(long duration, long delay); + private native Object nativeGetLineColor(); + private native TransitionOptions nativeGetLineColorTransition(); + + private native void nativeSetLineColorTransition(long duration, long delay); + private native Object nativeGetLineTranslate(); + private native TransitionOptions nativeGetLineTranslateTransition(); + + private native void nativeSetLineTranslateTransition(long duration, long delay); + private native Object nativeGetLineTranslateAnchor(); private native Object nativeGetLineWidth(); + private native TransitionOptions nativeGetLineWidthTransition(); + + private native void nativeSetLineWidthTransition(long duration, long delay); + private native Object nativeGetLineGapWidth(); + private native TransitionOptions nativeGetLineGapWidthTransition(); + + private native void nativeSetLineGapWidthTransition(long duration, long delay); + private native Object nativeGetLineOffset(); + private native TransitionOptions nativeGetLineOffsetTransition(); + + private native void nativeSetLineOffsetTransition(long duration, long delay); + private native Object nativeGetLineBlur(); + private native TransitionOptions nativeGetLineBlurTransition(); + + private native void nativeSetLineBlurTransition(long duration, long delay); + private native Object nativeGetLineDasharray(); + private native TransitionOptions nativeGetLineDasharrayTransition(); + + private native void nativeSetLineDasharrayTransition(long duration, long delay); + private native Object nativeGetLinePattern(); + private native TransitionOptions nativeGetLinePatternTransition(); + + private native void nativeSetLinePatternTransition(long duration, long delay); @Override protected native void finalize() throws Throwable; 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 1871686429..e67e71b61d 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * Raster map textures such as satellite imagery. * @@ -81,6 +83,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterOpacityTransition() { + return nativeGetRasterOpacityTransition(); + } + + /** + * Set the RasterOpacity property transition options + * + * @param options transition options for Float + */ + public void setRasterOpacityTransition(TransitionOptions options) { + nativeSetRasterOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterHueRotate property * * @return property wrapper value around Float @@ -91,6 +111,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterHueRotate property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterHueRotateTransition() { + return nativeGetRasterHueRotateTransition(); + } + + /** + * Set the RasterHueRotate property transition options + * + * @param options transition options for Float + */ + public void setRasterHueRotateTransition(TransitionOptions options) { + nativeSetRasterHueRotateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterBrightnessMin property * * @return property wrapper value around Float @@ -101,6 +139,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterBrightnessMin property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterBrightnessMinTransition() { + return nativeGetRasterBrightnessMinTransition(); + } + + /** + * Set the RasterBrightnessMin property transition options + * + * @param options transition options for Float + */ + public void setRasterBrightnessMinTransition(TransitionOptions options) { + nativeSetRasterBrightnessMinTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterBrightnessMax property * * @return property wrapper value around Float @@ -111,6 +167,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterBrightnessMax property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterBrightnessMaxTransition() { + return nativeGetRasterBrightnessMaxTransition(); + } + + /** + * Set the RasterBrightnessMax property transition options + * + * @param options transition options for Float + */ + public void setRasterBrightnessMaxTransition(TransitionOptions options) { + nativeSetRasterBrightnessMaxTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterSaturation property * * @return property wrapper value around Float @@ -121,6 +195,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterSaturation property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterSaturationTransition() { + return nativeGetRasterSaturationTransition(); + } + + /** + * Set the RasterSaturation property transition options + * + * @param options transition options for Float + */ + public void setRasterSaturationTransition(TransitionOptions options) { + nativeSetRasterSaturationTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterContrast property * * @return property wrapper value around Float @@ -131,6 +223,24 @@ public class RasterLayer extends Layer { } /** + * Get the RasterContrast property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterContrastTransition() { + return nativeGetRasterContrastTransition(); + } + + /** + * Set the RasterContrast property transition options + * + * @param options transition options for Float + */ + public void setRasterContrastTransition(TransitionOptions options) { + nativeSetRasterContrastTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the RasterFadeDuration property * * @return property wrapper value around Float @@ -140,20 +250,65 @@ public class RasterLayer extends Layer { return (PropertyValue<Float>) new PropertyValue("raster-fade-duration", nativeGetRasterFadeDuration()); } + /** + * Get the RasterFadeDuration property transition options + * + * @return transition options for Float + */ + public TransitionOptions getRasterFadeDurationTransition() { + return nativeGetRasterFadeDurationTransition(); + } + + /** + * Set the RasterFadeDuration property transition options + * + * @param options transition options for Float + */ + public void setRasterFadeDurationTransition(TransitionOptions options) { + nativeSetRasterFadeDurationTransition(options.getDuration(), options.getDelay()); + } + private native Object nativeGetRasterOpacity(); + private native TransitionOptions nativeGetRasterOpacityTransition(); + + private native void nativeSetRasterOpacityTransition(long duration, long delay); + private native Object nativeGetRasterHueRotate(); + private native TransitionOptions nativeGetRasterHueRotateTransition(); + + private native void nativeSetRasterHueRotateTransition(long duration, long delay); + private native Object nativeGetRasterBrightnessMin(); + private native TransitionOptions nativeGetRasterBrightnessMinTransition(); + + private native void nativeSetRasterBrightnessMinTransition(long duration, long delay); + private native Object nativeGetRasterBrightnessMax(); + private native TransitionOptions nativeGetRasterBrightnessMaxTransition(); + + private native void nativeSetRasterBrightnessMaxTransition(long duration, long delay); + private native Object nativeGetRasterSaturation(); + private native TransitionOptions nativeGetRasterSaturationTransition(); + + private native void nativeSetRasterSaturationTransition(long duration, long delay); + private native Object nativeGetRasterContrast(); + private native TransitionOptions nativeGetRasterContrastTransition(); + + private native void nativeSetRasterContrastTransition(long duration, long delay); + private native Object nativeGetRasterFadeDuration(); + private native TransitionOptions nativeGetRasterFadeDurationTransition(); + + private native void nativeSetRasterFadeDurationTransition(long duration, long delay); @Override protected native void finalize() throws Throwable; 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 c1efdc9636..318991c032 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 @@ -8,6 +8,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * An icon or a text label. * @@ -441,6 +443,24 @@ public class SymbolLayer extends Layer { } /** + * Get the IconOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getIconOpacityTransition() { + return nativeGetIconOpacityTransition(); + } + + /** + * Set the IconOpacity property transition options + * + * @param options transition options for Float + */ + public void setIconOpacityTransition(TransitionOptions options) { + nativeSetIconOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the IconColor property * * @return property wrapper value around String @@ -466,6 +486,23 @@ public class SymbolLayer extends Layer { } } + /** + * Get the IconColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getIconColorTransition() { + return nativeGetIconColorTransition(); + } + + /** + * Set the IconColor property transition options + * + * @param options transition options for String + */ + public void setIconColorTransition(TransitionOptions options) { + nativeSetIconColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the IconHaloColor property @@ -493,6 +530,23 @@ public class SymbolLayer extends Layer { } } + /** + * Get the IconHaloColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getIconHaloColorTransition() { + return nativeGetIconHaloColorTransition(); + } + + /** + * Set the IconHaloColor property transition options + * + * @param options transition options for String + */ + public void setIconHaloColorTransition(TransitionOptions options) { + nativeSetIconHaloColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the IconHaloWidth property @@ -505,6 +559,24 @@ public class SymbolLayer extends Layer { } /** + * Get the IconHaloWidth property transition options + * + * @return transition options for Float + */ + public TransitionOptions getIconHaloWidthTransition() { + return nativeGetIconHaloWidthTransition(); + } + + /** + * Set the IconHaloWidth property transition options + * + * @param options transition options for Float + */ + public void setIconHaloWidthTransition(TransitionOptions options) { + nativeSetIconHaloWidthTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the IconHaloBlur property * * @return property wrapper value around Float @@ -515,6 +587,24 @@ public class SymbolLayer extends Layer { } /** + * Get the IconHaloBlur property transition options + * + * @return transition options for Float + */ + public TransitionOptions getIconHaloBlurTransition() { + return nativeGetIconHaloBlurTransition(); + } + + /** + * Set the IconHaloBlur property transition options + * + * @param options transition options for Float + */ + public void setIconHaloBlurTransition(TransitionOptions options) { + nativeSetIconHaloBlurTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the IconTranslate property * * @return property wrapper value around Float[] @@ -525,6 +615,24 @@ public class SymbolLayer extends Layer { } /** + * Get the IconTranslate property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getIconTranslateTransition() { + return nativeGetIconTranslateTransition(); + } + + /** + * Set the IconTranslate property transition options + * + * @param options transition options for Float[] + */ + public void setIconTranslateTransition(TransitionOptions options) { + nativeSetIconTranslateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the IconTranslateAnchor property * * @return property wrapper value around String @@ -545,6 +653,24 @@ public class SymbolLayer extends Layer { } /** + * Get the TextOpacity property transition options + * + * @return transition options for Float + */ + public TransitionOptions getTextOpacityTransition() { + return nativeGetTextOpacityTransition(); + } + + /** + * Set the TextOpacity property transition options + * + * @param options transition options for Float + */ + public void setTextOpacityTransition(TransitionOptions options) { + nativeSetTextOpacityTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the TextColor property * * @return property wrapper value around String @@ -570,6 +696,23 @@ public class SymbolLayer extends Layer { } } + /** + * Get the TextColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getTextColorTransition() { + return nativeGetTextColorTransition(); + } + + /** + * Set the TextColor property transition options + * + * @param options transition options for String + */ + public void setTextColorTransition(TransitionOptions options) { + nativeSetTextColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the TextHaloColor property @@ -597,6 +740,23 @@ public class SymbolLayer extends Layer { } } + /** + * Get the TextHaloColor property transition options + * + * @return transition options for String + */ + public TransitionOptions getTextHaloColorTransition() { + return nativeGetTextHaloColorTransition(); + } + + /** + * Set the TextHaloColor property transition options + * + * @param options transition options for String + */ + public void setTextHaloColorTransition(TransitionOptions options) { + nativeSetTextHaloColorTransition(options.getDuration(), options.getDelay()); + } /** * Get the TextHaloWidth property @@ -609,6 +769,24 @@ public class SymbolLayer extends Layer { } /** + * Get the TextHaloWidth property transition options + * + * @return transition options for Float + */ + public TransitionOptions getTextHaloWidthTransition() { + return nativeGetTextHaloWidthTransition(); + } + + /** + * Set the TextHaloWidth property transition options + * + * @param options transition options for Float + */ + public void setTextHaloWidthTransition(TransitionOptions options) { + nativeSetTextHaloWidthTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the TextHaloBlur property * * @return property wrapper value around Float @@ -619,6 +797,24 @@ public class SymbolLayer extends Layer { } /** + * Get the TextHaloBlur property transition options + * + * @return transition options for Float + */ + public TransitionOptions getTextHaloBlurTransition() { + return nativeGetTextHaloBlurTransition(); + } + + /** + * Set the TextHaloBlur property transition options + * + * @param options transition options for Float + */ + public void setTextHaloBlurTransition(TransitionOptions options) { + nativeSetTextHaloBlurTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the TextTranslate property * * @return property wrapper value around Float[] @@ -629,6 +825,24 @@ public class SymbolLayer extends Layer { } /** + * Get the TextTranslate property transition options + * + * @return transition options for Float[] + */ + public TransitionOptions getTextTranslateTransition() { + return nativeGetTextTranslateTransition(); + } + + /** + * Set the TextTranslate property transition options + * + * @param options transition options for Float[] + */ + public void setTextTranslateTransition(TransitionOptions options) { + nativeSetTextTranslateTransition(options.getDuration(), options.getDelay()); + } + + /** * Get the TextTranslateAnchor property * * @return property wrapper value around String @@ -708,32 +922,79 @@ public class SymbolLayer extends Layer { private native Object nativeGetIconOpacity(); + private native TransitionOptions nativeGetIconOpacityTransition(); + + private native void nativeSetIconOpacityTransition(long duration, long delay); + private native Object nativeGetIconColor(); + private native TransitionOptions nativeGetIconColorTransition(); + + private native void nativeSetIconColorTransition(long duration, long delay); + private native Object nativeGetIconHaloColor(); + private native TransitionOptions nativeGetIconHaloColorTransition(); + + private native void nativeSetIconHaloColorTransition(long duration, long delay); + private native Object nativeGetIconHaloWidth(); + private native TransitionOptions nativeGetIconHaloWidthTransition(); + + private native void nativeSetIconHaloWidthTransition(long duration, long delay); + private native Object nativeGetIconHaloBlur(); + private native TransitionOptions nativeGetIconHaloBlurTransition(); + + private native void nativeSetIconHaloBlurTransition(long duration, long delay); + private native Object nativeGetIconTranslate(); + private native TransitionOptions nativeGetIconTranslateTransition(); + + private native void nativeSetIconTranslateTransition(long duration, long delay); + private native Object nativeGetIconTranslateAnchor(); private native Object nativeGetTextOpacity(); + private native TransitionOptions nativeGetTextOpacityTransition(); + + private native void nativeSetTextOpacityTransition(long duration, long delay); + private native Object nativeGetTextColor(); + private native TransitionOptions nativeGetTextColorTransition(); + + private native void nativeSetTextColorTransition(long duration, long delay); + private native Object nativeGetTextHaloColor(); + private native TransitionOptions nativeGetTextHaloColorTransition(); + + private native void nativeSetTextHaloColorTransition(long duration, long delay); + private native Object nativeGetTextHaloWidth(); + private native TransitionOptions nativeGetTextHaloWidthTransition(); + + private native void nativeSetTextHaloWidthTransition(long duration, long delay); + private native Object nativeGetTextHaloBlur(); + private native TransitionOptions nativeGetTextHaloBlurTransition(); + + private native void nativeSetTextHaloBlurTransition(long duration, long delay); + private native Object nativeGetTextTranslate(); - private native Object nativeGetTextTranslateAnchor(); + private native TransitionOptions nativeGetTextTranslateTransition(); + private native void nativeSetTextTranslateTransition(long duration, long delay); + + private native Object nativeGetTextTranslateAnchor(); @Override protected native void finalize() throws Throwable; 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 new file mode 100644 index 0000000000..a46c11b35c --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java @@ -0,0 +1,56 @@ +package com.mapbox.mapboxsdk.style.layers; + +public class TransitionOptions { + + private long duration; + private long delay; + + public TransitionOptions(long duration, long delay) { + this.duration = duration; + this.delay = delay; + } + + public static TransitionOptions fromTransitionOptions(long duration, long delay) { + return new TransitionOptions(duration, delay); + } + + public long getDuration() { + return duration; + } + + public long getDelay() { + return delay; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + TransitionOptions that = (TransitionOptions) o; + + if (duration != that.duration) { + return false; + } + return delay == that.delay; + } + + @Override + public int hashCode() { + int result = (int) (duration ^ (duration >>> 32)); + result = 31 * result + (int) (delay ^ (delay >>> 32)); + return result; + } + + @Override + public String toString() { + return "TransitionOptions{" + + "duration=" + duration + + ", delay=" + delay + + '}'; + } +} 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 5eab4c355e..316b3aeac1 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 @@ -13,6 +13,8 @@ import android.support.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + /** * <%- doc %> * @@ -110,8 +112,8 @@ public class <%- camelize(type) %>Layer extends Layer { } // Property getters - <% for (const property of properties) { -%> + /** * Get the <%- camelize(property.name) %> property * @@ -138,15 +140,39 @@ public class <%- camelize(type) %>Layer extends Layer { throw new RuntimeException("<%- property.name %> was set as a Function"); } } - <% } -%> +<% if (property.transition) { -%> + + /** + * Get the <%- camelize(property.name) %> property transition options + * + * @return transition options for <%- propertyType(property) %> + */ + public TransitionOptions get<%- camelize(property.name) %>Transition() { + return nativeGet<%- camelize(property.name) %>Transition(); + } + /** + * Set the <%- camelize(property.name) %> property transition options + * + * @param options transition options for <%- propertyType(property) %> + */ + public void set<%- camelize(property.name) %>Transition(TransitionOptions options) { + nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay()); + } <% } -%> +<% } -%> + <% for (const property of properties) { -%> private native Object nativeGet<%- camelize(property.name) %>(); -<% } -%> +<% if (property.transition) { -%> + private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); + + private native void nativeSet<%- camelize(property.name) %>Transition(long duration, long delay); +<% } -%> +<% } -%> @Override protected native void finalize() throws Throwable; |