@lugg/maps 0.2.0-alpha.0 → 0.2.0-alpha.2

package/android/src/main/java/com/luggmaps/{LuggMapsPolylineView.kt → LuggPolylineView.kt}

@@ -8,11 +8,11 @@ import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.StrokeStyle
 import com.google.android.gms.maps.model.StyleSpan
 
-interface LuggMapsPolylineViewDelegate {
-  fun polylineViewDidUpdate(polylineView: LuggMapsPolylineView)
+interface LuggPolylineViewDelegate {
+  fun polylineViewDidUpdate(polylineView: LuggPolylineView)
 }
 
-class LuggMapsPolylineView(context: Context) : ReactViewGroup(context) {
+class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   var coordinates: List<LatLng> = emptyList()
     private set
 
@@ -28,7 +28,7 @@ class LuggMapsPolylineView(context: Context) : ReactViewGroup(context) {
   var cachedSpans: List<StyleSpan>? = null
     private set
 
-  var delegate: LuggMapsPolylineViewDelegate? = null
+  var delegate: LuggPolylineViewDelegate? = null
   var polyline: Polyline? = null
 
   init {

package/android/src/main/java/com/luggmaps/{LuggMapsPolylineViewManager.kt → LuggPolylineViewManager.kt}

@@ -6,32 +6,32 @@ 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.LuggMapsPolylineViewManagerDelegate
-import com.facebook.react.viewmanagers.LuggMapsPolylineViewManagerInterface
+import com.facebook.react.viewmanagers.LuggPolylineViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggPolylineViewManagerInterface
 import com.google.android.gms.maps.model.LatLng
 
-@ReactModule(name = LuggMapsPolylineViewManager.NAME)
-class LuggMapsPolylineViewManager :
-  ViewGroupManager<LuggMapsPolylineView>(),
-  LuggMapsPolylineViewManagerInterface<LuggMapsPolylineView> {
-  private val delegate: ViewManagerDelegate<LuggMapsPolylineView> = LuggMapsPolylineViewManagerDelegate(this)
+@ReactModule(name = LuggPolylineViewManager.NAME)
+class LuggPolylineViewManager :
+  ViewGroupManager<LuggPolylineView>(),
+  LuggPolylineViewManagerInterface<LuggPolylineView> {
+  private val delegate: ViewManagerDelegate<LuggPolylineView> = LuggPolylineViewManagerDelegate(this)
 
-  override fun getDelegate(): ViewManagerDelegate<LuggMapsPolylineView> = delegate
+  override fun getDelegate(): ViewManagerDelegate<LuggPolylineView> = delegate
   override fun getName(): String = NAME
-  override fun createViewInstance(context: ThemedReactContext): LuggMapsPolylineView = LuggMapsPolylineView(context)
+  override fun createViewInstance(context: ThemedReactContext): LuggPolylineView = LuggPolylineView(context)
 
-  override fun onDropViewInstance(view: LuggMapsPolylineView) {
+  override fun onDropViewInstance(view: LuggPolylineView) {
     super.onDropViewInstance(view)
     view.onDropViewInstance()
   }
 
-  override fun onAfterUpdateTransaction(view: LuggMapsPolylineView) {
+  override fun onAfterUpdateTransaction(view: LuggPolylineView) {
     super.onAfterUpdateTransaction(view)
     view.onAfterUpdateTransaction()
   }
 
   @ReactProp(name = "coordinates")
-  override fun setCoordinates(view: LuggMapsPolylineView, value: ReadableArray?) {
+  override fun setCoordinates(view: LuggPolylineView, value: ReadableArray?) {
     value?.let { array ->
       val coords = mutableListOf<LatLng>()
       for (i in 0 until array.size()) {
@@ -45,7 +45,7 @@ class LuggMapsPolylineViewManager :
   }
 
   @ReactProp(name = "strokeColors")
-  override fun setStrokeColors(view: LuggMapsPolylineView, value: ReadableArray?) {
+  override fun setStrokeColors(view: LuggPolylineView, value: ReadableArray?) {
     val colors = mutableListOf<Int>()
     value?.let { array ->
       for (i in 0 until array.size()) {
@@ -56,16 +56,16 @@ class LuggMapsPolylineViewManager :
   }
 
   @ReactProp(name = "strokeWidth", defaultDouble = 1.0)
-  override fun setStrokeWidth(view: LuggMapsPolylineView, value: Double) {
+  override fun setStrokeWidth(view: LuggPolylineView, value: Double) {
     view.setStrokeWidth(value.toFloat())
   }
 
   @ReactProp(name = "animated", defaultBoolean = false)
-  override fun setAnimated(view: LuggMapsPolylineView, value: Boolean) {
+  override fun setAnimated(view: LuggPolylineView, value: Boolean) {
     view.setAnimated(value)
   }
 
   companion object {
-    const val NAME = "LuggMapsPolylineView"
+    const val NAME = "LuggPolylineView"
   }
 }

package/android/src/main/java/com/luggmaps/events/CameraIdleEvent.kt

@@ -1,10 +1,17 @@
 package com.luggmaps.events
 
+import android.view.View
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 
-class CameraIdleEvent(surfaceId: Int, viewId: Int, private val latitude: Double, private val longitude: Double, private val zoom: Float) :
-  Event<CameraIdleEvent>(surfaceId, viewId) {
+class CameraIdleEvent(
+  view: View,
+  private val latitude: Double,
+  private val longitude: Double,
+  private val zoom: Float,
+  private val gesture: Boolean
+) : Event<CameraIdleEvent>(UIManagerHelper.getSurfaceId(view), view.id) {
   override fun getEventName() = "topCameraIdle"
 
   override fun getEventData() =
@@ -17,5 +24,6 @@ class CameraIdleEvent(surfaceId: Int, viewId: Int, private val latitude: Double,
         }
       )
       putDouble("zoom", zoom.toDouble())
+      putBoolean("gesture", gesture)
     }
 }

package/android/src/main/java/com/luggmaps/events/CameraMoveEvent.kt

@@ -1,16 +1,17 @@
 package com.luggmaps.events
 
+import android.view.View
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 
 class CameraMoveEvent(
-  surfaceId: Int,
-  viewId: Int,
+  view: View,
   private val latitude: Double,
   private val longitude: Double,
   private val zoom: Float,
-  private val dragging: Boolean
-) : Event<CameraMoveEvent>(surfaceId, viewId) {
+  private val gesture: Boolean
+) : Event<CameraMoveEvent>(UIManagerHelper.getSurfaceId(view), view.id) {
   override fun getEventName() = "topCameraMove"
 
   override fun getEventData() =
@@ -23,6 +24,6 @@ class CameraMoveEvent(
         }
       )
       putDouble("zoom", zoom.toDouble())
-      putBoolean("dragging", dragging)
+      putBoolean("gesture", gesture)
     }
 }

package/android/src/main/java/com/luggmaps/events/ReadyEvent.kt

@@ -0,0 +1,12 @@
+package com.luggmaps.events
+
+import android.view.View
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.Event
+
+class ReadyEvent(view: View) : Event<ReadyEvent>(UIManagerHelper.getSurfaceId(view), view.id) {
+  override fun getEventName() = "topReady"
+
+  override fun getEventData() = Arguments.createMap()
+}

package/android/src/main/java/com/luggmaps/extensions/ViewExtensions.kt

@@ -0,0 +1,14 @@
+package com.luggmaps.extensions
+
+import android.view.View
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.Event
+
+fun View.dispatchEvent(event: Event<*>) {
+  val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(
+    context as ThemedReactContext,
+    id
+  )
+  eventDispatcher?.dispatchEvent(event)
+}

package/ios/{LuggMapsAppleMapView.h → LuggAppleMapView.h}

@@ -4,10 +4,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LuggMapsAppleMapViewContent : MKMapView
+@interface LuggAppleMapViewContent : MKMapView
 @end
 
-@interface LuggMapsAppleMapView : RCTViewComponentView
+@interface LuggAppleMapView : RCTViewComponentView
 
 - (MKMapView *)mapView;
 

package/ios/{LuggMapsAppleMapView.mm → LuggAppleMapView.mm}

@@ -1,10 +1,11 @@
-#import "LuggMapsAppleMapView.h"
-#import "LuggMapsMarkerView.h"
-#import "LuggMapsPolylineView.h"
-#import "LuggMapsWrapperView.h"
+#import "LuggAppleMapView.h"
+#import "LuggMapWrapperView.h"
+#import "LuggMarkerView.h"
+#import "LuggPolylineView.h"
 #import "core/MKPolylineAnimator.h"
 #import "events/CameraIdleEvent.h"
 #import "events/CameraMoveEvent.h"
+#import "events/ReadyEvent.h"
 #import "extensions/MKMapView+Zoom.h"
 
 #import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
@@ -21,36 +22,39 @@ using namespace luggmaps::events;
 @property(nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property(nonatomic, copy, nullable) NSString *title;
 @property(nonatomic, copy, nullable) NSString *subtitle;
-@property(nonatomic, strong) LuggMapsMarkerView *markerView;
+@property(nonatomic, strong) LuggMarkerView *markerView;
 @property(nonatomic, weak) MKAnnotationView *annotationView;
 @end
 
 @implementation AppleMarkerAnnotation
 @end
 
-@implementation LuggMapsAppleMapViewContent
+@implementation LuggAppleMapViewContent
 @end
 
-@interface LuggMapsAppleMapView () <
-    RCTLuggMapsAppleMapViewViewProtocol, MKMapViewDelegate,
-    LuggMapsMarkerViewDelegate, LuggMapsPolylineViewDelegate>
+@interface LuggAppleMapView () <RCTLuggAppleMapViewViewProtocol,
+                                MKMapViewDelegate, LuggMarkerViewDelegate,
+                                LuggPolylineViewDelegate>
 @end
 
-@implementation LuggMapsAppleMapView {
-  LuggMapsAppleMapViewContent *_mapView;
-  LuggMapsWrapperView *_mapWrapperView;
+@implementation LuggAppleMapView {
+  LuggAppleMapViewContent *_mapView;
+  LuggMapWrapperView *_mapWrapperView;
+  BOOL _isMapReady;
   BOOL _isDragging;
+  double _minZoom;
+  double _maxZoom;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
-      LuggMapsAppleMapViewComponentDescriptor>();
+      LuggAppleMapViewComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps =
-        std::make_shared<const LuggMapsAppleMapViewProps>();
+        std::make_shared<const LuggAppleMapViewProps>();
     _props = defaultProps;
   }
 
@@ -64,10 +68,10 @@ using namespace luggmaps::events;
                           index:(NSInteger)index {
   [super mountChildComponentView:childComponentView index:index];
 
-  if ([childComponentView isKindOfClass:[LuggMapsWrapperView class]]) {
-    _mapWrapperView = (LuggMapsWrapperView *)childComponentView;
-  } else if ([childComponentView isKindOfClass:[LuggMapsMarkerView class]]) {
-    LuggMapsMarkerView *markerView = (LuggMapsMarkerView *)childComponentView;
+  if ([childComponentView isKindOfClass:[LuggMapWrapperView class]]) {
+    _mapWrapperView = (LuggMapWrapperView *)childComponentView;
+  } else if ([childComponentView isKindOfClass:[LuggMarkerView class]]) {
+    LuggMarkerView *markerView = (LuggMarkerView *)childComponentView;
     markerView.delegate = self;
 
     AppleMarkerAnnotation *annotation = [[AppleMarkerAnnotation alloc] init];
@@ -79,9 +83,8 @@ using namespace luggmaps::events;
     }
 
     [self markerViewDidUpdate:markerView];
-  } else if ([childComponentView isKindOfClass:[LuggMapsPolylineView class]]) {
-    LuggMapsPolylineView *polylineView =
-        (LuggMapsPolylineView *)childComponentView;
+  } else if ([childComponentView isKindOfClass:[LuggPolylineView class]]) {
+    LuggPolylineView *polylineView = (LuggPolylineView *)childComponentView;
     polylineView.delegate = self;
     [self addPolylineViewToMap:polylineView];
   }
@@ -90,8 +93,8 @@ using namespace luggmaps::events;
 - (void)unmountChildComponentView:
             (UIView<RCTComponentViewProtocol> *)childComponentView
                             index:(NSInteger)index {
-  if ([childComponentView isKindOfClass:[LuggMapsMarkerView class]]) {
-    LuggMapsMarkerView *markerView = (LuggMapsMarkerView *)childComponentView;
+  if ([childComponentView isKindOfClass:[LuggMarkerView class]]) {
+    LuggMarkerView *markerView = (LuggMarkerView *)childComponentView;
     markerView.delegate = nil;
 
     AppleMarkerAnnotation *annotation =
@@ -103,9 +106,8 @@ using namespace luggmaps::events;
       [_mapView removeAnnotation:annotation];
       markerView.marker = nil;
     }
-  } else if ([childComponentView isKindOfClass:[LuggMapsPolylineView class]]) {
-    LuggMapsPolylineView *polylineView =
-        (LuggMapsPolylineView *)childComponentView;
+  } else if ([childComponentView isKindOfClass:[LuggPolylineView class]]) {
+    LuggPolylineView *polylineView = (LuggPolylineView *)childComponentView;
     polylineView.delegate = nil;
     MKPolyline *polyline = (MKPolyline *)polylineView.polyline;
     if (polyline) {
@@ -130,6 +132,7 @@ using namespace luggmaps::events;
   [_mapView removeFromSuperview];
   _mapView = nil;
   _mapWrapperView = nil;
+  _isMapReady = NO;
 }
 
 #pragma mark - Map Initialization
@@ -140,10 +143,10 @@ using namespace luggmaps::events;
   }
 
   const auto &viewProps =
-      *std::static_pointer_cast<LuggMapsAppleMapViewProps const>(_props);
+      *std::static_pointer_cast<LuggAppleMapViewProps const>(_props);
 
-  _mapView = [[LuggMapsAppleMapViewContent alloc]
-      initWithFrame:_mapWrapperView.bounds];
+  _mapView =
+      [[LuggAppleMapViewContent alloc] initWithFrame:_mapWrapperView.bounds];
   _mapView.autoresizingMask =
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   _mapView.delegate = self;
@@ -152,6 +155,15 @@ using namespace luggmaps::events;
   _mapView.scrollEnabled = viewProps.scrollEnabled;
   _mapView.rotateEnabled = viewProps.rotateEnabled;
   _mapView.pitchEnabled = viewProps.pitchEnabled;
+  _mapView.showsUserLocation = viewProps.userLocationEnabled;
+
+  _minZoom = viewProps.minZoom;
+  _maxZoom = viewProps.maxZoom;
+  [self applyZoomRange];
+
+  _mapView.layoutMargins =
+      UIEdgeInsetsMake(viewProps.padding.top, viewProps.padding.left,
+                       viewProps.padding.bottom, viewProps.padding.right);
 
   [_mapWrapperView addSubview:_mapView];
 
@@ -162,18 +174,22 @@ using namespace luggmaps::events;
 
   // Add annotations for any markers that were mounted before map was ready
   for (UIView *subview in self.subviews) {
-    if ([subview isKindOfClass:[LuggMapsMarkerView class]]) {
-      LuggMapsMarkerView *markerView = (LuggMapsMarkerView *)subview;
+    if ([subview isKindOfClass:[LuggMarkerView class]]) {
+      LuggMarkerView *markerView = (LuggMarkerView *)subview;
       AppleMarkerAnnotation *annotation =
           (AppleMarkerAnnotation *)markerView.marker;
       if (annotation) {
         [_mapView addAnnotation:annotation];
       }
-    } else if ([subview isKindOfClass:[LuggMapsPolylineView class]]) {
-      LuggMapsPolylineView *polylineView = (LuggMapsPolylineView *)subview;
+    } else if ([subview isKindOfClass:[LuggPolylineView class]]) {
+      LuggPolylineView *polylineView = (LuggPolylineView *)subview;
       [self addPolylineViewToMap:polylineView];
     }
   }
+
+  _isMapReady = YES;
+
+  ReadyEvent::emit<LuggAppleMapViewEventEmitter>(_eventEmitter);
 }
 
 - (void)setCameraWithLatitude:(double)latitude
@@ -185,6 +201,27 @@ using namespace luggmaps::events;
   [_mapView setCenterCoordinate:center zoomLevel:zoom animated:animated];
 }
 
+- (CLLocationDistance)cameraDistanceForZoomLevel:(double)zoomLevel {
+  // Approximate conversion: at zoom 0, altitude ~128M km
+  // Each zoom level halves the altitude
+  return 128000000.0 / pow(2, zoomLevel);
+}
+
+- (void)applyZoomRange {
+  if (!_mapView)
+    return;
+
+  CLLocationDistance minDistance =
+      _maxZoom > 0 ? [self cameraDistanceForZoomLevel:_maxZoom] : 0;
+  CLLocationDistance maxDistance =
+      _minZoom > 0 ? [self cameraDistanceForZoomLevel:_minZoom] : -1;
+
+  MKMapCameraZoomRange *zoomRange = [[MKMapCameraZoomRange alloc]
+      initWithMinCenterCoordinateDistance:minDistance
+              maxCenterCoordinateDistance:maxDistance];
+  _mapView.cameraZoomRange = zoomRange;
+}
+
 - (MKMapView *)mapView {
   return _mapView;
 }
@@ -194,16 +231,21 @@ using namespace luggmaps::events;
 - (void)updateProps:(Props::Shared const &)props
            oldProps:(Props::Shared const &)oldProps {
   const auto &newViewProps =
-      *std::static_pointer_cast<LuggMapsAppleMapViewProps const>(props);
+      *std::static_pointer_cast<LuggAppleMapViewProps const>(props);
 
   if (_mapView) {
     _mapView.zoomEnabled = newViewProps.zoomEnabled;
     _mapView.scrollEnabled = newViewProps.scrollEnabled;
     _mapView.rotateEnabled = newViewProps.rotateEnabled;
     _mapView.pitchEnabled = newViewProps.pitchEnabled;
+    _mapView.showsUserLocation = newViewProps.userLocationEnabled;
     _mapView.layoutMargins = UIEdgeInsetsMake(
         newViewProps.padding.top, newViewProps.padding.left,
         newViewProps.padding.bottom, newViewProps.padding.right);
+
+    _minZoom = newViewProps.minZoom;
+    _maxZoom = newViewProps.maxZoom;
+    [self applyZoomRange];
   }
 
   [super updateProps:props oldProps:oldProps];
@@ -213,7 +255,7 @@ using namespace luggmaps::events;
 
 - (void)updateAnnotationViewFrame:(AppleMarkerAnnotation *)annotation {
   MKAnnotationView *annotationView = annotation.annotationView;
-  LuggMapsMarkerView *markerView = annotation.markerView;
+  LuggMarkerView *markerView = annotation.markerView;
 
   if (!annotationView || !markerView) {
     return;
@@ -233,13 +275,13 @@ using namespace luggmaps::events;
 
 #pragma mark - PolylineViewDelegate
 
-- (void)polylineViewDidUpdate:(LuggMapsPolylineView *)polylineView {
+- (void)polylineViewDidUpdate:(LuggPolylineView *)polylineView {
   [self syncPolylineView:polylineView];
 }
 
 #pragma mark - Polyline Management
 
-- (void)addPolylineViewToMap:(LuggMapsPolylineView *)polylineView {
+- (void)addPolylineViewToMap:(LuggPolylineView *)polylineView {
   if (!_mapView) {
     return;
   }
@@ -263,7 +305,7 @@ using namespace luggmaps::events;
   [_mapView addOverlay:polyline];
 }
 
-- (void)syncPolylineView:(LuggMapsPolylineView *)polylineView {
+- (void)syncPolylineView:(LuggPolylineView *)polylineView {
   if (!_mapView) {
     return;
   }
@@ -311,10 +353,10 @@ using namespace luggmaps::events;
   [_mapView addOverlay:newPolyline];
 }
 
-- (LuggMapsPolylineView *)findPolylineViewForOverlay:(id<MKOverlay>)overlay {
+- (LuggPolylineView *)findPolylineViewForOverlay:(id<MKOverlay>)overlay {
   for (UIView *subview in self.subviews) {
-    if ([subview isKindOfClass:[LuggMapsPolylineView class]]) {
-      LuggMapsPolylineView *polylineView = (LuggMapsPolylineView *)subview;
+    if ([subview isKindOfClass:[LuggPolylineView class]]) {
+      LuggPolylineView *polylineView = (LuggPolylineView *)subview;
       if (polylineView.polyline == overlay) {
         return polylineView;
       }
@@ -325,7 +367,7 @@ using namespace luggmaps::events;
 
 #pragma mark - MarkerViewDelegate
 
-- (void)markerViewDidLayout:(LuggMapsMarkerView *)markerView {
+- (void)markerViewDidLayout:(LuggMarkerView *)markerView {
   AppleMarkerAnnotation *annotation =
       (AppleMarkerAnnotation *)markerView.marker;
   if (annotation) {
@@ -333,7 +375,7 @@ using namespace luggmaps::events;
   }
 }
 
-- (void)markerViewDidUpdate:(LuggMapsMarkerView *)markerView {
+- (void)markerViewDidUpdate:(LuggMarkerView *)markerView {
   AppleMarkerAnnotation *annotation =
       (AppleMarkerAnnotation *)markerView.marker;
 
@@ -367,27 +409,19 @@ using namespace luggmaps::events;
 }
 
 - (void)mapViewDidChangeVisibleRegion:(MKMapView *)mapView {
-  if (_eventEmitter) {
-    auto emitter =
-        std::static_pointer_cast<LuggMapsAppleMapViewEventEmitter const>(
-            _eventEmitter);
-    CameraMoveEvent{mapView.centerCoordinate.latitude,
-                    mapView.centerCoordinate.longitude, mapView.zoomLevel,
-                    _isDragging}
-        .emit(emitter);
-  }
+  CameraMoveEvent{mapView.centerCoordinate.latitude,
+                  mapView.centerCoordinate.longitude, mapView.zoomLevel,
+                  _isDragging}
+      .emit<LuggAppleMapViewEventEmitter>(_eventEmitter);
 }
 
 - (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated {
+  BOOL wasDragging = _isDragging;
   _isDragging = NO;
-  if (_eventEmitter) {
-    auto emitter =
-        std::static_pointer_cast<LuggMapsAppleMapViewEventEmitter const>(
-            _eventEmitter);
-    CameraIdleEvent{mapView.centerCoordinate.latitude,
-                    mapView.centerCoordinate.longitude, mapView.zoomLevel}
-        .emit(emitter);
-  }
+  CameraIdleEvent{mapView.centerCoordinate.latitude,
+                  mapView.centerCoordinate.longitude, mapView.zoomLevel,
+                  static_cast<bool>(wasDragging)}
+      .emit<LuggAppleMapViewEventEmitter>(_eventEmitter);
 }
 
 - (MKAnnotationView *)mapView:(MKMapView *)mapView
@@ -397,7 +431,7 @@ using namespace luggmaps::events;
   }
 
   AppleMarkerAnnotation *markerAnnotation = (AppleMarkerAnnotation *)annotation;
-  LuggMapsMarkerView *markerView = markerAnnotation.markerView;
+  LuggMarkerView *markerView = markerAnnotation.markerView;
 
   if (!markerView || !markerView.hasCustomView) {
     return nil;
@@ -435,8 +469,7 @@ using namespace luggmaps::events;
 - (MKOverlayRenderer *)mapView:(MKMapView *)mapView
             rendererForOverlay:(id<MKOverlay>)overlay {
   if ([overlay isKindOfClass:[MKPolyline class]]) {
-    LuggMapsPolylineView *polylineView =
-        [self findPolylineViewForOverlay:overlay];
+    LuggPolylineView *polylineView = [self findPolylineViewForOverlay:overlay];
     MKPolyline *polyline = (MKPolyline *)overlay;
 
     if (polylineView) {
@@ -494,7 +527,10 @@ using namespace luggmaps::events;
 }
 
 - (void)fitCoordinates:(NSArray *)coordinates
-               padding:(double)padding
+            paddingTop:(double)paddingTop
+           paddingLeft:(double)paddingLeft
+         paddingBottom:(double)paddingBottom
+          paddingRight:(double)paddingRight
               duration:(double)duration {
   if (!_mapView || coordinates.count == 0) {
     return;
@@ -517,7 +553,7 @@ using namespace luggmaps::events;
   free(coords);
 
   UIEdgeInsets edgePadding =
-      UIEdgeInsetsMake(padding, padding, padding, padding);
+      UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight);
 
   if (duration < 0) {
     [_mapView setVisibleMapRect:mapRect edgePadding:edgePadding animated:YES];
@@ -534,11 +570,11 @@ using namespace luggmaps::events;
 }
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
-  RCTLuggMapsAppleMapViewHandleCommand(self, commandName, args);
+  RCTLuggAppleMapViewHandleCommand(self, commandName, args);
 }
 
-Class<RCTComponentViewProtocol> LuggMapsAppleMapViewCls(void) {
-  return LuggMapsAppleMapView.class;
+Class<RCTComponentViewProtocol> LuggAppleMapViewCls(void) {
+  return LuggAppleMapView.class;
 }
 
 @end

package/ios/{LuggMapsGoogleMapView.h → LuggGoogleMapView.h}

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LuggMapsGoogleMapView : RCTViewComponentView
+@interface LuggGoogleMapView : RCTViewComponentView
 
 @property(nonatomic, readonly, nullable) GMSMapView *mapView;