3 files changed, 69 insertions, 2 deletions
diff --git a/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m b/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
index 36c5292127..a04ac8cd28 100644
--- a/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
+++ b/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
@@ -3,6 +3,7 @@
 #import "MGLMapView.h"
 #import "MGLUserLocation.h"
 #import "MGLUserLocationHeadingBeamLayer.h"
+#import "MGLUserLocationHeadingArrowLayer.h"
 
 @implementation MGLFaux3DUserLocationAnnotationView
 {
@@ -12,6 +13,7 @@
     CAShapeLayer *_puckArrow;
 
     MGLUserLocationHeadingBeamLayer *_headingIndicatorLayer;
+    //MGLUserLocationHeadingArrowLayer *_headingIndicatorLayer;
     CALayer *_accuracyRingLayer;
     CALayer *_dotBorderLayer;
     CALayer *_dotLayer;
@@ -213,7 +215,7 @@
         [self updateFrameWithSize:MGLUserLocationAnnotationDotSize];
     }
 
-    BOOL showHeadingIndicator = self.mapView.userTrackingMode == MGLUserTrackingModeFollowWithHeading;
+    BOOL showHeadingIndicator = YES;//self.mapView.userTrackingMode == MGLUserTrackingModeFollowWithHeading;
 
     // update heading indicator
     //
@@ -227,13 +229,14 @@
         if ( ! _headingIndicatorLayer && headingAccuracy)
         {
             _headingIndicatorLayer = [[MGLUserLocationHeadingBeamLayer alloc] initWithUserLocationAnnotationView:self];
+            //_headingIndicatorLayer = [[MGLUserLocationHeadingArrowLayer alloc] initWithUserLocationAnnotationView:self];
             [self.layer insertSublayer:_headingIndicatorLayer below:_dotBorderLayer];
 
             _oldHeadingAccuracy = headingAccuracy;
         }
         else if (_oldHeadingAccuracy != headingAccuracy)
         {
-            [_headingIndicatorLayer updateHeadingAccuracy:headingAccuracy];
+            //[_headingIndicatorLayer updateHeadingAccuracy:headingAccuracy];
              _oldHeadingAccuracy = headingAccuracy;
         }
 
diff --git a/platform/ios/src/MGLUserLocationHeadingArrowLayer.h b/platform/ios/src/MGLUserLocationHeadingArrowLayer.h
new file mode 100644
index 0000000000..2b7dea4e62
--- /dev/null
+++ b/platform/ios/src/MGLUserLocationHeadingArrowLayer.h
@@ -0,0 +1,9 @@
+#import <QuartzCore/QuartzCore.h>
+#import "MGLUserLocationAnnotationView.h"
+
+@interface MGLUserLocationHeadingArrowLayer : CAShapeLayer
+
+- (instancetype)initWithUserLocationAnnotationView:(MGLUserLocationAnnotationView *)userLocationView;
+- (void)updateTintColor:(CGColorRef)color;
+
+@end
diff --git a/platform/ios/src/MGLUserLocationHeadingArrowLayer.m b/platform/ios/src/MGLUserLocationHeadingArrowLayer.m
new file mode 100644
index 0000000000..3365fddb02
--- /dev/null
+++ b/platform/ios/src/MGLUserLocationHeadingArrowLayer.m
@@ -0,0 +1,55 @@
+#import "MGLUserLocationHeadingArrowLayer.h"
+
+#import "MGLFaux3DUserLocationAnnotationView.h"
+#import "MGLGeometry.h"
+
+const CGFloat MGLUserLocationHeadingArrowSize = 6;
+
+@implementation MGLUserLocationHeadingArrowLayer
+
+- (instancetype)initWithUserLocationAnnotationView:(MGLUserLocationAnnotationView *)userLocationView
+{
+    CGFloat size = userLocationView.bounds.size.width + MGLUserLocationHeadingArrowSize;
+
+    self = [super init];
+    self.bounds = CGRectMake(0, 0, size, size);
+    self.position = CGPointMake(CGRectGetMidX(userLocationView.bounds), CGRectGetMidY(userLocationView.bounds));
+    self.path = [self arrowPath];
+    self.fillColor = userLocationView.tintColor.CGColor;
+    self.shouldRasterize = YES;
+    self.rasterizationScale = UIScreen.mainScreen.scale;
+    self.drawsAsynchronously = YES;
+
+    self.strokeColor = UIColor.whiteColor.CGColor;
+    self.lineWidth = 1.0;
+    self.lineJoin = kCALineJoinRound;
+
+    return self;
+}
+
+- (void)updateTintColor:(CGColorRef)color
+{
+    // redraw the raw tinted gradient
+    self.fillColor = color;
+}
+
+- (CGPathRef)arrowPath {
+    CGFloat center = roundf(CGRectGetMidX(self.bounds));
+    CGFloat size = MGLUserLocationHeadingArrowSize;
+
+    CGPoint top =       CGPointMake(center,         0);
+    CGPoint left =      CGPointMake(center - size,  size);
+    CGPoint right =     CGPointMake(center + size,  size);
+    CGPoint middle =    CGPointMake(center,         size / M_PI);
+
+    UIBezierPath *bezierPath = [UIBezierPath bezierPath];
+    [bezierPath moveToPoint:top];
+    [bezierPath addLineToPoint:left];
+    [bezierPath addQuadCurveToPoint:right controlPoint:middle];
+    [bezierPath addLineToPoint:top];
+    [bezierPath closePath];
+    
+    return bezierPath.CGPath;
+}
+
+@end