react-native-google-maps-plus 1.0.3-dev.1 → 1.1.0-dev.1

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -1,5 +1,6 @@
 package com.rngooglemapsplus
 
+import android.annotation.SuppressLint
 import android.location.Location
 import android.widget.FrameLayout
 import com.facebook.react.bridge.LifecycleEventListener
@@ -24,12 +25,14 @@ import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
+import com.rngooglemapsplus.extensions.toGooglePriority
+import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 class GoogleMapsViewImpl(
   val reactContext: ThemedReactContext,
   val locationHandler: LocationHandler,
   val playServiceHandler: PlayServicesHandler,
-  val markerOptions: com.rngooglemapsplus.MarkerOptions,
+  val markerBuilder: MarkerBuilder,
 ) : FrameLayout(reactContext),
   GoogleMap.OnCameraMoveStartedListener,
   GoogleMap.OnCameraMoveListener,
@@ -252,12 +255,37 @@ class GoogleMapsViewImpl(
           it.bottom.dpToPx().toInt(),
         )
       }
+
+      uiSettings?.let { v ->
+        googleMap?.uiSettings?.apply {
+          v.allGesturesEnabled?.let { setAllGesturesEnabled(it) }
+          v.compassEnabled?.let { isCompassEnabled = it }
+          v.indoorLevelPickerEnabled?.let { isIndoorLevelPickerEnabled = it }
+          v.mapToolbarEnabled?.let { isMapToolbarEnabled = it }
+          v.myLocationButtonEnabled?.let {
+            googleMap?.setLocationSource(locationHandler)
+            isMyLocationButtonEnabled = it
+          }
+          v.rotateEnabled?.let { isRotateGesturesEnabled = it }
+          v.scrollEnabled?.let { isScrollGesturesEnabled = it }
+          v.scrollDuringRotateOrZoomEnabled?.let {
+            isScrollGesturesEnabledDuringRotateOrZoom = it
+          }
+          v.tiltEnabled?.let { isTiltGesturesEnabled = it }
+          v.zoomControlsEnabled?.let { isZoomControlsEnabled = it }
+          v.zoomGesturesEnabled?.let { isZoomGesturesEnabled = it }
+        }
+      }
+
       buildingEnabled?.let {
         googleMap?.isBuildingsEnabled = it
       }
       trafficEnabled?.let {
         googleMap?.isTrafficEnabled = it
       }
+      indoorEnabled?.let {
+        googleMap?.isIndoorEnabled = it
+      }
       googleMap?.setMapStyle(customMapStyle)
       mapType?.let {
         googleMap?.mapType = it
@@ -273,6 +301,12 @@ class GoogleMapsViewImpl(
       }
     }
 
+    locationConfig?.let {
+      locationHandler.priority = it.android?.priority?.toGooglePriority()
+      locationHandler.interval = it.android?.interval?.toLong()
+      locationHandler.minUpdateInterval = it.android?.minUpdateInterval?.toLong()
+    }
+
     if (pendingMarkers.isNotEmpty()) {
       pendingMarkers.forEach { (id, opts) ->
         internalAddMarker(id, opts)
@@ -302,6 +336,69 @@ class GoogleMapsViewImpl(
     }
   }
 
+  var uiSettings: RNMapUiSettings? = null
+    set(value) {
+      field = value
+      onUi {
+        value?.let { v ->
+          googleMap?.uiSettings?.apply {
+            v.allGesturesEnabled?.let { setAllGesturesEnabled(it) }
+            v.compassEnabled?.let { isCompassEnabled = it }
+            v.indoorLevelPickerEnabled?.let { isIndoorLevelPickerEnabled = it }
+            v.mapToolbarEnabled?.let { isMapToolbarEnabled = it }
+            v.myLocationButtonEnabled?.let {
+              googleMap?.setLocationSource(locationHandler)
+              isMyLocationButtonEnabled = it
+            }
+            v.rotateEnabled?.let { isRotateGesturesEnabled = it }
+            v.scrollEnabled?.let { isScrollGesturesEnabled = it }
+            v.scrollDuringRotateOrZoomEnabled?.let {
+              isScrollGesturesEnabledDuringRotateOrZoom = it
+            }
+            v.tiltEnabled?.let { isTiltGesturesEnabled = it }
+            v.zoomControlsEnabled?.let { isZoomControlsEnabled = it }
+            v.zoomGesturesEnabled?.let { isZoomGesturesEnabled = it }
+          }
+        }
+          ?: run {
+            googleMap?.uiSettings?.apply {
+              setAllGesturesEnabled(true)
+              isCompassEnabled = false
+              isIndoorLevelPickerEnabled = false
+              isMapToolbarEnabled = false
+              isMyLocationButtonEnabled = false
+              googleMap?.setLocationSource(null)
+              isRotateGesturesEnabled = true
+              isScrollGesturesEnabled = true
+              isScrollGesturesEnabledDuringRotateOrZoom = true
+              isTiltGesturesEnabled = true
+              isZoomControlsEnabled = false
+              isZoomGesturesEnabled = false
+            }
+          }
+      }
+    }
+
+  @SuppressLint("MissingPermission")
+  var myLocationEnabled: Boolean? = null
+    set(value) {
+      onUi {
+        try {
+          value?.let {
+            googleMap?.isMyLocationEnabled = it
+          }
+            ?: run {
+              googleMap?.isMyLocationEnabled = false
+            }
+        } catch (se: SecurityException) {
+          onLocationError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
+        } catch (ex: Exception) {
+          val error = ex.toLocationErrorCode(context)
+          onLocationError?.invoke(error)
+        }
+      }
+    }
+
   var buildingEnabled: Boolean? = null
     set(value) {
       field = value
@@ -327,6 +424,19 @@ class GoogleMapsViewImpl(
       }
     }
 
+  var indoorEnabled: Boolean? = null
+    set(value) {
+      field = value
+      onUi {
+        value?.let {
+          googleMap?.isIndoorEnabled = it
+        }
+          ?: run {
+            googleMap?.isIndoorEnabled = false
+          }
+      }
+    }
+
   var customMapStyle: MapStyleOptions? = null
     set(value) {
       field = value
@@ -400,6 +510,14 @@ class GoogleMapsViewImpl(
       }
     }
 
+  var locationConfig: RNLocationConfig? = null
+    set(value) {
+      field = value
+      locationHandler.priority = value?.android?.priority?.toGooglePriority()
+      locationHandler.interval = value?.android?.interval?.toLong()
+      locationHandler.minUpdateInterval = value?.android?.minUpdateInterval?.toLong()
+    }
+
   var onMapError: ((RNMapErrorCode) -> Unit)? = null
   var onMapReady: ((Boolean) -> Unit)? = null
   var onLocationUpdate: ((RNLocation) -> Unit)? = null
@@ -414,7 +532,7 @@ class GoogleMapsViewImpl(
   var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
 
   fun setCamera(
-    camera: RNCamera,
+    cameraPosition: CameraPosition,
     animated: Boolean,
     durationMS: Int,
   ) {
@@ -423,33 +541,8 @@ class GoogleMapsViewImpl(
       if (current == null) {
         return@onUi
       }
-      val camPosBuilder =
-        CameraPosition.Builder(
-          current,
-        )
-
-      camera.center?.let {
-        camPosBuilder.target(
-          LatLng(
-            it.latitude,
-            it.longitude,
-          ),
-        )
-      }
-
-      camera.zoom?.let {
-        camPosBuilder.zoom(it.toFloat())
-      }
-      camera.bearing?.let {
-        camPosBuilder.bearing(it.toFloat())
-      }
-      camera.tilt?.let {
-        camPosBuilder.tilt(it.toFloat())
-      }
-
-      val camPos = camPosBuilder.build()
 
-      val update = CameraUpdateFactory.newCameraPosition(camPos)
+      val update = CameraUpdateFactory.newCameraPosition(cameraPosition)
 
       if (animated) {
         googleMap?.animateCamera(update, durationMS, null)
@@ -746,7 +839,7 @@ class GoogleMapsViewImpl(
 
   fun destroyInternal() {
     onUi {
-      markerOptions.cancelAllJobs()
+      markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()
       clearPolygons()

package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt

@@ -10,8 +10,6 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.common.api.ApiException
-import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.gms.common.api.ResolvableApiException
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
@@ -19,22 +17,43 @@ import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
-import com.google.android.gms.location.LocationSettingsStatusCodes
 import com.google.android.gms.location.Priority
+import com.google.android.gms.maps.LocationSource
 import com.google.android.gms.tasks.OnSuccessListener
+import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001
+private const val PRIORITY_DEFAULT = Priority.PRIORITY_BALANCED_POWER_ACCURACY
+private const val INTERVAL_DEFAULT = 600000L
+private const val MIN_UPDATE_INTERVAL = 3600000L
 
 class LocationHandler(
   val context: ReactContext,
-) {
+) : LocationSource {
   private val fusedLocationClientProviderClient: FusedLocationProviderClient =
     LocationServices.getFusedLocationProviderClient(context)
+  private var listener: LocationSource.OnLocationChangedListener? = null
   private var locationRequest: LocationRequest? = null
   private var locationCallback: LocationCallback? = null
-  private var priority = Priority.PRIORITY_HIGH_ACCURACY
-  private var interval: Long = 5000
-  private var minUpdateInterval: Long = 5000
+
+  var priority: Int? = PRIORITY_DEFAULT
+    set(value) {
+      field = value
+      start()
+    }
+
+  var interval: Long? = INTERVAL_DEFAULT
+    set(value) {
+      field = value
+      buildLocationRequest()
+    }
+
+  var minUpdateInterval: Long? = MIN_UPDATE_INTERVAL
+    set(value) {
+      field = value
+      buildLocationRequest()
+    }
+
   var onUpdate: ((Location) -> Unit)? = null
   var onError: ((RNLocationErrorCode) -> Unit)? = null
 
@@ -90,6 +109,10 @@ class LocationHandler(
 
   @Suppress("deprecation")
   private fun buildLocationRequest() {
+    val priority = priority ?: Priority.PRIORITY_BALANCED_POWER_ACCURACY
+    val interval = interval ?: INTERVAL_DEFAULT
+    val minUpdateInterval = minUpdateInterval ?: MIN_UPDATE_INTERVAL
+
     locationRequest =
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
         LocationRequest
@@ -106,21 +129,6 @@ class LocationHandler(
     restartLocationUpdates()
   }
 
-  fun setPriority(priority: Int) {
-    this.priority = priority
-    buildLocationRequest()
-  }
-
-  fun setInterval(interval: Int) {
-    this.interval = interval.toLong()
-    buildLocationRequest()
-  }
-
-  fun setFastestInterval(fastestInterval: Int) {
-    this.minUpdateInterval = fastestInterval.toLong()
-    buildLocationRequest()
-  }
-
   private fun restartLocationUpdates() {
     stop()
     // 4) Google Play Services checken – früh zurückmelden
@@ -146,7 +154,7 @@ class LocationHandler(
             }
           },
         ).addOnFailureListener { e ->
-          val error = mapThrowableToCode(e)
+          val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
       locationCallback =
@@ -154,6 +162,7 @@ class LocationHandler(
           override fun onLocationResult(locationResult: LocationResult) {
             val location = locationResult.lastLocation
             if (location != null) {
+              listener?.onLocationChanged(location)
               onUpdate?.invoke(location)
             } else {
               onError?.invoke(RNLocationErrorCode.POSITION_UNAVAILABLE)
@@ -166,40 +175,31 @@ class LocationHandler(
           locationCallback!!,
           Looper.getMainLooper(),
         ).addOnFailureListener { e ->
-          val error = mapThrowableToCode(e)
+          val error = e.toLocationErrorCode(context)
           onError?.invoke(error)
         }
     } catch (se: SecurityException) {
       onError?.invoke(RNLocationErrorCode.PERMISSION_DENIED)
     } catch (ex: Exception) {
-      val error = mapThrowableToCode(ex)
+      val error = ex.toLocationErrorCode(context)
       onError?.invoke(error)
     }
   }
 
-  private fun mapThrowableToCode(t: Throwable): RNLocationErrorCode {
-    if (t is SecurityException) return RNLocationErrorCode.PERMISSION_DENIED
-    if (t.message?.contains("GoogleApi", ignoreCase = true) == true) {
-      val gms = GoogleApiAvailability.getInstance()
-      val status = gms.isGooglePlayServicesAvailable(context)
-      if (status != ConnectionResult.SUCCESS) return RNLocationErrorCode.PLAY_SERVICE_NOT_AVAILABLE
-    }
-    if (t is ApiException) {
-      when (t.statusCode) {
-        CommonStatusCodes.NETWORK_ERROR -> return RNLocationErrorCode.POSITION_UNAVAILABLE
-        LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
-        LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
-        -> return RNLocationErrorCode.SETTINGS_NOT_SATISFIED
-      }
-      return RNLocationErrorCode.INTERNAL_ERROR
-    }
-    return RNLocationErrorCode.INTERNAL_ERROR
-  }
-
   fun stop() {
+    listener = null
     if (locationCallback != null) {
       fusedLocationClientProviderClient.removeLocationUpdates(locationCallback!!)
       locationCallback = null
     }
   }
+
+  override fun activate(listener: LocationSource.OnLocationChangedListener) {
+    this.listener = listener
+    start()
+  }
+
+  override fun deactivate() {
+    stop()
+  }
 }

package/android/src/main/java/com/rngooglemapsplus/{MapCircle.kt → MapCircleBuilder.kt}

@@ -3,8 +3,9 @@ package com.rngooglemapsplus
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.CircleOptions
 import com.google.android.gms.maps.model.LatLng
+import com.rngooglemapsplus.extensions.toColor
 
-class MapCircleOptions {
+class MapCircleBuilder {
   fun buildCircleOptions(circle: RNCircle): CircleOptions =
     CircleOptions().apply {
       center(LatLng(circle.center.latitude, circle.center.longitude))
@@ -16,14 +17,3 @@ class MapCircleOptions {
       circle.zIndex?.let { zIndex(it.toFloat()) }
     }
 }
-
-fun RNCircle.circleEquals(b: RNCircle): Boolean {
-  if (zIndex != b.zIndex) return false
-  if (pressable != b.pressable) return false
-  if (center != b.center) return false
-  if (radius != b.radius) return false
-  if (strokeWidth != b.strokeWidth) return false
-  if (strokeColor != b.strokeColor) return false
-  if (fillColor != b.fillColor) return false
-  return true
-}

package/android/src/main/java/com/rngooglemapsplus/{MapMarker.kt → MapMarkerBuilder.kt}

@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.coroutineContext
 
-class MarkerOptions(
+class MarkerBuilder(
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =

package/android/src/main/java/com/rngooglemapsplus/{MapPolygon.kt → MapPolygonBuilder.kt}

@@ -2,8 +2,9 @@ package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.PolygonOptions
+import com.rngooglemapsplus.extensions.toColor
 
-class MapPolygonOptions {
+class MapPolygonBuilder {
   fun buildPolygonOptions(poly: RNPolygon): PolygonOptions =
     PolygonOptions().apply {
       poly.coordinates.forEach { pt ->
@@ -19,20 +20,3 @@ class MapPolygonOptions {
       poly.zIndex?.let { zIndex(it.toFloat()) }
     }
 }
-
-fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
-  if (zIndex != b.zIndex) return false
-  if (pressable != b.pressable) return false
-  if (strokeWidth != b.strokeWidth) return false
-  if (fillColor != b.fillColor) return false
-  if (strokeColor != b.strokeColor) return false
-  val ac = coordinates
-  val bc = b.coordinates
-  if (ac.size != bc.size) return false
-  for (i in ac.indices) {
-    val p = ac[i]
-    val q = bc[i]
-    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
-  }
-  return true
-}

package/android/src/main/java/com/rngooglemapsplus/{MapPolyline.kt → MapPolylineBuilder.kt.kt}

@@ -7,8 +7,9 @@ import com.google.android.gms.maps.model.JointType
 import com.google.android.gms.maps.model.PolylineOptions
 import com.google.android.gms.maps.model.RoundCap
 import com.google.android.gms.maps.model.SquareCap
+import com.rngooglemapsplus.extensions.toColor
 
-class MapPolylineOptions {
+class MapPolylineBuilder {
   fun buildPolylineOptions(pl: RNPolyline): PolylineOptions =
     PolylineOptions().apply {
       pl.coordinates.forEach { pt ->
@@ -41,21 +42,3 @@ class MapPolylineOptions {
       null -> JointType.DEFAULT
     }
 }
-
-fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
-  if (zIndex != b.zIndex) return false
-  if (pressable != b.pressable) return false
-  if ((width ?: 0.0) != (b.width ?: 0.0)) return false
-  if (lineCap != b.lineCap) return false
-  if (lineJoin != b.lineJoin) return false
-  if (color != b.color) return false
-  val ac = coordinates
-  val bc = b.coordinates
-  if (ac.size != bc.size) return false
-  for (i in ac.indices) {
-    val p = ac[i]
-    val q = bc[i]
-    if (p.latitude != q.latitude || p.longitude != q.longitude) return false
-  }
-  return true
-}

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -4,11 +4,15 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
-import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
-import com.google.android.gms.maps.model.MapColorScheme
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
+import com.rngooglemapsplus.extensions.circleEquals
+import com.rngooglemapsplus.extensions.polygonEquals
+import com.rngooglemapsplus.extensions.polylineEquals
+import com.rngooglemapsplus.extensions.toCameraPosition
+import com.rngooglemapsplus.extensions.toColor
+import com.rngooglemapsplus.extensions.toMapColorScheme
 
 @DoNotStrip
 class RNGoogleMapsPlusView(
@@ -19,23 +23,33 @@ class RNGoogleMapsPlusView(
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
 
-  private val markerOptions = MarkerOptions()
-  private val polylineOptions = MapPolylineOptions()
-  private val polygonOptions = MapPolygonOptions()
-  private val circleOptions = MapCircleOptions()
+  private val markerBuilder = MarkerBuilder()
+  private val polylineBuilder = MapPolylineBuilder()
+  private val polygonBuilder = MapPolygonBuilder()
+  private val circleBuilder = MapCircleBuilder()
 
   override val view =
-    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerOptions)
+    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
   override var initialProps: RNInitialProps? = null
     set(value) {
       view.initMapView(
         value?.mapId,
         value?.liteMode,
-        mapCameraToCameraPosition(value?.initialCamera),
+        value?.camera?.toCameraPosition(),
       )
     }
 
+  override var uiSettings: RNMapUiSettings? = null
+    set(value) {
+      view.uiSettings = value
+    }
+
+  override var myLocationEnabled: Boolean? = null
+    set(value) {
+      view.myLocationEnabled = value
+    }
+
   override var buildingEnabled: Boolean? = null
     set(value) {
       view.buildingEnabled = value
@@ -46,6 +60,11 @@ class RNGoogleMapsPlusView(
       view.trafficEnabled = value
     }
 
+  override var indoorEnabled: Boolean? = null
+    set(value) {
+      view.indoorEnabled = value
+    }
+
   override var customMapStyle: String? = null
     set(value) {
       currentCustomMapStyle = value
@@ -56,7 +75,7 @@ class RNGoogleMapsPlusView(
 
   override var userInterfaceStyle: RNUserInterfaceStyle? = null
     set(value) {
-      view.userInterfaceStyle = userInterfaceStyleToMapColorScheme(value)
+      view.userInterfaceStyle = value.toMapColorScheme()
     }
 
   override var minZoomLevel: Double? = null
@@ -87,17 +106,17 @@ class RNGoogleMapsPlusView(
       val nextById = value?.associateBy { it.id } ?: emptyMap()
 
       (prevById.keys - nextById.keys).forEach { id ->
-        markerOptions.cancelIconJob(id)
+        markerBuilder.cancelIconJob(id)
         view.removeMarker(id)
       }
 
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          markerOptions.buildIconAsync(id, next) { icon ->
+          markerBuilder.buildIconAsync(id, next) { icon ->
             view.addMarker(
               id,
-              markerOptions.build(next, icon),
+              markerBuilder.build(next, icon),
             )
           }
         } else if (!prev.markerEquals(next)) {
@@ -113,7 +132,7 @@ class RNGoogleMapsPlusView(
               }
 
               if (!prev.markerStyleEquals(next)) {
-                markerOptions.buildIconAsync(id, next) { icon ->
+                markerBuilder.buildIconAsync(id, next) { icon ->
                   m.setIcon(icon)
                 }
               }
@@ -140,7 +159,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolyline(id, polylineOptions.buildPolylineOptions(next))
+          view.addPolyline(id, polylineBuilder.buildPolylineOptions(next))
         } else if (!prev.polylineEquals(next)) {
           view.updatePolyline(id) { gms ->
             onUi {
@@ -151,11 +170,11 @@ class RNGoogleMapsPlusView(
                 }
               next.width?.let { gms.width = it.dpToPx() }
               next.lineCap?.let {
-                val cap = polylineOptions.mapLineCap(it)
+                val cap = polylineBuilder.mapLineCap(it)
                 gms.startCap = cap
                 gms.endCap = cap
               }
-              next.lineJoin?.let { gms.jointType = polylineOptions.mapLineJoin(it) }
+              next.lineJoin?.let { gms.jointType = polylineBuilder.mapLineJoin(it) }
               next.color?.let { gms.color = it.toColor() }
               next.zIndex?.let { gms.zIndex = it.toFloat() }
             }
@@ -177,7 +196,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addPolygon(id, polygonOptions.buildPolygonOptions(next))
+          view.addPolygon(id, polygonBuilder.buildPolygonOptions(next))
         } else if (!prev.polygonEquals(next)) {
           view.updatePolygon(id) { gmsPoly ->
             onUi {
@@ -209,7 +228,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         if (prev == null) {
-          view.addCircle(id, circleOptions.buildCircleOptions(next))
+          view.addCircle(id, circleBuilder.buildCircleOptions(next))
         } else if (!prev.circleEquals(next)) {
           view.updateCircle(id) { gmsCircle ->
             onUi {
@@ -226,6 +245,11 @@ class RNGoogleMapsPlusView(
       field = value
     }
 
+  override var locationConfig: RNLocationConfig? = null
+    set(value) {
+      view.locationConfig = value
+    }
+
   override var onMapError: ((RNMapErrorCode) -> Unit)? = null
     set(cb) {
       view.onMapError = cb
@@ -290,7 +314,7 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMS: Double?,
   ) {
-    view.setCamera(camera, animated == true, durationMS?.toInt() ?: 3000)
+    view.setCamera(camera.toCameraPosition(), animated == true, durationMS?.toInt() ?: 3000)
   }
 
   override fun setCameraToCoordinates(
@@ -318,41 +342,6 @@ class RNGoogleMapsPlusView(
   override fun requestLocationPermission(): Promise<RNLocationPermissionResult> = permissionHandler.requestLocationPermission()
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
-
-  fun userInterfaceStyleToMapColorScheme(value: RNUserInterfaceStyle?): Int? {
-    value ?: return null
-    return when (value) {
-      RNUserInterfaceStyle.LIGHT -> {
-        MapColorScheme.LIGHT
-      }
-
-      RNUserInterfaceStyle.DARK -> {
-        MapColorScheme.DARK
-      }
-
-      RNUserInterfaceStyle.DEFAULT -> {
-        MapColorScheme.FOLLOW_SYSTEM
-      }
-    }
-  }
-
-  fun mapCameraToCameraPosition(camera: RNCamera?): CameraPosition? {
-    camera ?: return null
-    val builder = CameraPosition.builder()
-    camera.center?.let {
-      builder.target(
-        com.google.android.gms.maps.model.LatLng(
-          camera.center.latitude,
-          camera.center.longitude,
-        ),
-      )
-    }
-    camera.zoom?.let { builder.zoom(it.toFloat()) }
-    camera.bearing?.let { builder.bearing(it.toFloat()) }
-    camera.tilt?.let { builder.tilt(it.toFloat()) }
-
-    return builder.build()
-  }
 }
 
 private inline fun onUi(crossinline block: () -> Unit) {