[core] Update shaders.

Implements 'icon-pitch-alignment' (issue #9345)
Fixes issue #9456 (map-aligned point label regression)

1 files changed, 32 insertions, 22 deletions

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 84f4c16801..559e446307 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
@@ -1052,11 +1052,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-alignment");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
-    assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
+        // Set and Get
+        layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
+        assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
+      }
+    });
   }
 
   @Test
@@ -1064,25 +1069,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-alignment");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circlePitchAlignment(
-        zoom(
-          interval(
-            stop(2, circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circlePitchAlignment(
+            zoom(
+              interval(
+                stop(2, circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCirclePitchAlignment());
-    assertNotNull(layer.getCirclePitchAlignment().getFunction());
-    assertEquals(CameraFunction.class, layer.getCirclePitchAlignment().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getCirclePitchAlignment().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getCirclePitchAlignment().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getCirclePitchAlignment());
+        assertNotNull(layer.getCirclePitchAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getCirclePitchAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getCirclePitchAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getCirclePitchAlignment().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test