Merge branch 'release-ios-v3.6.0-android-v5.1.0'

# Conflicts:
#	.travis.yml
#	circle.yml
#	cmake/core-files.cmake
#	include/mbgl/style/function/composite_function.hpp
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
#	platform/android/dependencies.gradle
#	platform/android/src/native_map_view.cpp
#	platform/darwin/scripts/generate-style-code.js
#	platform/darwin/src/MGLGeometry_Private.h
#	platform/darwin/src/MGLLight.h
#	platform/darwin/src/MGLLight.mm
#	platform/darwin/src/MGLSource.h
#	platform/darwin/src/MGLStyle.h
#	platform/darwin/src/MGLStyle.mm
#	platform/darwin/test/MGLLightTest.mm
#	platform/default/default_file_source.cpp
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf
#	platform/macos/CHANGELOG.md
#	scripts/generate-shaders.js
#	src/mbgl/layout/symbol_layout.cpp
#	src/mbgl/programs/program.hpp
#	src/mbgl/programs/symbol_program.hpp
#	src/mbgl/programs/uniforms.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/renderer/paint_property_binder.hpp
#	src/mbgl/shaders/line.cpp
#	src/mbgl/shaders/line_pattern.cpp
#	src/mbgl/shaders/line_sdf.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/style/layers/line_layer_properties.hpp
#	src/mbgl/style/sources/geojson_source.cpp
#	src/mbgl/style/style.cpp
#	src/mbgl/text/glyph_atlas.hpp
#	src/mbgl/tile/geometry_tile.cpp
#	src/mbgl/tile/geometry_tile.hpp
#	test/style/style.test.cpp

1 files changed, 78 insertions, 44 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
index 36833fb4ee..88da6e45be 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
@@ -6,6 +6,7 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.functions.Function;
 import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
@@ -13,6 +14,7 @@ import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.style.light.Position;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.FillExtrusionStyleTestActivity;
 
@@ -32,6 +34,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionCol
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
 
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 
@@ -43,89 +46,120 @@ public class LightTest extends BaseActivityTest {
   @Test
   public void testAnchor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("anchor");
-    assertNotNull(light);
-    // Set and Get
-    light.setAnchor(ANCHOR_MAP);
-    assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setAnchor(ANCHOR_MAP);
+        assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+      }
+    });
   }
 
   @Test
   public void testPositionTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("positionTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setPositionTransition(options);
-    assertEquals("Transition options should match", options, light.getPositionTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setPositionTransition(options);
+        assertEquals("Transition options should match", options, light.getPositionTransition());
+      }
+    });
   }
 
   @Test
   public void testPosition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("position");
-    assertNotNull(light);
-
-    // Set and Get
-    Position position = new Position(1,2,3);
-    light.setPosition(position);
-    assertEquals("Position should match", position, light.getPosition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        Position position = new Position(1, 2, 3);
+        light.setPosition(position);
+        assertEquals("Position should match", position, light.getPosition());
+      }
+    });
   }
 
   @Test
   public void testColorTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("colorTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setColorTransition(options);
-    assertEquals("Transition options should match", options, light.getColorTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setColorTransition(options);
+        assertEquals("Transition options should match", options, light.getColorTransition());
+      }
+    });
   }
 
   @Test
   public void testColor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("color");
-    assertNotNull(light);
-    // Set and Get
-    light.setColor("rgba(0, 0, 0, 1)");
-    assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+",""), light.getColor());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setColor("rgba(0, 0, 0, 1)");
+        assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+", ""), light.getColor());
+      }
+    });
   }
 
   @Test
   public void testIntensityTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensityTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setIntensityTransition(options);
-    assertEquals("Transition options should match", options, light.getIntensityTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setIntensityTransition(options);
+        assertEquals("Transition options should match", options, light.getIntensityTransition());
+      }
+    });
   }
 
   @Test
   public void testIntensity() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensity");
-    assertNotNull(light);
-    // Set and Get
-    light.setIntensity(0.3f);
-    assertEquals("Intensity should match", 0.3f, light.getIntensity());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setIntensity(0.3f);
+        assertEquals("Intensity should match", 0.3f, light.getIntensity());
+      }
+    });
   }
 
-  private void setupLayer() {
+  private void setupLight() {
     onView(withId(R.id.mapView)).perform(new ViewAction() {
       @Override
       public Matcher<View> getConstraints() {