From e1cdc8209cf3bcef0af960dc50c511900143d4bd Mon Sep 17 00:00:00 2001 From: Nicholas Hallahan Date: Thu, 16 Jul 2015 18:04:46 -0700 Subject: [PATCH] yay, polygon! #1716 --- .../java/com/mapbox/mapboxgl/testapp/MainActivity.java | 2 +- .../src/main/java/com/mapbox/mapboxgl/testapp/Util.java | 8 +++++++- 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 a1cd2e660..ed163c1d0 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 aee6e968a..74b909cec 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) {