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

package/ios/LuggMapView.mm

@@ -1,8 +1,11 @@
 #import "LuggMapView.h"
+#import "LuggCircleView.h"
+#import "LuggGroundOverlayView.h"
 #import "LuggMapWrapperView.h"
 #import "LuggMarkerView.h"
 #import "LuggPolygonView.h"
 #import "LuggPolylineView.h"
+#import "LuggTileOverlayView.h"
 #import "core/AppleMapProvider.h"
 #import "core/GoogleMapProvider.h"
 #import "core/MapProviderDelegate.h"
@@ -37,11 +40,16 @@ using namespace luggmaps::events;
   BOOL _rotateEnabled;
   BOOL _pitchEnabled;
   BOOL _userLocationEnabled;
+  LuggMapViewMapType _mapType;
   LuggMapViewTheme _theme;
+  BOOL _poiEnabled;
+  LuggMapViewPoiFilterMode _poiFilterMode;
+  NSArray<NSString *> *_poiFilterCategories;
   double _minZoom;
   double _maxZoom;
   UIEdgeInsets _edgeInsets;
   UIEdgeInsets _oldEdgeInsets;
+  LuggMapViewInsetAdjustment _insetAdjustment;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -61,8 +69,13 @@ using namespace luggmaps::events;
     _rotateEnabled = YES;
     _pitchEnabled = YES;
     _userLocationEnabled = NO;
+    _poiEnabled = NO;
+    _poiFilterMode = LuggMapViewPoiFilterMode::Including;
+    _poiFilterCategories = @[];
+    _mapType = LuggMapViewMapType::Standard;
     _theme = LuggMapViewTheme::System;
     _edgeInsets = UIEdgeInsetsZero;
+    _insetAdjustment = LuggMapViewInsetAdjustment::Never;
   }
   return self;
 }
@@ -91,6 +104,23 @@ using namespace luggmaps::events;
     if (_provider) {
       [_provider addPolygonView:polygonView];
     }
+  } else if ([childComponentView isKindOfClass:[LuggCircleView class]]) {
+    LuggCircleView *circleView = (LuggCircleView *)childComponentView;
+    if (_provider) {
+      [_provider addCircleView:circleView];
+    }
+  } else if ([childComponentView isKindOfClass:[LuggGroundOverlayView class]]) {
+    LuggGroundOverlayView *groundOverlayView =
+        (LuggGroundOverlayView *)childComponentView;
+    if (_provider) {
+      [_provider addGroundOverlayView:groundOverlayView];
+    }
+  } else if ([childComponentView isKindOfClass:[LuggTileOverlayView class]]) {
+    LuggTileOverlayView *tileOverlayView =
+        (LuggTileOverlayView *)childComponentView;
+    if (_provider) {
+      [_provider addTileOverlayView:tileOverlayView];
+    }
   }
 }
 
@@ -112,6 +142,23 @@ using namespace luggmaps::events;
     if (_provider) {
       [_provider removePolygonView:polygonView];
     }
+  } else if ([childComponentView isKindOfClass:[LuggCircleView class]]) {
+    LuggCircleView *circleView = (LuggCircleView *)childComponentView;
+    if (_provider) {
+      [_provider removeCircleView:circleView];
+    }
+  } else if ([childComponentView isKindOfClass:[LuggGroundOverlayView class]]) {
+    LuggGroundOverlayView *groundOverlayView =
+        (LuggGroundOverlayView *)childComponentView;
+    if (_provider) {
+      [_provider removeGroundOverlayView:groundOverlayView];
+    }
+  } else if ([childComponentView isKindOfClass:[LuggTileOverlayView class]]) {
+    LuggTileOverlayView *tileOverlayView =
+        (LuggTileOverlayView *)childComponentView;
+    if (_provider) {
+      [_provider removeTileOverlayView:tileOverlayView];
+    }
   }
 
   [super unmountChildComponentView:childComponentView index:index];
@@ -179,6 +226,12 @@ using namespace luggmaps::events;
       [_provider addPolylineView:(LuggPolylineView *)subview];
     } else if ([subview isKindOfClass:[LuggPolygonView class]]) {
       [_provider addPolygonView:(LuggPolygonView *)subview];
+    } else if ([subview isKindOfClass:[LuggCircleView class]]) {
+      [_provider addCircleView:(LuggCircleView *)subview];
+    } else if ([subview isKindOfClass:[LuggGroundOverlayView class]]) {
+      [_provider addGroundOverlayView:(LuggGroundOverlayView *)subview];
+    } else if ([subview isKindOfClass:[LuggTileOverlayView class]]) {
+      [_provider addTileOverlayView:(LuggTileOverlayView *)subview];
     }
   }
 }
@@ -229,9 +282,14 @@ using namespace luggmaps::events;
   [_provider setRotateEnabled:_rotateEnabled];
   [_provider setPitchEnabled:_pitchEnabled];
   [_provider setUserLocationEnabled:_userLocationEnabled];
-  [_provider setTheme:(NSInteger)_theme];
+  [_provider setMapType:_mapType];
+  [_provider setTheme:_theme];
+  [_provider setPoiEnabled:_poiEnabled];
+  [_provider setPoiFilterMode:_poiFilterMode];
+  [_provider setPoiFilterCategories:_poiFilterCategories];
   [_provider setMinZoom:_minZoom];
   [_provider setMaxZoom:_maxZoom];
+  [_provider setInsetAdjustment:_insetAdjustment];
 }
 
 - (void)updateProps:(Props::Shared const &)props
@@ -269,6 +327,26 @@ using namespace luggmaps::events;
     _userLocationEnabled = newViewProps.userLocationEnabled;
     [_provider setUserLocationEnabled:_userLocationEnabled];
   }
+  if (newViewProps.poiEnabled != prevViewProps.poiEnabled) {
+    _poiEnabled = newViewProps.poiEnabled;
+    [_provider setPoiEnabled:_poiEnabled];
+  }
+  if (newViewProps.poiFilterMode != prevViewProps.poiFilterMode) {
+    _poiFilterMode = newViewProps.poiFilterMode;
+    [_provider setPoiFilterMode:_poiFilterMode];
+  }
+  if (newViewProps.poiFilterCategories != prevViewProps.poiFilterCategories) {
+    NSMutableArray<NSString *> *categories = [NSMutableArray array];
+    for (const auto &category : newViewProps.poiFilterCategories) {
+      [categories addObject:[NSString stringWithUTF8String:category.c_str()]];
+    }
+    _poiFilterCategories = [categories copy];
+    [_provider setPoiFilterCategories:_poiFilterCategories];
+  }
+  if (newViewProps.mapType != prevViewProps.mapType) {
+    _mapType = newViewProps.mapType;
+    [_provider setMapType:_mapType];
+  }
   if (newViewProps.minZoom != prevViewProps.minZoom) {
     _minZoom = newViewProps.minZoom;
     [_provider setMinZoom:_minZoom];
@@ -279,7 +357,11 @@ using namespace luggmaps::events;
   }
   if (newViewProps.theme != prevViewProps.theme) {
     _theme = newViewProps.theme;
-    [_provider setTheme:(NSInteger)_theme];
+    [_provider setTheme:_theme];
+  }
+  if (newViewProps.insetAdjustment != prevViewProps.insetAdjustment) {
+    _insetAdjustment = newViewProps.insetAdjustment;
+    [_provider setInsetAdjustment:_insetAdjustment];
   }
 
   UIEdgeInsets newEdgeInsets = UIEdgeInsetsMake(

package/ios/LuggMarkerView.h

@@ -5,11 +5,14 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class LuggMarkerView;
+@class LuggCalloutView;
 
 @protocol LuggMarkerViewDelegate <NSObject>
 @optional
 - (void)markerViewDidLayout:(LuggMarkerView *)markerView;
 - (void)markerViewDidUpdate:(LuggMarkerView *)markerView;
+- (void)showCalloutForMarkerView:(LuggMarkerView *)markerView;
+- (void)hideCalloutForMarkerView:(LuggMarkerView *)markerView;
 @end
 
 @interface LuggMarkerView : RCTViewComponentView
@@ -23,10 +26,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, readonly) CLLocationDegrees rotate;
 @property(nonatomic, readonly) CGFloat scale;
 @property(nonatomic, readonly) BOOL rasterize;
+@property(nonatomic, readonly) BOOL centerOnPress;
 @property(nonatomic, readonly) BOOL draggable;
 @property(nonatomic, readonly) BOOL hasCustomView;
 @property(nonatomic, readonly) BOOL didLayout;
 @property(nonatomic, readonly) UIView *iconView;
+@property(nonatomic, readonly, nullable) LuggCalloutView *calloutView;
 @property(nonatomic, weak, nullable) id<LuggMarkerViewDelegate> delegate;
 @property(nonatomic, strong, nullable) NSObject *marker;
 

package/ios/LuggMarkerView.mm

@@ -1,4 +1,5 @@
 #import "LuggMarkerView.h"
+#import "LuggCalloutView.h"
 #import "events/MarkerDragEvent.h"
 #import "events/MarkerPressEvent.h"
 
@@ -25,9 +26,11 @@ using namespace luggmaps::events;
   CLLocationDegrees _rotate;
   CGFloat _scale;
   BOOL _rasterize;
+  BOOL _centerOnPress;
   BOOL _draggable;
   BOOL _didLayout;
   UIView *_iconView;
+  LuggCalloutView *_calloutView;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -47,6 +50,7 @@ using namespace luggmaps::events;
     _rotate = 0;
     _scale = 1;
     _rasterize = YES;
+    _centerOnPress = YES;
     _didLayout = NO;
 
     _iconView = [[UIView alloc] init];
@@ -76,6 +80,7 @@ using namespace luggmaps::events;
   _rotate = newViewProps.rotate;
   _scale = newViewProps.scale;
   _rasterize = newViewProps.rasterize;
+  _centerOnPress = newViewProps.centerOnPress;
   _draggable = newViewProps.draggable;
 }
 
@@ -92,14 +97,22 @@ using namespace luggmaps::events;
 - (void)mountChildComponentView:
             (UIView<RCTComponentViewProtocol> *)childComponentView
                           index:(NSInteger)index {
-  [_iconView insertSubview:childComponentView atIndex:index];
+  if ([childComponentView isKindOfClass:[LuggCalloutView class]]) {
+    _calloutView = (LuggCalloutView *)childComponentView;
+  } else {
+    [_iconView insertSubview:childComponentView atIndex:index];
+  }
   _didLayout = NO;
 }
 
 - (void)unmountChildComponentView:
             (UIView<RCTComponentViewProtocol> *)childComponentView
                             index:(NSInteger)index {
-  [childComponentView removeFromSuperview];
+  if ([childComponentView isKindOfClass:[LuggCalloutView class]]) {
+    _calloutView = nil;
+  } else {
+    [childComponentView removeFromSuperview];
+  }
   _didLayout = NO;
 }
 
@@ -164,6 +177,10 @@ using namespace luggmaps::events;
   return _rasterize;
 }
 
+- (BOOL)centerOnPress {
+  return _centerOnPress;
+}
+
 - (BOOL)draggable {
   return _draggable;
 }
@@ -180,6 +197,10 @@ using namespace luggmaps::events;
   return _iconView;
 }
 
+- (LuggCalloutView *)calloutView {
+  return _calloutView;
+}
+
 - (UIImage *)createIconImage {
   CGSize size = _iconView.bounds.size;
   if (size.width <= 0 || size.height <= 0) {
@@ -268,9 +289,26 @@ using namespace luggmaps::events;
                                _iconView.bounds.size.height);
 }
 
+- (void)showCallout {
+  if ([self.delegate respondsToSelector:@selector(showCalloutForMarkerView:)]) {
+    [self.delegate showCalloutForMarkerView:self];
+  }
+}
+
+- (void)hideCallout {
+  if ([self.delegate respondsToSelector:@selector(hideCalloutForMarkerView:)]) {
+    [self.delegate hideCalloutForMarkerView:self];
+  }
+}
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
+  RCTLuggMarkerViewHandleCommand(self, commandName, args);
+}
+
 - (void)prepareForRecycle {
   [super prepareForRecycle];
   _didLayout = NO;
+  _calloutView = nil;
   self.marker = nil;
   self.delegate = nil;
   [self resetIconViewTransform];

package/ios/LuggTileOverlayView.h

@@ -0,0 +1,31 @@
+#import <CoreLocation/CoreLocation.h>
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class LuggTileOverlayView;
+
+@protocol LuggTileOverlayViewDelegate <NSObject>
+@optional
+- (void)tileOverlayViewDidUpdate:(LuggTileOverlayView *)tileOverlayView;
+@end
+
+@interface LuggTileOverlayView : RCTViewComponentView
+
+@property(nonatomic, readonly) NSString *urlTemplate;
+@property(nonatomic, readonly) NSInteger tileSize;
+@property(nonatomic, readonly) CGFloat opacity;
+@property(nonatomic, readonly) BOOL hasBounds;
+@property(nonatomic, readonly) CLLocationCoordinate2D northeast;
+@property(nonatomic, readonly) CLLocationCoordinate2D southwest;
+@property(nonatomic, readonly) NSInteger zIndex;
+@property(nonatomic, readonly) BOOL tappable;
+@property(nonatomic, weak, nullable) id<LuggTileOverlayViewDelegate> delegate;
+@property(nonatomic, strong, nullable) NSObject *overlay;
+
+- (void)emitPressEvent;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/LuggTileOverlayView.mm

@@ -0,0 +1,130 @@
+#import "LuggTileOverlayView.h"
+#import "events/TileOverlayPressEvent.h"
+
+#import <react/renderer/components/RNMapsSpec/ComponentDescriptors.h>
+#import <react/renderer/components/RNMapsSpec/EventEmitters.h>
+#import <react/renderer/components/RNMapsSpec/Props.h>
+#import <react/renderer/components/RNMapsSpec/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+
+using namespace facebook::react;
+using namespace luggmaps::events;
+
+@interface LuggTileOverlayView () <RCTLuggTileOverlayViewViewProtocol>
+@end
+
+@implementation LuggTileOverlayView {
+  NSString *_urlTemplate;
+  NSInteger _tileSize;
+  CGFloat _opacity;
+  BOOL _hasBounds;
+  CLLocationCoordinate2D _northeast;
+  CLLocationCoordinate2D _southwest;
+  NSInteger _zIndex;
+  BOOL _tappable;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<
+      LuggTileOverlayViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps =
+        std::make_shared<const LuggTileOverlayViewProps>();
+    _props = defaultProps;
+
+    _urlTemplate = @"";
+    _tileSize = 256;
+    _opacity = 1.0;
+
+    self.hidden = YES;
+  }
+
+  return self;
+}
+
+- (void)updateProps:(Props::Shared const &)props
+           oldProps:(Props::Shared const &)oldProps {
+  [super updateProps:props oldProps:oldProps];
+  const auto &newViewProps =
+      *std::static_pointer_cast<LuggTileOverlayViewProps const>(props);
+
+  _urlTemplate =
+      [NSString stringWithUTF8String:newViewProps.urlTemplate.c_str()];
+  _tileSize = newViewProps.tileSize;
+  _opacity = newViewProps.opacity;
+
+  auto ne = newViewProps.bounds.northeast;
+  auto sw = newViewProps.bounds.southwest;
+  _hasBounds = (ne.latitude != 0 || ne.longitude != 0 || sw.latitude != 0 ||
+                sw.longitude != 0);
+  if (_hasBounds) {
+    _northeast = CLLocationCoordinate2DMake(ne.latitude, ne.longitude);
+    _southwest = CLLocationCoordinate2DMake(sw.latitude, sw.longitude);
+  }
+
+  _zIndex = newViewProps.zIndex.value_or(0);
+  _tappable = newViewProps.tappable;
+}
+
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
+  [super finalizeUpdates:updateMask];
+
+  if (updateMask & RNComponentViewUpdateMaskProps) {
+    if ([self.delegate
+            respondsToSelector:@selector(tileOverlayViewDidUpdate:)]) {
+      [self.delegate tileOverlayViewDidUpdate:self];
+    }
+  }
+}
+
+- (NSString *)urlTemplate {
+  return _urlTemplate;
+}
+
+- (NSInteger)tileSize {
+  return _tileSize;
+}
+
+- (CGFloat)opacity {
+  return _opacity;
+}
+
+- (BOOL)hasBounds {
+  return _hasBounds;
+}
+
+- (CLLocationCoordinate2D)northeast {
+  return _northeast;
+}
+
+- (CLLocationCoordinate2D)southwest {
+  return _southwest;
+}
+
+- (NSInteger)zIndex {
+  return _zIndex;
+}
+
+- (BOOL)tappable {
+  return _tappable;
+}
+
+- (void)emitPressEvent {
+  TileOverlayPressEvent::emit<LuggTileOverlayViewEventEmitter>(_eventEmitter);
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  self.overlay = nil;
+  self.delegate = nil;
+}
+
+Class<RCTComponentViewProtocol> LuggTileOverlayViewCls(void) {
+  return LuggTileOverlayView.class;
+}
+
+@end