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

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

@@ -1,10 +1,11 @@
-#import "LuggMapsGoogleMapView.h"
-#import "LuggMapsMarkerView.h"
-#import "LuggMapsPolylineView.h"
+#import "LuggGoogleMapView.h"
+#import "LuggMarkerView.h"
+#import "LuggPolylineView.h"
 #import "core/GMSPolylineAnimator.h"
 #import "core/PolylineAnimatorBase.h"
 #import "events/CameraIdleEvent.h"
 #import "events/CameraMoveEvent.h"
+#import "events/ReadyEvent.h"
 
 #import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNMapsSpec/EventEmitters.h>
@@ -16,35 +17,35 @@
 using namespace facebook::react;
 using namespace luggmaps::events;
 
-#import "LuggMapsWrapperView.h"
+#import "LuggMapWrapperView.h"
 
 static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 
-@interface LuggMapsGoogleMapView () <
-    RCTLuggMapsGoogleMapViewViewProtocol, GMSMapViewDelegate,
-    LuggMapsMarkerViewDelegate, LuggMapsPolylineViewDelegate>
+@interface LuggGoogleMapView () <RCTLuggGoogleMapViewViewProtocol,
+                                 GMSMapViewDelegate, LuggMarkerViewDelegate,
+                                 LuggPolylineViewDelegate>
 @end
 
-@implementation LuggMapsGoogleMapView {
+@implementation LuggGoogleMapView {
   GMSMapView *_mapView;
-  LuggMapsWrapperView *_mapWrapperView;
+  LuggMapWrapperView *_mapWrapperView;
   BOOL _isMapReady;
   BOOL _isDragging;
   NSString *_mapId;
-  NSMutableArray<LuggMapsMarkerView *> *_pendingMarkerViews;
-  NSMutableArray<LuggMapsPolylineView *> *_pendingPolylineViews;
-  NSMapTable<LuggMapsPolylineView *, GMSPolylineAnimator *> *_polylineAnimators;
+  NSMutableArray<LuggMarkerView *> *_pendingMarkerViews;
+  NSMutableArray<LuggPolylineView *> *_pendingPolylineViews;
+  NSMapTable<LuggPolylineView *, GMSPolylineAnimator *> *_polylineAnimators;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
-      LuggMapsGoogleMapViewComponentDescriptor>();
+      LuggGoogleMapViewComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps =
-        std::make_shared<const LuggMapsGoogleMapViewProps>();
+        std::make_shared<const LuggGoogleMapViewProps>();
     _props = defaultProps;
 
     _isMapReady = NO;
@@ -64,15 +65,14 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
                           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;
     [self syncMarkerView:markerView caller:@"mountChildComponentView"];
-  } else if ([childComponentView isKindOfClass:[LuggMapsPolylineView class]]) {
-    LuggMapsPolylineView *polylineView =
-        (LuggMapsPolylineView *)childComponentView;
+  } else if ([childComponentView isKindOfClass:[LuggPolylineView class]]) {
+    LuggPolylineView *polylineView = (LuggPolylineView *)childComponentView;
     polylineView.delegate = self;
     [self syncPolylineView:polylineView];
   }
@@ -81,17 +81,16 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 - (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;
     GMSAdvancedMarker *marker = (GMSAdvancedMarker *)markerView.marker;
     if (marker) {
       marker.iconView = nil;
       marker.map = nil;
       markerView.marker = nil;
     }
-  } else if ([childComponentView isKindOfClass:[LuggMapsPolylineView class]]) {
-    LuggMapsPolylineView *polylineView =
-        (LuggMapsPolylineView *)childComponentView;
+  } else if ([childComponentView isKindOfClass:[LuggPolylineView class]]) {
+    LuggPolylineView *polylineView = (LuggPolylineView *)childComponentView;
     [_polylineAnimators removeObjectForKey:polylineView];
     GMSPolyline *polyline = (GMSPolyline *)polylineView.polyline;
     if (polyline) {
@@ -131,7 +130,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   }
 
   const auto &viewProps =
-      *std::static_pointer_cast<LuggMapsGoogleMapViewProps const>(_props);
+      *std::static_pointer_cast<LuggGoogleMapViewProps const>(_props);
 
   GMSMapID *gmsMapId;
   if ([_mapId isEqualToString:kDemoMapId] || _mapId.length == 0) {
@@ -160,12 +159,26 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   _mapView.settings.scrollGestures = viewProps.scrollEnabled;
   _mapView.settings.rotateGestures = viewProps.rotateEnabled;
   _mapView.settings.tiltGestures = viewProps.pitchEnabled;
+  _mapView.myLocationEnabled = viewProps.userLocationEnabled;
+
+  if (viewProps.minZoom > 0) {
+    [_mapView setMinZoom:(float)viewProps.minZoom maxZoom:_mapView.maxZoom];
+  }
+  if (viewProps.maxZoom > 0) {
+    [_mapView setMinZoom:_mapView.minZoom maxZoom:(float)viewProps.maxZoom];
+  }
+
+  _mapView.padding =
+      UIEdgeInsetsMake(viewProps.padding.top, viewProps.padding.left,
+                       viewProps.padding.bottom, viewProps.padding.right);
 
   [_mapWrapperView addSubview:_mapView];
 
   _isMapReady = YES;
   [self processPendingMarkers];
   [self processPendingPolylines];
+
+  ReadyEvent::emit<LuggGoogleMapViewEventEmitter>(_eventEmitter);
 }
 
 - (GMSMapView *)mapView {
@@ -180,49 +193,39 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 
 - (void)mapView:(GMSMapView *)mapView
     didChangeCameraPosition:(GMSCameraPosition *)position {
-  if (_eventEmitter) {
-    auto emitter =
-        std::static_pointer_cast<LuggMapsGoogleMapViewEventEmitter const>(
-            _eventEmitter);
-    CameraMoveEvent{position.target.latitude, position.target.longitude,
-                    position.zoom, _isDragging}
-        .emit(emitter);
-  }
+  CameraMoveEvent{position.target.latitude, position.target.longitude,
+                  position.zoom, _isDragging}
+      .emit<LuggGoogleMapViewEventEmitter>(_eventEmitter);
 }
 
 - (void)mapView:(GMSMapView *)mapView
     idleAtCameraPosition:(GMSCameraPosition *)position {
+  BOOL wasDragging = _isDragging;
   _isDragging = NO;
-  if (_eventEmitter) {
-    auto emitter =
-        std::static_pointer_cast<LuggMapsGoogleMapViewEventEmitter const>(
-            _eventEmitter);
-    CameraIdleEvent{position.target.latitude, position.target.longitude,
-                    position.zoom}
-        .emit(emitter);
-  }
+  CameraIdleEvent{position.target.latitude, position.target.longitude,
+                  position.zoom, static_cast<bool>(wasDragging)}
+      .emit<LuggGoogleMapViewEventEmitter>(_eventEmitter);
 }
 
 #pragma mark - PolylineViewDelegate
 
-- (void)polylineViewDidUpdate:(LuggMapsPolylineView *)polylineView {
+- (void)polylineViewDidUpdate:(LuggPolylineView *)polylineView {
   [self syncPolylineView:polylineView];
 }
 
 #pragma mark - MarkerViewDelegate
 
-- (void)markerViewDidLayout:(LuggMapsMarkerView *)markerView {
+- (void)markerViewDidLayout:(LuggMarkerView *)markerView {
   [self syncMarkerView:markerView caller:@"markerViewDidLayout"];
 }
 
-- (void)markerViewDidUpdate:(LuggMapsMarkerView *)markerView {
+- (void)markerViewDidUpdate:(LuggMarkerView *)markerView {
   [self syncMarkerView:markerView caller:@"markerViewDidUpdate"];
 }
 
 #pragma mark - Marker Management
 
-- (void)syncMarkerView:(LuggMapsMarkerView *)markerView
-                caller:(NSString *)caller {
+- (void)syncMarkerView:(LuggMarkerView *)markerView caller:(NSString *)caller {
   if (!_mapView) {
     if (![_pendingMarkerViews containsObject:markerView]) {
       [_pendingMarkerViews addObject:markerView];
@@ -255,15 +258,15 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
     return;
   }
 
-  for (LuggMapsMarkerView *markerView in _pendingMarkerViews) {
+  for (LuggMarkerView *markerView in _pendingMarkerViews) {
     [self addMarkerViewToMap:markerView];
   }
   [_pendingMarkerViews removeAllObjects];
 }
 
-- (void)addMarkerViewToMap:(LuggMapsMarkerView *)markerView {
+- (void)addMarkerViewToMap:(LuggMarkerView *)markerView {
   if (!_mapView) {
-    RCTLogWarn(@"LuggMaps: addMarkerViewToMap called without a map");
+    RCTLogWarn(@"Lugg: addMarkerViewToMap called without a map");
     return;
   }
 
@@ -288,7 +291,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 
 #pragma mark - Polyline Management
 
-- (void)syncPolylineView:(LuggMapsPolylineView *)polylineView {
+- (void)syncPolylineView:(LuggPolylineView *)polylineView {
   if (!_mapView) {
     if (![_pendingPolylineViews containsObject:polylineView]) {
       [_pendingPolylineViews addObject:polylineView];
@@ -319,13 +322,13 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
     return;
   }
 
-  for (LuggMapsPolylineView *polylineView in _pendingPolylineViews) {
+  for (LuggPolylineView *polylineView in _pendingPolylineViews) {
     [self addPolylineViewToMap:polylineView];
   }
   [_pendingPolylineViews removeAllObjects];
 }
 
-- (void)addPolylineViewToMap:(LuggMapsPolylineView *)polylineView {
+- (void)addPolylineViewToMap:(LuggPolylineView *)polylineView {
   if (!_mapView) {
     return;
   }
@@ -350,7 +353,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 - (void)updateProps:(Props::Shared const &)props
            oldProps:(Props::Shared const &)oldProps {
   const auto &newViewProps =
-      *std::static_pointer_cast<LuggMapsGoogleMapViewProps const>(props);
+      *std::static_pointer_cast<LuggGoogleMapViewProps const>(props);
 
   if (_mapView == nil) {
     NSString *newMapId =
@@ -365,9 +368,16 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
     _mapView.settings.scrollGestures = newViewProps.scrollEnabled;
     _mapView.settings.rotateGestures = newViewProps.rotateEnabled;
     _mapView.settings.tiltGestures = newViewProps.pitchEnabled;
+    _mapView.myLocationEnabled = newViewProps.userLocationEnabled;
     _mapView.padding = UIEdgeInsetsMake(
         newViewProps.padding.top, newViewProps.padding.left,
         newViewProps.padding.bottom, newViewProps.padding.right);
+
+    float minZoom = newViewProps.minZoom > 0 ? (float)newViewProps.minZoom
+                                             : _mapView.minZoom;
+    float maxZoom = newViewProps.maxZoom > 0 ? (float)newViewProps.maxZoom
+                                             : _mapView.maxZoom;
+    [_mapView setMinZoom:minZoom maxZoom:maxZoom];
   }
 
   [super updateProps:props oldProps:oldProps];
@@ -400,7 +410,10 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 }
 
 - (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;
@@ -413,8 +426,10 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
     bounds = [bounds includingCoordinate:CLLocationCoordinate2DMake(lat, lng)];
   }
 
+  UIEdgeInsets edgePadding =
+      UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight);
   GMSCameraUpdate *cameraUpdate = [GMSCameraUpdate fitBounds:bounds
-                                                 withPadding:padding];
+                                              withEdgeInsets:edgePadding];
 
   if (duration < 0) {
     [_mapView animateWithCameraUpdate:cameraUpdate];
@@ -429,11 +444,11 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 }
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
-  RCTLuggMapsGoogleMapViewHandleCommand(self, commandName, args);
+  RCTLuggGoogleMapViewHandleCommand(self, commandName, args);
 }
 
-Class<RCTComponentViewProtocol> LuggMapsGoogleMapViewCls(void) {
-  return LuggMapsGoogleMapView.class;
+Class<RCTComponentViewProtocol> LuggGoogleMapViewCls(void) {
+  return LuggGoogleMapView.class;
 }
 
 @end

package/ios/{LuggMapsWrapperView.h → LuggMapWrapperView.h}

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LuggMapsWrapperView : RCTViewComponentView
+@interface LuggMapWrapperView : RCTViewComponentView
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/{LuggMapsWrapperView.mm → LuggMapWrapperView.mm}

@@ -1,4 +1,4 @@
-#import "LuggMapsWrapperView.h"
+#import "LuggMapWrapperView.h"
 
 #import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNMapsSpec/EventEmitters.h>
@@ -9,28 +9,28 @@
 
 using namespace facebook::react;
 
-@interface LuggMapsWrapperView () <RCTLuggMapsWrapperViewViewProtocol>
+@interface LuggMapWrapperView () <RCTLuggMapWrapperViewViewProtocol>
 @end
 
-@implementation LuggMapsWrapperView
+@implementation LuggMapWrapperView
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
-      LuggMapsWrapperViewComponentDescriptor>();
+      LuggMapWrapperViewComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps =
-        std::make_shared<const LuggMapsWrapperViewProps>();
+        std::make_shared<const LuggMapWrapperViewProps>();
     _props = defaultProps;
   }
 
   return self;
 }
 
-Class<RCTComponentViewProtocol> LuggMapsWrapperViewCls(void) {
-  return LuggMapsWrapperView.class;
+Class<RCTComponentViewProtocol> LuggMapWrapperViewCls(void) {
+  return LuggMapWrapperView.class;
 }
 
 @end

package/ios/{LuggMapsMarkerView.h → LuggMarkerView.h}

@@ -4,15 +4,15 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class LuggMapsMarkerView;
+@class LuggMarkerView;
 
-@protocol LuggMapsMarkerViewDelegate <NSObject>
+@protocol LuggMarkerViewDelegate <NSObject>
 @optional
-- (void)markerViewDidLayout:(LuggMapsMarkerView *)markerView;
-- (void)markerViewDidUpdate:(LuggMapsMarkerView *)markerView;
+- (void)markerViewDidLayout:(LuggMarkerView *)markerView;
+- (void)markerViewDidUpdate:(LuggMarkerView *)markerView;
 @end
 
-@interface LuggMapsMarkerView : RCTViewComponentView
+@interface LuggMarkerView : RCTViewComponentView
 
 @property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
 @property(nonatomic, readonly, nullable) NSString *title;
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, readonly) BOOL hasCustomView;
 @property(nonatomic, readonly) BOOL didLayout;
 @property(nonatomic, readonly) UIView *iconView;
-@property(nonatomic, weak, nullable) id<LuggMapsMarkerViewDelegate> delegate;
+@property(nonatomic, weak, nullable) id<LuggMarkerViewDelegate> delegate;
 @property(nonatomic, strong, nullable) NSObject *marker;
 
 @end

package/ios/{LuggMapsMarkerView.mm → LuggMarkerView.mm}

@@ -1,4 +1,4 @@
-#import "LuggMapsMarkerView.h"
+#import "LuggMarkerView.h"
 
 #import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNMapsSpec/EventEmitters.h>
@@ -9,10 +9,10 @@
 
 using namespace facebook::react;
 
-@interface LuggMapsMarkerView () <RCTLuggMapsMarkerViewViewProtocol>
+@interface LuggMarkerView () <RCTLuggMarkerViewViewProtocol>
 @end
 
-@implementation LuggMapsMarkerView {
+@implementation LuggMarkerView {
   CLLocationCoordinate2D _coordinate;
   NSString *_title;
   NSString *_markerDescription;
@@ -23,13 +23,13 @@ using namespace facebook::react;
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
-      LuggMapsMarkerViewComponentDescriptor>();
+      LuggMarkerViewComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps =
-        std::make_shared<const LuggMapsMarkerViewProps>();
+        std::make_shared<const LuggMarkerViewProps>();
     _props = defaultProps;
 
     _coordinate = CLLocationCoordinate2DMake(0, 0);
@@ -50,7 +50,7 @@ using namespace facebook::react;
            oldProps:(Props::Shared const &)oldProps {
   [super updateProps:props oldProps:oldProps];
   const auto &newViewProps =
-      *std::static_pointer_cast<LuggMapsMarkerViewProps const>(props);
+      *std::static_pointer_cast<LuggMarkerViewProps const>(props);
 
   _coordinate = CLLocationCoordinate2DMake(newViewProps.coordinate.latitude,
                                            newViewProps.coordinate.longitude);
@@ -147,8 +147,8 @@ using namespace facebook::react;
   }
 }
 
-Class<RCTComponentViewProtocol> LuggMapsMarkerViewCls(void) {
-  return LuggMapsMarkerView.class;
+Class<RCTComponentViewProtocol> LuggMarkerViewCls(void) {
+  return LuggMarkerView.class;
 }
 
 @end

package/ios/{LuggMapsPolylineView.h → LuggPolylineView.h}

@@ -4,20 +4,20 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class LuggMapsPolylineView;
+@class LuggPolylineView;
 
-@protocol LuggMapsPolylineViewDelegate <NSObject>
+@protocol LuggPolylineViewDelegate <NSObject>
 @optional
-- (void)polylineViewDidUpdate:(LuggMapsPolylineView *)polylineView;
+- (void)polylineViewDidUpdate:(LuggPolylineView *)polylineView;
 @end
 
-@interface LuggMapsPolylineView : RCTViewComponentView
+@interface LuggPolylineView : RCTViewComponentView
 
 @property(nonatomic, readonly) NSArray<CLLocation *> *coordinates;
 @property(nonatomic, readonly) NSArray<UIColor *> *strokeColors;
 @property(nonatomic, readonly) BOOL animated;
 @property(nonatomic, readonly) CGFloat strokeWidth;
-@property(nonatomic, weak, nullable) id<LuggMapsPolylineViewDelegate> delegate;
+@property(nonatomic, weak, nullable) id<LuggPolylineViewDelegate> delegate;
 @property(nonatomic, strong, nullable) NSObject *polyline;
 @property(nonatomic, weak, nullable) NSObject *renderer;
 @property(nonatomic, strong, nullable) NSArray *cachedSpans;

package/ios/{LuggMapsPolylineView.mm → LuggPolylineView.mm}

@@ -1,4 +1,4 @@
-#import "LuggMapsPolylineView.h"
+#import "LuggPolylineView.h"
 
 #import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNMapsSpec/EventEmitters.h>
@@ -10,10 +10,10 @@
 
 using namespace facebook::react;
 
-@interface LuggMapsPolylineView () <RCTLuggMapsPolylineViewViewProtocol>
+@interface LuggPolylineView () <RCTLuggPolylineViewViewProtocol>
 @end
 
-@implementation LuggMapsPolylineView {
+@implementation LuggPolylineView {
   NSArray<CLLocation *> *_coordinates;
   NSArray<UIColor *> *_strokeColors;
   BOOL _animated;
@@ -22,13 +22,13 @@ using namespace facebook::react;
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
-      LuggMapsPolylineViewComponentDescriptor>();
+      LuggPolylineViewComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps =
-        std::make_shared<const LuggMapsPolylineViewProps>();
+        std::make_shared<const LuggPolylineViewProps>();
     _props = defaultProps;
 
     _coordinates = @[];
@@ -45,7 +45,7 @@ using namespace facebook::react;
            oldProps:(Props::Shared const &)oldProps {
   [super updateProps:props oldProps:oldProps];
   const auto &newViewProps =
-      *std::static_pointer_cast<LuggMapsPolylineViewProps const>(props);
+      *std::static_pointer_cast<LuggPolylineViewProps const>(props);
 
   NSMutableArray<CLLocation *> *coords = [NSMutableArray array];
   for (const auto &coord : newViewProps.coordinates) {
@@ -109,8 +109,8 @@ using namespace facebook::react;
   self.delegate = nil;
 }
 
-Class<RCTComponentViewProtocol> LuggMapsPolylineViewCls(void) {
-  return LuggMapsPolylineView.class;
+Class<RCTComponentViewProtocol> LuggPolylineViewCls(void) {
+  return LuggPolylineView.class;
 }
 
 @end

package/ios/events/CameraIdleEvent.h

@@ -9,13 +9,18 @@ struct CameraIdleEvent {
   double latitude;
   double longitude;
   double zoom;
+  bool gesture;
 
   template <typename Emitter>
-  void emit(std::shared_ptr<Emitter const> emitter) const {
+  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+    if (!eventEmitter)
+      return;
+    auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
     typename Emitter::OnCameraIdle event;
     event.coordinate.latitude = latitude;
     event.coordinate.longitude = longitude;
     event.zoom = zoom;
+    event.gesture = gesture;
     emitter->onCameraIdle(event);
   }
 };

package/ios/events/CameraMoveEvent.h

@@ -9,15 +9,18 @@ struct CameraMoveEvent {
   double latitude;
   double longitude;
   double zoom;
-  bool dragging;
+  bool gesture;
 
   template <typename Emitter>
-  void emit(std::shared_ptr<Emitter const> emitter) const {
+  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+    if (!eventEmitter)
+      return;
+    auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
     typename Emitter::OnCameraMove event;
     event.coordinate.latitude = latitude;
     event.coordinate.longitude = longitude;
     event.zoom = zoom;
-    event.dragging = dragging;
+    event.gesture = gesture;
     emitter->onCameraMove(event);
   }
 };

package/ios/events/ReadyEvent.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#import <react/renderer/components/RNMapsSpec/EventEmitters.h>
+
+namespace luggmaps {
+namespace events {
+
+struct ReadyEvent {
+  template <typename Emitter>
+  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+    if (!eventEmitter)
+      return;
+    auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
+    typename Emitter::OnReady event;
+    emitter->onReady(event);
+  }
+};
+
+} // namespace events
+} // namespace luggmaps

package/lib/module/MapView.js

@@ -2,9 +2,9 @@
 
 import React from 'react';
 import { Platform, StyleSheet } from 'react-native';
-import LuggMapsGoogleMapViewNativeComponent, { Commands as GoogleMapCommands } from './fabric/LuggMapsGoogleMapViewNativeComponent';
-import LuggMapsAppleMapViewNativeComponent, { Commands as AppleMapCommands } from './fabric/LuggMapsAppleMapViewNativeComponent';
-import LuggMapsWrapperViewNativeComponent from './fabric/LuggMapsWrapperViewNativeComponent';
+import LuggGoogleMapViewNativeComponent, { Commands as GoogleMapCommands } from './fabric/LuggGoogleMapViewNativeComponent';
+import LuggAppleMapViewNativeComponent, { Commands as AppleMapCommands } from './fabric/LuggAppleMapViewNativeComponent';
+import LuggMapWrapperViewNativeComponent from './fabric/LuggMapWrapperViewNativeComponent';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export class MapView extends React.Component {
   static defaultProps = {
@@ -35,9 +35,15 @@ export class MapView extends React.Component {
     const first = coordinates[0];
     if (!ref || !first) return;
     const {
-      padding = 0,
+      padding,
       duration = -1
     } = options ?? {};
+    const {
+      top = 0,
+      left = 0,
+      bottom = 0,
+      right = 0
+    } = padding ?? {};
     if (coordinates.length === 1) {
       const zoom = this.props.initialZoom ?? 10;
       this.moveCamera(first, {
@@ -46,7 +52,7 @@ export class MapView extends React.Component {
       });
       return;
     }
-    this.nativeCommands.fitCoordinates(ref, coordinates, padding, duration);
+    this.nativeCommands.fitCoordinates(ref, coordinates, top, left, bottom, right, duration);
   }
   render() {
     const {
@@ -54,31 +60,39 @@ export class MapView extends React.Component {
       mapId,
       initialCoordinate,
       initialZoom,
+      minZoom,
+      maxZoom,
       zoomEnabled,
       scrollEnabled,
       rotateEnabled,
       pitchEnabled,
       padding,
+      userLocationEnabled,
       onCameraMove,
       onCameraIdle,
+      onReady,
       children,
       ...rest
     } = this.props;
-    const NativeMapView = Platform.OS === 'ios' && provider === 'apple' ? LuggMapsAppleMapViewNativeComponent : LuggMapsGoogleMapViewNativeComponent;
+    const NativeMapView = Platform.OS === 'ios' && provider === 'apple' ? LuggAppleMapViewNativeComponent : LuggGoogleMapViewNativeComponent;
     return /*#__PURE__*/_jsxs(NativeMapView, {
       ref: this.nativeRef,
       ...rest,
       mapId: mapId,
       initialCoordinate: initialCoordinate,
       initialZoom: initialZoom,
+      minZoom: minZoom,
+      maxZoom: maxZoom,
       zoomEnabled: zoomEnabled,
       scrollEnabled: scrollEnabled,
       rotateEnabled: rotateEnabled,
       pitchEnabled: pitchEnabled,
       padding: padding,
+      userLocationEnabled: userLocationEnabled,
       onCameraMove: onCameraMove,
       onCameraIdle: onCameraIdle,
-      children: [/*#__PURE__*/_jsx(LuggMapsWrapperViewNativeComponent, {
+      onReady: onReady,
+      children: [/*#__PURE__*/_jsx(LuggMapWrapperViewNativeComponent, {
         style: StyleSheet.absoluteFill
       }), children]
     });