tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - transition options for layer properties (#8509)

Browse Source 
[android] fixup highlevel bindings for transition options

finish integration
This commit is contained in:
Tobrun
2017-03-31 17:51:26 +02:00
committed by GitHub
parent 05992c47ac
commit 939526bac4
37 changed files with 2547 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
View File

@@ -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
@@ -86,6 +105,24 @@ public class BackgroundLayer extends Layer {
return (PropertyValue<String>) new PropertyValue("background-pattern", nativeGetBackgroundPattern());
}
/**
* 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
*
@@ -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;

175
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
View File

@@ -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.
*
@@ -100,6 +102,24 @@ public class CircleLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("circle-radius", nativeGetCircleRadius());
}
/**
* 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
*
@@ -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
@@ -137,6 +174,24 @@ public class CircleLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("circle-blur", nativeGetCircleBlur());
}
/**
* 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
*
@@ -147,6 +202,24 @@ public class CircleLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("circle-opacity", nativeGetCircleOpacity());
}
/**
* 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
*
@@ -157,6 +230,24 @@ public class CircleLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("circle-translate", nativeGetCircleTranslate());
}
/**
* 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
*
@@ -187,6 +278,24 @@ public class CircleLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("circle-stroke-width", nativeGetCircleStrokeWidth());
}
/**
* 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
*
@@ -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;

109
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
View File

@@ -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.
*
@@ -110,6 +112,24 @@ public class FillLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("fill-opacity", nativeGetFillOpacity());
}
/**
* 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
*
@@ -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
@@ -174,6 +228,24 @@ public class FillLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("fill-translate", nativeGetFillTranslate());
}
/**
* 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
*
@@ -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;

198
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
View File

@@ -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.
*
@@ -140,6 +142,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("line-opacity", nativeGetLineOpacity());
}
/**
* 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
*
@@ -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
@@ -177,6 +214,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("line-translate", nativeGetLineTranslate());
}
/**
* 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
*
@@ -197,6 +252,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("line-width", nativeGetLineWidth());
}
/**
* 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
*
@@ -207,6 +280,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("line-gap-width", nativeGetLineGapWidth());
}
/**
* 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
*
@@ -217,6 +308,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("line-offset", nativeGetLineOffset());
}
/**
* 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
*
@@ -227,6 +336,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("line-blur", nativeGetLineBlur());
}
/**
* 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
*
@@ -237,6 +364,24 @@ public class LineLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("line-dasharray", nativeGetLineDasharray());
}
/**
* 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
*
@@ -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;

155
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
View File

@@ -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.
*
@@ -80,6 +82,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-opacity", nativeGetRasterOpacity());
}
/**
* 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
*
@@ -90,6 +110,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-hue-rotate", nativeGetRasterHueRotate());
}
/**
* 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
*
@@ -100,6 +138,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-brightness-min", nativeGetRasterBrightnessMin());
}
/**
* 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
*
@@ -110,6 +166,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-brightness-max", nativeGetRasterBrightnessMax());
}
/**
* 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
*
@@ -120,6 +194,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-saturation", nativeGetRasterSaturation());
}
/**
* 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
*
@@ -130,6 +222,24 @@ public class RasterLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("raster-contrast", nativeGetRasterContrast());
}
/**
* 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
*
@@ -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;

263
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
View File

@@ -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.
*
@@ -440,6 +442,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("icon-opacity", nativeGetIconOpacity());
}
/**
* 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
*
@@ -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
@@ -504,6 +558,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("icon-halo-width", nativeGetIconHaloWidth());
}
/**
* 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
*
@@ -514,6 +586,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("icon-halo-blur", nativeGetIconHaloBlur());
}
/**
* 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
*
@@ -524,6 +614,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("icon-translate", nativeGetIconTranslate());
}
/**
* 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
*
@@ -544,6 +652,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("text-opacity", nativeGetTextOpacity());
}
/**
* 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
*
@@ -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
@@ -608,6 +768,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("text-halo-width", nativeGetTextHaloWidth());
}
/**
* 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
*
@@ -618,6 +796,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float>) new PropertyValue("text-halo-blur", nativeGetTextHaloBlur());
}
/**
* 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
*
@@ -628,6 +824,24 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Float[]>) new PropertyValue("text-translate", nativeGetTextTranslate());
}
/**
* 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
*
@@ -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;

56
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java Normal file
View File

@@ -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
+ '}';
}
}

32
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
View File

@@ -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;