From ef90e2286f6a63c4299dcb6b32f4b5c89b04cabe Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 25 Mar 2016 15:47:26 -0500 Subject: [PATCH] [android] #4475 - Wrap all Longitude Telemetry data --- .../mapboxsdk/telemetry/MapboxEventManager.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java index fb98903c8f8..6e5648ee3ea 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java @@ -24,8 +24,10 @@ import android.util.Log; import android.view.WindowManager; import com.mapbox.mapboxsdk.BuildConfig; +import com.mapbox.mapboxsdk.constants.GeoConstants; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.location.LocationServices; +import com.mapbox.mapboxsdk.utils.MathUtils; import org.json.JSONArray; import org.json.JSONObject; import java.security.MessageDigest; @@ -551,7 +553,16 @@ protected Void doInBackground(Void... voids) { jsonObject.putOpt(MapboxEvent.ATTRIBUTE_SOURCE, evt.get(MapboxEvent.ATTRIBUTE_SOURCE)); jsonObject.putOpt(MapboxEvent.ATTRIBUTE_SESSION_ID, evt.get(MapboxEvent.ATTRIBUTE_SESSION_ID)); jsonObject.putOpt(MapboxEvent.KEY_LATITUDE, evt.get(MapboxEvent.KEY_LATITUDE)); - jsonObject.putOpt(MapboxEvent.KEY_LONGITUDE, evt.get(MapboxEvent.KEY_LONGITUDE)); + + // Make sure Longitude Is Wrapped + if (evt.containsKey(MapboxEvent.KEY_LONGITUDE)) { + double lon = (double)evt.get(MapboxEvent.KEY_LONGITUDE); + Log.i(TAG, "Original Lon = " + lon); + lon = MathUtils.wrap(lon, GeoConstants.MIN_LONGITUDE, GeoConstants.MAX_LONGITUDE); + Log.i(TAG, "Wrapped Lon = " + lon); + jsonObject.put(MapboxEvent.KEY_LONGITUDE, lon); + } + jsonObject.putOpt(MapboxEvent.KEY_ALTITUDE, evt.get(MapboxEvent.KEY_ALTITUDE)); jsonObject.putOpt(MapboxEvent.KEY_ZOOM, evt.get(MapboxEvent.KEY_ZOOM)); jsonObject.putOpt(MapboxEvent.ATTRIBUTE_OPERATING_SYSTEM, evt.get(MapboxEvent.ATTRIBUTE_OPERATING_SYSTEM));