From 3cb28b988390e962ca96789a9a45ea5c68ffa35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Tue, 8 Jan 2019 12:48:46 +0100
Subject: [android] lift Parcelable inheritance to the OfflineRegionDefinition

---
 .../mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java   | 6 +++---
 .../java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java  | 6 ++++--
 .../mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java       | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
index 01ceb66b2b..7878460888 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java
@@ -1,11 +1,10 @@
 package com.mapbox.mapboxsdk.offline;
 
 import android.os.Parcel;
-import android.os.Parcelable;
 import android.support.annotation.Keep;
-
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
@@ -24,7 +23,7 @@ import com.mapbox.turf.TurfMeasurement;
  * <p>
  * if includeIdeographs is false, offline region will not include CJK glyphs
  */
-public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, Parcelable {
+public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition {
 
   @Keep
   private String styleURL;
@@ -104,6 +103,7 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition,
   /**
    * Calculates the bounding box for the Geometry it contains
    * to retain backwards compatibility
+   *
    * @return the {@link LatLngBounds} or null
    */
   @Nullable
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
index 782968fb00..29ba2e27f4 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java
@@ -1,8 +1,10 @@
 package com.mapbox.mapboxsdk.offline;
 
+import android.os.Parcelable;
 import android.support.annotation.Keep;
 
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
+import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 
 /**
  * This is the interface that all Offline Region definitions have to implement.
@@ -10,7 +12,7 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
  * For the present, a tile pyramid is the only type of offline region.
  */
 @Keep
-public interface OfflineRegionDefinition {
+public interface OfflineRegionDefinition extends Parcelable {
 
   /**
    * Gets the bounds of the OfflineRegion.
@@ -56,7 +58,7 @@ public interface OfflineRegionDefinition {
    * Defaults to `true`
    *
    * @return true if offline region will include ideographic glyphs
-   * @see MapboxMapOptions localIdeographFontFamily
+   * @see MapboxMapOptions#localIdeographFontFamily(String)
    */
   boolean getIncludeIdeographs();
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
index a5339fcac0..db2704650a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java
@@ -3,8 +3,8 @@ package com.mapbox.mapboxsdk.offline;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Keep;
-
 import android.support.annotation.NonNull;
+
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 
@@ -21,7 +21,7 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
  * <p>
  * if includeIdeographs is false, offline region will not include CJK glyphs
  */
-public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefinition, Parcelable {
+public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefinition {
 
   @Keep
   private String styleURL;
-- 
cgit v1.2.1