@capgo/nativegeocoder 0.1.6 → 0.1.9

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ee.forgr.capacitor_nativegeocoder">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

package/android/src/main/java/ee/forgr/{plugin/nativegeocoder → capacitor_nativegeocoder}/NativeGeocoder.java

@@ -1,9 +1,30 @@
 package ee.forgr.capacitor_nativegeocoder;
 
-import android.util.Log;
+import android.content.Context;
+import android.location.Address;
+import android.location.Geocoder;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Build;
+
+import com.getcapacitor.JSObject;
+import com.getcapacitor.PluginCall;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.List;
+import java.util.Locale;
+
+class NativeGeocoderOptions {
+  boolean useLocale = true;
+  String defaultLocale = null;
+  int maxResults = 1;
+}
 
 public class NativeGeocoder {
 
+    private Geocoder geocoder;
     public Context context;
     /**
      * Reverse geocode a given latitude and longitude to find location address
@@ -23,7 +44,7 @@ public class NativeGeocoder {
             return;
         }
 
-        NativeGeocoderOptions geocoderOptions = getNativeGeocoderOptions(options);
+        NativeGeocoderOptions geocoderOptions = getNativeGeocoderOptions(call);
         geocoder = createGeocoderWithOptions(geocoderOptions);
 
         try {
@@ -52,7 +73,9 @@ public class NativeGeocoder {
 
                     resultObj.put(placemark);
                 }
-                call.resolve(resultObj);
+                JSObject ret = new JSObject();
+                ret.put("addresses", resultObj);
+                call.resolve(ret);
             } else {
                 call.reject("Cannot get an address.");
             }
@@ -70,7 +93,6 @@ public class NativeGeocoder {
     /**
      * Forward geocode a given address to find coordinates
      * @param addressString String
-     * @param options JSONObject
      * @param call PluginCall
      */
     private void forwardGeocode(String addressString, PluginCall call) {
@@ -103,7 +125,7 @@ public class NativeGeocoder {
 
                         if (!latitude.isEmpty() && !longitude.isEmpty()) {
                             // https://developer.android.com/reference/android/location/Address.html
-                            JSONObject placemark = new JSONObject();
+                            JSObject placemark = new JSObject();
                             placemark.put("latitude", latitude);
                             placemark.put("longitude", longitude);
                             placemark.put("countryCode", address.getCountryCode() != null ? address.getCountryCode() : "");
@@ -128,7 +150,9 @@ public class NativeGeocoder {
                 if (resultObj.length() == 0) {
                     call.reject("Cannot get latitude and/or longitude.");
                 } else {
-                    call.resolve(resultObj);
+                    JSObject ret = new JSObject();
+                    ret.put("addresses", resultObj);
+                    call.resolve(ret);
                 }
 
             } else {
@@ -163,38 +187,16 @@ public class NativeGeocoder {
      * @param options JSONObject
      * @return NativeGeocoderOptions
      */
-    private NativeGeocoderOptions getNativeGeocoderOptions(JSONObject options) {
+    private NativeGeocoderOptions getNativeGeocoderOptions(PluginCall options) {
         NativeGeocoderOptions geocoderOptions = new NativeGeocoderOptions();
 
         if (options != null) {
-            try {
-                geocoderOptions.useLocale = !options.has("useLocale") || options.getBoolean("useLocale");
-            } catch (JSONException e) {
-                geocoderOptions.useLocale = true;
-            }
-
-            if (options.has("defaultLocale")) {
-                try {
-                    geocoderOptions.defaultLocale = options.getString("defaultLocale");
-                } catch (JSONException e) {
-                    geocoderOptions.defaultLocale = null;
-                }
-            } else {
-                geocoderOptions.defaultLocale = null;
-            }
-            if (options.has("maxResults")) {
-                try {
-                    geocoderOptions.maxResults = options.getInt("maxResults");
-                } catch (JSONException e) {
-                    geocoderOptions.maxResults = 1;
-                }
-
-                if (geocoderOptions.maxResults > 0) {
-                    int MAX_RESULTS_COUNT = 5;
-                    geocoderOptions.maxResults = Math.min(geocoderOptions.maxResults, MAX_RESULTS_COUNT);
-                } else {
-                    geocoderOptions.maxResults = 1;
-                }
+            geocoderOptions.useLocale = options.getBoolean("useLocale", false);
+            geocoderOptions.defaultLocale = options.getString("defaultLocale", null);
+            geocoderOptions.maxResults = options.getInt("maxResults", 1);
+            if (geocoderOptions.maxResults > 0) {
+                int MAX_RESULTS_COUNT = 5;
+                geocoderOptions.maxResults = Math.min(geocoderOptions.maxResults, MAX_RESULTS_COUNT);
             } else {
                 geocoderOptions.maxResults = 1;
             }

package/android/src/main/java/ee/forgr/{plugin/nativegeocoder → capacitor_nativegeocoder}/NativeGeocoderPlugin.java

@@ -1,6 +1,5 @@
 package ee.forgr.capacitor_nativegeocoder;
 
-import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
@@ -14,7 +13,7 @@ public class NativeGeocoderPlugin extends Plugin {
     @Override
     public void load() {
         super.load();
-        implementation.context = this.getContext()
+        implementation.context = this.getContext();
     }
 
     @PluginMethod
@@ -24,7 +23,7 @@ public class NativeGeocoderPlugin extends Plugin {
             call.reject("Missing addressString");
             return;
         }
-        implementation.reverseGeocode(addressString, call)
+        implementation.reverseGeocode(addressString, call);
     }
     @PluginMethod
     public void forwardGeocode(PluginCall call) {
@@ -34,6 +33,6 @@ public class NativeGeocoderPlugin extends Plugin {
             call.reject("Missing latitude or longitude");
             return;
         }
-        implementation.forwardGeocode(latitude, longitude, call)
+        implementation.forwardGeocode(latitude, longitude, call);
     }
 }

package/ios/Plugin/NativeGeocoder.swift

@@ -2,21 +2,6 @@ import Foundation
 import Capacitor
 import CoreLocation
 
-struct NativeGeocoderResult: Encodable {
-    var latitude: String?
-    var longitude: String?
-    var countryCode: String?
-    var countryName: String?
-    var postalCode: String?
-    var administrativeArea: String?
-    var subAdministrativeArea: String?
-    var locality: String?
-    var subLocality: String?
-    var thoroughfare: String?
-    var subThoroughfare: String?
-    var areasOfInterest: [String]?
-}
-
 struct NativeGeocoderError {
     var message: String
 }
@@ -29,8 +14,8 @@ struct NativeGeocoderOptions: Decodable {
 
 @objc public class NativeGeocoder: NSObject {
 
-    typealias ReverseGeocodeCompletionHandler = ([NativeGeocoderResult]?, NativeGeocoderError?) -> Void
-    typealias ForwardGeocodeCompletionHandler = ([NativeGeocoderResult]?, NativeGeocoderError?) -> Void
+    typealias ReverseGeocodeCompletionHandler = ([JSObject]?, NativeGeocoderError?) -> Void
+    typealias ForwardGeocodeCompletionHandler = ([JSObject]?, NativeGeocoderError?) -> Void
     private static let MAX_RESULTS_COUNT = 5
 
     func reverseGeocode(latitude: Double, longitude: Double, call: CAPPluginCall) {
@@ -49,12 +34,7 @@ struct NativeGeocoderOptions: Decodable {
             if let error = error {
                 call.reject(error.message)
             } else {
-                if let encodedResult = try? JSONEncoder().encode(resultObj),
-                    let result = try? JSONSerialization.jsonObject(with: encodedResult, options: .allowFragments) as? JSObject {
-                    call.resolve(result)
-                } else {
-                    call.reject("Invalid JSON result")
-                }
+                call.resolve(["addresses": resultObj])
             }
         })
     }
@@ -93,32 +73,10 @@ struct NativeGeocoderOptions: Decodable {
         
         if let placemarks = placemarks {
             let maxResultObjects = placemarks.count >= maxResults ? maxResults : placemarks.count
-            var resultObj = [NativeGeocoderResult]()
+            var resultObj = [JSObject]()
             
             for i in 0..<maxResultObjects {
-                // https://developer.apple.com/documentation/corelocation/clplacemark
-                var latitude = ""
-                if let lat = placemarks[i].location?.coordinate.latitude {
-                    latitude = "\(lat)"
-                }
-                var longitude = ""
-                if let lon = placemarks[i].location?.coordinate.longitude {
-                    longitude = "\(lon)"
-                }
-                let placemark = NativeGeocoderResult(
-                    latitude: latitude,
-                    longitude: longitude,
-                    countryCode: placemarks[i].isoCountryCode ?? "",
-                    countryName: placemarks[i].country ?? "",
-                    postalCode: placemarks[i].postalCode ?? "",
-                    administrativeArea: placemarks[i].administrativeArea ?? "",
-                    subAdministrativeArea: placemarks[i].subAdministrativeArea ?? "",
-                    locality: placemarks[i].locality ?? "",
-                    subLocality: placemarks[i].subLocality ?? "",
-                    thoroughfare: placemarks[i].thoroughfare ?? "",
-                    subThoroughfare: placemarks[i].subThoroughfare ?? "",
-                    areasOfInterest: placemarks[i].areasOfInterest ?? []
-                )
+                let placemark = makePosition(placemarks[i])
                 resultObj.append(placemark)
             }
             
@@ -146,12 +104,7 @@ struct NativeGeocoderOptions: Decodable {
             if let error = error {
                 call.reject(error.message)
             } else {
-                if let encodedResult = try? JSONEncoder().encode(resultObj),
-                    let result = try? JSONSerialization.jsonObject(with: encodedResult, options: .allowFragments) as? JSObject {
-                    call.resolve(result)
-                } else {
-                    call.reject("Invalid JSON result")
-                }
+                call.resolve(["addresses": resultObj])
             }
         })
     }
@@ -181,6 +134,23 @@ struct NativeGeocoderOptions: Decodable {
             })
         }
     }
+    
+    private func makePosition(_ placemark: CLPlacemark) -> JSObject {
+        var ret = JSObject()
+        ret["latitude"] = placemark.location?.coordinate.latitude ?? ""
+        ret["longitude"] = placemark.location?.coordinate.longitude ?? ""
+        ret["countryCode"] = placemark.isoCountryCode ?? ""
+        ret["countryName"] = placemark.country ?? ""
+        ret["postalCode"] = placemark.postalCode ?? ""
+        ret["administrativeArea"] = placemark.administrativeArea ?? ""
+        ret["subAdministrativeArea"] = placemark.subAdministrativeArea ?? ""
+        ret["locality"] = placemark.locality ?? ""
+        ret["subLocality"] = placemark.subLocality ?? ""
+        ret["thoroughfare"] = placemark.thoroughfare ?? ""
+        ret["subThoroughfare"] = placemark.subThoroughfare ?? ""
+        ret["areasOfInterest"] = placemark.areasOfInterest ?? []
+        return ret
+    }
 
     private func createForwardGeocodeResult(_ placemarks: [CLPlacemark]?, _ error: Error?, maxResults: Int, completionHandler: @escaping ForwardGeocodeCompletionHandler) {
         guard error == nil else {
@@ -190,27 +160,12 @@ struct NativeGeocoderOptions: Decodable {
         
         if let placemarks = placemarks {
             let maxResultObjects = placemarks.count >= maxResults ? maxResults : placemarks.count
-            var resultObj = [NativeGeocoderResult]()
+            var resultObj = [JSObject]()
             
             for i in 0..<maxResultObjects {
                 if let latitude = placemarks[i].location?.coordinate.latitude,
                     let longitude = placemarks[i].location?.coordinate.longitude {
-                
-                    // https://developer.apple.com/documentation/corelocation/clplacemark
-                    let placemark = NativeGeocoderResult(
-                        latitude: "\(latitude)",
-                        longitude: "\(longitude)",
-                        countryCode: placemarks[i].isoCountryCode ?? "",
-                        countryName: placemarks[i].country ?? "",
-                        postalCode: placemarks[i].postalCode ?? "",
-                        administrativeArea: placemarks[i].administrativeArea ?? "",
-                        subAdministrativeArea: placemarks[i].subAdministrativeArea ?? "",
-                        locality: placemarks[i].locality ?? "",
-                        subLocality: placemarks[i].subLocality ?? "",
-                        thoroughfare: placemarks[i].thoroughfare ?? "",
-                        subThoroughfare: placemarks[i].subThoroughfare ?? "",
-                        areasOfInterest: placemarks[i].areasOfInterest ?? []
-                    )
+                    let placemark = makePosition(placemarks[i])
                     resultObj.append(placemark)
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/nativegeocoder",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Capacitor plugin for native forward and reverse geocoding",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",