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

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;
   }
@@ -260,10 +302,10 @@ using namespace luggmaps::events;
   free(coords);
 
   polylineView.polyline = polyline;
-  [_mapView addOverlay:polyline];
+  [self insertOverlay:polyline withZIndex:polylineView.zIndex];
 }
 
-- (void)syncPolylineView:(LuggMapsPolylineView *)polylineView {
+- (void)syncPolylineView:(LuggPolylineView *)polylineView {
   if (!_mapView) {
     return;
   }
@@ -274,6 +316,9 @@ using namespace luggmaps::events;
   // Build new polyline from coordinates
   NSArray<CLLocation *> *coordinates = polylineView.coordinates;
   if (coordinates.count == 0) {
+    if (renderer) {
+      renderer.animated = NO;
+    }
     if (oldPolyline) {
       [_mapView removeOverlay:oldPolyline];
       polylineView.polyline = nil;
@@ -295,6 +340,8 @@ using namespace luggmaps::events;
 
   // If we have an existing renderer, update it in place
   if (renderer && oldPolyline) {
+    [_mapView removeOverlay:oldPolyline];
+    [self insertOverlay:newPolyline withZIndex:polylineView.zIndex];
     [renderer updatePolyline:newPolyline];
     renderer.lineWidth = polylineView.strokeWidth;
     renderer.strokeColor = polylineView.strokeColors.firstObject;
@@ -308,13 +355,34 @@ using namespace luggmaps::events;
   if (oldPolyline) {
     [_mapView removeOverlay:oldPolyline];
   }
-  [_mapView addOverlay:newPolyline];
+  [self insertOverlay:newPolyline withZIndex:polylineView.zIndex];
 }
 
-- (LuggMapsPolylineView *)findPolylineViewForOverlay:(id<MKOverlay>)overlay {
+- (void)insertOverlay:(id<MKOverlay>)overlay withZIndex:(NSInteger)zIndex {
+  if (zIndex == 0) {
+    [_mapView addOverlay:overlay];
+    return;
+  }
+
+  NSArray<id<MKOverlay>> *overlays = _mapView.overlays;
+  NSInteger insertIndex = overlays.count;
+
+  for (NSInteger i = 0; i < overlays.count; i++) {
+    LuggPolylineView *existingPolylineView =
+        [self findPolylineViewForOverlay:overlays[i]];
+    if (existingPolylineView && existingPolylineView.zIndex > zIndex) {
+      insertIndex = i;
+      break;
+    }
+  }
+
+  [_mapView insertOverlay:overlay atIndex:insertIndex];
+}
+
+- (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 +393,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 +401,7 @@ using namespace luggmaps::events;
   }
 }
 
-- (void)markerViewDidUpdate:(LuggMapsMarkerView *)markerView {
+- (void)markerViewDidUpdate:(LuggMarkerView *)markerView {
   AppleMarkerAnnotation *annotation =
       (AppleMarkerAnnotation *)markerView.marker;
 
@@ -346,6 +414,12 @@ using namespace luggmaps::events;
   annotation.title = markerView.title;
   annotation.subtitle = markerView.markerDescription;
 
+  MKAnnotationView *annotationView = annotation.annotationView;
+  if (annotationView) {
+    annotationView.layer.zPosition = markerView.zIndex;
+    annotationView.zPriority = markerView.zIndex;
+  }
+
   [self updateAnnotationViewFrame:annotation];
 }
 
@@ -367,27 +441,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 +463,7 @@ using namespace luggmaps::events;
   }
 
   AppleMarkerAnnotation *markerAnnotation = (AppleMarkerAnnotation *)annotation;
-  LuggMapsMarkerView *markerView = markerAnnotation.markerView;
+  LuggMarkerView *markerView = markerAnnotation.markerView;
 
   if (!markerView || !markerView.hasCustomView) {
     return nil;
@@ -408,7 +474,8 @@ using namespace luggmaps::events;
                                    reuseIdentifier:nil];
   annotationView.canShowCallout = YES;
   annotationView.displayPriority = MKFeatureDisplayPriorityRequired;
-  annotationView.collisionMode = MKAnnotationViewCollisionModeNone;
+  annotationView.layer.zPosition = markerView.zIndex;
+  annotationView.zPriority = markerView.zIndex;
 
   UIView *iconView = markerView.iconView;
   [iconView removeFromSuperview];
@@ -435,8 +502,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 +560,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 +586,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 +603,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;