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, 49 insertions, 57 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
index f1e2a6c418..bf8bcb9f66 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
@@ -8,6 +8,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.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
@@ -21,6 +22,7 @@ import com.mapbox.mapboxsdk.style.sources.RasterSource;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 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.RuntimeStyleTestActivity;
 
@@ -40,6 +42,7 @@ import timber.log.Timber;
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -189,63 +192,88 @@ public class RuntimeStyleTests extends BaseActivityTest {
   @Test
   public void testAddRemoveSource() {
     validateTestSetup();
-    mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-    mapboxMap.removeSource("my-source");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+        mapboxMap.removeSource("my-source");
+
+        // Add initial source
+        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+
+        // Remove
+        Source mySource = mapboxMap.removeSource("my-source");
+        assertNotNull(mySource);
+        assertNull(mapboxMap.getLayer("my-source"));
+
+        // Add
+        Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+
+        // Remove, preserving the reference
+        mapboxMap.removeSource(source);
+
+        // Re-add the reference...
+        mapboxMap.addSource(source);
+
+        // Ensure it's there
+        Assert.assertNotNull(mapboxMap.getSource(source.getId()));
+
+        // Test adding a duplicate source
+        try {
+          Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+          mapboxMap.addSource(source2);
+          fail("Should not have been allowed to add a source with a duplicate id");
+        } catch (CannotAddSourceException cannotAddSourceException) {
+          // OK
+        }
+      }
+    });
 
-    onView(withId(R.id.mapView)).perform(new AddRemoveSourceAction());
   }
 
   @Test
   public void testVectorSourceUrlGetter() {
     validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
-
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
       @Override
-      public void perform(UiController uiController, View view) {
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
         VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
         mapboxMap.addSource(source);
         assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
       }
-
     });
   }
 
   @Test
   public void testRasterSourceUrlGetter() {
     validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
-
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
       @Override
-      public void perform(UiController uiController, View view) {
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
         RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
         mapboxMap.addSource(source);
         assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
       }
-
     });
   }
 
   @Test
-  public void testGeoJsonSourceUrlGetter() {
+  public void testGeoJsonSourceUrlGetter() throws MalformedURLException {
     validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
-
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
       @Override
-      public void perform(UiController uiController, View view) {
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
         GeoJsonSource source = new GeoJsonSource("my-source");
         mapboxMap.addSource(source);
         assertNull(source.getUrl());
         try {
           source.setUrl(new URL("http://mapbox.com/my-file.json"));
-        } catch (MalformedURLException err) {
-          assertTrue(err.getMessage(), false);
+        } catch (MalformedURLException exception) {
+          fail();
         }
         assertEquals("http://mapbox.com/my-file.json", source.getUrl());
       }
-
     });
   }
 
@@ -329,42 +357,6 @@ public class RuntimeStyleTests extends BaseActivityTest {
     }
   }
 
-  private class AddRemoveSourceAction extends BaseViewAction {
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      // Add initial source
-      mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-
-      // Remove
-      Source mySource = mapboxMap.removeSource("my-source");
-      assertNotNull(mySource);
-      assertNull(mapboxMap.getLayer("my-source"));
-
-      // Add
-      Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-      mapboxMap.addSource(source);
-
-      // Remove, preserving the reference
-      mapboxMap.removeSource(source);
-
-      // Re-add the reference...
-      mapboxMap.addSource(source);
-
-      // Ensure it's there
-      Assert.assertNotNull(mapboxMap.getSource(source.getId()));
-
-      // Test adding a duplicate source
-      try {
-        Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-        mapboxMap.addSource(source2);
-        fail("Should not have been allowed to add a source with a duplicate id");
-      } catch (CannotAddSourceException cannotAddSourceException) {
-        // OK
-      }
-    }
-  }
-
   @After
   public void unregisterIntentServiceIdlingResource() {
     Espresso.unregisterIdlingResources(idlingResource);