diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-02-09 17:34:28 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-09 11:16:26 -0600 |
commit | c65e8bfa62907fe27f23952f6ae949736c52c6c0 (patch) | |
tree | b9fb2401627bdc67c3eb042dc109f9c52dafaf17 /platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox | |
parent | f35ca0d9dfc8a6ba88273edbeda43e633ae0adce (diff) | |
download | qtlocation-mapboxgl-c65e8bfa62907fe27f23952f6ae949736c52c6c0.tar.gz |
[android] Refactor composite stop types and conversions
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox')
7 files changed, 115 insertions, 153 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java index 4637989dd5..510f477bce 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.BackgroundLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java index db64246f7d..c48a6f1d68 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.CircleLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; @@ -215,17 +213,15 @@ public class CircleLayerTest extends BaseStyleTest { assertNotNull(layer.getCircleRadius().getFunction()); assertEquals(CompositeFunction.class, layer.getCircleRadius().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleRadius().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getCircleRadius().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getCircleRadius().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getCircleRadius().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleRadius().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -479,17 +475,15 @@ public class CircleLayerTest extends BaseStyleTest { assertNotNull(layer.getCircleBlur().getFunction()); assertEquals(CompositeFunction.class, layer.getCircleBlur().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleBlur().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getCircleBlur().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getCircleBlur().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getCircleBlur().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleBlur().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -624,17 +618,15 @@ public class CircleLayerTest extends BaseStyleTest { assertNotNull(layer.getCircleOpacity().getFunction()); assertEquals(CompositeFunction.class, layer.getCircleOpacity().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleOpacity().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getCircleOpacity().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getCircleOpacity().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getCircleOpacity().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleOpacity().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -878,17 +870,15 @@ public class CircleLayerTest extends BaseStyleTest { assertNotNull(layer.getCircleStrokeWidth().getFunction()); assertEquals(CompositeFunction.class, layer.getCircleStrokeWidth().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeWidth().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getCircleStrokeWidth().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getCircleStrokeWidth().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeWidth().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -1142,17 +1132,15 @@ public class CircleLayerTest extends BaseStyleTest { assertNotNull(layer.getCircleStrokeOpacity().getFunction()); assertEquals(CompositeFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getCircleStrokeOpacity().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeOpacity().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java index 40a9ddec58..dd59b97525 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.FillLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; @@ -251,17 +249,15 @@ public class FillLayerTest extends BaseStyleTest { assertNotNull(layer.getFillOpacity().getFunction()); assertEquals(CompositeFunction.class, layer.getFillOpacity().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillOpacity().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getFillOpacity().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getFillOpacity().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getFillOpacity().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillOpacity().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java index 7ac23daa66..740393ad36 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.LineLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; @@ -361,17 +359,15 @@ public class LineLayerTest extends BaseStyleTest { assertNotNull(layer.getLineOpacity().getFunction()); assertEquals(CompositeFunction.class, layer.getLineOpacity().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOpacity().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getLineOpacity().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getLineOpacity().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getLineOpacity().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOpacity().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -735,17 +731,15 @@ public class LineLayerTest extends BaseStyleTest { assertNotNull(layer.getLineGapWidth().getFunction()); assertEquals(CompositeFunction.class, layer.getLineGapWidth().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineGapWidth().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getLineGapWidth().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getLineGapWidth().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getLineGapWidth().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineGapWidth().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -880,17 +874,15 @@ public class LineLayerTest extends BaseStyleTest { assertNotNull(layer.getLineOffset().getFunction()); assertEquals(CompositeFunction.class, layer.getLineOffset().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOffset().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getLineOffset().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getLineOffset().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getLineOffset().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOffset().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test @@ -1025,17 +1017,15 @@ public class LineLayerTest extends BaseStyleTest { assertNotNull(layer.getLineBlur().getFunction()); assertEquals(CompositeFunction.class, layer.getLineBlur().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineBlur().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getLineBlur().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getLineBlur().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getLineBlur().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineBlur().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java index cc9597ab78..eb2155f545 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.RasterLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index 63bfaa8c8e..b4af1a1b1f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; import com.mapbox.mapboxsdk.testapp.R; @@ -29,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; @@ -614,17 +612,15 @@ public class SymbolLayerTest extends BaseStyleTest { assertNotNull(layer.getIconRotate().getFunction()); assertEquals(CompositeFunction.class, layer.getIconRotate().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconRotate().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.getIconRotate().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.getIconRotate().getFunction().getStops()).size()); - - CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>> stops = - (CompositeStops<Float, Float, Float, ExponentialStops<Float, Float>>) layer.getIconRotate().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<Float, Float>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops = + (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconRotate().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs index 03499be394..4d2aec9ddf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs @@ -17,10 +17,10 @@ import com.mapbox.mapboxsdk.style.functions.CompositeFunction; import com.mapbox.mapboxsdk.style.functions.CameraFunction; import com.mapbox.mapboxsdk.style.functions.SourceFunction; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer; import com.mapbox.mapboxsdk.testapp.R; @@ -33,8 +33,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Map; - import static com.mapbox.mapboxsdk.style.functions.Function.*; import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop; import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*; @@ -319,17 +317,15 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest { assertNotNull(layer.get<%- camelize(property.name) %>().getFunction()); assertEquals(CompositeFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass()); assertEquals("FeaturePropertyA", ((CompositeFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty()); - assertEquals(CompositeStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass()); - assertEquals(1, ((CompositeStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size()); - - CompositeStops<Float, <%- propertyType(property) %>, <%- propertyType(property) %>, ExponentialStops<<%- propertyType(property) %>, <%- propertyType(property) %>>> stops = - (CompositeStops<Float, <%- propertyType(property) %>, <%- propertyType(property) %>, ExponentialStops<<%- propertyType(property) %>, <%- propertyType(property) %>>>) layer.get<%- camelize(property.name) %>().getFunction().getStops(); - Map.Entry<Float, ExponentialStops<<%- propertyType(property) %>, <%- propertyType(property) %>>> stop = stops.iterator().next(); - assertEquals(ExponentialStops.class, stop.getValue().getClass()); - assertEquals(0f, stop.getKey(), 0.001); - assertEquals(1, stop.getValue().size()); - assertEquals(0.3f, stop.getValue().iterator().next().in, 0.001f); - assertEquals(0.9f, stop.getValue().iterator().next().out, 0.001f); + assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass()); + assertEquals(1, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size()); + + ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stops = + (ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>>) layer.get<%- camelize(property.name) %>().getFunction().getStops(); + Stop<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stop = stops.iterator().next(); + assertEquals(0f, stop.in.zoom, 0.001); + assertEquals(0.3f, stop.in.value, 0.001f); + assertEquals(0.9f, stop.out, 0.001f); } <% } -%> <% } -%> |