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

package/ios/LuggCalloutView.mm

@@ -43,7 +43,7 @@ using namespace facebook::react;
 @implementation LuggCalloutView {
   LuggCalloutContentView *_contentView;
   BOOL _bubbled;
-  CGPoint _anchor;
+  CGPoint _offset;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -58,7 +58,7 @@ using namespace facebook::react;
     _props = defaultProps;
 
     _bubbled = YES;
-    _anchor = CGPointMake(0.5, 1.0);
+    _offset = CGPointZero;
     _contentView = [[LuggCalloutContentView alloc] init];
     _contentView.backgroundColor = [UIColor clearColor];
 
@@ -74,29 +74,39 @@ using namespace facebook::react;
   const auto &newViewProps =
       *std::static_pointer_cast<LuggCalloutViewProps const>(props);
 
-  _bubbled = newViewProps.bubbled;
+  BOOL changed = NO;
+
+  if (_bubbled != newViewProps.bubbled) {
+    _bubbled = newViewProps.bubbled;
+    changed = YES;
+  }
 
   if (oldProps) {
     const auto &oldViewProps =
         *std::static_pointer_cast<LuggCalloutViewProps const>(oldProps);
-    if (newViewProps.anchor.x != oldViewProps.anchor.x ||
-        newViewProps.anchor.y != oldViewProps.anchor.y) {
-      _anchor = CGPointMake(newViewProps.anchor.x, newViewProps.anchor.y);
+    if (newViewProps.offset.x != oldViewProps.offset.x ||
+        newViewProps.offset.y != oldViewProps.offset.y) {
+      _offset = CGPointMake(newViewProps.offset.x, newViewProps.offset.y);
+      changed = YES;
     }
-  } else if (newViewProps.anchor.x != 0 || newViewProps.anchor.y != 0) {
-    _anchor = CGPointMake(newViewProps.anchor.x, newViewProps.anchor.y);
+  } else if (newViewProps.offset.x != 0 || newViewProps.offset.y != 0) {
+    _offset = CGPointMake(newViewProps.offset.x, newViewProps.offset.y);
+    changed = YES;
   }
 
   [super updateProps:props oldProps:oldProps];
-  [_delegate calloutViewDidUpdate:self];
+
+  if (changed) {
+    [_delegate calloutViewDidUpdate:self];
+  }
 }
 
 - (BOOL)bubbled {
   return _bubbled;
 }
 
-- (CGPoint)anchor {
-  return _anchor;
+- (CGPoint)offset {
+  return _offset;
 }
 
 - (void)mountChildComponentView:

package/ios/LuggMapView.mm

@@ -40,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 {
@@ -64,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;
 }
@@ -272,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
@@ -312,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];
@@ -322,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

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 @optional
 - (void)markerViewDidLayout:(LuggMarkerView *)markerView;
 - (void)markerViewDidUpdate:(LuggMarkerView *)markerView;
+- (void)showCalloutForMarkerView:(LuggMarkerView *)markerView;
+- (void)hideCalloutForMarkerView:(LuggMarkerView *)markerView;
 @end
 
 @interface LuggMarkerView : RCTViewComponentView
@@ -24,6 +26,7 @@ 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;

package/ios/LuggMarkerView.mm

@@ -26,6 +26,7 @@ using namespace luggmaps::events;
   CLLocationDegrees _rotate;
   CGFloat _scale;
   BOOL _rasterize;
+  BOOL _centerOnPress;
   BOOL _draggable;
   BOOL _didLayout;
   UIView *_iconView;
@@ -49,6 +50,7 @@ using namespace luggmaps::events;
     _rotate = 0;
     _scale = 1;
     _rasterize = YES;
+    _centerOnPress = YES;
     _didLayout = NO;
 
     _iconView = [[UIView alloc] init];
@@ -78,6 +80,7 @@ using namespace luggmaps::events;
   _rotate = newViewProps.rotate;
   _scale = newViewProps.scale;
   _rasterize = newViewProps.rasterize;
+  _centerOnPress = newViewProps.centerOnPress;
   _draggable = newViewProps.draggable;
 }
 
@@ -174,6 +177,10 @@ using namespace luggmaps::events;
   return _rasterize;
 }
 
+- (BOOL)centerOnPress {
+  return _centerOnPress;
+}
+
 - (BOOL)draggable {
   return _draggable;
 }
@@ -282,6 +289,22 @@ 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;

package/ios/core/AppleMapProvider.mm

@@ -1,4 +1,10 @@
 #import "AppleMapProvider.h"
+
+using facebook::react::LuggMapViewInsetAdjustment;
+using facebook::react::LuggMapViewMapType;
+using facebook::react::LuggMapViewPoiFilterMode;
+using facebook::react::LuggMapViewTheme;
+
 #import "../LuggCalloutView.h"
 #import "../LuggCircleView.h"
 #import "../LuggGroundOverlayView.h"
@@ -125,12 +131,17 @@ static double tileToLng(NSInteger x, NSInteger z) {
   UILongPressGestureRecognizer *_longPressGesture;
   LuggMarkerView *_activeNonBubbledMarker;
   BOOL _isReselectingAnnotation;
+  BOOL _isProgrammaticSelect;
   // Edge insets animation
   CADisplayLink *_edgeInsetsDisplayLink;
   UIEdgeInsets _edgeInsetsFrom;
   UIEdgeInsets _edgeInsetsTo;
+  UIEdgeInsets _edgeInsetsCurrent;
   CFTimeInterval _edgeInsetsAnimationStart;
   CFTimeInterval _edgeInsetsAnimationDuration;
+  BOOL _poiEnabled;
+  LuggMapViewPoiFilterMode _poiFilterMode;
+  NSArray<NSString *> *_poiFilterCategories;
 }
 
 @synthesize delegate = _delegate;
@@ -142,6 +153,9 @@ static double tileToLng(NSInteger x, NSInteger z) {
     _overlayToCircleMap = [NSMapTable strongToWeakObjectsMapTable];
     _overlayToGroundOverlayMap = [NSMapTable strongToWeakObjectsMapTable];
     _overlayToTileOverlayMap = [NSMapTable strongToWeakObjectsMapTable];
+    _poiEnabled = YES;
+    _poiFilterMode = LuggMapViewPoiFilterMode::Including;
+    _poiFilterCategories = @[];
   }
   return self;
 }
@@ -235,15 +249,142 @@ static double tileToLng(NSInteger x, NSInteger z) {
   _mapView.showsUserLocation = enabled;
 }
 
-- (void)setTheme:(NSInteger)theme {
+static MKPointOfInterestCategory poiCategoryFromString(NSString *string) {
+  static NSDictionary<NSString *, MKPointOfInterestCategory> *map;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    map = @{
+      @"airport" : MKPointOfInterestCategoryAirport,
+      @"amusement-park" : MKPointOfInterestCategoryAmusementPark,
+      @"aquarium" : MKPointOfInterestCategoryAquarium,
+      @"atm" : MKPointOfInterestCategoryATM,
+      @"bakery" : MKPointOfInterestCategoryBakery,
+      @"bank" : MKPointOfInterestCategoryBank,
+      @"beach" : MKPointOfInterestCategoryBeach,
+      @"brewery" : MKPointOfInterestCategoryBrewery,
+      @"cafe" : MKPointOfInterestCategoryCafe,
+      @"campground" : MKPointOfInterestCategoryCampground,
+      @"car-rental" : MKPointOfInterestCategoryCarRental,
+      @"ev-charger" : MKPointOfInterestCategoryEVCharger,
+      @"fire-station" : MKPointOfInterestCategoryFireStation,
+      @"fitness-center" : MKPointOfInterestCategoryFitnessCenter,
+      @"food-market" : MKPointOfInterestCategoryFoodMarket,
+      @"gas-station" : MKPointOfInterestCategoryGasStation,
+      @"hospital" : MKPointOfInterestCategoryHospital,
+      @"hotel" : MKPointOfInterestCategoryHotel,
+      @"laundry" : MKPointOfInterestCategoryLaundry,
+      @"library" : MKPointOfInterestCategoryLibrary,
+      @"marina" : MKPointOfInterestCategoryMarina,
+      @"movie-theater" : MKPointOfInterestCategoryMovieTheater,
+      @"museum" : MKPointOfInterestCategoryMuseum,
+      @"national-park" : MKPointOfInterestCategoryNationalPark,
+      @"nightlife" : MKPointOfInterestCategoryNightlife,
+      @"park" : MKPointOfInterestCategoryPark,
+      @"parking" : MKPointOfInterestCategoryParking,
+      @"pharmacy" : MKPointOfInterestCategoryPharmacy,
+      @"police" : MKPointOfInterestCategoryPolice,
+      @"post-office" : MKPointOfInterestCategoryPostOffice,
+      @"public-transport" : MKPointOfInterestCategoryPublicTransport,
+      @"restaurant" : MKPointOfInterestCategoryRestaurant,
+      @"restroom" : MKPointOfInterestCategoryRestroom,
+      @"school" : MKPointOfInterestCategorySchool,
+      @"stadium" : MKPointOfInterestCategoryStadium,
+      @"store" : MKPointOfInterestCategoryStore,
+      @"theater" : MKPointOfInterestCategoryTheater,
+      @"university" : MKPointOfInterestCategoryUniversity,
+      @"winery" : MKPointOfInterestCategoryWinery,
+      @"zoo" : MKPointOfInterestCategoryZoo,
+    };
+  });
+  return map[string];
+}
+
+- (void)applyPoiFilter {
+  if (!_poiEnabled) {
+    _mapView.pointOfInterestFilter =
+        MKPointOfInterestFilter.filterExcludingAllCategories;
+    return;
+  }
+  if (_poiFilterCategories.count > 0) {
+    NSMutableArray<MKPointOfInterestCategory> *categories =
+        [NSMutableArray array];
+    for (NSString *name in _poiFilterCategories) {
+      MKPointOfInterestCategory category = poiCategoryFromString(name);
+      if (category) {
+        [categories addObject:category];
+      }
+    }
+    if (categories.count > 0) {
+      if (_poiFilterMode == LuggMapViewPoiFilterMode::Excluding) {
+        _mapView.pointOfInterestFilter = [[MKPointOfInterestFilter alloc]
+            initExcludingCategories:categories];
+      } else {
+        _mapView.pointOfInterestFilter = [[MKPointOfInterestFilter alloc]
+            initIncludingCategories:categories];
+      }
+      return;
+    }
+  }
+  _mapView.pointOfInterestFilter = nil;
+}
+
+- (void)setInsetAdjustment:(LuggMapViewInsetAdjustment)insetAdjustment {
+  BOOL automatic = (insetAdjustment == LuggMapViewInsetAdjustment::Automatic);
+  if (_mapView.insetsLayoutMarginsFromSafeArea == automatic)
+    return;
+
+  CLLocationCoordinate2D center = _mapView.centerCoordinate;
+  _mapView.insetsLayoutMarginsFromSafeArea = automatic;
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self->_mapView setCenterCoordinate:center animated:NO];
+  });
+}
+
+- (void)setPoiEnabled:(BOOL)enabled {
+  _poiEnabled = enabled;
+  [self applyPoiFilter];
+}
+
+- (void)setPoiFilterMode:(LuggMapViewPoiFilterMode)mode {
+  _poiFilterMode = mode;
+  [self applyPoiFilter];
+}
+
+- (void)setPoiFilterCategories:(NSArray<NSString *> *)categories {
+  _poiFilterCategories = categories;
+  [self applyPoiFilter];
+}
+
+- (void)setMapType:(LuggMapViewMapType)mapType {
+  switch (mapType) {
+  case LuggMapViewMapType::Satellite:
+    _mapView.mapType = MKMapTypeSatellite;
+    break;
+  case LuggMapViewMapType::Terrain:
+    _mapView.mapType = MKMapTypeStandard;
+    break;
+  case LuggMapViewMapType::Hybrid:
+    _mapView.mapType = MKMapTypeHybrid;
+    break;
+  case LuggMapViewMapType::MutedStandard:
+    _mapView.mapType = MKMapTypeMutedStandard;
+    break;
+  default:
+    _mapView.mapType = MKMapTypeStandard;
+    break;
+  }
+}
+
+- (void)setTheme:(LuggMapViewTheme)theme {
   switch (theme) {
-  case 1: // Dark
+  case LuggMapViewTheme::Dark:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
     break;
-  case 0: // Light
+  case LuggMapViewTheme::Light:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
     break;
-  default: // System
+  default:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleUnspecified;
     break;
   }
@@ -270,6 +411,7 @@ static double tileToLng(NSInteger x, NSInteger z) {
   CGFloat deltaY = newOffsetY - oldOffsetY;
 
   _mapView.layoutMargins = edgeInsets;
+  _edgeInsetsCurrent = edgeInsets;
 
   if (deltaX != 0 || deltaY != 0) {
     CLLocationCoordinate2D currentCenter = _mapView.centerCoordinate;
@@ -320,7 +462,7 @@ static double tileToLng(NSInteger x, NSInteger z) {
       _edgeInsetsFrom.right +
           (_edgeInsetsTo.right - _edgeInsetsFrom.right) * t);
 
-  [self setEdgeInsets:current oldEdgeInsets:_mapView.layoutMargins];
+  [self setEdgeInsets:current oldEdgeInsets:_edgeInsetsCurrent];
 
   if (progress >= 1.0) {
     [self stopEdgeInsetsAnimation];
@@ -719,9 +861,11 @@ static double tileToLng(NSInteger x, NSInteger z) {
   LuggMarkerView *markerView = annotation.markerView;
 
   if (markerView) {
-    CGPoint point = [_mapView convertCoordinate:markerView.coordinate
-                                  toPointToView:_mapView];
-    [markerView emitPressEventWithPoint:point];
+    if (!_isProgrammaticSelect) {
+      CGPoint point = [_mapView convertCoordinate:markerView.coordinate
+                                    toPointToView:_mapView];
+      [markerView emitPressEventWithPoint:point];
+    }
 
     LuggCalloutView *calloutView = markerView.calloutView;
     if (calloutView && !calloutView.bubbled && calloutView.hasCustomContent) {
@@ -785,24 +929,23 @@ static double tileToLng(NSInteger x, NSInteger z) {
   if (contentSize.width <= 0 || contentSize.height <= 0)
     return;
 
-  CGPoint anchor = calloutView.anchor;
+  CGPoint offset = calloutView.offset;
 
   AppleMarkerAnnotation *annotation =
       (AppleMarkerAnnotation *)_activeNonBubbledMarker.marker;
   MKAnnotationView *annotationView = annotation.annotationView;
 
   if (annotationView && contentView.superview == annotationView) {
-    CGPoint center = CGPointMake(annotationView.bounds.size.width / 2.0 +
-                                     contentSize.width * (0.5 - anchor.x),
-                                 contentSize.height * (0.5 - anchor.y));
+    CGPoint center =
+        CGPointMake(annotationView.bounds.size.width / 2.0 + offset.x,
+                    -contentSize.height / 2.0 + offset.y);
     contentView.center = center;
   } else {
     CGPoint point =
         [_mapView convertCoordinate:_activeNonBubbledMarker.coordinate
                       toPointToView:_wrapperView];
-    contentView.center =
-        CGPointMake(point.x + contentSize.width * (0.5 - anchor.x),
-                    point.y + contentSize.height * (0.5 - anchor.y));
+    contentView.center = CGPointMake(
+        point.x + offset.x, point.y - contentSize.height / 2.0 + offset.y);
   }
 
   contentView.hidden = NO;
@@ -876,7 +1019,9 @@ static double tileToLng(NSInteger x, NSInteger z) {
   if ([view.annotation isKindOfClass:[AppleMarkerAnnotation class]]) {
     AppleMarkerAnnotation *annotation =
         (AppleMarkerAnnotation *)view.annotation;
-    [_mapView setCenterCoordinate:annotation.coordinate animated:YES];
+    if (annotation.markerView.centerOnPress) {
+      [_mapView setCenterCoordinate:annotation.coordinate animated:YES];
+    }
   }
 }
 
@@ -901,6 +1046,42 @@ static double tileToLng(NSInteger x, NSInteger z) {
       calloutView.hasCustomContent ? calloutView.contentView : nil;
 }
 
+- (void)showCalloutForMarkerView:(LuggMarkerView *)markerView {
+  LuggCalloutView *calloutView = markerView.calloutView;
+  _isProgrammaticSelect = YES;
+
+  if (calloutView && calloutView.hasCustomContent) {
+    [self dismissNonBubbledCallout];
+    AppleMarkerAnnotation *annotation =
+        (AppleMarkerAnnotation *)markerView.marker;
+    if (!calloutView.bubbled) {
+      [self showNonBubbledCallout:markerView];
+    } else if (annotation) {
+      [_mapView selectAnnotation:annotation animated:YES];
+    }
+    _isProgrammaticSelect = NO;
+    return;
+  }
+
+  if (markerView.title.length > 0) {
+    AppleMarkerAnnotation *annotation =
+        (AppleMarkerAnnotation *)markerView.marker;
+    if (annotation) {
+      [_mapView selectAnnotation:annotation animated:YES];
+    }
+  }
+  _isProgrammaticSelect = NO;
+}
+
+- (void)hideCalloutForMarkerView:(LuggMarkerView *)markerView {
+  [self dismissNonBubbledCallout];
+  AppleMarkerAnnotation *annotation =
+      (AppleMarkerAnnotation *)markerView.marker;
+  if (annotation) {
+    [_mapView deselectAnnotation:annotation animated:YES];
+  }
+}
+
 #pragma mark - MarkerViewDelegate
 
 - (void)markerViewDidLayout:(LuggMarkerView *)markerView {

package/ios/core/GoogleMapProvider.mm

@@ -1,4 +1,10 @@
 #import "GoogleMapProvider.h"
+
+using facebook::react::LuggMapViewInsetAdjustment;
+using facebook::react::LuggMapViewMapType;
+using facebook::react::LuggMapViewPoiFilterMode;
+using facebook::react::LuggMapViewTheme;
+
 #import "../LuggCalloutView.h"
 #import "../LuggCircleView.h"
 #import "../LuggGroundOverlayView.h"
@@ -22,7 +28,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   GMSMapView *_mapView;
   BOOL _isMapReady;
   BOOL _isDragging;
-  NSInteger _theme;
+  LuggMapViewTheme _theme;
   UIEdgeInsets _edgeInsets;
   NSMutableArray<LuggMarkerView *> *_pendingMarkerViews;
   NSMutableArray<LuggPolylineView *> *_pendingPolylineViews;
@@ -164,7 +170,43 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   _mapView.myLocationEnabled = enabled;
 }
 
-- (void)setTheme:(NSInteger)theme {
+- (void)setInsetAdjustment:(LuggMapViewInsetAdjustment)insetAdjustment {
+  _mapView.paddingAdjustmentBehavior =
+      (insetAdjustment == LuggMapViewInsetAdjustment::Automatic)
+          ? kGMSMapViewPaddingAdjustmentBehaviorAlways
+          : kGMSMapViewPaddingAdjustmentBehaviorNever;
+}
+
+- (void)setPoiEnabled:(BOOL)enabled {
+}
+
+- (void)setPoiFilterMode:(LuggMapViewPoiFilterMode)mode {
+}
+
+- (void)setPoiFilterCategories:(NSArray<NSString *> *)categories {
+}
+
+- (void)setMapType:(LuggMapViewMapType)mapType {
+  if (!_mapView)
+    return;
+
+  switch (mapType) {
+  case LuggMapViewMapType::Satellite:
+    _mapView.mapType = kGMSTypeSatellite;
+    break;
+  case LuggMapViewMapType::Terrain:
+    _mapView.mapType = kGMSTypeTerrain;
+    break;
+  case LuggMapViewMapType::Hybrid:
+    _mapView.mapType = kGMSTypeHybrid;
+    break;
+  default:
+    _mapView.mapType = kGMSTypeNormal;
+    break;
+  }
+}
+
+- (void)setTheme:(LuggMapViewTheme)theme {
   _theme = theme;
   [self applyTheme];
 }
@@ -174,13 +216,13 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
     return;
 
   switch (_theme) {
-  case 1: // Dark
+  case LuggMapViewTheme::Dark:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
     break;
-  case 0: // Light
+  case LuggMapViewTheme::Light:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
     break;
-  default: // System
+  default:
     _mapView.overrideUserInterfaceStyle = UIUserInterfaceStyleUnspecified;
     break;
   }
@@ -346,15 +388,21 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
 
     LuggCalloutView *calloutView = markerView.calloutView;
     if (calloutView && calloutView.hasCustomContent) {
-      [mapView animateToLocation:marker.position];
-
-      dispatch_async(dispatch_get_main_queue(), ^{
-        if (calloutView.bubbled) {
-          mapView.selectedMarker = marker;
-        } else {
-          [self showNonBubbledCallout:markerView];
-        }
-      });
+      if (markerView.centerOnPress) {
+        [mapView animateToLocation:marker.position];
+      }
+
+      mapView.selectedMarker = marker;
+
+      if (!calloutView.bubbled) {
+        [self showNonBubbledCallout:markerView];
+      }
+
+      return YES;
+    }
+
+    if (!markerView.centerOnPress) {
+      mapView.selectedMarker = marker;
       return YES;
     }
   }
@@ -473,7 +521,7 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   if (contentSize.width <= 0 || contentSize.height <= 0)
     return;
 
-  CGPoint anchor = calloutView.anchor;
+  CGPoint offset = calloutView.offset;
   CGPoint point = [_mapView.projection
       pointForCoordinate:_activeNonBubbledMarker.coordinate];
 
@@ -482,9 +530,34 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
       iconView.bounds.size.height * _activeNonBubbledMarker.scale;
 
   contentView.center =
-      CGPointMake(point.x + contentSize.width * (0.5 - anchor.x),
-                  point.y - markerHeight * _activeNonBubbledMarker.anchor.y +
-                      contentSize.height * (0.5 - anchor.y));
+      CGPointMake(point.x + offset.x,
+                  point.y - markerHeight * _activeNonBubbledMarker.anchor.y -
+                      contentSize.height / 2.0 + offset.y);
+}
+
+- (void)showCalloutForMarkerView:(LuggMarkerView *)markerView {
+  LuggCalloutView *calloutView = markerView.calloutView;
+  if (calloutView && calloutView.hasCustomContent) {
+    [self dismissNonBubbledCallout];
+    GMSMarker *marker = (GMSMarker *)markerView.marker;
+    if (calloutView.bubbled) {
+      _mapView.selectedMarker = marker;
+    } else {
+      [self showNonBubbledCallout:markerView];
+    }
+    return;
+  }
+
+  if (markerView.title.length > 0) {
+    _mapView.selectedMarker = (GMSMarker *)markerView.marker;
+  }
+}
+
+- (void)hideCalloutForMarkerView:(LuggMarkerView *)markerView {
+  [self dismissNonBubbledCallout];
+  if (_mapView.selectedMarker == markerView.marker) {
+    _mapView.selectedMarker = nil;
+  }
 }
 
 #pragma mark - MarkerViewDelegate