Merge branch 'master' of https://github.com/androidseb/react-native-geocoder-reborn into androidseb-master

Author: timwangdev

android/src/main/java/dev/timwang/RNGeocoder/RNGeocoderModule.java

@@ -42,9 +42,9 @@ public void init(String locale, Integer maxResults) {
     }
 
     @ReactMethod
-    public void geocodeAddress(String addressName, String language, Promise promise) {
+    public void geocodeAddress(String addressName, float swLat, float swLng, float neLat, float neLng, String language, Promise promise) {
         try {
-            List<Address> addresses = geocoder.getFromLocationName(addressName, maxResults);
+            List<Address> addresses = geocoder.getFromLocationName(addressName, 2, swLat, swLng, neLat, neLng, maxResults);
             if(addresses != null && addresses.size() > 0) {
                 promise.resolve(transform(addresses));
             } else {

ios/RNGeocoder/RNGeocoder.m

@@ -55,6 +55,10 @@ @implementation RNGeocoder
 }
 
 RCT_EXPORT_METHOD(geocodeAddress:(NSString *)address
+                  withSWLat:(CGFloat)swLat
+                  withSWLng:(CGFloat)swLng
+                  withNELat:(CGFloat)neLat
+                  withNELng:(CGFloat)neLng
                   language:(NSString *)language
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -68,6 +72,17 @@ @implementation RNGeocoder
     }
 
     CLGeocodeCompletionHandler handler = ^void(NSArray< CLPlacemark *> *placemarks, NSError *error) {
+    CLRegion* region;
+    if (swLat == 0 || swLng == 0 || neLat == 0 || neLng == 0){
+        region = nil;
+    }else{
+        CLLocationCoordinate2D center = CLLocationCoordinate2DMake(swLat + (neLat-swLat) / 2, swLng + (neLng-swLng) / 2);
+        //Computing the radius based on lat delta, since 1 lat = 111 km no matter the location
+        float latDelta = neLat - swLat;
+        float radiusLat = (latDelta/2);
+        float radius = radiusLat * 111000;
+        region = [[CLCircularRegion alloc] initWithCenter:center radius:radius identifier:@"Search Radius"];
+    }
         if (error) {
             if (placemarks.count == 0) {
               return reject(@"NOT_FOUND", @"geocodeAddress failed", error);
@@ -78,7 +93,7 @@ @implementation RNGeocoder
     };
 
     if (@available(iOS 11.0, *)) {
-        [self.geocoder geocodeAddressString:address inRegion:nil preferredLocale:[NSLocale localeWithLocaleIdentifier:language] completionHandler:handler];
+        [self.geocoder geocodeAddressString:address inRegion:region preferredLocale:[NSLocale localeWithLocaleIdentifier:language] completionHandler:handler];
     } else {
         [self.geocoder geocodeAddressString:address completionHandler:handler];
     }

src/geocoder.js

@@ -94,6 +94,13 @@ export default {
     if (this._forceGoogleOnIos && Platform.OS === 'ios') {
       return this.geocodeAddressGoogle(address);
     }
+    // If any of the parameters is not set for the region, we set them all to 0
+    if (swLat == null || swLng == null || neLat == null || neLng == null){
+        swLat = 0;
+        swLng = 0;
+        neLat = 0;
+        neLng = 0;
+    }
 
     if (typeof RNGeocoder === 'undefined') {
       if (!this._fallbackToGoogle) {