From e9504912dc4eca1793be200cc46c14d81fbf1ee5 Mon Sep 17 00:00:00 2001
From: Jesse Bounds <jesse@rebounds.net>
Date: Mon, 28 Nov 2016 16:14:02 -0800
Subject: [PATCH] [ios] Use new pinning cert for staging

This updates the cert for the staging environment. It also adjusts the
telem implementation to send along the horizontal accuracy for each
location event and removes the previous battery level gathering logic.
---
 .../default/resources/api_mapbox_staging.der     | Bin 0 -> 1334 bytes
 .../default/resources/star_tilestream_net.der    | Bin 1273 -> 0 bytes
 platform/ios/ios.xcodeproj/project.pbxproj       |  12 +++++-------
 platform/ios/src/MGLAPIClient.m                  |   2 +-
 platform/ios/src/MGLMapboxEvents.m               |  15 ++++-----------
 5 files changed, 10 insertions(+), 19 deletions(-)
 create mode 100644 platform/default/resources/api_mapbox_staging.der
 delete mode 100644 platform/default/resources/star_tilestream_net.der

diff --git a/platform/default/resources/api_mapbox_staging.der b/platform/default/resources/api_mapbox_staging.der
new file mode 100644
index 0000000000000000000000000000000000000000..45f7df7c490f7a8e1b8c55bd5bf4098b6e89f613
GIT binary patch
literal 1334
zcmXqLVl^^oVv$<F%*4pVB*5O_dZlBHbcopfh12K#-(+vV%f_kI=F#?@mywa1mBGN*
zklTQhjX9KsO_(V(*ih6!7{uWc=5fhP&vZ^LDpByvOEy$DPz4Dy3(LWUgFPIL6oONe
zON&y0R8d)Kk%F_Mft)z6p_zfDftdjqL;<;$hK7d5hDIQMltB@yb+QK1Aagl{MO-qA
zONug+OBC|c6rA&ON^_Gk6Agt81VPg5!d&5r#Tl7-=_UDjh9U++5GQi`CKe>+SAZO-
zXDDeP4t61rfR<iKW=<;5wA930y}Z;CgC<5LWM4C~GB7tW@-qO%xtN+585x$d?<&u^
z?Pzc-B<FJC0*&k`n>kLYerh#!HaV5ru{Yz}yS=r-?}Bv`USvLcC>{OU>A|-LFMkLd
zvE(G)%IwV(*G+Fo^=wU>wyrz(c}cYK>eW7hN0~GZmkQiE@0YuuU8HV{&U3D%<xxwn
z@0GJyc&@33ce0LF%46ZY;>cY;YO-4eB(tU@239Dy$0e|tre*y;DZk_R4&$W;Dd7hB
zlY0b=fBbuWz%}LUl>JfvcOGx4d3~m<)orTsHuq;fUc%bd%T`Hz6yy(^V0zEap(KAt
z=!%m8hO8Qf??SRf<UhMv-1(?#rXnV|QFLofW_0V@)JZ~R*6))4_*Lr$)mO!YeO|ZR
zz><lXk%4h>6XSDWh&(os2L_|8GK++PSc3?EL!wNRVd7PNjpw~?7F%>49=rL-Ko+Ec
zk420{L~iAi*t;*^bT8X0AnzL=#ClP(CBi@(BrV9IVxZK75fx2*Xi>ulQq0fD_@9M^
znTd4)#B5a-F#{1c4sA9@R#tXqMmUSfARDAyo+ZT~$v}UB?gH&L&5V+g0xNy}<f0s7
zy%b=IO$Me|z2y8{{o>-}MBU<yL?hjFQ$3(GrUnxN8hk*ODX_R2I2)L=aVE5RFt+{8
zVPrJWGSGlIiHT862IPWbpcBf=%TWz<4hS~jU}H;f<N@YGgBq9~Mn;wbgFFKj7~g=g
zO#<qR{N&;S6f+Fm;HsF~tYCgk1bMO;MWH?{TY_>WBvV52q_ZQ?^Cbp6AioHM!kNi{
z0XZ`OivVC|U}Wga`=pv=T6HJc)wg{5NwrHm_wIRKvetD;WBbHKQ@@_Rb^gXDG1li#
zD*vw(oW)rE?WjuOCq@Yk6&7{3L#ee(DtNzmeNyLs@VokWSdRH!!!OA{+s>bu=x7|)
z_bW<Z;-BBFOD7olT9`kd62JGX5dVGM-uF^_?kR1}YgYJB+$dW8LapLL>xJNbmt{Wk
z9{Tlg+QDO+y4UF0c2&e0bF{g#))l4PUfMVHM(A^i11<;TBToKO+1aqrwAWO|;yELe
zL!^w>m(G({9&T~?RDZc{`me{HPZbKPr^S3Nz57~tFWdhBhmWTMUtZi%x28QZQnPs_
ZYj@!FM245Iu2gQRzNY$WN_vL^BLIrZ(PjVu

literal 0
HcmV?d00001

diff --git a/platform/default/resources/star_tilestream_net.der b/platform/default/resources/star_tilestream_net.der
deleted file mode 100644
index 3c7cea0ff72f758e9ca12610d4ec564defd23b45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1273
zcmXqLV)<&&#C&%FGZP~dlYp7~`S?rOQ+RuKKm3?grZLrkmyJ`a&7<u*FC!y2D}#ZH
zA-4f18*?ZNn=n&ou%VcN2#CWa%<G<-A5v6WT%zEam#k+fYak60XBHNLiw6h$C^$PR
z=qk7y8_0?C8k!nd8d(^CK@^Z{2IQI>8Jk*~T1FWZquK&Bje|$TC9}AsC^NZ4AwNyQ
zIX|Z~Hz_mGP}o2aWEndTS9oG^MrK}mNq(N8sDUupWjs8-i3Lgd6*>@yNg9ZQ9mXS|
zrB{-flL|C0H8EE&FSW#=iBSpJw~VX|%uS5^3_x)%rY1&4hGU_o4o}=S{hItyYnhvg
z@7#0t^8>ECJ$|pDG=ufD?xF;R)vYtO@W|)s-LZ<g*<lsHk@rGLWr>wb_rfm;`ut}-
zzj02hln^Oi`g(ickAIWqYft&Rn_G0r&ebcQhF<4vxi){&MV{ZH$LqGuo;HQAD#N<s
zZL(FdA@kw97cZW_N#Lt8RGw8JILUjH<jH4mI3~tkQN5YMA~vhuTY258u7oY2Z$rv-
z4t?Ic?f3kQp1+2hm~NH(Oq_m9dA7wOpQ_n@%^l_+S3E5=vdop47<=`usz9DhqG?gf
z&0m{+%pW9vcQ@Brr{~d7=h$9kD^fF|@dG<^z1se4yEn#3pD#QOE}e6;<`O>>Gb01z
z;wHvTzz|typbZR0SwR*R1EnU6plsqp3tCW$krifPGGH*^12Op-8UM4eFf*|(fS4l>
zGRHt+f!qR_HmQt~k^(Dz{q#J&;>z6QB)#PPTo5O@D9502E=acmOXF07#z_W^{cLRM
zjXc0)YtYzYV9&;(&Bn;e%Fe_nW(+c;7-&d&dAVMCYJLeQWr7VVN-fSWElN%;)-Ose
z$S=+;$uFwZ&q+;B%rS6;8^B~>%0reBvLNTFvVd|0)G^GAa2At+JV;uZMZ!R=LF7{Y
z_i0~R?Tc&-YL#!bR?J>p6IEjn4pYp?$l`6_3Df{J#(=R+7&Tl{K;AJ>gDYUd6L2NS
z=^B`ef$5r&!Aw;>@c@hb=3ne9Q&miFt~^<v!}^!?dgEJ*CiN?mly68fmLAp2cswQC
zW<{aP8#R`L=d$<B+o@iqy7SUEo%!_|8G?J658pa%w*PCHpmTu#p;fz6DwXW6%}f8h
zbk#2Ai%sn-Bz!zQ_k~wJ$Q0gpT;_h&49}n9NphdmuO<fxf3rEW;BMojnJ=yiMJ*2Y
zwbHv<=2vmfI?(Ub%ih*G8oeJ~_*tIcn$GvjG4j2$NSv9&swezy|HGA@@kh)}NDq`V
z_w3cSQagB|Hd**&*^+G)DQUh{y4eW@2i<D+9s0kh*6m+2i;mXu%he5^uY7qEkblC!
W@c!e^i87^^d1E3Oq5=yNZvX&cqPb@P

diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 2149df9db..a1ad742b1 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -152,6 +152,7 @@
 		40EDA1C01CFE0E0200D9EA68 /* MGLAnnotationContainerView.h in Headers */ = {isa = PBXBuildFile; fileRef = 40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */; };
 		40EDA1C11CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */; };
 		40EDA1C21CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */; };
+		40F2631B1DECE003009B635C /* api_mapbox_staging.der in Resources */ = {isa = PBXBuildFile; fileRef = 40F2631A1DECE003009B635C /* api_mapbox_staging.der */; };
 		40F887701D7A1E58008ECB67 /* MGLGeoJSONSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */; };
 		40F887711D7A1E59008ECB67 /* MGLGeoJSONSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */; };
 		40FDA76B1CCAAA6800442548 /* MBXAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */; };
@@ -294,7 +295,6 @@
 		DA8848751CBAFCC100AB86E3 /* mapbox@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */; };
 		DA88487A1CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848771CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der */; };
 		DA88487B1CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848781CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der */; };
-		DA88487C1CBAFD5C00AB86E3 /* star_tilestream_net.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848791CBAFD5C00AB86E3 /* star_tilestream_net.der */; };
 		DA8848841CBB033F00AB86E3 /* FABAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848801CBB033F00AB86E3 /* FABAttributes.h */; };
 		DA8848851CBB033F00AB86E3 /* FABKitProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */; };
 		DA8848861CBB033F00AB86E3 /* Fabric+FABKits.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */; };
@@ -309,7 +309,6 @@
 		DA8933DC1CCD31D400E68420 /* Foundation.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = DA8933BD1CCD2CAD00E68420 /* Foundation.stringsdict */; };
 		DA8933DD1CCD31D400E68420 /* api_mapbox_com-digicert.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848771CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der */; };
 		DA8933DE1CCD31D400E68420 /* api_mapbox_com-geotrust.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848781CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der */; };
-		DA8933DF1CCD31D400E68420 /* star_tilestream_net.der in Resources */ = {isa = PBXBuildFile; fileRef = DA8848791CBAFD5C00AB86E3 /* star_tilestream_net.der */; };
 		DA8933E01CCD31DF00E68420 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA89339F1CCC951200E68420 /* Localizable.strings */; };
 		DA8933E11CCD31DF00E68420 /* Compass.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848631CBAFCC100AB86E3 /* Compass.png */; };
 		DA8933E21CCD31DF00E68420 /* Compass@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848641CBAFCC100AB86E3 /* Compass@2x.png */; };
@@ -582,6 +581,7 @@
 		40CFA6501D787579008103BD /* MGLGeoJSONSourceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLGeoJSONSourceTests.mm; path = ../../darwin/test/MGLGeoJSONSourceTests.mm; sourceTree = "<group>"; };
 		40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationContainerView.h; sourceTree = "<group>"; };
 		40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLAnnotationContainerView.m; sourceTree = "<group>"; };
+		40F2631A1DECE003009B635C /* api_mapbox_staging.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = api_mapbox_staging.der; path = ../../default/resources/api_mapbox_staging.der; sourceTree = "<group>"; };
 		40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLGeoJSONSource_Private.h; sourceTree = "<group>"; };
 		40FDA7691CCAAA6800442548 /* MBXAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXAnnotationView.h; sourceTree = "<group>"; };
 		40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXAnnotationView.m; sourceTree = "<group>"; };
@@ -720,7 +720,6 @@
 		DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mapbox@3x.png"; sourceTree = "<group>"; };
 		DA8848771CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = "api_mapbox_com-digicert.der"; path = "../../default/resources/api_mapbox_com-digicert.der"; sourceTree = "<group>"; };
 		DA8848781CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = "api_mapbox_com-geotrust.der"; path = "../../default/resources/api_mapbox_com-geotrust.der"; sourceTree = "<group>"; };
-		DA8848791CBAFD5C00AB86E3 /* star_tilestream_net.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = star_tilestream_net.der; path = ../../default/resources/star_tilestream_net.der; sourceTree = "<group>"; };
 		DA8848801CBB033F00AB86E3 /* FABAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABAttributes.h; sourceTree = "<group>"; };
 		DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABKitProtocol.h; sourceTree = "<group>"; };
 		DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Fabric+FABKits.h"; sourceTree = "<group>"; };
@@ -1138,9 +1137,9 @@
 			children = (
 				DA89339F1CCC951200E68420 /* Localizable.strings */,
 				DAC49C5F1CD02BC9009E1AA3 /* Localizable.stringsdict */,
+				40F2631A1DECE003009B635C /* api_mapbox_staging.der */,
 				DA8848771CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der */,
 				DA8848781CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der */,
-				DA8848791CBAFD5C00AB86E3 /* star_tilestream_net.der */,
 				DA8848631CBAFCC100AB86E3 /* Compass.png */,
 				DA8848641CBAFCC100AB86E3 /* Compass@2x.png */,
 				DA8848651CBAFCC100AB86E3 /* Compass@3x.png */,
@@ -1816,18 +1815,18 @@
 				DA8848731CBAFCC100AB86E3 /* mapbox.png in Resources */,
 				DA8933BC1CCD2CA100E68420 /* Foundation.strings in Resources */,
 				DA8848741CBAFCC100AB86E3 /* mapbox@2x.png in Resources */,
+				DA88487B1CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der in Resources */,
 				DA88487A1CBAFD5C00AB86E3 /* api_mapbox_com-digicert.der in Resources */,
+				40F2631B1DECE003009B635C /* api_mapbox_staging.der in Resources */,
 				DA8933A31CCC95B000E68420 /* Localizable.strings in Resources */,
 				DA88486D1CBAFCC100AB86E3 /* Compass.png in Resources */,
 				DA8848721CBAFCC100AB86E3 /* default_marker@3x.png in Resources */,
-				DA88487C1CBAFD5C00AB86E3 /* star_tilestream_net.der in Resources */,
 				DA88486F1CBAFCC100AB86E3 /* Compass@3x.png in Resources */,
 				DA88486E1CBAFCC100AB86E3 /* Compass@2x.png in Resources */,
 				DA8848701CBAFCC100AB86E3 /* default_marker.png in Resources */,
 				DA8848711CBAFCC100AB86E3 /* default_marker@2x.png in Resources */,
 				DA8933F01CCD387900E68420 /* strip-frameworks.sh in Resources */,
 				DA8848751CBAFCC100AB86E3 /* mapbox@3x.png in Resources */,
-				DA88487B1CBAFD5C00AB86E3 /* api_mapbox_com-geotrust.der in Resources */,
 				DAC49C5C1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */,
 				DA8933BF1CCD2CAD00E68420 /* Foundation.stringsdict in Resources */,
 			);
@@ -1852,7 +1851,6 @@
 				DA8933DD1CCD31D400E68420 /* api_mapbox_com-digicert.der in Resources */,
 				DAC49C5D1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */,
 				DA8933DE1CCD31D400E68420 /* api_mapbox_com-geotrust.der in Resources */,
-				DA8933DF1CCD31D400E68420 /* star_tilestream_net.der in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/platform/ios/src/MGLAPIClient.m b/platform/ios/src/MGLAPIClient.m
index b9b0dc17c..7fb6538e5 100644
--- a/platform/ios/src/MGLAPIClient.m
+++ b/platform/ios/src/MGLAPIClient.m
@@ -122,7 +122,7 @@ static NSString * const MGLAPIClientHTTPMethodPost = @"POST";
     self.geoTrustCert = certificate;
     [self loadCertificate:&certificate withResource:@"api_mapbox_com-digicert"];
     self.digicertCert = certificate;
-    [self loadCertificate:&certificate withResource:@"star_tilestream_net"];
+    [self loadCertificate:&certificate withResource:@"api_mapbox_staging"];
     self.testServerCert = certificate;
 }
 
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index d86114d01..a8de1bb58 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/platform/ios/src/MGLMapboxEvents.m
@@ -35,6 +35,7 @@ NSString *const MGLEventKeyZoomLevel = @"zoom";
 NSString *const MGLEventKeySpeed = @"speed";
 NSString *const MGLEventKeyCourse = @"course";
 NSString *const MGLEventKeyGestureID = @"gesture";
+NSString *const MGLEventHorizontalAccuracy = @"horizontalAccuracy";
 NSString *const MGLEventKeyLocalDebugDescription = @"debug.description";
 
 static NSString *const MGLEventKeyEvent = @"event";
@@ -46,7 +47,6 @@ static NSString *const MGLEventKeyOperatingSystem = @"operatingSystem";
 static NSString *const MGLEventKeyResolution = @"resolution";
 static NSString *const MGLEventKeyAccessibilityFontScale = @"accessibilityFontScale";
 static NSString *const MGLEventKeyOrientation = @"orientation";
-static NSString *const MGLEventKeyBatteryLevel = @"batteryLevel";
 static NSString *const MGLEventKeyPluggedIn = @"pluggedIn";
 static NSString *const MGLEventKeyWifi = @"wifi";
 static NSString *const MGLEventKeySource = @"source";
@@ -190,9 +190,6 @@ const NSTimeInterval MGLFlushInterval = 180;
         // Clear Any System TimeZone Cache
         [NSTimeZone resetSystemTimeZone];
         [_rfc3339DateFormatter setTimeZone:[NSTimeZone systemTimeZone]];
-        
-        // Enable Battery Monitoring
-        [UIDevice currentDevice].batteryMonitoringEnabled = YES;
 
         // Configure logging
         if ([self isProbablyAppStoreBuild]) {
@@ -454,7 +451,6 @@ const NSTimeInterval MGLFlushInterval = 180;
                                                      MGLEventKeyResolution: @(self.data.scale),
                                                      MGLEventKeyAccessibilityFontScale: @([self contentSizeScale]),
                                                      MGLEventKeyOrientation: [self deviceOrientation],
-                                                     MGLEventKeyBatteryLevel: @([self batteryLevel]),
                                                      MGLEventKeyWifi: @([[MGLReachability reachabilityForLocalWiFi] isReachableViaWiFi])} mutableCopy];
     [self addBatteryStateToAttributes:attributes];
     return [self eventForAttributes:attributes attributeDictionary:attributeDictionary];
@@ -475,7 +471,6 @@ const NSTimeInterval MGLFlushInterval = 180;
 - (MGLMutableMapboxEventAttributes *)interactionEvent {
     MGLMutableMapboxEventAttributes *attributes = [@{MGLEventKeyCreated: [self.rfc3339DateFormatter stringFromDate:[NSDate date]],
                                                      MGLEventKeyOrientation: [self deviceOrientation],
-                                                     MGLEventKeyBatteryLevel: @([self batteryLevel]),
                                                      MGLEventKeyWifi: @([[MGLReachability reachabilityForLocalWiFi] isReachableViaWiFi])} mutableCopy];
     [self addBatteryStateToAttributes:attributes];
     return attributes;
@@ -519,10 +514,6 @@ const NSTimeInterval MGLFlushInterval = 180;
                                                  repeats:YES];
 }
 
-- (NSInteger)batteryLevel {
-    return [[NSNumber numberWithFloat:roundf(100 * [UIDevice currentDevice].batteryLevel)] integerValue];
-}
-
 - (NSString *)deviceOrientation {
     NSString *result;
 
@@ -665,11 +656,13 @@ const NSTimeInterval MGLFlushInterval = 180;
         double accuracy = 10000000;
         double lat = floor(loc.coordinate.latitude * accuracy) / accuracy;
         double lng = floor(loc.coordinate.longitude * accuracy) / accuracy;
+        double horizontalAccuracy = loc.horizontalAccuracy;
         NSString *formattedDate = [self.rfc3339DateFormatter stringFromDate:loc.timestamp];
         [MGLMapboxEvents pushEvent:MGLEventTypeLocation withAttributes:@{MGLEventKeyCreated: formattedDate,
                                                                          MGLEventKeyLatitude: @(lat),
                                                                          MGLEventKeyLongitude: @(lng),
-                                                                         MGLEventKeyAltitude: @(round(loc.altitude))}];
+                                                                         MGLEventKeyAltitude: @(round(loc.altitude)),
+                                                                         MGLEventHorizontalAccuracy: @(horizontalAccuracy)}];
     }
 }