@lugg/maps 1.0.0-beta.2 → 1.0.0-beta.4

package/ios/LuggGroundOverlayView.mm

@@ -0,0 +1,125 @@
+#import "LuggGroundOverlayView.h"
+#import "events/GroundOverlayPressEvent.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 LuggGroundOverlayView () <RCTLuggGroundOverlayViewViewProtocol>
+@end
+
+@implementation LuggGroundOverlayView {
+  NSString *_imageUri;
+  CLLocationCoordinate2D _northeast;
+  CLLocationCoordinate2D _southwest;
+  CGFloat _opacity;
+  CGFloat _bearing;
+  NSInteger _zIndex;
+  BOOL _tappable;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<
+      LuggGroundOverlayViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps =
+        std::make_shared<const LuggGroundOverlayViewProps>();
+    _props = defaultProps;
+
+    _imageUri = @"";
+    _northeast = CLLocationCoordinate2DMake(0, 0);
+    _southwest = CLLocationCoordinate2DMake(0, 0);
+    _opacity = 1.0;
+    _bearing = 0.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<LuggGroundOverlayViewProps const>(props);
+
+  _imageUri = [NSString stringWithUTF8String:newViewProps.image.c_str()];
+
+  _northeast =
+      CLLocationCoordinate2DMake(newViewProps.bounds.northeast.latitude,
+                                 newViewProps.bounds.northeast.longitude);
+  _southwest =
+      CLLocationCoordinate2DMake(newViewProps.bounds.southwest.latitude,
+                                 newViewProps.bounds.southwest.longitude);
+
+  _opacity = newViewProps.opacity;
+  _bearing = newViewProps.bearing;
+  _zIndex = newViewProps.zIndex.value_or(0);
+  _tappable = newViewProps.tappable;
+}
+
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
+  [super finalizeUpdates:updateMask];
+
+  if (updateMask & RNComponentViewUpdateMaskProps) {
+    if ([self.delegate
+            respondsToSelector:@selector(groundOverlayViewDidUpdate:)]) {
+      [self.delegate groundOverlayViewDidUpdate:self];
+    }
+  }
+}
+
+- (NSString *)imageUri {
+  return _imageUri;
+}
+
+- (CLLocationCoordinate2D)northeast {
+  return _northeast;
+}
+
+- (CLLocationCoordinate2D)southwest {
+  return _southwest;
+}
+
+- (CGFloat)opacity {
+  return _opacity;
+}
+
+- (CGFloat)bearing {
+  return _bearing;
+}
+
+- (NSInteger)zIndex {
+  return _zIndex;
+}
+
+- (BOOL)tappable {
+  return _tappable;
+}
+
+- (void)emitPressEvent {
+  GroundOverlayPressEvent::emit<LuggGroundOverlayViewEventEmitter>(
+      _eventEmitter);
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  self.overlay = nil;
+  self.delegate = nil;
+}
+
+Class<RCTComponentViewProtocol> LuggGroundOverlayViewCls(void) {
+  return LuggGroundOverlayView.class;
+}
+
+@end

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"
@@ -91,6 +94,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 +132,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 +216,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];
     }
   }
 }

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