@lugg/maps 0.2.0-alpha.9 → 1.0.0-beta.1

package/ios/core/GMSPolylineAnimator.h

@@ -5,7 +5,10 @@
 
 @property(nonatomic, weak) GMSPolyline *polyline;
 @property(nonatomic, assign) BOOL animated;
+@property(nonatomic, strong) PolylineAnimatedOptions *animatedOptions;
 
 - (void)update;
+- (void)pause;
+- (void)resume;
 
 @end

package/ios/core/GMSPolylineAnimator.m

@@ -1,13 +1,44 @@
 #import "GMSPolylineAnimator.h"
 #import <QuartzCore/QuartzCore.h>
 
+static const NSUInteger kMaxAnimationSpans = 16;
+
+@interface GMSDisplayLinkProxy : NSObject
+@property(nonatomic, weak) id target;
+@property(nonatomic, assign) SEL selector;
+@end
+
+@implementation GMSDisplayLinkProxy
+- (instancetype)initWithTarget:(id)target selector:(SEL)selector {
+  if (self = [super init]) {
+    _target = target;
+    _selector = selector;
+  }
+  return self;
+}
+- (void)tick:(CADisplayLink *)displayLink {
+  if (_target) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    [_target performSelector:_selector withObject:displayLink];
+#pragma clang diagnostic pop
+  } else {
+    [displayLink invalidate];
+  }
+}
+@end
+
 @implementation GMSPolylineAnimator {
   CADisplayLink *_displayLink;
+  GMSDisplayLinkProxy *_displayLinkProxy;
   CGFloat _animationProgress;
+  CGFloat _delayRemaining;
   NSArray<NSNumber *> *_cumulativeDistances;
   CGFloat _totalLength;
 }
 
+@synthesize animatedOptions = _animatedOptions;
+
 - (void)dealloc {
   [self stopAnimation];
 }
@@ -33,13 +64,23 @@
   }
 }
 
+- (void)setAnimatedOptions:(PolylineAnimatedOptions *)animatedOptions {
+  _animatedOptions = animatedOptions ?: [PolylineAnimatedOptions defaultOptions];
+  if (_animated && _displayLink) {
+    [self stopAnimation];
+    [self startAnimation];
+  }
+}
+
 - (void)startAnimation {
   if (_displayLink) {
     return;
   }
   [self computeCumulativeDistances];
   _animationProgress = 0;
-  _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(animationTick:)];
+  _delayRemaining = self.animatedOptions.delay / 1000.0;
+  _displayLinkProxy = [[GMSDisplayLinkProxy alloc] initWithTarget:self selector:@selector(animationTick:)];
+  _displayLink = [CADisplayLink displayLinkWithTarget:_displayLinkProxy selector:@selector(tick:)];
   [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
 }
 
@@ -62,14 +103,35 @@
 - (void)stopAnimation {
   [_displayLink invalidate];
   _displayLink = nil;
+  _displayLinkProxy = nil;
+}
+
+- (void)pause {
+  _displayLink.paused = YES;
+}
+
+- (void)resume {
+  _displayLink.paused = NO;
 }
 
 - (void)animationTick:(CADisplayLink *)displayLink {
-  CGFloat speed = displayLink.duration / 1.0;
+  if (_delayRemaining > 0) {
+    _delayRemaining -= displayLink.duration;
+    return;
+  }
+
+  CGFloat duration = self.animatedOptions.duration / 1000.0;
+  if (duration <= 0) duration = 2.15;
+
+  CGFloat trailLength = MAX(0.01, MIN(1.0, self.animatedOptions.trailLength));
+  CGFloat maxProgress = (trailLength < 1.0) ? 1.0 : 2.15;
+
+  CGFloat speed = displayLink.duration / duration;
   _animationProgress += speed;
 
-  if (_animationProgress >= 2.15) {
+  if (_animationProgress >= maxProgress) {
     _animationProgress = 0;
+    _delayRemaining = self.animatedOptions.delay / 1000.0;
   }
 
   [self updateAnimatedPolyline];
@@ -98,12 +160,19 @@
 }
 
 - (NSUInteger)indexForDistance:(CGFloat)distance {
-  for (NSUInteger i = 1; i < _cumulativeDistances.count; i++) {
-    if (_cumulativeDistances[i].doubleValue >= distance) {
-      return i - 1;
+  NSUInteger left = 0;
+  NSUInteger right = _cumulativeDistances.count - 1;
+
+  while (left < right) {
+    NSUInteger mid = (left + right + 1) / 2;
+    if (_cumulativeDistances[mid].doubleValue <= distance) {
+      left = mid;
+    } else {
+      right = mid - 1;
     }
   }
-  return _cumulativeDistances.count - 2;
+
+  return MIN(left, _cumulativeDistances.count - 2);
 }
 
 - (CLLocationCoordinate2D)coordinateAtDistance:(CGFloat)distance {
@@ -132,14 +201,21 @@
     return;
   }
 
-  CGFloat progress = MIN(_animationProgress, 2.0);
+  CGFloat trailLength = MAX(0.01, MIN(1.0, self.animatedOptions.trailLength));
+  CGFloat maxProgress = (trailLength < 1.0) ? 1.0 : 2.0;
+  CGFloat progress = MIN(_animationProgress, maxProgress);
+  CGFloat easedProgress = [self applyEasing:progress / maxProgress] * maxProgress;
+
   CGFloat headDist, tailDist;
 
-  if (progress <= 1.0) {
+  if (trailLength < 1.0) {
+    headDist = easedProgress * _totalLength;
+    tailDist = MAX(0, headDist - _totalLength * trailLength);
+  } else if (easedProgress <= 1.0) {
     tailDist = 0;
-    headDist = progress * _totalLength;
+    headDist = easedProgress * _totalLength;
   } else {
-    CGFloat shrinkProgress = progress - 1.0;
+    CGFloat shrinkProgress = easedProgress - 1.0;
     tailDist = shrinkProgress * _totalLength;
     headDist = _totalLength;
   }
@@ -171,12 +247,22 @@
   }
 
   NSUInteger pathCount = path.count;
-  for (NSUInteger i = 0; i < pathCount - 1; i++) {
-    CGFloat segMidDist = tailDist + visibleLength * ((CGFloat)i + 0.5) / (CGFloat)(pathCount - 1);
-    CGFloat gradientPos = (segMidDist - tailDist) / visibleLength;
+  NSUInteger segmentCount = pathCount - 1;
+
+  if (self.strokeColors.count <= 1) {
+    _polyline.path = path;
+    _polyline.strokeColor = self.strokeColors.firstObject ?: [UIColor blackColor];
+    return;
+  }
+
+  NSUInteger spanCount = MIN(segmentCount, kMaxAnimationSpans);
+  double segmentsPerSpan = (double)segmentCount / spanCount;
+
+  for (NSUInteger i = 0; i < spanCount; i++) {
+    CGFloat gradientPos = ((CGFloat)i + 0.5) / spanCount;
     UIColor *color = [self colorAtGradientPosition:gradientPos];
     GMSStrokeStyle *style = [GMSStrokeStyle solidColor:color];
-    [spans addObject:[GMSStyleSpan spanWithStyle:style]];
+    [spans addObject:[GMSStyleSpan spanWithStyle:style segments:segmentsPerSpan]];
   }
 
   _polyline.path = path;

package/ios/core/GoogleMapProvider.h

@@ -0,0 +1,13 @@
+#import "MapProviderDelegate.h"
+#import <GoogleMaps/GoogleMaps.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GoogleMapProvider : NSObject <MapProvider, GMSMapViewDelegate>
+
+@property(nonatomic, copy, nullable) NSString *mapId;
+@property(nonatomic, readonly, nullable) GMSMapView *mapView;
+
+@end
+
+NS_ASSUME_NONNULL_END