@capgo/nativegeocoder 0.1.7 → 0.1.10

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
@@ -11,7 +32,7 @@ public class NativeGeocoder {
      * @param longitude double
      * @param call PluginCall
      */
-    private void reverseGeocode(double latitude, double longitude, PluginCall call) {
+    public void reverseGeocode(double latitude, double longitude, PluginCall call) {
 
         if (latitude == 0 || longitude == 0) {
             call.reject("Expected two non-empty double arguments.");
@@ -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,10 +93,9 @@ 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) {
+    public void forwardGeocode(String addressString, PluginCall call) {
         if (addressString == null || addressString.length() == 0) {
             call.reject("Expected a non-empty string argument.");
             return;
@@ -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/capacitor_nativegeocoder/NativeGeocoderPlugin.java

@@ -0,0 +1,38 @@
+package ee.forgr.capacitor_nativegeocoder;
+
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+
+@CapacitorPlugin(name = "NativeGeocoder")
+public class NativeGeocoderPlugin extends Plugin {
+
+    private NativeGeocoder implementation = new NativeGeocoder();
+
+    @Override
+    public void load() {
+        super.load();
+        implementation.context = this.getContext();
+    }
+
+    @PluginMethod
+    public void reverseGeocode(PluginCall call) {
+      Double latitude = call.getDouble("latitude");
+      Double longitude = call.getDouble("longitude");
+      if (latitude == null || longitude == null) {
+        call.reject("Missing latitude or longitude");
+        return;
+      }
+      implementation.reverseGeocode(latitude, longitude, call);
+    }
+    @PluginMethod
+    public void forwardGeocode(PluginCall call) {
+      String addressString = call.getString("addressString");
+      if (addressString == null) {
+        call.reject("Missing addressString");
+        return;
+      }
+      implementation.forwardGeocode(addressString, call);
+    }
+}

package/ios/Plugin/NativeGeocoder.swift

@@ -34,7 +34,7 @@ struct NativeGeocoderOptions: Decodable {
             if let error = error {
                 call.reject(error.message)
             } else {
-                call.resolve(["results": resultObj])
+                call.resolve(["addresses": resultObj])
             }
         })
     }
@@ -104,7 +104,7 @@ struct NativeGeocoderOptions: Decodable {
             if let error = error {
                 call.reject(error.message)
             } else {
-                call.resolve(["results": resultObj])
+                call.resolve(["addresses": resultObj])
             }
         })
     }

package/package.json

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

package/android/src/main/java/ee/forgr/plugin/nativegeocoder/NativeGeocoderPlugin.java

@@ -1,39 +0,0 @@
-package ee.forgr.capacitor_nativegeocoder;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-@CapacitorPlugin(name = "NativeGeocoder")
-public class NativeGeocoderPlugin extends Plugin {
-
-    private NativeGeocoder implementation = new NativeGeocoder();
-
-    @Override
-    public void load() {
-        super.load();
-        implementation.context = this.getContext()
-    }
-
-    @PluginMethod
-    public void reverseGeocode(PluginCall call) {
-        String addressString = call.getString("addressString");
-        if (addressString == null) {
-            call.reject("Missing addressString");
-            return;
-        }
-        implementation.reverseGeocode(addressString, call)
-    }
-    @PluginMethod
-    public void forwardGeocode(PluginCall call) {
-        Number latitude = call.getDouble("latitude");
-        Number longitude = call.getDouble("longitude");
-        if (latitude == null || longitude == null) {
-            call.reject("Missing latitude or longitude");
-            return;
-        }
-        implementation.forwardGeocode(latitude, longitude, call)
-    }
-}