[style] add image array support (#544)

Author: tobrun

MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java

@@ -438,7 +438,6 @@ public void addImageAsync(@NonNull String name, @NonNull Drawable drawable) {
     addImageAsync(name, bitmap, false);
   }
 
-
   /**
    * Adds an drawable asynchronously, to be converted into a bitmap to be used in the map's style.
    *
@@ -606,6 +605,16 @@ public void addImagesAsync(@NonNull HashMap<String, Bitmap> images, boolean sdf,
       .execute(Builder.ImageWrapper.convertToImageArray(images, sdf, stretchX, stretchY, content));
   }
 
+  /**
+   * Add images synchronously, to be used in the map's style.
+   *
+   * @param images the array of images to add
+   */
+  public void addImages(Image[] images) {
+    validateState("addImages");
+    nativeMap.addImages(images);
+  }
+
   /**
    * Removes an image from the map's style.
    *
@@ -1425,7 +1434,7 @@ public interface OnStyleLoaded {
    * constants means your map style will always use the latest version and may change as we
    * improve the style
    */
-  @StringDef( {MAPBOX_STREETS, OUTDOORS, LIGHT, DARK, SATELLITE, SATELLITE_STREETS, TRAFFIC_DAY, TRAFFIC_NIGHT})
+  @StringDef({MAPBOX_STREETS, OUTDOORS, LIGHT, DARK, SATELLITE, SATELLITE_STREETS, TRAFFIC_DAY, TRAFFIC_NIGHT})
   @Retention(RetentionPolicy.SOURCE)
   public @interface StyleUrl {
   }

MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt

@@ -405,4 +405,21 @@ class StyleTest {
             Assert.assertEquals("Layer that failed to be added shouldn't be cached", layer1, mapboxMap.style!!.getLayer("layer1"))
         }
     }
+
+    @Test
+    fun addImages() {
+        val images = arrayOf(mockk<Image>())
+        mapboxMap.setStyle(Style.Builder())
+        mapboxMap.notifyStyleLoaded()
+        val style = mapboxMap.style!!
+        style.addImages(images)
+        verify { nativeMapView.addImages(images) }
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun addImagesNotLoadedStyleThrows() {
+        val images = arrayOf(mockk<Image>())
+        val style = Style.Builder().build(mockk())
+        style.addImages(images)
+    }
 }