Merge branch 'feature/directions' into develop

* feature/directions: Removes babelrc file Adds openCalloutInMaps function to MapMarker Requests location access permissions based on info.plist file
3sidedcube · Apr 6, 2017 · 531ed82 · 531ed82
2 parents af4b54e + 6ad6989
commit 531ed82
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/lib/components/MapMarker.js b/lib/components/MapMarker.js
@@ -229,6 +229,14 @@ class MapMarker extends React.Component {
     this._runCommand('hideCallout', []);
   }
 
+  openCalloutInMaps() {
+    if (Platform.OS === "ios") {
+      this._runCommand('openCalloutInMaps', []);
+    } else {
+      console.log("openCalloutInMaps is not yet supported on Android");
+    }
+  }
+
   _getHandle() {
     return findNodeHandle(this.marker);
   }

diff --git a/lib/ios/AirMaps/AIRMap.m b/lib/ios/AirMaps/AIRMap.m
@@ -203,7 +203,13 @@ - (void)setShowsUserLocation:(BOOL)showsUserLocation
     if (self.showsUserLocation != showsUserLocation) {
         if (showsUserLocation && !_locationManager) {
             _locationManager = [CLLocationManager new];
-            if ([_locationManager respondsToSelector:@selector(requestWhenInUseAuthorization)]) {
+
+            // Request location access permission
+            if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysUsageDescription"] &&
+                [_locationManager respondsToSelector:@selector(requestAlwaysAuthorization)]) {
+                [_locationManager requestAlwaysAuthorization];
+            } else if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationWhenInUseUsageDescription"] &&
+                       [_locationManager respondsToSelector:@selector(requestWhenInUseAuthorization)]) {
                 [_locationManager requestWhenInUseAuthorization];
             }
         }

diff --git a/lib/ios/AirMaps/AIRMapMarkerManager.m b/lib/ios/AirMaps/AIRMapMarkerManager.m
@@ -57,7 +57,7 @@ - (UIView *)view
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
         if (![view isKindOfClass:[AIRMapMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMapMarker, got: %@", view);
         } else {
             [(AIRMapMarker *) view showCalloutView];
         }
@@ -69,11 +69,26 @@ - (UIView *)view
     [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         id view = viewRegistry[reactTag];
         if (![view isKindOfClass:[AIRMapMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMapMarker, got: %@", view);
         } else {
             [(AIRMapMarker *) view hideCalloutView];
         }
     }];
 }
 
+RCT_EXPORT_METHOD(openCalloutInMaps:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[AIRMapMarker class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting AIRMapMarker, got: %@", view);
+        } else {
+            AIRMapMarker *marker = (AIRMapMarker *)view;
+            MKMapItem *mapItem = [[MKMapItem alloc] initWithPlacemark:[[MKPlacemark alloc] initWithCoordinate:marker.coordinate]];
+            mapItem.name = marker.title;
+            [MKMapItem openMapsWithItems:@[mapItem] launchOptions:@{MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDefault}];
+        }
+    }];
+}
+
 @end