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

package/android/src/main/java/com/{googlemapsnitro/GoogleMapsNitroViewImpl.kt → rngooglemapsplus/GoogleMapsViewImpl.kt}

@@ -1,7 +1,7 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
-import android.annotation.SuppressLint
 import android.location.Location
+import android.widget.FrameLayout
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
@@ -9,9 +9,11 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.MapView
-import com.google.android.gms.maps.OnMapReadyCallback
 import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.Circle
+import com.google.android.gms.maps.model.CircleOptions
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.maps.model.MapColorScheme
@@ -23,58 +25,51 @@ import com.google.android.gms.maps.model.PolygonOptions
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 
-class GoogleMapsNitroViewImpl(
+class GoogleMapsViewImpl(
   val reactContext: ThemedReactContext,
   val locationHandler: LocationHandler,
   val playServiceHandler: PlayServicesHandler,
-  val markerOptions: com.googlemapsnitro.MarkerOptions,
-) : MapView(reactContext),
+  val markerOptions: com.rngooglemapsplus.MarkerOptions,
+) : FrameLayout(reactContext),
   GoogleMap.OnCameraMoveStartedListener,
   GoogleMap.OnCameraMoveListener,
   GoogleMap.OnCameraIdleListener,
   GoogleMap.OnMapClickListener,
-  OnMapReadyCallback,
   GoogleMap.OnMarkerClickListener,
+  GoogleMap.OnPolylineClickListener,
+  GoogleMap.OnPolygonClickListener,
+  GoogleMap.OnCircleClickListener,
   LifecycleEventListener {
+  private var initialized = false
+  private var mapReady = false
   private var googleMap: GoogleMap? = null
+  private var mapView: MapView? = null
 
-  private var pendingBuildingEnabled: Boolean = false
-  private var pendingTrafficEnabled: Boolean = false
-  private var pendingCustomMapStyle: MapStyleOptions? = null
-  private var pendingInitialCamera: CameraPosition =
-    CameraPosition
-      .builder()
-      .target(
-        LatLng(
-          0.0,
-          0.0,
-        ),
-      ).zoom(0f)
-      .bearing(0f)
-      .tilt(0f)
-      .build()
-  private var pendingUserInterfaceStyle: Int = MapColorScheme.FOLLOW_SYSTEM
-  private var pendingMinZoomLevel: Double = 0.0
-  private var pendingMaxZoomLevel: Double = 21.0
-  private var pendingMapPadding: RNMapPadding = RNMapPadding(0.0, 0.0, 0.0, 0.0)
-  private val pendingPolygons = mutableListOf<Pair<String, PolygonOptions>>()
-  private val pendingPolylines = mutableListOf<Pair<String, PolylineOptions>>()
   private val pendingMarkers = mutableListOf<Pair<String, MarkerOptions>>()
-  private var cameraMoveReason = -1
+  private val pendingPolylines = mutableListOf<Pair<String, PolylineOptions>>()
+  private val pendingPolygons = mutableListOf<Pair<String, PolygonOptions>>()
+  private val pendingCircles = mutableListOf<Pair<String, CircleOptions>>()
 
-  private val polygonsById = mutableMapOf<String, Polygon>()
-  private val polylinesById = mutableMapOf<String, Polyline>()
   private val markersById = mutableMapOf<String, Marker>()
+  private val polylinesById = mutableMapOf<String, Polyline>()
+  private val polygonsById = mutableMapOf<String, Polygon>()
+  private val circlesById = mutableMapOf<String, Circle>()
 
+  private var cameraMoveReason = -1
   private var lastSubmittedLocation: Location? = null
   private var lastSubmittedCameraPosition: CameraPosition? = null
 
   init {
     reactContext.addLifecycleEventListener(this)
-    getMap()
   }
 
-  private fun getMap() {
+  fun initMapView(
+    mapId: String?,
+    liteMode: Boolean?,
+    cameraPosition: CameraPosition?,
+  ) {
+    if (initialized) return
+    initialized = true
     val result = playServiceHandler.playServicesAvailability()
 
     when (result) {
@@ -103,8 +98,38 @@ class GoogleMapsNitroViewImpl(
         onMapError?.invoke(RNMapErrorCode.UNKNOWN)
     }
 
-    onCreate(null)
-    getMapAsync(this@GoogleMapsNitroViewImpl)
+    mapView =
+      MapView(
+        reactContext,
+        GoogleMapOptions().apply {
+          mapId?.let { mapId(it) }
+          liteMode?.let { liteMode(it) }
+          cameraPosition?.let {
+            camera(it)
+          }
+        },
+      )
+
+    super.addView(mapView)
+
+    mapView?.onCreate(null)
+    mapView?.getMapAsync { map ->
+      googleMap = map
+      googleMap?.setOnMapLoadedCallback {
+        googleMap?.setOnCameraMoveStartedListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnCameraMoveListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnCameraIdleListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnMarkerClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnPolylineClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnPolygonClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnCircleClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnMapClickListener(this@GoogleMapsViewImpl)
+      }
+      initLocationCallbacks()
+      applyPending()
+    }
+    mapReady = true
+    onMapReady?.invoke(true)
   }
 
   override fun onCameraMoveStarted(reason: Int) {
@@ -195,22 +220,6 @@ class GoogleMapsNitroViewImpl(
     )
   }
 
-  @SuppressLint("PotentialBehaviorOverride")
-  override fun onMapReady(map: GoogleMap) {
-    googleMap = map
-    googleMap?.setOnMapLoadedCallback {
-      googleMap?.setOnCameraMoveStartedListener(this)
-      googleMap?.setOnCameraMoveListener(this)
-      googleMap?.setOnCameraIdleListener(this)
-      googleMap?.setOnMarkerClickListener(this)
-      googleMap?.setOnMapClickListener(this)
-    }
-    initLocationCallbacks()
-    applyPending()
-
-    onMapReady?.invoke(true)
-  }
-
   fun initLocationCallbacks() {
     locationHandler.onUpdate = { location ->
       // / only the coordinated are relevant right now
@@ -235,27 +244,33 @@ class GoogleMapsNitroViewImpl(
 
   fun applyPending() {
     onUi {
-      googleMap?.setPadding(
-        pendingMapPadding.left.dpToPx().toInt(),
-        pendingMapPadding.top.dpToPx().toInt(),
-        pendingMapPadding.right.dpToPx().toInt(),
-        pendingMapPadding.bottom.dpToPx().toInt(),
-      )
-
-      pendingInitialCamera.let {
-        googleMap?.moveCamera(
-          CameraUpdateFactory.newCameraPosition(
-            it,
-          ),
+      mapPadding?.let {
+        googleMap?.setPadding(
+          it.left.dpToPx().toInt(),
+          it.top.dpToPx().toInt(),
+          it.right.dpToPx().toInt(),
+          it.bottom.dpToPx().toInt(),
         )
       }
-
-      googleMap?.isBuildingsEnabled = pendingBuildingEnabled
-      googleMap?.isTrafficEnabled = pendingTrafficEnabled
-      googleMap?.setMapStyle(pendingCustomMapStyle)
-      googleMap?.mapColorScheme = pendingUserInterfaceStyle
-      googleMap?.setMinZoomPreference(pendingMinZoomLevel.toFloat())
-      googleMap?.setMaxZoomPreference(pendingMaxZoomLevel.toFloat())
+      buildingEnabled?.let {
+        googleMap?.isBuildingsEnabled = it
+      }
+      trafficEnabled?.let {
+        googleMap?.isTrafficEnabled = it
+      }
+      googleMap?.setMapStyle(customMapStyle)
+      mapType?.let {
+        googleMap?.mapType = it
+      }
+      userInterfaceStyle?.let {
+        googleMap?.mapColorScheme = it
+      }
+      minZoomLevel?.let {
+        googleMap?.setMinZoomPreference(it.toFloat())
+      }
+      maxZoomLevel?.let {
+        googleMap?.setMaxZoomPreference(it.toFloat())
+      }
     }
 
     if (pendingMarkers.isNotEmpty()) {
@@ -278,79 +293,110 @@ class GoogleMapsNitroViewImpl(
       }
       pendingPolygons.clear()
     }
+
+    if (pendingCircles.isNotEmpty()) {
+      pendingCircles.forEach { (id, opts) ->
+        internalAddCircle(id, opts)
+      }
+      pendingCircles.clear()
+    }
   }
 
-  var buildingEnabled: Boolean
-    get() = googleMap?.isBuildingsEnabled ?: pendingBuildingEnabled
+  var buildingEnabled: Boolean? = null
     set(value) {
-      pendingBuildingEnabled = value
+      field = value
       onUi {
-        googleMap?.isBuildingsEnabled = value
+        value?.let {
+          googleMap?.isBuildingsEnabled = it
+        }
+          ?: run {
+            googleMap?.isBuildingsEnabled = false
+          }
       }
     }
 
-  var trafficEnabled: Boolean
-    get() = googleMap?.isTrafficEnabled ?: pendingTrafficEnabled
+  var trafficEnabled: Boolean? = null
     set(value) {
-      pendingTrafficEnabled = value
+      field = value
       onUi {
-        googleMap?.isTrafficEnabled = value
+        value?.let {
+          googleMap?.isTrafficEnabled = it
+        } ?: run {
+          googleMap?.isTrafficEnabled = false
+        }
       }
     }
 
-  var customMapStyle: MapStyleOptions?
-    get() = pendingCustomMapStyle
+  var customMapStyle: MapStyleOptions? = null
     set(value) {
-      pendingCustomMapStyle = value
+      field = value
       onUi {
         googleMap?.setMapStyle(value)
       }
     }
 
-  var initialCamera: CameraPosition
-    get() = pendingInitialCamera
+  var userInterfaceStyle: Int? = null
     set(value) {
-      pendingInitialCamera = value
+      field = value
+      onUi {
+        value?.let {
+          googleMap?.mapColorScheme = it
+        } ?: run {
+          googleMap?.mapColorScheme = MapColorScheme.FOLLOW_SYSTEM
+        }
+      }
     }
 
-  var userInterfaceStyle: Int
-    get() = pendingUserInterfaceStyle
+  var minZoomLevel: Double? = null
     set(value) {
-      pendingUserInterfaceStyle = value
+      field = value
       onUi {
-        googleMap?.mapColorScheme = value
+        value?.let {
+          googleMap?.setMinZoomPreference(it.toFloat())
+        } ?: run {
+          googleMap?.setMinZoomPreference(2.0f)
+        }
       }
     }
 
-  var minZoomLevel: Double
-    get() = pendingMinZoomLevel
+  var maxZoomLevel: Double? = null
     set(value) {
-      pendingMinZoomLevel = value
+      field = value
       onUi {
-        googleMap?.setMinZoomPreference(value.toFloat())
+        value?.let {
+          googleMap?.setMaxZoomPreference(it.toFloat())
+        } ?: run {
+          googleMap?.setMaxZoomPreference(21.0f)
+        }
       }
     }
 
-  var maxZoomLevel: Double
-    get() = pendingMaxZoomLevel
+  var mapPadding: RNMapPadding? = null
     set(value) {
-      pendingMaxZoomLevel = value
-      onUi {
-        googleMap?.setMaxZoomPreference(value.toFloat())
+      field = value
+      value?.let {
+        onUi {
+          googleMap?.setPadding(
+            it.left.dpToPx().toInt(),
+            it.top.dpToPx().toInt(),
+            it.right.dpToPx().toInt(),
+            it.bottom.dpToPx().toInt(),
+          )
+        }
+      } ?: run {
+        googleMap?.setPadding(0, 0, 0, 0)
       }
     }
 
-  var mapPadding: RNMapPadding
-    get() = pendingMapPadding
+  var mapType: Int? = null
     set(value) {
-      pendingMapPadding = value
+      field = value
       onUi {
-        googleMap?.setPadding(
-          value.left.dpToPx().toInt(),
-          value.top.dpToPx().toInt(),
-          value.right.dpToPx().toInt(),
-          value.bottom.dpToPx().toInt(),
-        )
+        value?.let {
+          googleMap?.mapType = it
+        } ?: run {
+          googleMap?.mapType = 1
+        }
       }
     }
 
@@ -360,6 +406,9 @@ class GoogleMapsNitroViewImpl(
   var onLocationError: ((RNLocationErrorCode) -> Unit)? = null
   var onMapPress: ((RNLatLng) -> Unit)? = null
   var onMarkerPress: ((String) -> Unit)? = null
+  var onPolylinePress: ((String) -> Unit)? = null
+  var onPolygonPress: ((String) -> Unit)? = null
+  var onCirclePress: ((String) -> Unit)? = null
   var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
@@ -429,8 +478,8 @@ class GoogleMapsNitroViewImpl(
       val latSpan = bounds.northeast.latitude - bounds.southwest.latitude
       val lngSpan = bounds.northeast.longitude - bounds.southwest.longitude
 
-      val latPerPixel = latSpan / height
-      val lngPerPixel = lngSpan / width
+      val latPerPixel = latSpan / (mapView?.height ?: 0)
+      val lngPerPixel = lngSpan / (mapView?.width ?: 0)
 
       builder.include(
         LatLng(
@@ -459,8 +508,10 @@ class GoogleMapsNitroViewImpl(
 
       val paddedBounds = builder.build()
 
-      val adjustedWidth = (width - padding.left.dpToPx() - padding.right.dpToPx()).toInt()
-      val adjustedHeight = (height - padding.top.dpToPx() - padding.bottom.dpToPx()).toInt()
+      val adjustedWidth =
+        ((mapView?.width ?: 0) - padding.left.dpToPx() - padding.right.dpToPx()).toInt()
+      val adjustedHeight =
+        ((mapView?.height ?: 0) - padding.top.dpToPx() - padding.bottom.dpToPx()).toInt()
 
       val update =
         CameraUpdateFactory.newLatLngBounds(
@@ -639,22 +690,86 @@ class GoogleMapsNitroViewImpl(
     pendingPolygons.clear()
   }
 
-  fun clearAll() {
+  fun addCircle(
+    id: String,
+    opts: CircleOptions,
+  ) {
+    if (googleMap == null) {
+      pendingCircles.add(id to opts)
+      return
+    }
+
+    onUi {
+      circlesById.remove(id)?.remove()
+    }
+    internalAddCircle(id, opts)
+  }
+
+  private fun internalAddCircle(
+    id: String,
+    opts: CircleOptions,
+  ) {
+    onUi {
+      val circle =
+        googleMap?.addCircle(opts).also {
+          it?.tag = id
+        }
+      if (circle != null) {
+        circlesById[id] = circle
+      }
+    }
+  }
+
+  fun updateCircle(
+    id: String,
+    block: (Circle) -> Unit,
+  ) {
+    val circle = circlesById[id] ?: return
+    onUi {
+      block(circle)
+    }
+  }
+
+  fun removeCircle(id: String) {
+    onUi {
+      circlesById.remove(id)?.remove()
+    }
+  }
+
+  fun clearCircles() {
+    onUi {
+      circlesById.values.forEach { it.remove() }
+    }
+    circlesById.clear()
+    pendingCircles.clear()
+  }
+
+  fun destroyInternal() {
     onUi {
       markerOptions.cancelAllJobs()
       clearMarkers()
       clearPolylines()
       clearPolygons()
+      clearCircles()
       locationHandler.stop()
       googleMap?.apply {
         setOnCameraMoveStartedListener(null)
         setOnCameraMoveListener(null)
         setOnCameraIdleListener(null)
         setOnMarkerClickListener(null)
+        setOnPolylineClickListener(null)
+        setOnPolygonClickListener(null)
+        setOnCircleClickListener(null)
         setOnMapClickListener(null)
       }
-      this@GoogleMapsNitroViewImpl.onDestroy()
       googleMap = null
+      mapView?.apply {
+        onPause()
+        onStop()
+        onDestroy()
+        removeAllViews()
+      }
+      super.removeAllViews()
       reactContext.removeLifecycleEventListener(this)
     }
   }
@@ -684,19 +799,19 @@ class GoogleMapsNitroViewImpl(
   override fun onHostResume() {
     onUi {
       locationHandler.start()
-      this@GoogleMapsNitroViewImpl.onResume()
+      mapView?.onResume()
     }
   }
 
   override fun onHostPause() {
     onUi {
       locationHandler.stop()
-      this@GoogleMapsNitroViewImpl.onPause()
+      mapView?.onPause()
     }
   }
 
   override fun onHostDestroy() {
-    clearAll()
+    destroyInternal()
   }
 
   override fun onMarkerClick(marker: Marker): Boolean {
@@ -704,6 +819,18 @@ class GoogleMapsNitroViewImpl(
     return true
   }
 
+  override fun onPolylineClick(polyline: Polyline) {
+    onPolylinePress?.invoke(polyline.tag?.toString() ?: "unknown")
+  }
+
+  override fun onPolygonClick(polygon: Polygon) {
+    onPolygonPress?.invoke(polygon.tag?.toString() ?: "unknown")
+  }
+
+  override fun onCircleClick(circle: Circle) {
+    onCirclePress?.invoke(circle.tag?.toString() ?: "unknown")
+  }
+
   override fun onMapClick(coordinates: LatLng) {
     onMapPress?.invoke(
       RNLatLng(coordinates.latitude, coordinates.longitude),

package/android/src/main/java/com/{googlemapsnitro → rngooglemapsplus}/LocationHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.annotation.SuppressLint
 import android.content.Intent

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

@@ -0,0 +1,29 @@
+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
+
+class MapCircleOptions {
+  fun buildCircleOptions(circle: RNCircle): CircleOptions =
+    CircleOptions().apply {
+      center(LatLng(circle.center.latitude, circle.center.longitude))
+      circle.radius?.let { radius(it) }
+      circle.strokeWidth?.let { strokeWidth(it.dpToPx()) }
+      circle.strokeColor?.let { strokeColor(it.toColor()) }
+      circle.fillColor?.let { fillColor(it.toColor()) }
+      circle.pressable?.let { clickable(it) }
+      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/{googlemapsnitro → rngooglemapsplus}/MapMarker.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -36,11 +36,12 @@ class MarkerOptions(
     m: RNMarker,
     icon: BitmapDescriptor,
   ): MarkerOptions =
-    MarkerOptions()
-      .position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
-      .zIndex(m.zIndex.toFloat())
-      .icon(icon)
-      .anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
+    MarkerOptions().apply {
+      position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
+      anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
+      icon(icon)
+      m.zIndex?.let { zIndex(it.toFloat()) }
+    }
 
   fun buildIconAsync(
     id: String,

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

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.PolygonOptions
@@ -15,12 +15,14 @@ class MapPolygonOptions {
       poly.fillColor?.let { fillColor(it.toColor()) }
       poly.strokeColor?.let { strokeColor(it.toColor()) }
       poly.strokeWidth?.let { strokeWidth(it.dpToPx()) }
-      zIndex(poly.zIndex.toFloat())
+      poly.pressable?.let { clickable(it) }
+      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

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

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.ButtCap
@@ -22,7 +22,8 @@ class MapPolylineOptions {
       pl.lineCap?.let { endCap(mapLineCap(it)) }
       pl.lineJoin?.let { jointType(mapLineJoin(it)) }
       pl.color?.let { color(it.toColor()) }
-      zIndex(pl.zIndex.toFloat())
+      pl.pressable?.let { clickable(it) }
+      pl.zIndex?.let { zIndex(it.toFloat()) }
     }
 
   fun mapLineCap(type: RNLineCapType?): Cap =
@@ -43,6 +44,7 @@ class MapPolylineOptions {
 
 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

package/android/src/main/java/com/{googlemapsnitro → rngooglemapsplus}/PermissionHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.Manifest
 import android.content.pm.PackageManager

package/android/src/main/java/com/{googlemapsnitro → rngooglemapsplus}/PlayServicesHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.bridge.ReactContext
 import com.google.android.gms.common.ConnectionResult

package/android/src/main/java/com/{googlemapsnitro/HybridGoogleMapsNitroModule.kt → rngooglemapsplus/RNGoogleMapsPlusModule.kt}

@@ -1,9 +1,9 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.margelo.nitro.core.Promise
 
-class HybridGoogleMapsNitroModule : HybridGoogleMapsNitroModuleSpec() {
-  val context = GoogleMapsNitroPackage.AppContextHolder.context
+class RNGoogleMapsPlusModule : HybridRNGoogleMapsPlusModuleSpec() {
+  val context = RNGoogleMapsPlusPackage.AppContextHolder.context
   private val locationHandler: LocationHandler = LocationHandler(context)
   private val permissionHandler: PermissionHandler = PermissionHandler(context)
   private val playServicesHandler: PlayServicesHandler = PlayServicesHandler(context)