diff options
4 files changed, 37 insertions, 36 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java index 867791d7bb..88e41943fa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java @@ -36,8 +36,8 @@ class MapEventFactory { @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) Double maxZoom, String styleURL, - int sizeOfResourcesCompleted, - int numberOfTilesCompleted, + long sizeOfResourcesCompleted, + long numberOfTilesCompleted, @OfflineRegion.DownloadState int state) { OfflineDownloadEndEvent offlineEvent = diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java index 3032ffd621..9f1b053a88 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java @@ -17,8 +17,8 @@ public class OfflineDownloadEndEvent extends MapBaseEvent { private final String shapeForOfflineRegion; private String styleURL; private String state; - private int sizeOfResourcesCompleted; - private int numberOfTilesCompleted; + private long sizeOfResourcesCompleted; + private long numberOfTilesCompleted; OfflineDownloadEndEvent(PhoneState phoneState, String shapeForOfflineRegion, @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, @@ -56,19 +56,19 @@ public class OfflineDownloadEndEvent extends MapBaseEvent { this.styleURL = styleURL; } - int getSizeOfResourcesCompleted() { + long getSizeOfResourcesCompleted() { return sizeOfResourcesCompleted; } - void setSizeOfResourcesCompleted(int sizeOfResourcesCompleted) { + void setSizeOfResourcesCompleted(long sizeOfResourcesCompleted) { this.sizeOfResourcesCompleted = sizeOfResourcesCompleted; } - int getNumberOfTilesCompleted() { + long getNumberOfTilesCompleted() { return numberOfTilesCompleted; } - void setNumberOfTilesCompleted(int numberOfTilesCompleted) { + void setNumberOfTilesCompleted(long numberOfTilesCompleted) { this.numberOfTilesCompleted = numberOfTilesCompleted; } @@ -120,8 +120,8 @@ public class OfflineDownloadEndEvent extends MapBaseEvent { result = 31 * result + (shapeForOfflineRegion != null ? shapeForOfflineRegion.hashCode() : 0); result = 31 * result + (styleURL != null ? styleURL.hashCode() : 0); result = 31 * result + (state != null ? state.hashCode() : 0); - result = 31 * result + sizeOfResourcesCompleted; - result = 31 * result + numberOfTilesCompleted; + result = 31 * result + (int) (sizeOfResourcesCompleted ^ (sizeOfResourcesCompleted >>> 32)); + result = 31 * result + (int) (numberOfTilesCompleted ^ (numberOfTilesCompleted >>> 32)); return result; } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java index 70e20d6259..b028911d4d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactoryTest.java @@ -38,8 +38,8 @@ public class MapEventFactoryTest { private static final Double MIN_ZOOM = 1.0; private static final Double MAX_ZOOM = 10.0; private static final String STYLE_URL = "style url"; - private static final int SIZE_OF_RESOURCES_COMPLETED = 100; - private static final int NUMBER_OF_TILE_COMPLETED = 1000; + private static final long SIZE_OF_RESOURCES_COMPLETED = 100; + private static final long NUMBER_OF_TILE_COMPLETED = 1000; private static final int STATE = OfflineRegion.STATE_ACTIVE; private static final String SESSION_ID = "001"; diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java index 9c06ed38b0..24a343137a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/telemetry/SchemaTest.java @@ -41,6 +41,29 @@ public class SchemaTest { unpackSchemas(); } + private static ByteArrayInputStream getFileBytes() throws IOException { + InputStream inputStream = SchemaTest.class.getClassLoader().getResourceAsStream("mobile-event-schemas.jsonl.gz"); + byte[] byteOut = IOUtils.toByteArray(inputStream); + + return new ByteArrayInputStream(byteOut); + } + + private static void unpackSchemas() throws IOException { + ByteArrayInputStream bais = getFileBytes(); + GZIPInputStream gzis = new GZIPInputStream(bais); + InputStreamReader reader = new InputStreamReader(gzis); + BufferedReader in = new BufferedReader(reader); + + schemaArray = new ArrayList<>(); + + Gson gson = new Gson(); + String readed; + while ((readed = in.readLine()) != null) { + JsonObject schema = gson.fromJson(readed, JsonObject.class); + schemaArray.add(schema); + } + } + @Test public void checkMapClickEventSize() { JsonObject schema = grabSchema(MAP_CLICK); @@ -189,7 +212,8 @@ public class SchemaTest { private void typesMatch(JsonObject schema, String type) { if (type.equalsIgnoreCase("int") || type.equalsIgnoreCase("integer") - || type.equalsIgnoreCase("double") || type.equalsIgnoreCase("float")) { + || type.equalsIgnoreCase("double") || type.equalsIgnoreCase("float") + || type.equalsIgnoreCase("long")) { type = "number"; } @@ -211,29 +235,6 @@ public class SchemaTest { } } - private static ByteArrayInputStream getFileBytes() throws IOException { - InputStream inputStream = SchemaTest.class.getClassLoader().getResourceAsStream("mobile-event-schemas.jsonl.gz"); - byte[] byteOut = IOUtils.toByteArray(inputStream); - - return new ByteArrayInputStream(byteOut); - } - - private static void unpackSchemas() throws IOException { - ByteArrayInputStream bais = getFileBytes(); - GZIPInputStream gzis = new GZIPInputStream(bais); - InputStreamReader reader = new InputStreamReader(gzis); - BufferedReader in = new BufferedReader(reader); - - schemaArray = new ArrayList<>(); - - Gson gson = new Gson(); - String readed; - while ((readed = in.readLine()) != null) { - JsonObject schema = gson.fromJson(readed, JsonObject.class); - schemaArray.add(schema); - } - } - private JsonObject grabSchema(String eventName) { for (JsonObject thisSchema : schemaArray) { String name = thisSchema.get("name").getAsString(); |