diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-26 08:31:25 +0100 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-26 10:53:14 +0100 |
commit | bf8c5feb0bf25a038ac43580eed453d8fb822534 (patch) | |
tree | d1b8b97ffa05b582dcdc38f97189471bc20f09df /android | |
parent | 1007dc9754b05fe83c720096cfbea6cb55158e0f (diff) | |
download | qtlocation-mapboxgl-bf8c5feb0bf25a038ac43580eed453d8fb822534.tar.gz |
[android] #2726 - moved utility classes to separate package
Diffstat (limited to 'android')
-rw-r--r-- | android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java | 9 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java (renamed from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java) | 5 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java (renamed from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java) | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index 50c70b5f5e..6e9f99a9c0 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -31,6 +31,7 @@ import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.annotations.Sprite; import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil; import com.mapbox.mapboxsdk.utils.ApiAccess; import com.mapbox.mapboxsdk.views.MapView; import io.fabric.sdk.android.Fabric; @@ -466,8 +467,8 @@ public class MainActivity extends AppCompatActivity { private void addPolyline() { try { - String geojsonStr = Util.loadStringFromAssets(this, "small_line.geojson"); - List<LatLng> latLngs = Util.parseGeoJSONCoordinates(geojsonStr); + String geojsonStr = GeoParseUtil.loadStringFromAssets(this, "small_line.geojson"); + List<LatLng> latLngs = GeoParseUtil.parseGeoJSONCoordinates(geojsonStr); MapView map = mMapView; map.addPolyline(new PolylineOptions() .add(latLngs.toArray(new LatLng[latLngs.size()])) @@ -481,8 +482,8 @@ public class MainActivity extends AppCompatActivity { private void addPolygon() { try { - String geojsonStr = Util.loadStringFromAssets(this, "small_poly.geojson"); - List<LatLng> latLngs = Util.parseGeoJSONCoordinates(geojsonStr); + String geojsonStr = GeoParseUtil.loadStringFromAssets(this, "small_poly.geojson"); + List<LatLng> latLngs = GeoParseUtil.parseGeoJSONCoordinates(geojsonStr); MapView map = mMapView; ArrayList<PolygonOptions> opts = new ArrayList<>(); opts.add(new PolygonOptions() diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java index 4e4618cd28..d6a8280c6a 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java +++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.utils; import android.content.Context; import android.text.TextUtils; @@ -18,7 +18,7 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -public class Util { +public class GeoParseUtil { public static String loadStringFromAssets(final Context context, final String fileName) throws IOException { if (TextUtils.isEmpty(fileName)) { @@ -55,6 +55,7 @@ public class Util { double lng = coordinates.getDouble(0); double lat = coordinates.getDouble(1); latLngs.add(new LatLng(lat, lng)); + break; } } } diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java index de8c4df303..6789b401eb 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TimingLogger.java +++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.utils; import java.util.ArrayList; |