@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/ios/RCTMGL/MGLFaux3DUserLocationAnnotationView.m

@@ -1,474 +0,0 @@
-//
-// https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/src/MGLFaux3DUserLocationAnnotationView.m
-//
-
-#import "MGLFaux3DUserLocationAnnotationView.h"
-
-#import "MGLUserLocationHeadingIndicator.h"
-#import "MGLUserLocationHeadingArrowLayer.h"
-#import "MGLUserLocationHeadingBeamLayer.h"
-
-#import "RCTMGLMapView.h"
-
-const CGFloat MGLUserLocationAnnotationDotSize = 22.0;
-const CGFloat MGLUserLocationAnnotationHaloSize = 115.0;
-
-const CGFloat MGLUserLocationAnnotationPuckSize = 45.0;
-const CGFloat MGLUserLocationAnnotationArrowSize = MGLUserLocationAnnotationPuckSize * 0.5;
-
-const CGFloat MGLUserLocationHeadingUpdateThreshold = 0.01;
-
-@implementation MGLFaux3DUserLocationAnnotationView
-{
-    BOOL _puckModeActivated;
-    
-    CALayer *_puckDot;
-    CAShapeLayer *_puckArrow;
-    
-    CALayer<MGLUserLocationHeadingIndicator> *_headingIndicatorLayer;
-    CALayer *_accuracyRingLayer;
-    CALayer *_dotBorderLayer;
-    CALayer *_dotLayer;
-    CALayer *_haloLayer;
-    
-    CLLocationDirection _oldHeadingAccuracy;
-    CLLocationAccuracy _oldHorizontalAccuracy;
-    double _oldZoom;
-    double _oldPitch;
-}
-
-- (CALayer *)hitTestLayer
-{
-    // Only the main dot should be interactive (i.e., exclude the accuracy ring and halo).
-    return _dotBorderLayer ?: _puckDot;
-}
-
-- (void)update
-{
-    if (CGSizeEqualToSize(self.frame.size, CGSizeZero))
-    {
-        CGFloat frameSize = (self.mapView.userTrackingMode == MGLUserTrackingModeFollowWithCourse) ? MGLUserLocationAnnotationPuckSize : MGLUserLocationAnnotationDotSize;
-        [self updateFrameWithSize:frameSize];
-    }
-    
-    if (CLLocationCoordinate2DIsValid(self.userLocation.coordinate))
-    {
-        RCTMGLMapView *reactMapView = (RCTMGLMapView *)self.mapView;
-        // FM - TODO
-        (reactMapView.userTrackingMode == MGLUserTrackingModeFollowWithCourse) ? [self drawPuck] : [self drawDot];
-        [self updatePitch];
-    }
-    
-    _haloLayer.hidden = ! CLLocationCoordinate2DIsValid(self.mapView.userLocation.coordinate) || self.mapView.userLocation.location.horizontalAccuracy > 10;
-}
-
-- (void)setTintColor:(UIColor *)tintColor
-{
-    CGColorRef newTintColor = [tintColor CGColor];
-    
-    if (_puckModeActivated)
-    {
-        _puckArrow.fillColor = newTintColor;
-    }
-    else
-    {
-        _accuracyRingLayer.backgroundColor = newTintColor;
-        _haloLayer.backgroundColor = newTintColor;
-        _dotLayer.backgroundColor = newTintColor;
-        [_headingIndicatorLayer updateTintColor:newTintColor];
-    }
-}
-
-- (void)updatePitch
-{
-    if (self.mapView.camera.pitch != _oldPitch)
-    {
-        // disable implicit animation
-        [CATransaction begin];
-        [CATransaction setDisableActions:YES];
-        
-        CATransform3D t = CATransform3DRotate(CATransform3DIdentity, MGLRadiansFromDegrees(self.mapView.camera.pitch), 1.0, 0, 0);
-        self.layer.sublayerTransform = t;
-        
-        [self updateFaux3DEffect];
-        
-        [CATransaction commit];
-        
-        _oldPitch = self.mapView.camera.pitch;
-    }
-}
-
-- (void)updateFaux3DEffect
-{
-    CGFloat pitch = MGLRadiansFromDegrees(self.mapView.camera.pitch);
-    
-    if (_puckDot)
-    {
-        _puckDot.shadowOffset = CGSizeMake(0, fmaxf(pitch * 10.f, 1.f));
-        _puckDot.shadowRadius = fmaxf(pitch * 5.f, 0.75f);
-    }
-    
-    if (_dotBorderLayer)
-    {
-        _dotBorderLayer.shadowOffset = CGSizeMake(0.f, pitch * 10.f);
-        _dotBorderLayer.shadowRadius = fmaxf(pitch * 5.f, 3.f);
-    }
-    
-    if (_dotLayer)
-    {
-        _dotLayer.zPosition = pitch * 2.f;
-    }
-}
-
-- (void)updateFrameWithSize:(CGFloat)size
-{
-    CGSize newSize = CGSizeMake(size, size);
-    if (CGSizeEqualToSize(self.frame.size, newSize))
-    {
-        return;
-    }
-    
-    // Update frame size, keeping the existing center point.
-    CGPoint oldCenter = self.center;
-    CGRect newFrame = self.frame;
-    newFrame.size = newSize;
-    [self setFrame:newFrame];
-    [self setCenter:oldCenter];
-}
-
-- (void)drawPuck
-{
-    if ( ! _puckModeActivated)
-    {
-        self.layer.sublayers = nil;
-        
-        _headingIndicatorLayer = nil;
-        _accuracyRingLayer = nil;
-        _haloLayer = nil;
-        _dotBorderLayer = nil;
-        _dotLayer = nil;
-        
-        [self updateFrameWithSize:MGLUserLocationAnnotationPuckSize];
-    }
-    
-    // background dot (white with black shadow)
-    //
-    if ( ! _puckDot)
-    {
-        _puckDot = [self circleLayerWithSize:MGLUserLocationAnnotationPuckSize];
-        _puckDot.backgroundColor = [[UIColor whiteColor] CGColor];
-        _puckDot.shadowColor = [[UIColor blackColor] CGColor];
-        _puckDot.shadowOpacity = 0.25;
-        _puckDot.shadowPath = [[UIBezierPath bezierPathWithOvalInRect:_puckDot.bounds] CGPath];
-        
-        if (self.mapView.camera.pitch)
-        {
-            [self updateFaux3DEffect];
-        }
-        else
-        {
-            _puckDot.shadowOffset = CGSizeMake(0, 1);
-            _puckDot.shadowRadius = 0.75;
-        }
-        
-        [self.layer addSublayer:_puckDot];
-    }
-    
-    // arrow
-    //
-    if ( ! _puckArrow)
-    {
-        _puckArrow = [CAShapeLayer layer];
-        _puckArrow.path = [[self puckArrow] CGPath];
-        _puckArrow.fillColor = [self.mapView.tintColor CGColor];
-        _puckArrow.bounds = CGRectMake(0, 0, round(MGLUserLocationAnnotationArrowSize), round(MGLUserLocationAnnotationArrowSize));
-        _puckArrow.position = CGPointMake(CGRectGetMidX(super.bounds), CGRectGetMidY(super.bounds));
-        _puckArrow.shouldRasterize = YES;
-        _puckArrow.rasterizationScale = [UIScreen mainScreen].scale;
-        _puckArrow.drawsAsynchronously = YES;
-        
-        _puckArrow.lineJoin = @"round";
-        _puckArrow.lineWidth = 1.f;
-        _puckArrow.strokeColor = _puckArrow.fillColor;
-        
-        [self.layer addSublayer:_puckArrow];
-    }
-    if (self.userLocation.location.course >= 0)
-    {
-        _puckArrow.affineTransform = CGAffineTransformRotate(CGAffineTransformIdentity, -MGLRadiansFromDegrees(self.mapView.direction - self.userLocation.location.course));
-    }
-    
-    if ( ! _puckModeActivated)
-    {
-        _puckModeActivated = YES;
-        
-        [self updateFaux3DEffect];
-    }
-}
-
-- (UIBezierPath *)puckArrow
-{
-    CGFloat max = MGLUserLocationAnnotationArrowSize;
-    
-    UIBezierPath *bezierPath = UIBezierPath.bezierPath;
-    [bezierPath moveToPoint:    CGPointMake(max * 0.5, 0)];
-    [bezierPath addLineToPoint: CGPointMake(max * 0.1, max)];
-    [bezierPath addLineToPoint: CGPointMake(max * 0.5, max * 0.65)];
-    [bezierPath addLineToPoint: CGPointMake(max * 0.9, max)];
-    [bezierPath addLineToPoint: CGPointMake(max * 0.5, 0)];
-    [bezierPath closePath];
-    
-    return bezierPath;
-}
-
-- (void)drawDot
-{
-    if (_puckModeActivated)
-    {
-        self.layer.sublayers = nil;
-        
-        _puckDot = nil;
-        _puckArrow = nil;
-        
-        [self updateFrameWithSize:MGLUserLocationAnnotationDotSize];
-    }
-    
-    // heading indicator (tinted, beam or arrow)
-    RCTMGLMapView *reactMapView = (RCTMGLMapView *)self.mapView;
-    BOOL headingTrackingModeEnabled = reactMapView.userTrackingMode == MGLUserTrackingModeFollowWithHeading;
-    BOOL showHeadingIndicator = self.mapView.showsUserHeadingIndicator || headingTrackingModeEnabled;
-
-    if (showHeadingIndicator)
-    {
-        _headingIndicatorLayer.hidden = NO;
-        CLLocationDirection headingAccuracy = self.userLocation.heading.headingAccuracy;
-        
-        if (([_headingIndicatorLayer isMemberOfClass:[MGLUserLocationHeadingBeamLayer class]] && ! headingTrackingModeEnabled) ||
-            ([_headingIndicatorLayer isMemberOfClass:[MGLUserLocationHeadingArrowLayer class]] && headingTrackingModeEnabled))
-        {
-            [_headingIndicatorLayer removeFromSuperlayer];
-            _headingIndicatorLayer = nil;
-            _oldHeadingAccuracy = -1;
-        }
-        
-        if ( ! _headingIndicatorLayer && headingAccuracy)
-        {
-            if (headingTrackingModeEnabled)
-            {
-                _headingIndicatorLayer = [[MGLUserLocationHeadingBeamLayer alloc] initWithUserLocationAnnotationView:self];
-                [self.layer insertSublayer:_headingIndicatorLayer below:_dotBorderLayer];
-            }
-            else
-            {
-                _headingIndicatorLayer = [[MGLUserLocationHeadingArrowLayer alloc] initWithUserLocationAnnotationView:self];
-                [self.layer addSublayer:_headingIndicatorLayer];
-                _headingIndicatorLayer.zPosition = 1;
-            }
-        }
-        
-        if (_oldHeadingAccuracy != headingAccuracy)
-        {
-            [_headingIndicatorLayer updateHeadingAccuracy:headingAccuracy];
-            _oldHeadingAccuracy = headingAccuracy;
-        }
-        
-        if (self.userLocation.heading.trueHeading >= 0)
-        {
-            CGFloat rotation = -MGLRadiansFromDegrees(self.mapView.direction - self.userLocation.heading.trueHeading);
-            
-            // Don't rotate if the change is imperceptible.
-            if (fabs(rotation) > MGLUserLocationHeadingUpdateThreshold)
-            {
-                [CATransaction begin];
-                [CATransaction setDisableActions:YES];
-                
-                _headingIndicatorLayer.affineTransform = CGAffineTransformRotate(CGAffineTransformIdentity, rotation);
-                
-                [CATransaction commit];
-            }
-        }
-    }
-    else
-    {
-        [_headingIndicatorLayer removeFromSuperlayer];
-        _headingIndicatorLayer = nil;
-    }
-    
-    // update accuracy ring (if zoom or horizontal accuracy have changed)
-    //
-    if (_accuracyRingLayer && (_oldZoom != self.mapView.zoomLevel || _oldHorizontalAccuracy != self.userLocation.location.horizontalAccuracy))
-    {
-        CGFloat accuracyRingSize = [self calculateAccuracyRingSize];
-        
-        // only show the accuracy ring if it won't be obscured by the location dot
-        if (accuracyRingSize > MGLUserLocationAnnotationDotSize + 15)
-        {
-            _accuracyRingLayer.hidden = NO;
-            
-            // disable implicit animation of the accuracy ring, unless triggered by a change in accuracy
-            BOOL shouldDisableActions = _oldHorizontalAccuracy == self.userLocation.location.horizontalAccuracy;
-            
-            [CATransaction begin];
-            [CATransaction setDisableActions:shouldDisableActions];
-            
-            _accuracyRingLayer.bounds = CGRectMake(0, 0, accuracyRingSize, accuracyRingSize);
-            _accuracyRingLayer.cornerRadius = accuracyRingSize / 2.0;
-            
-            // match the halo to the accuracy ring
-            _haloLayer.bounds = _accuracyRingLayer.bounds;
-            _haloLayer.cornerRadius = _accuracyRingLayer.cornerRadius;
-            _haloLayer.shouldRasterize = NO;
-            
-            [CATransaction commit];
-        }
-        else
-        {
-            _accuracyRingLayer.hidden = YES;
-            
-            _haloLayer.bounds = CGRectMake(0, 0, MGLUserLocationAnnotationHaloSize, MGLUserLocationAnnotationHaloSize);
-            _haloLayer.cornerRadius = MGLUserLocationAnnotationHaloSize / 2.0;
-            _haloLayer.shouldRasterize = YES;
-            _haloLayer.rasterizationScale = [UIScreen mainScreen].scale;
-        }
-        
-        // store accuracy and zoom so we're not redrawing unchanged location updates
-        _oldHorizontalAccuracy = self.userLocation.location.horizontalAccuracy;
-        _oldZoom = self.mapView.zoomLevel;
-    }
-    
-    // accuracy ring (circular, tinted, mostly-transparent)
-    //
-    if ( ! _accuracyRingLayer && self.userLocation.location.horizontalAccuracy)
-    {
-        CGFloat accuracyRingSize = [self calculateAccuracyRingSize];
-        _accuracyRingLayer = [self circleLayerWithSize:accuracyRingSize];
-        _accuracyRingLayer.backgroundColor = [self.mapView.tintColor CGColor];
-        _accuracyRingLayer.opacity = 0.1;
-        _accuracyRingLayer.shouldRasterize = NO;
-        _accuracyRingLayer.allowsGroupOpacity = NO;
-        
-        [self.layer addSublayer:_accuracyRingLayer];
-    }
-    
-    // expanding sonar-like pulse (circular, tinted, fades out)
-    //
-    if ( ! _haloLayer)
-    {
-        _haloLayer = [self circleLayerWithSize:MGLUserLocationAnnotationHaloSize];
-        _haloLayer.backgroundColor = [self.mapView.tintColor CGColor];
-        _haloLayer.allowsGroupOpacity = NO;
-        _haloLayer.zPosition = -0.1f;
-        
-        // set defaults for the animations
-        CAAnimationGroup *animationGroup = [self loopingAnimationGroupWithDuration:3.0];
-        
-        // scale out radially with initial acceleration
-        CAKeyframeAnimation *boundsAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale.xy"];
-        boundsAnimation.values = @[@0, @0.35, @1];
-        boundsAnimation.keyTimes = @[@0, @0.2, @1];
-        
-        // go transparent as scaled out, start semi-opaque
-        CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
-        opacityAnimation.values = @[@0.4, @0.4, @0];
-        opacityAnimation.keyTimes = @[@0, @0.2, @1];
-        
-        animationGroup.animations = @[boundsAnimation, opacityAnimation];
-        
-        [_haloLayer addAnimation:animationGroup forKey:@"animateTransformAndOpacity"];
-        
-        [self.layer addSublayer:_haloLayer];
-    }
-    
-    // background dot (white with black shadow)
-    //
-    if ( ! _dotBorderLayer)
-    {
-        _dotBorderLayer = [self circleLayerWithSize:MGLUserLocationAnnotationDotSize];
-        _dotBorderLayer.backgroundColor = [[UIColor whiteColor] CGColor];
-        _dotBorderLayer.shadowColor = [[UIColor blackColor] CGColor];
-        _dotBorderLayer.shadowOpacity = 0.25;
-        _dotBorderLayer.shadowPath = [[UIBezierPath bezierPathWithOvalInRect:_dotBorderLayer.bounds] CGPath];
-        
-        if (self.mapView.camera.pitch)
-        {
-            [self updateFaux3DEffect];
-        }
-        else
-        {
-            _dotBorderLayer.shadowOffset = CGSizeMake(0, 0);
-            _dotBorderLayer.shadowRadius = 3;
-        }
-        
-        [self.layer addSublayer:_dotBorderLayer];
-    }
-    
-    // inner dot (pulsing, tinted)
-    //
-    if ( ! _dotLayer)
-    {
-        _dotLayer = [self circleLayerWithSize:MGLUserLocationAnnotationDotSize * 0.75];
-        _dotLayer.backgroundColor = [self.mapView.tintColor CGColor];
-        
-        // set defaults for the animations
-        CAAnimationGroup *animationGroup = [self loopingAnimationGroupWithDuration:1.5];
-        animationGroup.autoreverses = YES;
-        animationGroup.fillMode = kCAFillModeBoth;
-        
-        // scale the dot up and down
-        CABasicAnimation *pulseAnimation = [CABasicAnimation animationWithKeyPath:@"transform.scale.xy"];
-        pulseAnimation.fromValue = @0.8;
-        pulseAnimation.toValue = @1;
-        
-        // fade opacity in and out, subtly
-        CABasicAnimation *opacityAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
-        opacityAnimation.fromValue = @0.8;
-        opacityAnimation.toValue = @1;
-        
-        animationGroup.animations = @[pulseAnimation, opacityAnimation];
-        
-        [_dotLayer addAnimation:animationGroup forKey:@"animateTransformAndOpacity"];
-        
-        [self.layer addSublayer:_dotLayer];
-    }
-    
-    if (_puckModeActivated)
-    {
-        _puckModeActivated = NO;
-        
-        [self updateFaux3DEffect];
-    }
-}
-
-- (CALayer *)circleLayerWithSize:(CGFloat)layerSize
-{
-    layerSize = round(layerSize);
-    
-    CALayer *circleLayer = [CALayer layer];
-    circleLayer.bounds = CGRectMake(0, 0, layerSize, layerSize);
-    circleLayer.position = CGPointMake(CGRectGetMidX(super.bounds), CGRectGetMidY(super.bounds));
-    circleLayer.cornerRadius = layerSize / 2.0;
-    circleLayer.shouldRasterize = YES;
-    circleLayer.rasterizationScale = [UIScreen mainScreen].scale;
-    circleLayer.drawsAsynchronously = YES;
-    
-    return circleLayer;
-}
-
-- (CAAnimationGroup *)loopingAnimationGroupWithDuration:(CGFloat)animationDuration
-{
-    CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
-    animationGroup.duration = animationDuration;
-    animationGroup.repeatCount = INFINITY;
-    animationGroup.removedOnCompletion = NO;
-    animationGroup.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault];
-    
-    return animationGroup;
-}
-
-- (CGFloat)calculateAccuracyRingSize
-{
-    // diameter in screen points
-    return round(self.userLocation.location.horizontalAccuracy / [self.mapView metersPerPointAtLatitude:self.userLocation.coordinate.latitude] * 2.0);
-}
-
-@end

package/ios/RCTMGL/MGLModule.h

@@ -1,13 +0,0 @@
-//
-//  MGLModule.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 8/23/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-
-@interface MGLModule : NSObject<RCTBridgeModule>
-@end