@lugg/maps 1.0.0-beta.0 → 1.0.0-beta.10

package/README.md

@@ -113,10 +113,13 @@ import { MapView, Marker, Polyline, Polygon } from '@lugg/maps';
 ## Components
 
 - [MapView](docs/MAPVIEW.md) - Main map component
-- [Marker](docs/MARKER.md) - Map markers
+- [Marker](docs/MARKER.md) - Map markers with callout support
 - [Polyline](docs/POLYLINE.md) - Draw lines on the map
 - [Polygon](docs/POLYGON.md) - Draw filled shapes on the map
+- [Circle](docs/CIRCLE.md) - Draw circular overlays on the map
 - [GeoJson](docs/GEOJSON.md) - Render GeoJSON data on the map
+- [GroundOverlay](docs/GROUND_OVERLAY.md) - Display images on the map
+- [TileOverlay](docs/TILE_OVERLAY.md) - Display custom tile layers on the map
 
 ## Types
 

package/android/build.gradle

@@ -74,5 +74,5 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.google.android.gms:play-services-maps:19.2.0"
+  implementation "com.google.android.gms:play-services-maps:20.0.0"
 }

package/android/src/main/java/com/luggmaps/LuggCalloutView.kt

@@ -0,0 +1,79 @@
+package com.luggmaps
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.view.View
+import androidx.core.graphics.createBitmap
+import androidx.core.view.isNotEmpty
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.views.view.ReactViewGroup
+
+class LuggCalloutView(context: Context) : ReactViewGroup(context) {
+  val contentView: ReactViewGroup = ReactViewGroup(context)
+  var bubbled: Boolean = true
+  var offsetX: Float = 0f
+    set(value) {
+      field = value
+      onUpdate?.invoke()
+    }
+  var offsetY: Float = 0f
+    set(value) {
+      field = value
+      onUpdate?.invoke()
+    }
+  var onUpdate: (() -> Unit)? = null
+
+  val hasCustomContent: Boolean
+    get() = contentView.isNotEmpty()
+
+  init {
+    visibility = GONE
+    pointerEvents = PointerEvents.NONE
+  }
+
+  override fun addView(child: View, index: Int) {
+    contentView.addView(child, index)
+    child.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+      onUpdate?.invoke()
+    }
+  }
+
+  override fun removeView(child: View) {
+    contentView.removeView(child)
+  }
+
+  override fun removeViewAt(index: Int) {
+    contentView.removeViewAt(index)
+  }
+
+  override fun getChildCount(): Int = contentView.childCount
+
+  override fun getChildAt(index: Int): View? = contentView.getChildAt(index)
+
+  // no-op: avoid accessibility traversal of detached callout children
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
+
+  fun createContentBitmap(): Bitmap? {
+    var maxWidth = 0
+    var maxHeight = 0
+    for (i in 0 until contentView.childCount) {
+      val child = contentView.getChildAt(i)
+      val childRight = child.left + child.width
+      val childBottom = child.top + child.height
+      if (childRight > maxWidth) maxWidth = childRight
+      if (childBottom > maxHeight) maxHeight = childBottom
+    }
+
+    if (maxWidth <= 0 || maxHeight <= 0) return null
+
+    val bitmap = createBitmap(maxWidth, maxHeight)
+    val canvas = Canvas(bitmap)
+    contentView.draw(canvas)
+    return bitmap
+  }
+
+  fun onDropViewInstance() {
+    contentView.removeAllViews()
+  }
+}

package/android/src/main/java/com/luggmaps/LuggCalloutViewManager.kt

@@ -0,0 +1,39 @@
+package com.luggmaps
+
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggCalloutViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggCalloutViewManagerInterface
+
+@ReactModule(name = LuggCalloutViewManager.NAME)
+class LuggCalloutViewManager :
+  ViewGroupManager<LuggCalloutView>(),
+  LuggCalloutViewManagerInterface<LuggCalloutView> {
+  private val delegate: ViewManagerDelegate<LuggCalloutView> = LuggCalloutViewManagerDelegate(this)
+
+  override fun getDelegate(): ViewManagerDelegate<LuggCalloutView> = delegate
+  override fun getName(): String = NAME
+  override fun createViewInstance(context: ThemedReactContext): LuggCalloutView = LuggCalloutView(context)
+
+  override fun setBubbled(view: LuggCalloutView, value: Boolean) {
+    view.bubbled = value
+  }
+
+  override fun setOffset(view: LuggCalloutView, value: ReadableMap?) {
+    view.offsetX = value?.getDouble("x")?.toFloat()?.dpToPx() ?: 0f
+    view.offsetY = value?.getDouble("y")?.toFloat()?.dpToPx() ?: 0f
+  }
+
+  override fun onDropViewInstance(view: LuggCalloutView) {
+    super.onDropViewInstance(view)
+    view.onDropViewInstance()
+  }
+
+  companion object {
+    const val NAME = "LuggCalloutView"
+  }
+}

package/android/src/main/java/com/luggmaps/LuggCircleView.kt

@@ -0,0 +1,85 @@
+package com.luggmaps
+
+import android.content.Context
+import android.graphics.Color
+import com.facebook.react.views.view.ReactViewGroup
+import com.google.android.gms.maps.model.Circle
+import com.google.android.gms.maps.model.LatLng
+import com.luggmaps.events.CirclePressEvent
+import com.luggmaps.extensions.dispatchEvent
+
+interface LuggCircleViewDelegate {
+  fun circleViewDidUpdate(circleView: LuggCircleView)
+}
+
+class LuggCircleView(context: Context) : ReactViewGroup(context) {
+  var center: LatLng = LatLng(0.0, 0.0)
+    private set
+
+  var radius: Double = 0.0
+    private set
+
+  var strokeColor: Int = Color.BLACK
+    private set
+
+  var fillColor: Int = Color.argb(77, 0, 0, 0)
+    private set
+
+  var strokeWidth: Float = 1f
+    private set
+
+  var zIndex: Float = 0f
+    private set
+
+  var tappable: Boolean = false
+    private set
+
+  var delegate: LuggCircleViewDelegate? = null
+  var circle: Circle? = null
+
+  init {
+    visibility = GONE
+  }
+
+  fun setCenter(value: LatLng) {
+    center = value
+  }
+
+  fun setRadius(value: Double) {
+    radius = value
+  }
+
+  fun setStrokeColor(color: Int) {
+    strokeColor = color
+  }
+
+  fun setFillColor(color: Int) {
+    fillColor = color
+  }
+
+  fun setStrokeWidth(width: Float) {
+    strokeWidth = width
+  }
+
+  fun setZIndex(value: Float) {
+    zIndex = value
+  }
+
+  fun setTappable(value: Boolean) {
+    tappable = value
+  }
+
+  fun emitPressEvent() {
+    dispatchEvent(CirclePressEvent(this))
+  }
+
+  fun onAfterUpdateTransaction() {
+    delegate?.circleViewDidUpdate(this)
+  }
+
+  fun onDropViewInstance() {
+    delegate = null
+    circle?.remove()
+    circle = null
+  }
+}

package/android/src/main/java/com/luggmaps/LuggCircleViewManager.kt

@@ -0,0 +1,79 @@
+package com.luggmaps
+
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.LuggCircleViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggCircleViewManagerInterface
+import com.google.android.gms.maps.model.LatLng
+
+@ReactModule(name = LuggCircleViewManager.NAME)
+class LuggCircleViewManager :
+  ViewGroupManager<LuggCircleView>(),
+  LuggCircleViewManagerInterface<LuggCircleView> {
+  private val delegate: ViewManagerDelegate<LuggCircleView> = LuggCircleViewManagerDelegate(this)
+
+  override fun getDelegate(): ViewManagerDelegate<LuggCircleView> = delegate
+  override fun getName(): String = NAME
+  override fun createViewInstance(context: ThemedReactContext): LuggCircleView = LuggCircleView(context)
+
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+    mapOf("topCirclePress" to mapOf("registrationName" to "onCirclePress"))
+
+  override fun onDropViewInstance(view: LuggCircleView) {
+    super.onDropViewInstance(view)
+    view.onDropViewInstance()
+  }
+
+  override fun onAfterUpdateTransaction(view: LuggCircleView) {
+    super.onAfterUpdateTransaction(view)
+    view.onAfterUpdateTransaction()
+  }
+
+  @ReactProp(name = "center")
+  override fun setCenter(view: LuggCircleView, value: ReadableMap?) {
+    value?.let { map ->
+      val lat = map.getDouble("latitude")
+      val lng = map.getDouble("longitude")
+      view.setCenter(LatLng(lat, lng))
+    }
+  }
+
+  @ReactProp(name = "radius", defaultDouble = 0.0)
+  override fun setRadius(view: LuggCircleView, value: Double) {
+    view.setRadius(value)
+  }
+
+  @ReactProp(name = "strokeColor", customType = "Color")
+  override fun setStrokeColor(view: LuggCircleView, value: Int?) {
+    view.setStrokeColor(value ?: android.graphics.Color.BLACK)
+  }
+
+  @ReactProp(name = "fillColor", customType = "Color")
+  override fun setFillColor(view: LuggCircleView, value: Int?) {
+    view.setFillColor(value ?: android.graphics.Color.argb(77, 0, 0, 0))
+  }
+
+  @ReactProp(name = "strokeWidth", defaultDouble = 1.0)
+  override fun setStrokeWidth(view: LuggCircleView, value: Double) {
+    view.setStrokeWidth(value.toFloat())
+  }
+
+  @ReactProp(name = "tappable")
+  override fun setTappable(view: LuggCircleView, value: Boolean) {
+    view.setTappable(value)
+  }
+
+  @ReactProp(name = "zIndex", defaultFloat = 0f)
+  override fun setZIndex(view: LuggCircleView, value: Float) {
+    super.setZIndex(view, value)
+    view.setZIndex(value)
+  }
+
+  companion object {
+    const val NAME = "LuggCircleView"
+  }
+}

package/android/src/main/java/com/luggmaps/LuggGroundOverlayView.kt

@@ -0,0 +1,81 @@
+package com.luggmaps
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+import com.google.android.gms.maps.model.GroundOverlay
+import com.google.android.gms.maps.model.LatLng
+import com.luggmaps.events.GroundOverlayPressEvent
+import com.luggmaps.extensions.dispatchEvent
+
+interface LuggGroundOverlayViewDelegate {
+  fun groundOverlayViewDidUpdate(groundOverlayView: LuggGroundOverlayView)
+}
+
+class LuggGroundOverlayView(context: Context) : ReactViewGroup(context) {
+  var imageUri: String = ""
+    private set
+
+  var northeast: LatLng = LatLng(0.0, 0.0)
+    private set
+
+  var southwest: LatLng = LatLng(0.0, 0.0)
+    private set
+
+  var overlayOpacity: Float = 1f
+    private set
+
+  var bearing: Float = 0f
+    private set
+
+  var zIndex: Float = 0f
+    private set
+
+  var tappable: Boolean = false
+    private set
+
+  var delegate: LuggGroundOverlayViewDelegate? = null
+  var groundOverlay: GroundOverlay? = null
+
+  init {
+    visibility = GONE
+  }
+
+  fun setImageUri(value: String) {
+    imageUri = value
+  }
+
+  fun setBounds(ne: LatLng, sw: LatLng) {
+    northeast = ne
+    southwest = sw
+  }
+
+  fun setOverlayOpacity(value: Float) {
+    overlayOpacity = value
+  }
+
+  fun setBearing(value: Float) {
+    bearing = value
+  }
+
+  fun setZIndex(value: Float) {
+    zIndex = value
+  }
+
+  fun setTappable(value: Boolean) {
+    tappable = value
+  }
+
+  fun emitPressEvent() {
+    dispatchEvent(GroundOverlayPressEvent(this))
+  }
+
+  fun onAfterUpdateTransaction() {
+    delegate?.groundOverlayViewDidUpdate(this)
+  }
+
+  fun onDropViewInstance() {
+    delegate = null
+    groundOverlay?.remove()
+    groundOverlay = null
+  }
+}

package/android/src/main/java/com/luggmaps/LuggGroundOverlayViewManager.kt

@@ -0,0 +1,82 @@
+package com.luggmaps
+
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.LuggGroundOverlayViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggGroundOverlayViewManagerInterface
+import com.google.android.gms.maps.model.LatLng
+
+@ReactModule(name = LuggGroundOverlayViewManager.NAME)
+class LuggGroundOverlayViewManager :
+  ViewGroupManager<LuggGroundOverlayView>(),
+  LuggGroundOverlayViewManagerInterface<LuggGroundOverlayView> {
+  private val delegate: ViewManagerDelegate<LuggGroundOverlayView> = LuggGroundOverlayViewManagerDelegate(this)
+
+  override fun getDelegate(): ViewManagerDelegate<LuggGroundOverlayView> = delegate
+  override fun getName(): String = NAME
+  override fun createViewInstance(context: ThemedReactContext): LuggGroundOverlayView = LuggGroundOverlayView(context)
+
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+    mapOf("topGroundOverlayPress" to mapOf("registrationName" to "onGroundOverlayPress"))
+
+  override fun onDropViewInstance(view: LuggGroundOverlayView) {
+    super.onDropViewInstance(view)
+    view.onDropViewInstance()
+  }
+
+  override fun onAfterUpdateTransaction(view: LuggGroundOverlayView) {
+    super.onAfterUpdateTransaction(view)
+    view.onAfterUpdateTransaction()
+  }
+
+  @ReactProp(name = "image")
+  override fun setImage(view: LuggGroundOverlayView, value: String?) {
+    view.setImageUri(value ?: "")
+  }
+
+  @ReactProp(name = "bounds")
+  override fun setBounds(view: LuggGroundOverlayView, value: ReadableMap?) {
+    value?.let { map ->
+      val ne = map.getMap("northeast")
+      val sw = map.getMap("southwest")
+      val northeast = LatLng(
+        ne?.getDouble("latitude") ?: 0.0,
+        ne?.getDouble("longitude") ?: 0.0
+      )
+      val southwest = LatLng(
+        sw?.getDouble("latitude") ?: 0.0,
+        sw?.getDouble("longitude") ?: 0.0
+      )
+      view.setBounds(northeast, southwest)
+    }
+  }
+
+  @ReactProp(name = "opacity", defaultDouble = 1.0)
+  override fun setOpacity(view: LuggGroundOverlayView, value: Double) {
+    view.setOverlayOpacity(value.toFloat())
+  }
+
+  @ReactProp(name = "bearing", defaultDouble = 0.0)
+  override fun setBearing(view: LuggGroundOverlayView, value: Double) {
+    view.setBearing(value.toFloat())
+  }
+
+  @ReactProp(name = "tappable")
+  override fun setTappable(view: LuggGroundOverlayView, value: Boolean) {
+    view.setTappable(value)
+  }
+
+  @ReactProp(name = "zIndex", defaultFloat = 0f)
+  override fun setZIndex(view: LuggGroundOverlayView, value: Float) {
+    super.setZIndex(view, value)
+    view.setZIndex(value)
+  }
+
+  companion object {
+    const val NAME = "LuggGroundOverlayView"
+  }
+}

package/android/src/main/java/com/luggmaps/LuggMapView.kt

@@ -58,6 +58,7 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
   private var initialLatitude: Double = 37.78
   private var initialLongitude: Double = -122.43
   private var initialZoom: Float = 14f
+  private var mapType: String = "standard"
   private var theme: String = "system"
   private var zoomEnabled: Boolean = true
   private var scrollEnabled: Boolean = true
@@ -65,9 +66,13 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
   private var pitchEnabled: Boolean = true
   private var userLocationEnabled: Boolean = false
   private var userLocationButtonEnabled: Boolean = false
+  private var poiEnabled: Boolean = true
+  private var poiFilterMode: String = "including"
+  private var poiFilterCategories: List<String> = emptyList()
   private var minZoom: Double? = null
   private var maxZoom: Double? = null
   private var edgeInsets: EdgeInsets = EdgeInsets()
+  private var insetAdjustment: String = "never"
 
   // region View Lifecycle
 
@@ -78,6 +83,9 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
       is LuggMarkerView -> provider?.addMarkerView(child)
       is LuggPolylineView -> provider?.addPolylineView(child)
       is LuggPolygonView -> provider?.addPolygonView(child)
+      is LuggCircleView -> provider?.addCircleView(child)
+      is LuggGroundOverlayView -> provider?.addGroundOverlayView(child)
+      is LuggTileOverlayView -> provider?.addTileOverlayView(child)
     }
   }
 
@@ -87,6 +95,9 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
       is LuggMarkerView -> provider?.removeMarkerView(view)
       is LuggPolylineView -> provider?.removePolylineView(view)
       is LuggPolygonView -> provider?.removePolygonView(view)
+      is LuggCircleView -> provider?.removeCircleView(view)
+      is LuggGroundOverlayView -> provider?.removeGroundOverlayView(view)
+      is LuggTileOverlayView -> provider?.removeTileOverlayView(view)
     }
     super.removeViewAt(index)
   }
@@ -135,6 +146,9 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
         is LuggMarkerView -> google.addMarkerView(child)
         is LuggPolylineView -> google.addPolylineView(child)
         is LuggPolygonView -> google.addPolygonView(child)
+        is LuggCircleView -> google.addCircleView(child)
+        is LuggGroundOverlayView -> google.addGroundOverlayView(child)
+        is LuggTileOverlayView -> google.addTileOverlayView(child)
       }
     }
   }
@@ -174,10 +188,15 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
     provider?.setPitchEnabled(pitchEnabled)
     provider?.setUserLocationEnabled(userLocationEnabled)
     provider?.setUserLocationButtonEnabled(userLocationButtonEnabled)
+    provider?.setMapType(mapType)
     provider?.setTheme(theme)
     minZoom?.let { provider?.setMinZoom(it) }
     maxZoom?.let { provider?.setMaxZoom(it) }
     provider?.setEdgeInsets(edgeInsets)
+    provider?.setInsetAdjustment(insetAdjustment)
+    provider?.setPoiEnabled(poiEnabled)
+    provider?.setPoiFilterMode(poiFilterMode)
+    provider?.setPoiFilterCategories(poiFilterCategories)
   }
 
   fun setProvider(value: String?) {
@@ -248,12 +267,42 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
     provider?.setMaxZoom(zoom)
   }
 
+  fun setMapType(value: String) {
+    if (mapType == value) return
+    mapType = value
+    provider?.setMapType(value)
+  }
+
   fun setTheme(value: String) {
     if (theme == value) return
     theme = value
     provider?.setTheme(value)
   }
 
+  fun setPoiEnabled(enabled: Boolean) {
+    if (poiEnabled == enabled) return
+    poiEnabled = enabled
+    provider?.setPoiEnabled(enabled)
+  }
+
+  fun setPoiFilterMode(value: String) {
+    if (poiFilterMode == value) return
+    poiFilterMode = value
+    provider?.setPoiFilterMode(value)
+  }
+
+  fun setPoiFilterCategories(categories: List<String>) {
+    if (poiFilterCategories == categories) return
+    poiFilterCategories = categories
+    provider?.setPoiFilterCategories(categories)
+  }
+
+  fun setInsetAdjustment(value: String) {
+    if (insetAdjustment == value) return
+    insetAdjustment = value
+    provider?.setInsetAdjustment(value)
+  }
+
   fun setEdgeInsets(
     top: Int,
     left: Int,

package/android/src/main/java/com/luggmaps/LuggMapViewManager.kt

@@ -152,11 +152,42 @@ class LuggMapViewManager :
     view.setMaxZoom(value)
   }
 
+  @ReactProp(name = "mapType")
+  override fun setMapType(view: LuggMapView, value: String?) {
+    view.setMapType(value ?: "standard")
+  }
+
   @ReactProp(name = "theme")
   override fun setTheme(view: LuggMapView, value: String?) {
     view.setTheme(value ?: "system")
   }
 
+  @ReactProp(name = "poiEnabled", defaultBoolean = true)
+  override fun setPoiEnabled(view: LuggMapView, value: Boolean) {
+    view.setPoiEnabled(value)
+  }
+
+  @ReactProp(name = "poiFilterMode")
+  override fun setPoiFilterMode(view: LuggMapView, value: String?) {
+    view.setPoiFilterMode(value ?: "including")
+  }
+
+  @ReactProp(name = "poiFilterCategories")
+  override fun setPoiFilterCategories(view: LuggMapView, value: ReadableArray?) {
+    val categories = mutableListOf<String>()
+    value?.let { array ->
+      for (i in 0 until array.size()) {
+        array.getString(i)?.let { categories.add(it) }
+      }
+    }
+    view.setPoiFilterCategories(categories)
+  }
+
+  @ReactProp(name = "insetAdjustment")
+  override fun setInsetAdjustment(view: LuggMapView, value: String?) {
+    view.setInsetAdjustment(value ?: "never")
+  }
+
   @ReactProp(name = "edgeInsets")
   override fun setEdgeInsets(view: LuggMapView, value: ReadableMap?) {
     value?.let {

package/android/src/main/java/com/luggmaps/LuggMapWrapperView.kt

@@ -15,17 +15,6 @@ class LuggMapWrapperView(context: ThemedReactContext) : ReactViewGroup(context)
     return super.dispatchTouchEvent(event)
   }
 
-  override fun requestLayout() {
-    super.requestLayout()
-    getChildAt(0)?.let {
-      it.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-      )
-      it.layout(0, 0, width, height)
-    }
-  }
-
   override fun onLayout(
     changed: Boolean,
     left: Int,