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

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];
@@ -239,14 +242,15 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   marker.position = markerView.coordinate;
   marker.title = markerView.title;
   marker.snippet = markerView.markerDescription;
-  marker.groundAnchor = markerView.anchor;
-
+  marker.zIndex = (int)markerView.zIndex;
   if (markerView.hasCustomView) {
     UIView *iconView = markerView.iconView;
     [iconView removeFromSuperview];
     marker.iconView = iconView;
+    marker.groundAnchor = markerView.anchor;
   } else {
     marker.iconView = nil;
+    marker.groundAnchor = CGPointMake(0.5, 1);
   }
 }
 
@@ -255,15 +259,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;
   }
 
@@ -274,13 +278,13 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   marker.position = markerView.coordinate;
   marker.title = markerView.title;
   marker.snippet = markerView.markerDescription;
-  marker.collisionBehavior = GMSCollisionBehaviorRequired;
 
   if (markerView.hasCustomView) {
     marker.iconView = iconView;
+    marker.groundAnchor = markerView.anchor;
   }
 
-  marker.groundAnchor = markerView.anchor;
+  marker.zIndex = (int)markerView.zIndex;
   marker.map = _mapView;
 
   markerView.marker = marker;
@@ -288,7 +292,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];
@@ -303,6 +307,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 
   GMSPolyline *polyline = (GMSPolyline *)polylineView.polyline;
   polyline.strokeWidth = polylineView.strokeWidth;
+  polyline.zIndex = (int)polylineView.zIndex;
 
   GMSPolylineAnimator *animator =
       [_polylineAnimators objectForKey:polylineView];
@@ -319,19 +324,20 @@ 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;
   }
 
   GMSPolyline *polyline = [GMSPolyline polylineWithPath:[GMSMutablePath path]];
   polyline.strokeWidth = polylineView.strokeWidth;
+  polyline.zIndex = (int)polylineView.zIndex;
   polyline.map = _mapView;
   polylineView.polyline = polyline;
 
@@ -350,7 +356,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 +371,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 +413,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 +429,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 +447,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,24 +4,26 @@
 
 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, nullable) NSString *name;
 @property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
 @property(nonatomic, readonly, nullable) NSString *title;
 @property(nonatomic, readonly, nullable) NSString *markerDescription;
 @property(nonatomic, readonly) CGPoint anchor;
+@property(nonatomic, readonly) NSInteger zIndex;
 @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,31 +9,34 @@
 
 using namespace facebook::react;
 
-@interface LuggMapsMarkerView () <RCTLuggMapsMarkerViewViewProtocol>
+@interface LuggMarkerView () <RCTLuggMarkerViewViewProtocol>
 @end
 
-@implementation LuggMapsMarkerView {
+@implementation LuggMarkerView {
+  NSString *_name;
   CLLocationCoordinate2D _coordinate;
   NSString *_title;
   NSString *_markerDescription;
   CGPoint _anchor;
+  NSInteger _zIndex;
   BOOL _didLayout;
   UIView *_iconView;
 }
 
 + (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);
     _anchor = CGPointMake(0.5, 1.0);
+    _zIndex = 0;
     _didLayout = NO;
 
     _iconView = [[UIView alloc] init];
@@ -50,14 +53,16 @@ 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);
 
+  _name = [NSString stringWithUTF8String:newViewProps.name.c_str()];
   _coordinate = CLLocationCoordinate2DMake(newViewProps.coordinate.latitude,
                                            newViewProps.coordinate.longitude);
   _title = [NSString stringWithUTF8String:newViewProps.title.c_str()];
   _markerDescription =
       [NSString stringWithUTF8String:newViewProps.description.c_str()];
   _anchor = CGPointMake(newViewProps.anchor.x, newViewProps.anchor.y);
+  _zIndex = newViewProps.zIndex.value_or(0);
 }
 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
@@ -109,6 +114,10 @@ using namespace facebook::react;
   }
 }
 
+- (NSString *)name {
+  return _name;
+}
+
 - (CLLocationCoordinate2D)coordinate {
   return _coordinate;
 }
@@ -125,6 +134,10 @@ using namespace facebook::react;
   return _anchor;
 }
 
+- (NSInteger)zIndex {
+  return _zIndex;
+}
+
 - (BOOL)hasCustomView {
   return _iconView.subviews.count > 0;
 }
@@ -147,8 +160,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,21 @@
 
 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, readonly) NSInteger zIndex;
+@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,25 +10,26 @@
 
 using namespace facebook::react;
 
-@interface LuggMapsPolylineView () <RCTLuggMapsPolylineViewViewProtocol>
+@interface LuggPolylineView () <RCTLuggPolylineViewViewProtocol>
 @end
 
-@implementation LuggMapsPolylineView {
+@implementation LuggPolylineView {
   NSArray<CLLocation *> *_coordinates;
   NSArray<UIColor *> *_strokeColors;
   BOOL _animated;
   CGFloat _strokeWidth;
+  NSInteger _zIndex;
 }
 
 + (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 +46,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) {
@@ -71,8 +72,8 @@ using namespace facebook::react;
   }
 
   _animated = newViewProps.animated;
-
   _strokeWidth = newViewProps.strokeWidth > 0 ? newViewProps.strokeWidth : 1.0;
+  _zIndex = newViewProps.zIndex.value_or(0);
 }
 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
@@ -101,6 +102,10 @@ using namespace facebook::react;
   return _strokeWidth;
 }
 
+- (NSInteger)zIndex {
+  return _zIndex;
+}
+
 - (void)prepareForRecycle {
   [super prepareForRecycle];
   self.polyline = nil;
@@ -109,8 +114,8 @@ using namespace facebook::react;
   self.delegate = nil;
 }
 
-Class<RCTComponentViewProtocol> LuggMapsPolylineViewCls(void) {
-  return LuggMapsPolylineView.class;
+Class<RCTComponentViewProtocol> LuggPolylineViewCls(void) {
+  return LuggPolylineView.class;
 }
 
 @end