Update shaders: get 'icon-pitch-alignment' and fix for issue #9456

include/mbgl/style/conversion/make_property_setters.hpp

@@ -45,6 +45,7 @@ auto makeLayoutPropertySetters() {
     result["icon-padding"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconPadding>;
     result["icon-keep-upright"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconKeepUpright>;
     result["icon-offset"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setIconOffset>;
+    result["icon-pitch-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setIconPitchAlignment>;
     result["text-pitch-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextPitchAlignment>;
     result["text-rotation-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextRotationAlignment>;
     result["text-field"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setTextField>;

include/mbgl/style/layers/symbol_layer.hpp

@@ -98,6 +98,10 @@ class SymbolLayer : public Layer {
     DataDrivenPropertyValue<std::array<float, 2>> getIconOffset() const;
     void setIconOffset(DataDrivenPropertyValue<std::array<float, 2>>);
 
+    static PropertyValue<AlignmentType> getDefaultIconPitchAlignment();
+    PropertyValue<AlignmentType> getIconPitchAlignment() const;
+    void setIconPitchAlignment(PropertyValue<AlignmentType>);
+
     static PropertyValue<AlignmentType> getDefaultTextPitchAlignment();
     PropertyValue<AlignmentType> getTextPitchAlignment() const;
     void setTextPitchAlignment(PropertyValue<AlignmentType>);

include/mbgl/util/size.hpp

@@ -15,6 +15,10 @@ class Size {
     constexpr uint32_t area() const {
         return width * height;
     }
+
+    constexpr float aspectRatio() const {
+        return static_cast<float>(width) / static_cast<float>(height);
+    }
 
     constexpr bool isEmpty() const {
         return width == 0 || height == 0;

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java

@@ -160,6 +160,32 @@ public final class Property {
   @Retention(RetentionPolicy.SOURCE)
   public @interface ICON_TEXT_FIT {}
 
+  // ICON_PITCH_ALIGNMENT: Orientation of icon when map is pitched.
+
+  /**
+   * The icon is aligned to the plane of the map.
+   */
+  public static final String ICON_PITCH_ALIGNMENT_MAP = "map";
+  /**
+   * The icon is aligned to the plane of the viewport.
+   */
+  public static final String ICON_PITCH_ALIGNMENT_VIEWPORT = "viewport";
+  /**
+   * Automatically matches the value of {@link ICON_ROTATION_ALIGNMENT}.
+   */
+  public static final String ICON_PITCH_ALIGNMENT_AUTO = "auto";
+
+  /**
+   * Orientation of icon when map is pitched.
+   */
+  @StringDef({
+      ICON_PITCH_ALIGNMENT_MAP,
+      ICON_PITCH_ALIGNMENT_VIEWPORT,
+      ICON_PITCH_ALIGNMENT_AUTO,
+    })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface ICON_PITCH_ALIGNMENT {}
+
   // TEXT_PITCH_ALIGNMENT: Orientation of text when map is pitched.
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java

@@ -1881,6 +1881,29 @@ public static <T> PropertyValue<Function<T, Float[]>> iconOffset(Function<T, Flo
     return new LayoutPropertyValue<>("icon-offset", function);
   }
 
+  /**
+   * Orientation of icon when map is pitched.
+   *
+   * @param value a String value
+   * @return property wrapper around String
+   */
+  public static PropertyValue<String> iconPitchAlignment(@Property.ICON_PITCH_ALIGNMENT String value) {
+    return new LayoutPropertyValue<>("icon-pitch-alignment", value);
+  }
+
+
+
+  /**
+   * Orientation of icon when map is pitched.
+   *
+   * @param <Z> the zoom parameter type
+   * @param function a wrapper {@link CameraFunction} for String
+   * @return property wrapper around a String function
+   */
+  public static <Z extends Number> PropertyValue<CameraFunction<Z, String>> iconPitchAlignment(CameraFunction<Z, String> function) {
+    return new LayoutPropertyValue<>("icon-pitch-alignment", function);
+  }
+
   /**
    * Orientation of text when map is pitched.
    *

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java

@@ -251,6 +251,16 @@ public PropertyValue<Float[]> getIconOffset() {
     return (PropertyValue<Float[]>) new PropertyValue("icon-offset", nativeGetIconOffset());
   }
 
+  /**
+   * Get the IconPitchAlignment property
+   *
+   * @return property wrapper value around String
+   */
+  @SuppressWarnings("unchecked")
+  public PropertyValue<String> getIconPitchAlignment() {
+    return (PropertyValue<String>) new PropertyValue("icon-pitch-alignment", nativeGetIconPitchAlignment());
+  }
+
   /**
    * Get the TextPitchAlignment property
    *
@@ -891,6 +901,8 @@ public PropertyValue<String> getTextTranslateAnchor() {
 
   private native Object nativeGetIconOffset();
 
+  private native Object nativeGetIconPitchAlignment();
+
   private native Object nativeGetTextPitchAlignment();
 
   private native Object nativeGetTextRotationAlignment();

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java

@@ -43,8 +43,7 @@ public void setAnchor(@Property.ANCHOR String anchor) {
    *
    * @return anchor as String
    */
-  @Property.ANCHOR
-  public String getAnchor() {
+  @Property.ANCHOR public String getAnchor() {
     return nativeGetAnchor();
   }
 
@@ -107,7 +106,7 @@ public void setColor(String color) {
    *
    * @return color as String
    */
-  public String getColor() {
+   public String getColor() {
     return nativeGetColor();
   }
 
@@ -143,7 +142,7 @@ public void setIntensity(float intensity) {
    *
    * @return intensity as Float
    */
-  public float getIntensity() {
+   public float getIntensity() {
     return nativeGetIntensity();
   }
 
@@ -166,30 +165,17 @@ public void setIntensityTransition(TransitionOptions options) {
   }
 
   private native void nativeSetAnchor(String anchor);
-
   private native String nativeGetAnchor();
-
   private native void nativeSetPosition(Position position);
-
   private native Position nativeGetPosition();
-
   private native TransitionOptions nativeGetPositionTransition();
-
   private native void nativeSetPositionTransition(long duration, long delay);
-
   private native void nativeSetColor(String color);
-
   private native String nativeGetColor();
-
   private native TransitionOptions nativeGetColorTransition();
-
   private native void nativeSetColorTransition(long duration, long delay);
-
   private native void nativeSetIntensity(float intensity);
-
   private native float nativeGetIntensity();
-
   private native TransitionOptions nativeGetIntensityTransition();
-
   private native void nativeSetIntensityTransition(long duration, long delay);
 }

platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java

@@ -1052,37 +1052,47 @@ public void testCirclePitchAlignmentAsConstant() {
     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
   public void testCirclePitchAlignmentAsCameraFunction() {
     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