Skip to content

Commit f146e7c

Browse files
author
Cameron Mace
authored
Map out all navigation events (#556)
* initial fix * individually add events
1 parent a16ec05 commit f146e7c

1 file changed

Lines changed: 79 additions & 0 deletions

File tree

  • mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http

‎mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http/TelemetryClient.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.mapbox.services.android.telemetry.MapboxEvent;
77
import com.mapbox.services.android.telemetry.constants.GeoConstants;
8+
import com.mapbox.services.android.telemetry.navigation.MapboxNavigationEvent;
89
import com.mapbox.services.android.telemetry.utils.MathUtils;
910

1011
import org.json.JSONArray;
@@ -149,6 +150,84 @@ private void sendEventsWrapped(Vector<Hashtable<String, Object>> events, Callbac
149150
for (Hashtable<String, Object> evt : events) {
150151
JSONObject jsonObject = new JSONObject();
151152

153+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SDK_IDENTIFIER, evt.get(MapboxNavigationEvent.KEY_SDK_IDENTIFIER));
154+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SDK_VERSION, evt.get(MapboxNavigationEvent.KEY_SDK_VERSION));
155+
jsonObject.putOpt(MapboxNavigationEvent.KEY_EVENT_VERSION, evt.get(MapboxNavigationEvent.KEY_EVENT_VERSION));
156+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SESSION_IDENTIFIER,
157+
evt.get(MapboxNavigationEvent.KEY_SESSION_IDENTIFIER));
158+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ORIGINAL_REQUEST_IDENTIFIER,
159+
evt.get(MapboxNavigationEvent.KEY_ORIGINAL_REQUEST_IDENTIFIER));
160+
jsonObject.putOpt(MapboxNavigationEvent.KEY_REQUEST_IDENTIFIER,
161+
evt.get(MapboxNavigationEvent.KEY_REQUEST_IDENTIFIER));
162+
jsonObject.putOpt(MapboxNavigationEvent.KEY_LAT, evt.get(MapboxNavigationEvent.KEY_LAT));
163+
jsonObject.putOpt(MapboxNavigationEvent.KEY_LNG, evt.get(MapboxNavigationEvent.KEY_LNG));
164+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ORIGINAL_GEOMETRY,
165+
evt.get(MapboxNavigationEvent.KEY_ORIGINAL_GEOMETRY));
166+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ORIGINAL_ESTIMATED_DISTANCE,
167+
evt.get(MapboxNavigationEvent.KEY_ORIGINAL_ESTIMATED_DISTANCE));
168+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ORIGINAL_ESTIMATED_DURATION,
169+
evt.get(MapboxNavigationEvent.KEY_ORIGINAL_ESTIMATED_DURATION));
170+
jsonObject.putOpt(MapboxNavigationEvent.KEY_AUDIO_TYPE, evt.get(MapboxNavigationEvent.KEY_AUDIO_TYPE));
171+
jsonObject.putOpt(MapboxNavigationEvent.KEY_GEOMETRY, evt.get(MapboxNavigationEvent.KEY_GEOMETRY));
172+
jsonObject.putOpt(MapboxNavigationEvent.KEY_CREATED, evt.get(MapboxNavigationEvent.KEY_CREATED));
173+
jsonObject.putOpt(MapboxNavigationEvent.KEY_PROFILE, evt.get(MapboxNavigationEvent.KEY_PROFILE));
174+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SIMULATION, evt.get(MapboxNavigationEvent.KEY_SIMULATION));
175+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ESTIMATED_DISTANCE,
176+
evt.get(MapboxNavigationEvent.KEY_ESTIMATED_DISTANCE));
177+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ESTIMATED_DURATION,
178+
evt.get(MapboxNavigationEvent.KEY_ESTIMATED_DURATION));
179+
jsonObject.putOpt(MapboxNavigationEvent.KEY_REROUTE_COUNT, evt.get(MapboxNavigationEvent.KEY_REROUTE_COUNT));
180+
jsonObject.putOpt(MapboxNavigationEvent.KEY_VOLUME_LEVEL, evt.get(MapboxNavigationEvent.KEY_VOLUME_LEVEL));
181+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SCREEN_BRIGHTNESS,
182+
evt.get(MapboxNavigationEvent.KEY_SCREEN_BRIGHTNESS));
183+
jsonObject.putOpt(MapboxNavigationEvent.KEY_BATTERY_PLUGGED_IN,
184+
evt.get(MapboxNavigationEvent.KEY_BATTERY_PLUGGED_IN));
185+
jsonObject.putOpt(MapboxNavigationEvent.KEY_CONNECTIVITY, evt.get(MapboxNavigationEvent.KEY_CONNECTIVITY));
186+
jsonObject.putOpt(MapboxNavigationEvent.KEY_FEEDBACK_TYPE, evt.get(MapboxNavigationEvent.KEY_FEEDBACK_TYPE));
187+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DESCRIPTIONS, evt.get(MapboxNavigationEvent.KEY_DESCRIPTIONS));
188+
jsonObject.putOpt(MapboxNavigationEvent.KEY_LOCATIONS_BEFORE,
189+
evt.get(MapboxNavigationEvent.KEY_LOCATIONS_BEFORE));
190+
jsonObject.putOpt(MapboxNavigationEvent.KEY_LOCATIONS_AFTER, evt.get(MapboxNavigationEvent.KEY_LOCATIONS_AFTER));
191+
jsonObject.putOpt(MapboxNavigationEvent.KEY_USER_ID, evt.get(MapboxNavigationEvent.KEY_USER_ID));
192+
jsonObject.putOpt(MapboxNavigationEvent.KEY_FEEDBACK_ID, evt.get(MapboxNavigationEvent.KEY_FEEDBACK_ID));
193+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SCREENSHOT, evt.get(MapboxNavigationEvent.KEY_SCREENSHOT));
194+
jsonObject.putOpt(MapboxNavigationEvent.KEY_NEW_DISTANCE_REMAINING,
195+
evt.get(MapboxNavigationEvent.KEY_NEW_DISTANCE_REMAINING));
196+
jsonObject.putOpt(MapboxNavigationEvent.KEY_NEW_DURATION_REMAINING,
197+
evt.get(MapboxNavigationEvent.KEY_NEW_DURATION_REMAINING));
198+
jsonObject.putOpt(MapboxNavigationEvent.KEY_NEW_GEOMETRY, evt.get(MapboxNavigationEvent.KEY_NEW_GEOMETRY));
199+
jsonObject.putOpt(MapboxNavigationEvent.KEY_START_TIMESTAMP, evt.get(MapboxNavigationEvent.KEY_START_TIMESTAMP));
200+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DISTANCE_COMPLETED,
201+
evt.get(MapboxNavigationEvent.KEY_DISTANCE_COMPLETED));
202+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DISTANCE_REMAINING,
203+
evt.get(MapboxNavigationEvent.KEY_DISTANCE_REMAINING));
204+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DURATION_REMAINING,
205+
evt.get(MapboxNavigationEvent.KEY_DURATION_REMAINING));
206+
jsonObject.putOpt(MapboxNavigationEvent.KEY_SECONDS_SINCE_LAST_REROUTE,
207+
evt.get(MapboxNavigationEvent.KEY_SECONDS_SINCE_LAST_REROUTE));
208+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ARRIVAL_TIMESTAMP,
209+
evt.get(MapboxNavigationEvent.KEY_ARRIVAL_TIMESTAMP));
210+
jsonObject.putOpt(MapboxNavigationEvent.KEY_STEP, evt.get(MapboxNavigationEvent.KEY_STEP));
211+
jsonObject.putOpt(MapboxNavigationEvent.KEY_STEP_COUNT, evt.get(MapboxNavigationEvent.KEY_STEP_COUNT));
212+
213+
// Step metadata
214+
jsonObject.putOpt(MapboxNavigationEvent.KEY_UPCOMING_INSTRUCTION,
215+
evt.get(MapboxNavigationEvent.KEY_UPCOMING_INSTRUCTION));
216+
jsonObject.putOpt(MapboxNavigationEvent.KEY_UPCOMING_MODIFIER,
217+
evt.get(MapboxNavigationEvent.KEY_UPCOMING_MODIFIER));
218+
jsonObject.putOpt(MapboxNavigationEvent.KEY_UPCOMING_NAME, evt.get(MapboxNavigationEvent.KEY_UPCOMING_NAME));
219+
jsonObject.putOpt(MapboxNavigationEvent.KEY_PREVIOUS_INSTRUCTION,
220+
evt.get(MapboxNavigationEvent.KEY_PREVIOUS_INSTRUCTION));
221+
jsonObject.putOpt(MapboxNavigationEvent.KEY_PREVIOUS_TYPE, evt.get(MapboxNavigationEvent.KEY_PREVIOUS_TYPE));
222+
jsonObject.putOpt(MapboxNavigationEvent.KEY_PREVIOUS_MODIFIER,
223+
evt.get(MapboxNavigationEvent.KEY_PREVIOUS_MODIFIER));
224+
jsonObject.putOpt(MapboxNavigationEvent.KEY_PREVIOUS_NAME, evt.get(MapboxNavigationEvent.KEY_PREVIOUS_NAME));
225+
jsonObject.putOpt(MapboxNavigationEvent.KEY_UPCOMING_TYPE, evt.get(MapboxNavigationEvent.KEY_UPCOMING_TYPE));
226+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DURATION, evt.get(MapboxNavigationEvent.KEY_DURATION));
227+
jsonObject.putOpt(MapboxNavigationEvent.KEY_DISTANCE, evt.get(MapboxNavigationEvent.KEY_DISTANCE));
228+
jsonObject.putOpt(MapboxNavigationEvent.KEY_ORIGINAL_STEP_COUNT,
229+
evt.get(MapboxNavigationEvent.KEY_ORIGINAL_STEP_COUNT));
230+
152231
// Build the JSON but only if there's a value for it in the evt
153232
jsonObject.putOpt(MapboxEvent.KEY_EVENT, evt.get(MapboxEvent.KEY_EVENT));
154233
jsonObject.putOpt(MapboxEvent.KEY_CREATED, evt.get(MapboxEvent.KEY_CREATED));

0 commit comments

Comments
 (0)