react-native-maps 2.0.0-beta.14 → 2.0.0-beta.15

package/ios/Maps/RNMMap.h

@@ -29,6 +29,7 @@ extern const NSInteger RNMMapMaxZoomLevel;
 @property (nonatomic, assign) BOOL ignoreRegionChanges;
 @property (nonatomic, assign) BOOL mapLoaded;
 @property (nonatomic, assign) BOOL userLocationCalloutEnabled;
+@property (nonatomic, assign) BOOL mapChangedFromUserInteraction;
 @property (nonatomic, assign) CGFloat maxDelta;
 @property (nonatomic, assign) CGFloat maxZoomLevel;
 @property (nonatomic, assign) CGFloat minDelta;

package/ios/Maps/RNMMap.m

@@ -86,6 +86,7 @@ const NSInteger RNMMapMaxZoomLevel = 20;
         self.minZoomLevel = 0;
         self.maxZoomLevel = RNMMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
+        self.mapChangedFromUserInteraction = NO;
     }
     return self;
 }
@@ -405,6 +406,11 @@ const NSInteger RNMMapMaxZoomLevel = 20;
         region.span.longitudeDelta = self.region.span.longitudeDelta;
     }
 
+    // If the region was changed with an animation, there is no way it was a user interaction
+    if (animated) {
+        self.mapChangedFromUserInteraction = NO;
+    }
+    
     // Animate/move to new position
     [super setRegion:region animated:animated];
 }
@@ -418,6 +424,11 @@ const NSInteger RNMMapMaxZoomLevel = 20;
 
 - (void)setCamera:(MKMapCamera*)camera animated:(BOOL)animated
 {
+    // If the camera was changed with an animation, there is no way it was a user interaction
+    if (animated) {
+        self.mapChangedFromUserInteraction = NO;
+    }
+    
     [super setCamera:camera animated:animated];
 }
 

package/ios/Maps/RNMMapManager.m

@@ -513,6 +513,24 @@ static int kDragCenterContext;
     [self _regionChanged:mapView];
 }
 
+- (BOOL)mapViewRegionDidChangeFromUserInteraction:(RNMMap *)mapView
+{
+    UIView *view = mapView.subviews.firstObject;
+    // Look through gesture recognizers to determine whether this region change is from user interaction
+    for(UIGestureRecognizer *recognizer in view.gestureRecognizers) {
+        if(recognizer.state == UIGestureRecognizerStateBegan || recognizer.state == UIGestureRecognizerStateChanged || recognizer.state == UIGestureRecognizerStateEnded) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
+- (void)mapView:(RNMMap *)mapView regionWillChangeAnimated:(BOOL)animated
+{
+    mapView.mapChangedFromUserInteraction = [self mapViewRegionDidChangeFromUserInteraction: mapView];
+}
+
 - (void)mapView:(RNMMap *)mapView regionDidChangeAnimated:(__unused BOOL)animated
 {
     CGFloat zoomLevel = [self zoomLevel:mapView];
@@ -598,6 +616,7 @@ static int kDragCenterContext;
 #define FLUSH_NAN(value) (isnan(value) ? 0 : value)
         mapView.onChange(@{
                 @"continuous": @(continuous),
+                @"isGesture": @(mapView.mapChangedFromUserInteraction),
                 @"region": @{
                         @"latitude": @(FLUSH_NAN(region.center.latitude)),
                         @"longitude": @(FLUSH_NAN(region.center.longitude)),

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.15",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",