[android] data driven style implementation

1 files changed, 203 insertions, 93 deletions

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 5d230a1c47..cc9597ab78 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
@@ -1,11 +1,23 @@
-package com.mapbox.mapboxsdk.testapp.style;
 // This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
 
+package com.mapbox.mapboxsdk.testapp.style;
+
+import android.graphics.Color;
 import android.support.test.espresso.Espresso;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
+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.Stops;
 import com.mapbox.mapboxsdk.style.layers.RasterLayer;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
@@ -17,20 +29,14 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
+import java.util.Map;
 
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterBrightnessMax;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterBrightnessMin;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterContrast;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterFadeDuration;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterHueRotate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterSaturation;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+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.*;
+import static org.junit.Assert.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
 
 /**
  * Basic smoke tests for RasterLayer
@@ -51,12 +57,6 @@ public class RasterLayerTest extends BaseStyleTest {
   public void setup() {
     idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
     Espresso.registerIdlingResources(idlingResource);
-  }
-
-  @Test
-  public void testSetVisibility() {
-    checkViewIsDisplayed(R.id.mapView);
-
     mapboxMap = rule.getActivity().getMapboxMap();
 
     if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
@@ -67,7 +67,12 @@ public class RasterLayerTest extends BaseStyleTest {
       // Layer reference is now stale, get new reference
       layer = mapboxMap.getLayerAs("my-layer");
     }
-    Timber.i("visibility");
+  }
+
+  @Test
+  public void testSetVisibility() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("Visibility");
     assertNotNull(layer);
 
     // Get initial
@@ -79,19 +84,8 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterOpacity() {
+  public void testRasterOpacityAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
-
-    mapboxMap = rule.getActivity().getMapboxMap();
-
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
     Timber.i("raster-opacity");
     assertNotNull(layer);
 
@@ -101,19 +95,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterHueRotate() {
+  public void testRasterOpacityAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-opacity");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterOpacity(
+        zoom(
+          exponential(
+            stop(2, rasterOpacity(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterOpacity());
+    assertNotNull(layer.getRasterOpacity().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterHueRotateAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-hue-rotate");
     assertNotNull(layer);
 
@@ -123,19 +132,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterBrightnessMin() {
+  public void testRasterHueRotateAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-hue-rotate");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterHueRotate(
+        zoom(
+          exponential(
+            stop(2, rasterHueRotate(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterHueRotate());
+    assertNotNull(layer.getRasterHueRotate().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterBrightnessMinAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-brightness-min");
     assertNotNull(layer);
 
@@ -145,19 +169,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterBrightnessMax() {
+  public void testRasterBrightnessMinAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-brightness-min");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterBrightnessMin(
+        zoom(
+          exponential(
+            stop(2, rasterBrightnessMin(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterBrightnessMin());
+    assertNotNull(layer.getRasterBrightnessMin().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterBrightnessMaxAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-brightness-max");
     assertNotNull(layer);
 
@@ -167,19 +206,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterSaturation() {
+  public void testRasterBrightnessMaxAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-brightness-max");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterBrightnessMax(
+        zoom(
+          exponential(
+            stop(2, rasterBrightnessMax(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterBrightnessMax());
+    assertNotNull(layer.getRasterBrightnessMax().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterSaturationAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-saturation");
     assertNotNull(layer);
 
@@ -189,19 +243,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterContrast() {
+  public void testRasterSaturationAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-saturation");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterSaturation(
+        zoom(
+          exponential(
+            stop(2, rasterSaturation(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterSaturation());
+    assertNotNull(layer.getRasterSaturation().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterContrastAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-contrast");
     assertNotNull(layer);
 
@@ -211,19 +280,34 @@ public class RasterLayerTest extends BaseStyleTest {
   }
 
   @Test
-  public void testRasterFadeDuration() {
+  public void testRasterContrastAsCameraFunction() {
     checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-contrast");
+    assertNotNull(layer);
 
-    mapboxMap = rule.getActivity().getMapboxMap();
+    // Set
+    layer.setProperties(
+      rasterContrast(
+        zoom(
+          exponential(
+            stop(2, rasterContrast(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterContrast());
+    assertNotNull(layer.getRasterContrast().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
+  }
 
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  @Test
+  public void testRasterFadeDurationAsConstant() {
+    checkViewIsDisplayed(R.id.mapView);
     Timber.i("raster-fade-duration");
     assertNotNull(layer);
 
@@ -232,6 +316,32 @@ public class RasterLayerTest extends BaseStyleTest {
     assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
   }
 
+  @Test
+  public void testRasterFadeDurationAsCameraFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("raster-fade-duration");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      rasterFadeDuration(
+        zoom(
+          exponential(
+            stop(2, rasterFadeDuration(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getRasterFadeDuration());
+    assertNotNull(layer.getRasterFadeDuration().getFunction());
+    assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
+    assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
+    assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
+    assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
+  }
+
 
   @After
   public void unregisterIntentServiceIdlingResource() {