diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry')
6 files changed, 41 insertions, 20 deletions
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 fd4095c01a..dc1fbfe740 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 @@ -6,6 +6,8 @@ import android.os.Parcelable; import android.support.annotation.FloatRange; import android.support.annotation.Keep; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.constants.GeometryConstants; @@ -27,7 +29,7 @@ public class LatLng implements Parcelable { * Inner class responsible for recreating Parcels into objects. */ public static final Parcelable.Creator<LatLng> CREATOR = new Parcelable.Creator<LatLng>() { - public LatLng createFromParcel(Parcel in) { + public LatLng createFromParcel(@NonNull Parcel in) { return new LatLng(in); } @@ -204,6 +206,7 @@ public class LatLng implements Parcelable { * * @return new LatLng object with wrapped Longitude */ + @NonNull public LatLng wrap() { return new LatLng(latitude, wrap(longitude, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE)); } @@ -241,7 +244,7 @@ public class LatLng implements Parcelable { * @return True if equal, false if not */ @Override - public boolean equals(Object object) { + public boolean equals(@Nullable Object object) { if (this == object) { return true; } @@ -278,6 +281,7 @@ public class LatLng implements Parcelable { * * @return the string representation */ + @NonNull @Override public String toString() { return "LatLng [latitude=" + latitude + ", longitude=" + longitude + ", altitude=" + altitude + "]"; @@ -300,7 +304,7 @@ public class LatLng implements Parcelable { * @param flags Additional flags about how the object should be written */ @Override - public void writeToParcel(Parcel out, int flags) { + public void writeToParcel(@NonNull Parcel out, int flags) { out.writeDouble(latitude); out.writeDouble(longitude); out.writeDouble(altitude); @@ -312,7 +316,7 @@ public class LatLng implements Parcelable { * @param other Other LatLng to compare to * @return distance in meters */ - public double distanceTo(LatLng other) { + public double distanceTo(@NonNull LatLng other) { if (latitude == other.latitude && longitude == other.longitude) { // return 0.0 to avoid a NaN return 0.0; 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 76036c475e..ca39c99c4a 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 @@ -68,6 +68,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLng center of this LatLngBounds */ + @NonNull public LatLng getCenter() { double latCenter = (this.latitudeNorth + this.latitudeSouth) / 2.0; double longCenter; @@ -126,6 +127,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLng of the south west corner */ + @NonNull public LatLng getSouthWest() { return new LatLng(latitudeSouth, longitudeWest); } @@ -135,6 +137,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLng of the north east corner */ + @NonNull public LatLng getNorthEast() { return new LatLng(latitudeNorth, longitudeEast); } @@ -144,6 +147,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLng of the south east corner */ + @NonNull public LatLng getSouthEast() { return new LatLng(latitudeSouth, longitudeEast); } @@ -153,6 +157,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLng of the north west corner */ + @NonNull public LatLng getNorthWest() { return new LatLng(latitudeNorth, longitudeWest); } @@ -162,6 +167,7 @@ public class LatLngBounds implements Parcelable { * * @return LatLngSpan area */ + @NonNull public LatLngSpan getSpan() { return new LatLngSpan(getLatitudeSpan(), getLongitudeSpan()); } @@ -216,6 +222,7 @@ public class LatLngBounds implements Parcelable { * * @return the string representation */ + @NonNull @Override public String toString() { return "N:" + this.latitudeNorth + "; E:" + this.longitudeEast + "; S:" + this.latitudeSouth @@ -276,6 +283,7 @@ public class LatLngBounds implements Parcelable { * * @return an array of 2 LatLng objects. */ + @NonNull public LatLng[] toLatLngs() { return new LatLng[] {getNorthEast(), getSouthWest()}; } @@ -365,7 +373,8 @@ public class LatLngBounds implements Parcelable { * @param latLng the latitude lognitude pair to include in the bounds. * @return the newly constructed bounds */ - public LatLngBounds include(LatLng latLng) { + @NonNull + public LatLngBounds include(@NonNull LatLng latLng) { return new LatLngBounds.Builder() .include(getNorthEast()) .include(getSouthWest()) @@ -418,7 +427,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 LatLng latLng) { + public boolean contains(@NonNull final LatLng latLng) { return containsLatitude(latLng.getLatitude()) && containsLongitude(latLng.getLongitude()); } @@ -429,7 +438,7 @@ public class LatLngBounds implements Parcelable { * @param other the bounds which may be contained * @return true, if the bounds is contained within the bounds */ - public boolean contains(final LatLngBounds other) { + public boolean contains(@NonNull final LatLngBounds other) { return contains(other.getNorthEast()) && contains(other.getSouthWest()); } @@ -629,7 +638,7 @@ public class LatLngBounds implements Parcelable { public static final Parcelable.Creator<LatLngBounds> CREATOR = new Parcelable.Creator<LatLngBounds>() { @Override - public LatLngBounds createFromParcel(final Parcel in) { + public LatLngBounds createFromParcel(@NonNull final Parcel in) { return readFromParcel(in); } @@ -669,7 +678,7 @@ public class LatLngBounds implements Parcelable { * @param flags Additional flags about how the object should be written */ @Override - public void writeToParcel(final Parcel out, final int flags) { + public void writeToParcel(@NonNull final Parcel out, final int flags) { out.writeDouble(this.latitudeNorth); out.writeDouble(this.longitudeEast); out.writeDouble(this.latitudeSouth); @@ -712,7 +721,8 @@ public class LatLngBounds implements Parcelable { * @param latLngs the List of LatLng objects to be added * @return this */ - public Builder includes(List<LatLng> latLngs) { + @NonNull + public Builder includes(@NonNull List<LatLng> latLngs) { latLngList.addAll(latLngs); return this; } @@ -723,6 +733,7 @@ public class LatLngBounds implements Parcelable { * @param latLng the LatLng to be added * @return this */ + @NonNull public Builder include(@NonNull LatLng latLng) { latLngList.add(latLng); return this; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java index 9f65ee636b..d17d0d6fe6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.Keep; +import android.support.annotation.NonNull; /** * A geographical area representing a non-aligned quadrilateral @@ -51,7 +52,7 @@ public class LatLngQuad implements Parcelable { public static final Parcelable.Creator<LatLngQuad> CREATOR = new Parcelable.Creator<LatLngQuad>() { @Override - public LatLngQuad createFromParcel(final Parcel in) { + public LatLngQuad createFromParcel(@NonNull final Parcel in) { return readFromParcel(in); } @@ -76,14 +77,14 @@ public class LatLngQuad implements Parcelable { } @Override - public void writeToParcel(final Parcel out, final int arg1) { + public void writeToParcel(@NonNull final Parcel out, final int arg1) { topLeft.writeToParcel(out, arg1); topRight.writeToParcel(out, arg1); bottomRight.writeToParcel(out, arg1); bottomLeft.writeToParcel(out, arg1); } - private static LatLngQuad readFromParcel(final Parcel in) { + private static LatLngQuad readFromParcel(@NonNull final Parcel in) { final LatLng topLeft = new LatLng(in); final LatLng topRight = new LatLng(in); final LatLng bottomRight = new LatLng(in); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java index 133949f743..f069d7807f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java @@ -91,7 +91,7 @@ public class LatLngSpan implements Parcelable { public static final Parcelable.Creator<LatLngSpan> CREATOR = new Parcelable.Creator<LatLngSpan>() { @Override - public LatLngSpan createFromParcel(Parcel in) { + public LatLngSpan createFromParcel(@NonNull Parcel in) { return new LatLngSpan(in); } @@ -118,7 +118,7 @@ public class LatLngSpan implements Parcelable { * @param flags Additional flags about how the object should be written */ @Override - public void writeToParcel(Parcel out, int flags) { + public void writeToParcel(@NonNull Parcel out, int flags) { out.writeDouble(mLatitudeSpan); out.writeDouble(mLongitudeSpan); } 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 97347542e6..745a7c6be0 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 @@ -3,6 +3,8 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.Keep; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; /** * ProjectedMeters is a projection of longitude, latitude points in Mercator meters. @@ -18,7 +20,7 @@ public class ProjectedMeters implements Parcelable { * Inner class responsible for recreating Parcels into objects. */ public static final Creator<ProjectedMeters> CREATOR = new Creator<ProjectedMeters>() { - public ProjectedMeters createFromParcel(Parcel in) { + public ProjectedMeters createFromParcel(@NonNull Parcel in) { return new ProjectedMeters(in); } @@ -88,7 +90,7 @@ public class ProjectedMeters implements Parcelable { * @return true if equal, false if not */ @Override - public boolean equals(Object other) { + public boolean equals(@Nullable Object other) { if (this == other) { return true; } @@ -123,6 +125,7 @@ public class ProjectedMeters implements Parcelable { * * @return the string representation of this */ + @NonNull @Override public String toString() { return "ProjectedMeters [northing=" + northing + ", easting=" + easting + "]"; @@ -145,7 +148,7 @@ public class ProjectedMeters implements Parcelable { * @param flags Additional flags about how the object should be written */ @Override - public void writeToParcel(Parcel out, int flags) { + public void writeToParcel(@NonNull Parcel out, int flags) { out.writeDouble(northing); out.writeDouble(easting); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java index c09c00fced..a8b4421eec 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; +import android.support.annotation.NonNull; /** * Contains the four points defining the four-sided polygon that is visible in a map's camera. @@ -98,6 +99,7 @@ public class VisibleRegion implements Parcelable { * * @return the string representation of this */ + @NonNull @Override public String toString() { return "[farLeft [" + farLeft + "], farRight [" + farRight + "], nearLeft [" + nearLeft + "], nearRight [" @@ -134,7 +136,7 @@ public class VisibleRegion implements Parcelable { * @param flags Additional flags about how the object should be written */ @Override - public void writeToParcel(Parcel out, int flags) { + public void writeToParcel(@NonNull Parcel out, int flags) { out.writeParcelable(farLeft, flags); out.writeParcelable(farRight, flags); out.writeParcelable(nearLeft, flags); @@ -147,7 +149,7 @@ public class VisibleRegion implements Parcelable { */ public static final Parcelable.Creator<VisibleRegion> CREATOR = new Parcelable.Creator<VisibleRegion>() { - public VisibleRegion createFromParcel(Parcel in) { + public VisibleRegion createFromParcel(@NonNull Parcel in) { return new VisibleRegion(in); } |