From fb805e7486e56cff2a8e1a48e61dbb67209696cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cosana=E2=80=9D?= Date: Wed, 24 Oct 2018 10:35:30 -0400 Subject: [android] remove ILatLng and IProjectedMeteres --- .../com/mapbox/mapboxsdk/geometry/ILatLng.java | 28 ---------------------- .../mapboxsdk/geometry/IProjectedMeters.java | 22 ----------------- .../java/com/mapbox/mapboxsdk/geometry/LatLng.java | 5 +--- .../mapbox/mapboxsdk/geometry/LatLngBounds.java | 6 ++--- .../mapbox/mapboxsdk/geometry/ProjectedMeters.java | 4 +--- 5 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java deleted file mode 100644 index 07df87af3a..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mapbox.mapboxsdk.geometry; - -/** - * Describes a latitude, longitude, and altitude tuple. - */ -public interface ILatLng { - - /** - * Get the latitude, in degrees. - * - * @return the latitude value in degrees - */ - double getLatitude(); - - /** - * Get the longitude, in degrees. - * - * @return the longitude value in degrees - */ - double getLongitude(); - - /** - * Get the altitude, in meters. - * - * @return the altitude value in meters - */ - double getAltitude(); -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java deleted file mode 100644 index db459d7cbb..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mapbox.mapboxsdk.geometry; - -/** - * Describes a projection in Mercator meters. - */ -public interface IProjectedMeters { - - /** - * Get the north projection, in meters. - * - * @return the projected meters in north direction - */ - double getNorthing(); - - /** - * Get the east projection, in meters. - * - * @return the projected meters in east direction - */ - double getEasting(); - -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java index 57c83daf18..fd4095c01a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java @@ -21,7 +21,7 @@ import com.mapbox.mapboxsdk.constants.GeometryConstants; * data automatically, so all data enters in the WGS84 datum. *

*/ -public class LatLng implements ILatLng, Parcelable { +public class LatLng implements Parcelable { /** * Inner class responsible for recreating Parcels into objects. @@ -139,7 +139,6 @@ public class LatLng implements ILatLng, Parcelable { * @see GeometryConstants#MIN_LATITUDE * @see GeometryConstants#MAX_LATITUDE */ - @Override public double getLatitude() { return latitude; } @@ -177,7 +176,6 @@ public class LatLng implements ILatLng, Parcelable { * @see GeometryConstants#MIN_LONGITUDE * @see GeometryConstants#MAX_LONGITUDE */ - @Override public double getLongitude() { return longitude; } @@ -196,7 +194,6 @@ public class LatLng implements ILatLng, Parcelable { * * @return the altitude value in meters */ - @Override public double getAltitude() { return altitude; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java index 8d016131f2..76036c475e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java @@ -229,7 +229,7 @@ public class LatLngBounds implements Parcelable { * @param latLngs List of LatLng objects * @return LatLngBounds */ - static LatLngBounds fromLatLngs(final List latLngs) { + static LatLngBounds fromLatLngs(final List latLngs) { double minLat = GeometryConstants.MAX_LATITUDE; double maxLat = GeometryConstants.MIN_LATITUDE; @@ -251,7 +251,7 @@ public class LatLngBounds implements Parcelable { } } - for (final ILatLng gp : latLngs) { + for (final LatLng gp : latLngs) { final double latitude = gp.getLatitude(); minLat = Math.min(minLat, latitude); maxLat = Math.max(maxLat, latitude); @@ -418,7 +418,7 @@ public class LatLngBounds implements Parcelable { * @param latLng the point which may be contained * @return true, if the point is contained within the bounds */ - public boolean contains(final ILatLng latLng) { + public boolean contains(final LatLng latLng) { return containsLatitude(latLng.getLatitude()) && containsLongitude(latLng.getLongitude()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java index 7251fd360b..97347542e6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java @@ -12,7 +12,7 @@ import android.support.annotation.Keep; * except at the equator. *

*/ -public class ProjectedMeters implements IProjectedMeters, Parcelable { +public class ProjectedMeters implements Parcelable { /** * Inner class responsible for recreating Parcels into objects. @@ -68,7 +68,6 @@ public class ProjectedMeters implements IProjectedMeters, Parcelable { * * @return Projected meters in north. */ - @Override public double getNorthing() { return northing; } @@ -78,7 +77,6 @@ public class ProjectedMeters implements IProjectedMeters, Parcelable { * * @return Projected meters in east. */ - @Override public double getEasting() { return easting; } -- cgit v1.2.1