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

package/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt

@@ -354,7 +354,7 @@ class GoogleMapProvider(private val context: Context) :
 
     val point = map.projection.toScreenLocation(marker.position)
     contentView.translationX = point.x - contentView.width * calloutView.anchorX
-    contentView.translationY = point.y - contentView.height * calloutView.anchorY
+    contentView.translationY = point.y - markerView.contentView.height * markerView.anchorY - contentView.height * calloutView.anchorY
   }
 
   // endregion

package/ios/core/AppleMapProvider.mm

@@ -587,10 +587,7 @@
   }
 
   _activeNonBubbledMarker = markerView;
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self positionNonBubbledCallout];
-    contentView.hidden = NO;
-  });
+  [self positionNonBubbledCallout];
 }
 
 - (void)calloutViewDidUpdate:(LuggCalloutView *)calloutView {
@@ -616,8 +613,7 @@
   if (annotationView && contentView.superview == annotationView) {
     CGPoint center = CGPointMake(annotationView.bounds.size.width / 2.0 +
                                      contentSize.width * (0.5 - anchor.x),
-                                 annotationView.bounds.size.height / 2.0 +
-                                     contentSize.height * (0.5 - anchor.y));
+                                 contentSize.height * (0.5 - anchor.y));
     contentView.center = center;
   } else {
     CGPoint point =
@@ -627,6 +623,8 @@
         CGPointMake(point.x + contentSize.width * (0.5 - anchor.x),
                     point.y + contentSize.height * (0.5 - anchor.y));
   }
+
+  contentView.hidden = NO;
 }
 
 - (void)dismissNonBubbledCallout {

package/ios/core/GoogleMapProvider.mm

@@ -443,9 +443,14 @@ static NSString *const kDemoMapId = @"DEMO_MAP_ID";
   CGPoint point = [_mapView.projection
       pointForCoordinate:_activeNonBubbledMarker.coordinate];
 
+  UIView *iconView = _activeNonBubbledMarker.iconView;
+  CGFloat markerHeight =
+      iconView.bounds.size.height * _activeNonBubbledMarker.scale;
+
   contentView.center =
       CGPointMake(point.x + contentSize.width * (0.5 - anchor.x),
-                  point.y + contentSize.height * (0.5 - anchor.y));
+                  point.y - markerHeight * _activeNonBubbledMarker.anchor.y +
+                      contentSize.height * (0.5 - anchor.y));
 }
 
 #pragma mark - MarkerViewDelegate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",