feature parity between iOS / android

Author: devfd

android/src/main/java/com/devfd/RNGeocoder/RNGeocoderModule.java

@@ -33,7 +33,7 @@ public String getName() {
     @ReactMethod
     public void geocodeAddress(String addressName, Promise promise) {
         if (!geocoder.isPresent()) {
-          promise.reject("-1", "Geocoder not available for this platform");
+          promise.reject("NOT_AVAILABLE", "Geocoder not available for this platform");
           return;
         }
 
@@ -50,7 +50,7 @@ public void geocodeAddress(String addressName, Promise promise) {
     @ReactMethod
     public void geocodePosition(ReadableMap position, Promise promise) {
         if (!geocoder.isPresent()) {
-            promise.reject("-1", "Geocoder not available for this platform");
+            promise.reject("NOT_AVAILABLE", "Geocoder not available for this platform");
             return;
         }
 

index.js

@@ -1,39 +1,22 @@
-var {
-  NativeModules: {
-    RNGeocoder
-  }
-} = require('react-native');
+import { NativeModules } from 'react-native';
 
-var Geocoder = {
+const { RNGeocoder } = NativeModules;
 
-  reverseGeocodeLocation: function(location, callback) {
+export default {
 
-    return new Promise((resolve, reject) => {
+  geocodePosition(position) {
+    if (!position || !position.lat || !position.lng) {
+      return Promise.reject(new Error("invalid position: {lat, lng} required"));
+    }
 
-      RNGeocoder.reverseGeocodeLocation(location, (err) => {
-        callback && callback(err, null);
-        reject(err);
-      }, (data) => {
-        callback && callback(null, data);
-        resolve(data);
-      });
-    });
+    return RNGeocoder.geocodePosition(position);
   },
 
-  geocodeAddress: function(address, callback) {
+  geocodeAddress(address) {
+    if (!address) {
+      return Promise.reject(new Error("address is null"));
+    }
 
-    return new Promise((resolve, reject) => {
-
-      RNGeocoder.geocodeAddress(address, (err) => {
-        callback && callback(err, null);
-        reject(err);
-      }, (data) => {
-        callback && callback(null, data);
-        resolve(data);
-      });
-    });
-  }
-};
-
-
-module.exports = Geocoder;
+    return RNGeocoder.geocodeAddress(address);
+  },
+}

ios/RNGeocoder.xcodeproj/project.pbxproj

@@ -212,7 +212,7 @@
 		BF8FCF9E1BFFB184000FCD37 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../react-native/React/**";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -222,7 +222,7 @@
 		BF8FCF9F1BFFB184000FCD37 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../react-native/React/**";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native/React/**";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/RNGeocoder/RNGeocoder.m

@@ -10,8 +10,8 @@ + (CLLocation *)CLLocation:(id)json
 {
   json = [self NSDictionary:json];
 
-  double lat = [RCTConvert double:json[@"latitude"]];
-  double lng = [RCTConvert double:json[@"longitude"]];
+  double lat = [RCTConvert double:json[@"lat"]];
+  double lng = [RCTConvert double:json[@"lng"]];
   return [[CLLocation alloc] initWithLatitude:lat longitude:lng];
 }
 
@@ -22,7 +22,9 @@ @implementation RNGeocoder
 
 RCT_EXPORT_MODULE();
 
-RCT_EXPORT_METHOD(reverseGeocodeLocation:(CLLocation *)location errorCallback: (RCTResponseSenderBlock)errorCallback successCallback: (RCTResponseSenderBlock)successCallback)
+RCT_EXPORT_METHOD(geocodePosition:(CLLocation *)location
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
   if (!self.geocoder) {
     self.geocoder = [[CLGeocoder alloc] init];
@@ -34,38 +36,38 @@ @implementation RNGeocoder
 
     if (error) {
       if (placemarks.count == 0) {
-        return errorCallback(@[@"Not found"]);
+          return reject(@"NOT_FOUND", @"geocodePosition failed", error);
       }
 
-      return errorCallback(@[error.description]);
+      return reject(@"ERROR", @"geocodePosition failed", error);
     }
 
-
-    successCallback(@[[self placemarksToDictionary:placemarks]]);
+    resolve([self placemarksToDictionary:placemarks]);
 
   }];
 }
 
-RCT_EXPORT_METHOD(geocodeAddress:(NSString *)address errorCallback: (RCTResponseSenderBlock)errorCallback successCallback: (RCTResponseSenderBlock)successCallback)
+RCT_EXPORT_METHOD(geocodeAddress:(NSString *)address
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-  if (!self.geocoder) {
-    self.geocoder = [[CLGeocoder alloc] init];
-  }
-
-  [self.geocoder cancelGeocode];
+    if (!self.geocoder) {
+        self.geocoder = [[CLGeocoder alloc] init];
+    }
 
-  [self.geocoder geocodeAddressString:address completionHandler:^(NSArray *placemarks, NSError *error) {
+    [self.geocoder cancelGeocode];
 
-    if (error) {
-      if (placemarks.count == 0) {
-        return errorCallback(@[@"Not found"]);
-      }
+    [self.geocoder geocodeAddressString:address completionHandler:^(NSArray *placemarks, NSError *error) {
 
-      return errorCallback(@[error.description]);
-    }
+        if (error) {
+            if (placemarks.count == 0) {
+              return reject(@"NOT_FOUND", @"geocodePosition failed", error);
+            }
 
-    successCallback(@[[self placemarksToDictionary:placemarks]]);
+            return reject(@"ERROR", @"geocodePosition failed", error);
+        }
 
+        resolve([self placemarksToDictionary:placemarks]);
   }];
 }
 
@@ -76,20 +78,34 @@ - (NSArray *)placemarksToDictionary:(NSArray *)placemarks {
   for (int i = 0; i < placemarks.count; i++) {
     CLPlacemark* placemark = [placemarks objectAtIndex:i];
 
+    NSString* name = [NSNull null];
+
+    if (![placemark.name isEqualToString:placemark.locality] &&
+        ![placemark.name isEqualToString:placemark.thoroughfare] &&
+        ![placemark.name isEqualToString:placemark.subThoroughfare])
+    {
+
+        name = placemark.name;
+    }
+
+    NSArray *lines = placemark.addressDictionary[@"FormattedAddressLines"];
+
     NSDictionary *result = @{
-     @"name": placemark.name ?: [NSNull null],
+     @"feature": name,
      @"position": @{
          @"lat": [NSNumber numberWithDouble:placemark.location.coordinate.latitude],
          @"lng": [NSNumber numberWithDouble:placemark.location.coordinate.longitude],
          },
      @"country": placemark.country ?: [NSNull null],
+     @"countryCode": placemark.ISOcountryCode ?: [NSNull null],
      @"locality": placemark.locality ?: [NSNull null],
      @"subLocality": placemark.subLocality ?: [NSNull null],
-     @"thoroughfare": placemark.thoroughfare ?: [NSNull null],
-     @"subThoroughfare": placemark.subThoroughfare ?: [NSNull null],
+     @"streetName": placemark.thoroughfare ?: [NSNull null],
+     @"streetNumber": placemark.subThoroughfare ?: [NSNull null],
      @"postalCode": placemark.postalCode ?: [NSNull null],
-     @"administrativeArea": placemark.administrativeArea ?: [NSNull null],
-     @"subAdministrativeArea": placemark.subAdministrativeArea ?: [NSNull null],
+     @"adminArea": placemark.administrativeArea ?: [NSNull null],
+     @"subAdminArea": placemark.subAdministrativeArea ?: [NSNull null],
+     @"formattedAddress": [lines componentsJoinedByString:@","]
    };
 
     [results addObject:result];