Merge pull request #300 from shankari/deal_with_google_play_810_format

Support the new google play motion activity format
e-mission · Jun 28, 2016 · ddd428a · ddd428a
2 parents ba31882 + c1b6005
commit ddd428a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/emission/net/usercache/formatters/android/motion_activity.py b/emission/net/usercache/formatters/android/motion_activity.py
@@ -18,13 +18,18 @@ def format(entry):
     data = ad.AttrDict()
     if 'agb' in entry.data:
         data.type = ecwa.MotionTypes(entry.data.agb).value
-    else:
+    elif 'zzaEg' in entry.data:
         data.type = ecwa.MotionTypes(entry.data.zzaEg).value
+    else:
+        data.type = ecwa.MotionTypes(entry.data.zzaKM).value
+
 
     if 'agc' in entry.data:
         data.confidence = entry.data.agc
-    else:
+    elif 'zzaEh' in entry.data:
         data.confidence = entry.data.zzaEh
+    else:
+        data.confidence = entry.data.zzaKN
 
     data.ts = formatted_entry.metadata.write_ts
     data.local_dt = formatted_entry.metadata.write_local_dt