react-native-nitro-geolocation 0.1.2 → 0.2.0

package/android/src/main/java/com/margelo/nitro/nitrogeolocation/NitroGeolocationCompat.kt

@@ -0,0 +1,81 @@
+package com.margelo.nitro.nitrogeolocation
+
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.nitro.NitroModules
+
+@DoNotStrip
+class NitroGeolocationCompat(
+        private val reactContext: ReactApplicationContext = NitroModules.applicationContext!!
+) : HybridNitroGeolocationCompatSpec() {
+    private var configuration: RNConfigurationInternal =
+            RNConfigurationInternal(
+                    skipPermissionRequests = false,
+                    authorizationLevel = null,
+                    enableBackgroundLocationUpdates = null,
+                    locationProvider = null
+            )
+
+    private val requestAuthorizationHandler by lazy {
+        RequestAuthorization(
+                reactContext = reactContext,
+                onPermissionResult = { result, success, error ->
+                    when (result) {
+                        is PermissionResult.Granted -> success?.invoke()
+                        is PermissionResult.Denied ->
+                                error?.invoke(
+                                        createPermissionError(
+                                                "Location permission was not granted."
+                                        )
+                                )
+                    }
+                }
+        )
+    }
+
+    private val watchPositionHandler by lazy { WatchPosition(reactContext) }
+
+    override fun setRNConfiguration(config: RNConfigurationInternal) {
+        configuration = config
+    }
+
+    override fun requestAuthorization(
+            success: (() -> Unit)?,
+            error: ((error: GeolocationError) -> Unit)?
+    ) {
+        requestAuthorizationHandler.execute(success, error)
+    }
+
+    override fun getCurrentPosition(
+            success: (position: GeolocationResponse) -> Unit,
+            error: ((error: GeolocationError) -> Unit)?,
+            options: GeolocationOptions?
+    ) {
+        GetCurrentPosition(reactContext).execute(success, error, options)
+    }
+
+    override fun watchPosition(
+            success: (position: GeolocationResponse) -> Unit,
+            error: ((error: GeolocationError) -> Unit)?,
+            options: GeolocationOptions?
+    ): Double {
+        return watchPositionHandler.watch(success, error, options).toDouble()
+    }
+
+    override fun clearWatch(watchId: Double) {
+        watchPositionHandler.clearWatch(watchId.toInt())
+    }
+
+    override fun stopObserving() {
+        watchPositionHandler.stopObserving()
+    }
+
+    private fun createPermissionError(message: String) =
+            GeolocationError(
+                    code = RequestAuthorization.PERMISSION_DENIED.toDouble(),
+                    message = message,
+                    PERMISSION_DENIED = RequestAuthorization.PERMISSION_DENIED.toDouble(),
+                    POSITION_UNAVAILABLE = RequestAuthorization.POSITION_UNAVAILABLE.toDouble(),
+                    TIMEOUT = RequestAuthorization.TIMEOUT.toDouble()
+            )
+}

package/android/src/main/java/com/margelo/nitro/nitrogeolocation/WatchPosition.kt

@@ -186,19 +186,19 @@ class WatchPosition(private val reactContext: ReactApplicationContext) {
                         GeolocationCoordinates(
                                 latitude = location.latitude,
                                 longitude = location.longitude,
-                                altitude = if (location.hasAltitude()) location.altitude else null,
+                                altitude = if (location.hasAltitude()) NullableDouble.create(location.altitude) else null,
                                 accuracy = location.accuracy.toDouble(),
                                 altitudeAccuracy =
                                         if (android.os.Build.VERSION.SDK_INT >=
                                                         android.os.Build.VERSION_CODES.O &&
                                                         location.hasVerticalAccuracy()
                                         )
-                                                location.verticalAccuracyMeters.toDouble()
+                                                NullableDouble.create(location.verticalAccuracyMeters.toDouble())
                                         else null,
                                 heading =
-                                        if (location.hasBearing()) location.bearing.toDouble()
+                                        if (location.hasBearing()) NullableDouble.create(location.bearing.toDouble())
                                         else null,
-                                speed = if (location.hasSpeed()) location.speed.toDouble() else null
+                                speed = if (location.hasSpeed()) NullableDouble.create(location.speed.toDouble()) else null
                         ),
                 timestamp = location.time.toDouble()
         )

package/ios/LocationManager.swift

@@ -487,11 +487,11 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
         let coordsObj = GeolocationCoordinates(
             latitude: location.coordinate.latitude,
             longitude: location.coordinate.longitude,
-            altitude: altitude,
+            altitude: .second(altitude),
             accuracy: location.horizontalAccuracy,
-            altitudeAccuracy: altitudeAccuracy,
-            heading: heading,
-            speed: speed
+            altitudeAccuracy: .second(altitudeAccuracy),
+            heading: .second(heading),
+            speed: .second(speed)
         )
 
         let position = GeolocationResponse(