summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukasz.paczos@mapbox.com>2019-07-31 10:23:30 +0300
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-07-31 10:23:30 +0300
commitcc1124f19ba2a1b893657107c081acc73493462f (patch)
treeff951d72b509aa02fed18ac4a2f87a80a529fcad
parent9bb4ba953ed750434cf30cb65bb4990a9f78882d (diff)
downloadqtlocation-mapboxgl-upstream/lp-offline-packs-ideographs-14201.tar.gz
[android] package ideographs flag in the offline definition parcelupstream/lp-offline-packs-ideographs-14201
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java2
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java2
2 files changed, 4 insertions, 0 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 113404dbc9..48a46d0b09 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
@@ -88,6 +88,7 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition
this.minZoom = parcel.readDouble();
this.maxZoom = parcel.readDouble();
this.pixelRatio = parcel.readFloat();
+ this.includeIdeographs = parcel.readByte() != 0;
}
@Override
@@ -159,6 +160,7 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition
dest.writeDouble(minZoom);
dest.writeDouble(maxZoom);
dest.writeFloat(pixelRatio);
+ dest.writeByte((byte) (includeIdeographs ? 1 : 0));
}
public static final Creator CREATOR = new Creator() {
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 ed7203eb6a..eff9644e59 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
@@ -88,6 +88,7 @@ public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefiniti
this.minZoom = parcel.readDouble();
this.maxZoom = parcel.readDouble();
this.pixelRatio = parcel.readFloat();
+ this.includeIdeographs = parcel.readByte() != 0;
}
@@ -146,6 +147,7 @@ public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefiniti
dest.writeDouble(minZoom);
dest.writeDouble(maxZoom);
dest.writeFloat(pixelRatio);
+ dest.writeByte((byte) (includeIdeographs ? 1 : 0));
}
public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {