yay, polygon! #1716

2 files changed, 8 insertions, 2 deletions

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index a1cd2e660b..ed163c1d0e 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -317,7 +317,7 @@ public class MainActivity extends ActionBarActivity {
     private void addPolygon() {
         String geojsonStr = null;
         try {
-            geojsonStr = Util.loadStringFromAssets(this, "small_polygon.geojson");
+            geojsonStr = Util.loadStringFromAssets(this, "small_poly.geojson");
             LatLng[] latLngs = Util.parseGeoJSONCoordinates(geojsonStr);
             MapView map = mMapFragment.getMap();
             Polygon polygon = map.addPolygon(new PolygonOptions()
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java
index aee6e968aa..74b909cec5 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java
@@ -32,7 +32,13 @@ public class Util {
         JSONArray features = jsonObject.getJSONArray("features");
         JSONObject feature = features.getJSONObject(0);
         JSONObject geometry = feature.getJSONObject("geometry");
-        JSONArray coordinates = geometry.getJSONArray("coordinates");
+        String type = geometry.getString("type");
+        JSONArray coordinates;
+        if (type.equals("Polygon")) {
+            coordinates = geometry.getJSONArray("coordinates").getJSONArray(0);
+        } else {
+            coordinates = geometry.getJSONArray("coordinates");
+        }
         int len = coordinates.length();
         LatLng[] latLngs = new LatLng[coordinates.length()];
         for (int i = 0; i < len; ++i) {