@inoxialabs/react-native-nitro-location-geocoder 0.1.0 → 1.0.1

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,6 @@
-#include <jni.h>
-#include "NitroLocationGeocoderOnLoad.hpp"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::locationgeocoder::initialize(vm);
-}
+#include <jni.h>
+#include "NitroLocationGeocoderOnLoad.hpp"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+  return margelo::nitro::locationgeocoder::initialize(vm);
+}

package/android/src/main/java/com/margelo/nitro/locationgeocoder/HybridLocationGeocoder.kt

@@ -1,95 +1,123 @@
-package com.margelo.nitro.locationgeocoder
-
-import android.location.Address
-import android.location.Geocoder
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.NitroModules
-import com.margelo.nitro.core.Promise
-import java.util.Locale
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicReference
-
-@DoNotStrip
-class HybridLocationGeocoder : HybridLocationGeocoderSpec() {
-
-    private val context
-        get() = NitroModules.applicationContext
-            ?: throw RuntimeException("Application context not available")
-
-    private fun getLocale(locale: String): Locale {
-        val normalized = locale.trim()
-        if (normalized.isEmpty()) return Locale.getDefault()
-        return Locale.forLanguageTag(normalized)
-    }
-
-    private fun createGeocoder(locale: String): Geocoder {
-        return Geocoder(context, getLocale(locale))
-    }
-
-    override fun reverseGeocode(
-        latitude: Double,
-        longitude: Double,
-        locale: String
-    ): Promise<LocationGeocoderResult> {
-        return Promise.async {
-            if (!Geocoder.isPresent()) {
-                throw Exception("UNAVAILABLE")
-            }
-
-            val address = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                reverseGeocodeApi33(latitude, longitude, locale)
-            } else {
-                reverseGeocodeLegacy(latitude, longitude, locale)
-            } ?: throw Exception("NO_RESULTS")
-
-            mapAddress(address)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    private fun reverseGeocodeApi33(latitude: Double, longitude: Double, locale: String): Address? {
-        val geocoder = createGeocoder(locale)
-        val resultRef = AtomicReference<Address?>()
-        val errorRef = AtomicReference<Exception?>()
-        val latch = CountDownLatch(1)
-
-        geocoder.getFromLocation(latitude, longitude, 1, object : Geocoder.GeocodeListener {
-            override fun onGeocode(addresses: MutableList<Address>) {
-                resultRef.set(addresses.firstOrNull())
-                latch.countDown()
-            }
-
-            override fun onError(errorMessage: String?) {
-                errorRef.set(Exception(errorMessage ?: "GEOCODER_ERROR"))
-                latch.countDown()
-            }
-        })
-
-        val completed = latch.await(15, TimeUnit.SECONDS)
-        if (!completed) {
-            throw Exception("GEOCODER_TIMEOUT")
-        }
-
-        errorRef.get()?.let { throw it }
-        return resultRef.get()
-    }
-
-    @Suppress("DEPRECATION")
-    private fun reverseGeocodeLegacy(latitude: Double, longitude: Double, locale: String): Address? {
-        return createGeocoder(locale).getFromLocation(latitude, longitude, 1)?.firstOrNull()
-    }
-
-    private fun mapAddress(address: Address): LocationGeocoderResult {
-        return LocationGeocoderResult(
-            countryCode = address.countryCode ?: "",
-            country = address.countryName ?: "",
-            locality = address.locality ?: "",
-            administrativeArea = address.adminArea ?: "",
-            subAdministrativeArea = address.subAdminArea ?: "",
-            subLocality = address.subLocality ?: ""
-        )
-    }
-}
+package com.margelo.nitro.locationgeocoder
+
+import android.location.Address
+import android.location.Geocoder
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.NitroModules
+import com.margelo.nitro.core.Promise
+import java.io.IOException
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicReference
+
+@DoNotStrip
+class HybridLocationGeocoder : HybridLocationGeocoderSpec() {
+
+    private val context
+        get() = NitroModules.applicationContext
+            ?: throw RuntimeException("Application context not available")
+
+    private fun getLocale(locale: String): Locale {
+        val normalized = locale.trim()
+        if (normalized.isEmpty()) return Locale.getDefault()
+        return Locale.forLanguageTag(normalized)
+    }
+
+    private fun createGeocoder(locale: String): Geocoder {
+        return Geocoder(context, getLocale(locale))
+    }
+
+    private fun isValidCoordinate(latitude: Double, longitude: Double): Boolean {
+        return latitude.isFinite() &&
+            longitude.isFinite() &&
+            latitude >= -90.0 &&
+            latitude <= 90.0 &&
+            longitude >= -180.0 &&
+            longitude <= 180.0
+    }
+
+    private fun geocoderFailed(message: String?): Exception {
+        val normalized = message?.trim()?.takeIf { it.isNotEmpty() }
+        return Exception(if (normalized == null) "GEOCODER_FAILED" else "GEOCODER_FAILED: $normalized")
+    }
+
+    override fun reverseGeocode(
+        latitude: Double,
+        longitude: Double,
+        locale: String
+    ): Promise<LocationGeocoderResult> {
+        return Promise.async {
+            if (!isValidCoordinate(latitude, longitude)) {
+                throw Exception("INVALID_COORDINATES")
+            }
+
+            if (!Geocoder.isPresent()) {
+                throw Exception("UNAVAILABLE")
+            }
+
+            val address = try {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    reverseGeocodeApi33(latitude, longitude, locale)
+                } else {
+                    reverseGeocodeLegacy(latitude, longitude, locale)
+                }
+            } catch (error: IllegalArgumentException) {
+                throw Exception("INVALID_COORDINATES")
+            } catch (error: IOException) {
+                throw geocoderFailed(error.message)
+            } catch (error: InterruptedException) {
+                Thread.currentThread().interrupt()
+                throw geocoderFailed(error.message)
+            } ?: throw Exception("NO_RESULTS")
+
+            mapAddress(address)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private fun reverseGeocodeApi33(latitude: Double, longitude: Double, locale: String): Address? {
+        val geocoder = createGeocoder(locale)
+        val resultRef = AtomicReference<Address?>()
+        val errorRef = AtomicReference<Exception?>()
+        val latch = CountDownLatch(1)
+
+        geocoder.getFromLocation(latitude, longitude, 1, object : Geocoder.GeocodeListener {
+            override fun onGeocode(addresses: MutableList<Address>) {
+                resultRef.set(addresses.firstOrNull())
+                latch.countDown()
+            }
+
+            override fun onError(errorMessage: String?) {
+                errorRef.set(geocoderFailed(errorMessage))
+                latch.countDown()
+            }
+        })
+
+        val completed = latch.await(10, TimeUnit.SECONDS)
+        if (!completed) {
+            throw Exception("GEOCODER_TIMEOUT")
+        }
+
+        errorRef.get()?.let { throw it }
+        return resultRef.get()
+    }
+
+    @Suppress("DEPRECATION")
+    private fun reverseGeocodeLegacy(latitude: Double, longitude: Double, locale: String): Address? {
+        return createGeocoder(locale).getFromLocation(latitude, longitude, 1)?.firstOrNull()
+    }
+
+    private fun mapAddress(address: Address): LocationGeocoderResult {
+        return LocationGeocoderResult(
+            countryCode = address.countryCode ?: "",
+            country = address.countryName ?: "",
+            locality = address.locality ?: "",
+            administrativeArea = address.adminArea ?: "",
+            subAdministrativeArea = address.subAdminArea ?: "",
+            subLocality = address.subLocality ?: ""
+        )
+    }
+}

package/android/src/main/java/com/margelo/nitro/locationgeocoder/NitroLocationGeocoderPackage.kt

@@ -1,18 +1,18 @@
-package com.margelo.nitro.locationgeocoder
-
-import com.facebook.react.BaseReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfoProvider
-
-class NitroLocationGeocoderPackage : BaseReactPackage() {
-    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = null
-
-    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider { HashMap() }
-
-    companion object {
-        init {
-            NitroLocationGeocoderOnLoad.initializeNative()
-        }
-    }
-}
+package com.margelo.nitro.locationgeocoder
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class NitroLocationGeocoderPackage : BaseReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = null
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider { HashMap() }
+
+    companion object {
+        init {
+            NitroLocationGeocoderOnLoad.initializeNative()
+        }
+    }
+}

package/ios/Bridge.h

@@ -1 +1 @@
-#pragma once
+#pragma once

package/ios/HybridLocationGeocoder.swift

@@ -1,49 +1,92 @@
-import Foundation
-import CoreLocation
-import NitroModules
-
-class HybridLocationGeocoder: HybridLocationGeocoderSpec {
-
-    private let geocoder = CLGeocoder()
-
-    private func preferredLocale(_ locale: String) -> Locale? {
-        let normalized = locale.trimmingCharacters(in: .whitespacesAndNewlines)
-        if normalized.isEmpty {
-            return nil
-        }
-        return Locale(identifier: normalized)
-    }
-
-    func reverseGeocode(latitude: Double, longitude: Double, locale: String) throws -> Promise<LocationGeocoderResult> {
-        let promise = Promise<LocationGeocoderResult>()
-
-        if geocoder.isGeocoding {
-            geocoder.cancelGeocode()
-        }
-
-        let location = CLLocation(latitude: latitude, longitude: longitude)
-        geocoder.reverseGeocodeLocation(location, preferredLocale: preferredLocale(locale)) { placemarks, error in
-            if let error = error {
-                promise.reject(withError: RuntimeError.error(withMessage: "GEOCODER_FAILED: \(error.localizedDescription)"))
-                return
-            }
-
-            guard let placemark = placemarks?.first else {
-                promise.reject(withError: RuntimeError.error(withMessage: "NO_RESULTS"))
-                return
-            }
-
-            let result = LocationGeocoderResult(
-                countryCode: placemark.isoCountryCode ?? "",
-                country: placemark.country ?? "",
-                locality: placemark.locality ?? "",
-                administrativeArea: placemark.administrativeArea ?? "",
-                subAdministrativeArea: placemark.subAdministrativeArea ?? "",
-                subLocality: placemark.subLocality ?? ""
-            )
-            promise.resolve(withResult: result)
-        }
-
-        return promise
-    }
-}
+import Foundation
+import CoreLocation
+import NitroModules
+
+class HybridLocationGeocoder: HybridLocationGeocoderSpec {
+
+    private let timeoutSeconds: TimeInterval = 10
+
+    private func preferredLocale(_ locale: String) -> Locale? {
+        let normalized = locale.trimmingCharacters(in: .whitespacesAndNewlines)
+        if normalized.isEmpty {
+            return nil
+        }
+        return Locale(identifier: normalized)
+    }
+
+    private func isValidCoordinate(latitude: Double, longitude: Double) -> Bool {
+        latitude.isFinite &&
+            longitude.isFinite &&
+            latitude >= -90 &&
+            latitude <= 90 &&
+            longitude >= -180 &&
+            longitude <= 180
+    }
+
+    func reverseGeocode(latitude: Double, longitude: Double, locale: String) throws -> Promise<LocationGeocoderResult> {
+        let promise = Promise<LocationGeocoderResult>()
+
+        guard isValidCoordinate(latitude: latitude, longitude: longitude) else {
+            promise.reject(withError: RuntimeError.error(withMessage: "INVALID_COORDINATES"))
+            return promise
+        }
+
+        let geocoder = CLGeocoder()
+        var didComplete = false
+        var timeoutWorkItem: DispatchWorkItem?
+
+        func reject(_ message: String) {
+            if didComplete {
+                return
+            }
+            didComplete = true
+            timeoutWorkItem?.cancel()
+            promise.reject(withError: RuntimeError.error(withMessage: message))
+        }
+
+        func resolve(_ result: LocationGeocoderResult) {
+            if didComplete {
+                return
+            }
+            didComplete = true
+            timeoutWorkItem?.cancel()
+            promise.resolve(withResult: result)
+        }
+
+        timeoutWorkItem = DispatchWorkItem {
+            reject("GEOCODER_TIMEOUT")
+            geocoder.cancelGeocode()
+        }
+        if let timeoutWorkItem = timeoutWorkItem {
+            DispatchQueue.main.asyncAfter(
+                deadline: .now() + .milliseconds(Int(timeoutSeconds * 1000)),
+                execute: timeoutWorkItem
+            )
+        }
+
+        let location = CLLocation(latitude: latitude, longitude: longitude)
+        geocoder.reverseGeocodeLocation(location, preferredLocale: preferredLocale(locale)) { placemarks, error in
+            if let error = error {
+                reject("GEOCODER_FAILED: \(error.localizedDescription)")
+                return
+            }
+
+            guard let placemark = placemarks?.first else {
+                reject("NO_RESULTS")
+                return
+            }
+
+            let result = LocationGeocoderResult(
+                countryCode: placemark.isoCountryCode ?? "",
+                country: placemark.country ?? "",
+                locality: placemark.locality ?? "",
+                administrativeArea: placemark.administrativeArea ?? "",
+                subAdministrativeArea: placemark.subAdministrativeArea ?? "",
+                subLocality: placemark.subLocality ?? ""
+            )
+            resolve(result)
+        }
+
+        return promise
+    }
+}

package/nitro.json

@@ -1,24 +1,24 @@
-{
-  "$schema": "https://nitro.margelo.com/nitro.schema.json",
-  "cxxNamespace": [
-    "locationgeocoder"
-  ],
-  "ios": {
-    "iosModuleName": "NitroLocationGeocoder"
-  },
-  "android": {
-    "androidNamespace": [
-      "locationgeocoder"
-    ],
-    "androidCxxLibName": "NitroLocationGeocoder"
-  },
-  "autolinking": {
-    "LocationGeocoder": {
-      "swift": "HybridLocationGeocoder",
-      "kotlin": "HybridLocationGeocoder"
-    }
-  },
-  "ignorePaths": [
-    "**/node_modules"
-  ]
-}
+{
+  "$schema": "https://nitro.margelo.com/nitro.schema.json",
+  "cxxNamespace": [
+    "locationgeocoder"
+  ],
+  "ios": {
+    "iosModuleName": "NitroLocationGeocoder"
+  },
+  "android": {
+    "androidNamespace": [
+      "locationgeocoder"
+    ],
+    "androidCxxLibName": "NitroLocationGeocoder"
+  },
+  "autolinking": {
+    "LocationGeocoder": {
+      "swift": "HybridLocationGeocoder",
+      "kotlin": "HybridLocationGeocoder"
+    }
+  },
+  "ignorePaths": [
+    "**/node_modules"
+  ]
+}

package/nitrogen/generated/android/NitroLocationGeocoderOnLoad.cpp

@@ -27,9 +27,9 @@ int initialize(JavaVM* vm) {
 }
 
 struct JHybridLocationGeocoderSpecImpl: public jni::JavaClass<JHybridLocationGeocoderSpecImpl, JHybridLocationGeocoderSpec::JavaPart> {
-  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoder;";
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoder;";
   static std::shared_ptr<JHybridLocationGeocoderSpec> create() {
-    static auto constructorFn = javaClassStatic()->getConstructor<JHybridLocationGeocoderSpecImpl::javaobject()>();
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridLocationGeocoderSpecImpl::javaobject()>();
     jni::local_ref<JHybridLocationGeocoderSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
     return javaPart->getJHybridLocationGeocoderSpec();
   }

package/nitrogen/generated/android/c++/JHybridLocationGeocoderSpec.hpp

@@ -21,11 +21,11 @@ namespace margelo::nitro::locationgeocoder {
   class JHybridLocationGeocoderSpec: public virtual HybridLocationGeocoderSpec, public virtual JHybridObject {
   public:
     struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoderSpec;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoderSpec;";
       std::shared_ptr<JHybridLocationGeocoderSpec> getJHybridLocationGeocoderSpec();
     };
     struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoderSpec$CxxPart;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/HybridLocationGeocoderSpec$CxxPart;";
       static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
       static void registerNatives();
       using HybridBase::HybridBase;

package/nitrogen/generated/android/c++/JLocationGeocoderResult.hpp

@@ -17,11 +17,11 @@ namespace margelo::nitro::locationgeocoder {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "LocationGeocoderResult" and the the Kotlin data class "LocationGeocoderResult".
+   * The C++ JNI bridge between the C++ struct "LocationGeocoderResult" and the Kotlin data class "LocationGeocoderResult".
    */
   struct JLocationGeocoderResult final: public jni::JavaClass<JLocationGeocoderResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/LocationGeocoderResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/locationgeocoder/LocationGeocoderResult;";
 
   public:
     /**

package/nitrogen/generated/android/kotlin/com/margelo/nitro/locationgeocoder/LocationGeocoderResult.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.locationgeocoder
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -38,6 +39,28 @@ data class LocationGeocoderResult(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is LocationGeocoderResult) return false
+    return Objects.deepEquals(this.countryCode, other.countryCode)
+      && Objects.deepEquals(this.country, other.country)
+      && Objects.deepEquals(this.locality, other.locality)
+      && Objects.deepEquals(this.administrativeArea, other.administrativeArea)
+      && Objects.deepEquals(this.subAdministrativeArea, other.subAdministrativeArea)
+      && Objects.deepEquals(this.subLocality, other.subLocality)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf<Any?>(
+      countryCode,
+      country,
+      locality,
+      administrativeArea,
+      subAdministrativeArea,
+      subLocality
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/ios/NitroLocationGeocoder+autolinking.rb

@@ -56,5 +56,7 @@ def add_nitrogen_files(spec)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here)
+    "SWIFT_INSTALL_OBJC_HEADER" => "NO",
   })
 end