react-native-google-maps-plus 1.10.0-dev.7 → 1.10.1-dev.1

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

@@ -53,7 +53,6 @@ import com.rngooglemapsplus.extensions.toRnCamera
 import com.rngooglemapsplus.extensions.toRnLatLng
 import com.rngooglemapsplus.extensions.toRnLocation
 import com.rngooglemapsplus.extensions.toRnRegion
-import com.rngooglemapsplus.extensions.withPaddingPixels
 import idTag
 import tagData
 import java.io.ByteArrayInputStream
@@ -451,27 +450,25 @@ class GoogleMapsViewImpl(
   ) = onUi {
     if (coordinates.isEmpty()) return@onUi
 
-    val w = mapView?.width ?: 0
-    val h = mapView?.height ?: 0
+    val bounds =
+      LatLngBounds
+        .builder()
+        .apply {
+          coordinates.forEach { include(it.toLatLng()) }
+        }.build()
 
-    val builder = LatLngBounds.builder()
-    coordinates.forEach { coord -> builder.include(coord.toLatLng()) }
+    val previousMapPadding = mapPadding
+    mapPadding = padding
 
-    val baseBounds = builder.build()
-    val paddedBounds = baseBounds.withPaddingPixels(w, h, padding)
-
-    val adjustedWidth =
-      (w - padding.left.dpToPx() - padding.right.dpToPx()).toInt().coerceAtLeast(0)
-    val adjustedHeight =
-      (h - padding.top.dpToPx() - padding.bottom.dpToPx()).toInt().coerceAtLeast(0)
-
-    val update = CameraUpdateFactory.newLatLngBounds(paddedBounds, adjustedWidth, adjustedHeight, 0)
+    val update = CameraUpdateFactory.newLatLngBounds(bounds, 0)
 
     if (animated) {
       googleMap?.animateCamera(update, durationMs, null)
     } else {
       googleMap?.moveCamera(update)
     }
+
+    mapPadding = previousMapPadding
   }
 
   fun setCameraBounds(bounds: LatLngBounds?) =
@@ -837,9 +834,15 @@ class GoogleMapsViewImpl(
         setOnMyLocationClickListener(null)
         setOnMyLocationButtonClickListener(null)
         setInfoWindowAdapter(null)
+        isTrafficEnabled = false
+        isIndoorEnabled = false
+        myLocationEnabled = false
+        setLocationSource(null)
+        setLatLngBoundsForCameraTarget(null)
       }
       googleMap = null
       mapView?.removeAllViews()
+      mapView = null
       super.removeAllViews()
       reactContext.unregisterComponentCallbacks(componentCallbacks)
     }

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

@@ -19,6 +19,7 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
 import com.google.android.gms.location.Priority
 import com.google.android.gms.maps.LocationSource
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001
@@ -64,8 +65,8 @@ class LocationHandler(
   }
 
   fun showLocationDialog() {
-    UiThreadUtil.runOnUiThread {
-      val activity = context.currentActivity ?: run { return@runOnUiThread }
+    onUi {
+      val activity = context.currentActivity ?: run { return@onUi }
 
       val lr =
         if (Build.VERSION.SDK_INT >= 31) {

package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt

@@ -1,41 +1,10 @@
 package com.rngooglemapsplus.extensions
 
-import com.facebook.react.uimanager.PixelUtil.dpToPx
-import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.rngooglemapsplus.RNLatLngBounds
-import com.rngooglemapsplus.RNMapPadding
 
 fun LatLngBounds.toRnLatLngBounds(): RNLatLngBounds =
   RNLatLngBounds(
     northeast = northeast.toRnLatLng(),
     southwest = southwest.toRnLatLng(),
   )
-
-fun LatLngBounds.withPaddingPixels(
-  mapWidthPx: Int,
-  mapHeightPx: Int,
-  padding: RNMapPadding,
-): LatLngBounds {
-  val latSpan = northeast.latitude - southwest.latitude
-  val lngSpan = northeast.longitude - southwest.longitude
-  if (latSpan == 0.0 && lngSpan == 0.0) return this
-
-  val latPerPixel = if (mapHeightPx != 0) latSpan / mapHeightPx else 0.0
-  val lngPerPixel = if (mapWidthPx != 0) lngSpan / mapWidthPx else 0.0
-
-  val builder = LatLngBounds.builder()
-  builder.include(
-    LatLng(
-      northeast.latitude + (padding.top.dpToPx() * latPerPixel),
-      northeast.longitude + (padding.right.dpToPx() * lngPerPixel),
-    ),
-  )
-  builder.include(
-    LatLng(
-      southwest.latitude - (padding.bottom.dpToPx() * latPerPixel),
-      southwest.longitude - (padding.left.dpToPx() * lngPerPixel),
-    ),
-  )
-  return builder.build()
-}