Merge pull request #3639 from mapbox/release-android-v3.1.0

Android 3.1.0 --> master

1 files changed, 48 insertions, 16 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
index 79361f725a..a43757713d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
@@ -1,32 +1,41 @@
 package com.mapbox.mapboxsdk.geometry;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
 /**
- * Implementation of iOS MKCoordinateSpan
+ * A geographical span defined by its latitude and longitude span.
  */
-public class CoordinateSpan {
+public class CoordinateSpan implements Parcelable {
+
+    private double mLatitudeSpan;
+    private double mLongitudeSpan;
 
-    private double latitudeSpan;
-    private double longitudeSpan;
+    public CoordinateSpan(@NonNull Parcel in){
+        mLatitudeSpan = in.readDouble();
+        mLongitudeSpan = in.readDouble();
+    }
 
-    public CoordinateSpan(final double latitudeSpan, final double longitudeSpan) {
-        this.latitudeSpan = latitudeSpan;
-        this.longitudeSpan = longitudeSpan;
+    public CoordinateSpan(double latitudeSpan, double longitudeSpan) {
+        mLatitudeSpan = latitudeSpan;
+        mLongitudeSpan = longitudeSpan;
     }
 
     public double getLatitudeSpan() {
-        return latitudeSpan;
+        return mLatitudeSpan;
     }
 
-    public void setLatitudeSpan(final double latitudeSpan) {
-        this.latitudeSpan = latitudeSpan;
+    public void setLatitudeSpan(double latitudeSpan) {
+        mLatitudeSpan = latitudeSpan;
     }
 
     public double getLongitudeSpan() {
-        return longitudeSpan;
+        return mLongitudeSpan;
     }
 
-    public void setLongitudeSpan(final double longitudeSpan) {
-        this.longitudeSpan = longitudeSpan;
+    public void setLongitudeSpan(double longitudeSpan) {
+        mLongitudeSpan = longitudeSpan;
     }
 
     @Override
@@ -34,10 +43,33 @@ public class CoordinateSpan {
         if (this == o) return true;
         if (o instanceof CoordinateSpan) {
             CoordinateSpan other = (CoordinateSpan) o;
-            return longitudeSpan == other.getLongitudeSpan()
-                    && latitudeSpan == other.getLatitudeSpan();
+            return mLongitudeSpan == other.getLongitudeSpan()
+                    && mLatitudeSpan == other.getLatitudeSpan();
         }
         return false;
     }
 
-}
+    public static final Parcelable.Creator<CoordinateSpan> CREATOR =
+            new Parcelable.Creator<CoordinateSpan>() {
+                @Override
+                public CoordinateSpan createFromParcel(Parcel in) {
+                    return new CoordinateSpan(in);
+                }
+
+                @Override
+                public CoordinateSpan[] newArray(int size) {
+                    return new CoordinateSpan[size];
+                }
+            };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int arg1) {
+        out.writeDouble(mLatitudeSpan);
+        out.writeDouble(mLongitudeSpan);
+    }
+}
\ No newline at end of file