From b16fb73398622fff97c73248639c410b90964ccf Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Fri, 11 Sep 2026 02:15:23 +0800
Subject: [PATCH 1/4] fix(example): reuse static map overlays in details

---
 docs/content/docs/usage.mdx                   |  2 ++
 .../shared/src/screens/MarkerDetailScreen.tsx | 32 ++++++++++++++++---
 .../shared/src/screens/StaticMapsScreen.tsx   |  8 ++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/docs/content/docs/usage.mdx b/docs/content/docs/usage.mdx
index dc25258..0a07d45 100644
--- a/docs/content/docs/usage.mdx
+++ b/docs/content/docs/usage.mdx
@@ -105,6 +105,8 @@ Mounting many live maps is expensive. Use `staticMode` to render lightweight, no
 </MapView>
 ```
 
+The example app uses the same markers and polyline in each static list map and its detail screen.
+
 Read more in [Static Maps](./components/map-view.mdx#static-maps).
 
 ## Next steps
diff --git a/example/shared/src/screens/MarkerDetailScreen.tsx b/example/shared/src/screens/MarkerDetailScreen.tsx
index aaf465f..ffc9b14 100644
--- a/example/shared/src/screens/MarkerDetailScreen.tsx
+++ b/example/shared/src/screens/MarkerDetailScreen.tsx
@@ -1,11 +1,17 @@
-import { StyleSheet, View } from 'react-native';
+import { Platform, StyleSheet, View, useWindowDimensions } from 'react-native';
 import { MapProvider, MapView, Marker } from '@lugg/maps';
 
 import { ThemedText } from '../components';
 import { INITIAL_MARKERS } from '../markers';
 import { CIRCLE_CENTER } from '../mapData';
 import { sizes, useTheme } from '../theme';
-import { PLACES } from './StaticMapsScreen';
+import {
+  PLACES,
+  PlaceConstellation,
+  PlaceMarkers,
+  fittedCamera,
+  placeCoordinates,
+} from './StaticMapsScreen';
 
 interface MarkerDetailScreenProps {
   name: string;
@@ -18,6 +24,7 @@ const formatCoordinate = (value: number) => value.toFixed(4);
 
 export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
   const { colors } = useTheme();
+  const { width, height } = useWindowDimensions();
   const apiKey = process.env.GOOGLE_MAPS_API_KEY;
 
   const marker = INITIAL_MARKERS.find((m) => m.name === name);
@@ -27,6 +34,14 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
   const title = marker?.title ?? place?.name ?? name;
   const description =
     marker?.description ?? place?.description ?? 'Marker detail screen';
+  const camera = place
+    ? fittedCamera(
+        placeCoordinates(place),
+        Platform.OS === 'ios' ? 'apple' : 'google',
+        { width, height: height - CARD_BOTTOM - CARD_HEIGHT },
+        sizes.xl
+      )
+    : { coordinate, zoom: 15 };
 
   return (
     <View style={styles.container}>
@@ -35,8 +50,8 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
           style={StyleSheet.absoluteFill}
           staticMode
           staticKey={name}
-          initialCoordinate={coordinate}
-          initialZoom={15}
+          initialCoordinate={camera.coordinate}
+          initialZoom={camera.zoom}
           edgeInsets={{
             top: 0,
             left: 0,
@@ -44,7 +59,14 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
             bottom: CARD_BOTTOM + CARD_HEIGHT,
           }}
         >
-          <Marker coordinate={coordinate} />
+          {place ? (
+            <>
+              <PlaceMarkers place={place} />
+              <PlaceConstellation place={place} />
+            </>
+          ) : (
+            <Marker coordinate={coordinate} />
+          )}
         </MapView>
       </MapProvider>
       <View
diff --git a/example/shared/src/screens/StaticMapsScreen.tsx b/example/shared/src/screens/StaticMapsScreen.tsx
index 85401e5..d9fca4a 100644
--- a/example/shared/src/screens/StaticMapsScreen.tsx
+++ b/example/shared/src/screens/StaticMapsScreen.tsx
@@ -142,7 +142,7 @@ const multipleMarkerCoordinates = (coordinate: Coordinate): Coordinate[] => [
 
 // Every coordinate rendered on a place's map (markers + constellation),
 // used to fit the camera around the content
-const placeCoordinates = (place: StaticPlace): Coordinate[] => {
+export const placeCoordinates = (place: StaticPlace): Coordinate[] => {
   const coordinates = [
     place.coordinate,
     ...constellationPoints(place.coordinate, seedFromId(place.id)),
@@ -162,7 +162,7 @@ const mercatorY = (latitude: number) =>
 // Matches the native static framing: Google shows the world 256 * 2^zoom
 // points wide; Apple fits a square span rect to the view's short side
 // (see LuggStaticFittedMapRect)
-const fittedCamera = (
+export const fittedCamera = (
   coordinates: Coordinate[],
   provider: MapProviderType,
   size: { width: number; height: number },
@@ -202,7 +202,7 @@ const fittedCamera = (
   return { coordinate, zoom };
 };
 
-const PlaceConstellation = ({ place }: { place: StaticPlace }) => {
+export const PlaceConstellation = ({ place }: { place: StaticPlace }) => {
   const points = constellationPoints(place.coordinate, seedFromId(place.id));
   return (
     <>
@@ -220,7 +220,7 @@ const PlaceConstellation = ({ place }: { place: StaticPlace }) => {
   );
 };
 
-const PlaceMarkers = ({ place }: { place: StaticPlace }) => {
+export const PlaceMarkers = ({ place }: { place: StaticPlace }) => {
   const { coordinate, markerType, markerText, imageUrl } = place;
 
   switch (markerType) {

From 2d7d8df103865f5cb96392eec4469c3dc4212d33 Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Fri, 11 Sep 2026 02:15:47 +0800
Subject: [PATCH 2/4] feat(example): toggle static map provider in details

---
 docs/content/docs/usage.mdx                   |  1 +
 .../shared/src/screens/MarkerDetailScreen.tsx | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/content/docs/usage.mdx b/docs/content/docs/usage.mdx
index 0a07d45..c70c8bc 100644
--- a/docs/content/docs/usage.mdx
+++ b/docs/content/docs/usage.mdx
@@ -106,6 +106,7 @@ Mounting many live maps is expensive. Use `staticMode` to render lightweight, no
 ```
 
 The example app uses the same markers and polyline in each static list map and its detail screen.
+On iOS, both screens include a button to switch between Apple Maps and Google Maps.
 
 Read more in [Static Maps](./components/map-view.mdx#static-maps).
 
diff --git a/example/shared/src/screens/MarkerDetailScreen.tsx b/example/shared/src/screens/MarkerDetailScreen.tsx
index ffc9b14..a7840d4 100644
--- a/example/shared/src/screens/MarkerDetailScreen.tsx
+++ b/example/shared/src/screens/MarkerDetailScreen.tsx
@@ -1,7 +1,8 @@
+import { useState } from 'react';
 import { Platform, StyleSheet, View, useWindowDimensions } from 'react-native';
-import { MapProvider, MapView, Marker } from '@lugg/maps';
+import { MapProvider, MapView, Marker, type MapProviderType } from '@lugg/maps';
 
-import { ThemedText } from '../components';
+import { Button, ThemedText } from '../components';
 import { INITIAL_MARKERS } from '../markers';
 import { CIRCLE_CENTER } from '../mapData';
 import { sizes, useTheme } from '../theme';
@@ -26,6 +27,9 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
   const { colors } = useTheme();
   const { width, height } = useWindowDimensions();
   const apiKey = process.env.GOOGLE_MAPS_API_KEY;
+  const [provider, setProvider] = useState<MapProviderType>(
+    Platform.OS === 'ios' ? 'apple' : 'google'
+  );
 
   const marker = INITIAL_MARKERS.find((m) => m.name === name);
   const place = PLACES.find((p) => p.name === name);
@@ -37,7 +41,7 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
   const camera = place
     ? fittedCamera(
         placeCoordinates(place),
-        Platform.OS === 'ios' ? 'apple' : 'google',
+        provider,
         { width, height: height - CARD_BOTTOM - CARD_HEIGHT },
         sizes.xl
       )
@@ -47,6 +51,8 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
     <View style={styles.container}>
       <MapProvider apiKey={apiKey}>
         <MapView
+          key={provider}
+          provider={provider}
           style={StyleSheet.absoluteFill}
           staticMode
           staticKey={name}
@@ -69,6 +75,14 @@ export const MarkerDetailScreen = ({ name }: MarkerDetailScreenProps) => {
           )}
         </MapView>
       </MapProvider>
+      <Button
+        style={styles.providerButton}
+        title={provider === 'google' ? 'Apple Maps' : 'Google Maps'}
+        disabled={Platform.OS !== 'ios'}
+        onPress={() =>
+          setProvider((p) => (p === 'google' ? 'apple' : 'google'))
+        }
+      />
       <View
         style={[
           styles.overlay,
@@ -98,6 +112,11 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
+  providerButton: {
+    position: 'absolute',
+    right: sizes.lg,
+    bottom: CARD_BOTTOM + CARD_HEIGHT + sizes.lg,
+  },
   overlay: {
     position: 'absolute',
     left: sizes.lg,

From c070733e5de09d4362f597b7185a26bbaf1ed658 Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Fri, 11 Sep 2026 02:16:05 +0800
Subject: [PATCH 3/4] fix(ios): respect static map attribution insets

---
 docs/content/docs/components/map-view.mdx | 11 ++--
 ios/core/AppleStaticMapProvider.mm        | 74 +++++++++++++++++++++++
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/docs/content/docs/components/map-view.mdx b/docs/content/docs/components/map-view.mdx
index e342df4..87ed0fd 100644
--- a/docs/content/docs/components/map-view.mdx
+++ b/docs/content/docs/components/map-view.mdx
@@ -59,9 +59,11 @@ mounting many live maps is expensive:
   not support cloud-based styling, so `mapId` is ignored on lite static maps.
   Lite mode caps its bitmap at ~2048px per dimension, so larger views (e.g.
   full-screen maps) fall back to a full map with all gestures disabled.
-- **iOS (Apple)** - the base map is rendered with `MKMapSnapshotter`, which
-  loads entirely off the main thread (no live map view is ever created), so
-  static maps keep loading while scrolling. Markers stay live views
+- **iOS (Apple)** - `MKMapSnapshotter` renders the base map off the main
+  thread, so static maps keep loading while scrolling. With nonzero
+  `edgeInsets`, a temporary `MKMapView` renders the image to keep Apple Maps
+  attribution inside the inset viewport. The map view is released after capture.
+  Markers stay live views
   positioned over the base map; polylines, polygons, circles, and ground
   overlays are drawn onto it. Tile overlays are not supported.
 - **iOS (Google)** - markers and shapes render as live overlay views,
@@ -98,7 +100,8 @@ Notes:
   at the final camera (iOS) or re-centers (Android). Map-setting prop
   updates (e.g. `mapType`) after the snapshot are still ignored on iOS.
 - `edgeInsets` shift the visible center like on a live map, so the
-  coordinate centers in the inset viewport. Changing insets after the
+  coordinate centers in the inset viewport. On iOS, attribution also respects
+  these insets. Changing insets after the
   render re-renders the base map (iOS) or re-centers the camera (Android).
 - For taps, wrap the map in a `Pressable` with `pointerEvents="none"` on the
   map container (as above) instead of relying on `onPress`.
diff --git a/ios/core/AppleStaticMapProvider.mm b/ios/core/AppleStaticMapProvider.mm
index 7e88ab0..53bb695 100644
--- a/ios/core/AppleStaticMapProvider.mm
+++ b/ios/core/AppleStaticMapProvider.mm
@@ -4,6 +4,7 @@
 using facebook::react::LuggMapViewTheme;
 
 #import "../extensions/MKMapView+Zoom.h"
+#import "../extensions/UIView+Snapshot.h"
 #import "AppleMapProvider.h"
 #import "LuggAnnotationView.h"
 
@@ -42,8 +43,13 @@ static MKMapRect LuggStaticFittedMapRect(CLLocationCoordinate2D center,
   return rect;
 }
 
+@interface AppleStaticMapProvider () <MKMapViewDelegate>
+@end
+
 @implementation AppleStaticMapProvider {
   MKMapSnapshotter *_snapshotter;
+  MKMapView *_warmupMapView;
+  BOOL _snapshotReady;
 
   BOOL _poiEnabled;
   LuggMapViewPoiFilterMode _poiFilterMode;
@@ -106,6 +112,12 @@ - (UITraitCollection *)snapshotTraitCollection {
 }
 
 - (void)renderBaseMap {
+  // MKMapSnapshotter bakes attribution into the image without inset control.
+  if (!UIEdgeInsetsEqualToEdgeInsets(self.edgeInsets, UIEdgeInsetsZero)) {
+    [self renderInsetBaseMap];
+    return;
+  }
+
   if (_snapshotter)
     return;
 
@@ -140,6 +152,68 @@ - (void)renderBaseMap {
 - (void)cancelBaseRender {
   [_snapshotter cancel];
   _snapshotter = nil;
+  _warmupMapView.delegate = nil;
+  [_warmupMapView removeFromSuperview];
+  _warmupMapView = nil;
+  _snapshotReady = NO;
+}
+
+#pragma mark - Inset snapshots
+
+- (void)renderInsetBaseMap {
+  if (_warmupMapView) {
+    if (!_snapshotReady || !_warmupMapView.window)
+      return;
+
+    UIImageView *imageView = [_warmupMapView lugg_snapshotImageView];
+    if (!imageView)
+      return;
+
+    [self displayBaseImage:imageView.image fromCache:NO];
+    [self cancelBaseRender];
+    return;
+  }
+
+  MKMapView *mapView =
+      [[MKMapView alloc] initWithFrame:self.wrapperView.bounds];
+  mapView.userInteractionEnabled = NO;
+  mapView.showsCompass = NO;
+  mapView.insetsLayoutMarginsFromSafeArea = NO;
+  mapView.layoutMargins = self.edgeInsets;
+  mapView.mapType = LuggMKMapTypeFromMapType(self.mapType);
+  mapView.pointOfInterestFilter = LuggPointOfInterestFilter(
+      _poiEnabled, _poiFilterMode, _poiFilterCategories);
+  mapView.overrideUserInterfaceStyle =
+      [self snapshotTraitCollection].userInterfaceStyle;
+  [mapView setVisibleMapRect:self.mapRect
+                 edgePadding:UIEdgeInsetsZero
+                    animated:NO];
+  _warmupMapView = mapView;
+  mapView.delegate = self;
+  [self.wrapperView insertSubview:mapView atIndex:0];
+}
+
+- (void)mapViewWillStartRenderingMap:(MKMapView *)mapView {
+  _snapshotReady = NO;
+}
+
+- (void)mapViewDidFinishRenderingMap:(MKMapView *)mapView
+                       fullyRendered:(BOOL)fullyRendered {
+  _snapshotReady = fullyRendered;
+  [self revealOverlays];
+  if (!fullyRendered)
+    return;
+
+  __weak AppleStaticMapProvider *weakSelf = self;
+  __weak MKMapView *weakMapView = mapView;
+  [[NSRunLoop mainRunLoop]
+      performInModes:@[ NSDefaultRunLoopMode ]
+               block:^{
+                 AppleStaticMapProvider *strongSelf = weakSelf;
+                 if (strongSelf && weakMapView &&
+                     strongSelf->_warmupMapView == weakMapView)
+                   [strongSelf renderInsetBaseMap];
+               }];
 }
 
 #pragma mark - Props

From b04a6a00e79b73c831e6ccf57b7e6e60248fe508 Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Fri, 11 Sep 2026 02:25:38 +0800
Subject: [PATCH 4/4] refactor(ios): share edge inset offset and easing helpers

---
 docs/content/docs/components/map-view.mdx |  4 ++--
 ios/core/AppleMapProvider.mm              | 23 +++++++----------------
 ios/core/GoogleMapProvider.mm             | 13 +++----------
 ios/core/MapEdgeInsets.h                  | 18 ++++++++++++++++++
 ios/core/StaticMapProviderBase.mm         | 14 ++++++++------
 5 files changed, 38 insertions(+), 34 deletions(-)
 create mode 100644 ios/core/MapEdgeInsets.h

diff --git a/docs/content/docs/components/map-view.mdx b/docs/content/docs/components/map-view.mdx
index 87ed0fd..dc3e5c5 100644
--- a/docs/content/docs/components/map-view.mdx
+++ b/docs/content/docs/components/map-view.mdx
@@ -100,8 +100,8 @@ Notes:
   at the final camera (iOS) or re-centers (Android). Map-setting prop
   updates (e.g. `mapType`) after the snapshot are still ignored on iOS.
 - `edgeInsets` shift the visible center like on a live map, so the
-  coordinate centers in the inset viewport. On iOS, attribution also respects
-  these insets. Changing insets after the
+  coordinate centers in the inset viewport without changing the zoom.
+  On iOS, attribution also respects these insets. Changing insets after the
   render re-renders the base map (iOS) or re-centers the camera (Android).
 - For taps, wrap the map in a `Pressable` with `pointerEvents="none"` on the
   map container (as above) instead of relying on `onPress`.
diff --git a/ios/core/AppleMapProvider.mm b/ios/core/AppleMapProvider.mm
index f4b683f..49c14fa 100644
--- a/ios/core/AppleMapProvider.mm
+++ b/ios/core/AppleMapProvider.mm
@@ -14,6 +14,7 @@
 #import "../LuggTileOverlayView.h"
 #import "../extensions/MKMapView+Zoom.h"
 #import "LuggAnnotationView.h"
+#import "MapEdgeInsets.h"
 #import "MKPolylineAnimator.h"
 
 @interface AppleMarkerAnnotation : NSObject <MKAnnotation>
@@ -465,13 +466,11 @@ - (void)setMaxZoom:(double)maxZoom {
 
 - (void)setEdgeInsets:(UIEdgeInsets)edgeInsets
         oldEdgeInsets:(UIEdgeInsets)oldEdgeInsets {
-  CGFloat oldOffsetX = (oldEdgeInsets.left - oldEdgeInsets.right) / 2.0;
-  CGFloat oldOffsetY = (oldEdgeInsets.top - oldEdgeInsets.bottom) / 2.0;
-  CGFloat newOffsetX = (edgeInsets.left - edgeInsets.right) / 2.0;
-  CGFloat newOffsetY = (edgeInsets.top - edgeInsets.bottom) / 2.0;
+  CGPoint oldOffset = LuggMapInsetOffset(oldEdgeInsets);
+  CGPoint newOffset = LuggMapInsetOffset(edgeInsets);
 
-  CGFloat deltaX = newOffsetX - oldOffsetX;
-  CGFloat deltaY = newOffsetY - oldOffsetY;
+  CGFloat deltaX = newOffset.x - oldOffset.x;
+  CGFloat deltaY = newOffset.y - oldOffset.y;
 
   _mapView.layoutMargins = edgeInsets;
   _edgeInsetsCurrent = edgeInsets;
@@ -514,16 +513,8 @@ - (void)edgeInsetsAnimationTick:(CADisplayLink *)displayLink {
   CFTimeInterval elapsed = CACurrentMediaTime() - _edgeInsetsAnimationStart;
   CGFloat progress = MIN(elapsed / _edgeInsetsAnimationDuration, 1.0);
 
-  // Ease out cubic
-  CGFloat t = 1.0 - (1.0 - progress) * (1.0 - progress) * (1.0 - progress);
-
-  UIEdgeInsets current = UIEdgeInsetsMake(
-      _edgeInsetsFrom.top + (_edgeInsetsTo.top - _edgeInsetsFrom.top) * t,
-      _edgeInsetsFrom.left + (_edgeInsetsTo.left - _edgeInsetsFrom.left) * t,
-      _edgeInsetsFrom.bottom +
-          (_edgeInsetsTo.bottom - _edgeInsetsFrom.bottom) * t,
-      _edgeInsetsFrom.right +
-          (_edgeInsetsTo.right - _edgeInsetsFrom.right) * t);
+  UIEdgeInsets current =
+      LuggMapInsetsAtProgress(_edgeInsetsFrom, _edgeInsetsTo, progress);
 
   [self setEdgeInsets:current oldEdgeInsets:_edgeInsetsCurrent];
 
diff --git a/ios/core/GoogleMapProvider.mm b/ios/core/GoogleMapProvider.mm
index 210d170..7c755a6 100644
--- a/ios/core/GoogleMapProvider.mm
+++ b/ios/core/GoogleMapProvider.mm
@@ -13,6 +13,7 @@
 #import "../LuggPolylineView.h"
 #import "../LuggTileOverlayView.h"
 #import "GMSPolylineAnimator.h"
+#import "MapEdgeInsets.h"
 #import "PolylineAnimatorBase.h"
 
 static NSString *const kDemoMapId = @"DEMO_MAP_ID";
@@ -296,16 +297,8 @@ - (void)edgeInsetsAnimationTick:(CADisplayLink *)displayLink {
   CFTimeInterval elapsed = CACurrentMediaTime() - _edgeInsetsAnimationStart;
   CGFloat progress = MIN(elapsed / _edgeInsetsAnimationDuration, 1.0);
 
-  // Ease out cubic
-  CGFloat t = 1.0 - (1.0 - progress) * (1.0 - progress) * (1.0 - progress);
-
-  UIEdgeInsets current = UIEdgeInsetsMake(
-      _edgeInsetsFrom.top + (_edgeInsetsTo.top - _edgeInsetsFrom.top) * t,
-      _edgeInsetsFrom.left + (_edgeInsetsTo.left - _edgeInsetsFrom.left) * t,
-      _edgeInsetsFrom.bottom +
-          (_edgeInsetsTo.bottom - _edgeInsetsFrom.bottom) * t,
-      _edgeInsetsFrom.right +
-          (_edgeInsetsTo.right - _edgeInsetsFrom.right) * t);
+  UIEdgeInsets current =
+      LuggMapInsetsAtProgress(_edgeInsetsFrom, _edgeInsetsTo, progress);
 
   _mapView.padding = current;
 
diff --git a/ios/core/MapEdgeInsets.h b/ios/core/MapEdgeInsets.h
new file mode 100644
index 0000000..3f23562
--- /dev/null
+++ b/ios/core/MapEdgeInsets.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#import <UIKit/UIKit.h>
+
+static inline CGPoint LuggMapInsetOffset(UIEdgeInsets insets) {
+  return CGPointMake((insets.left - insets.right) / 2.0,
+                     (insets.top - insets.bottom) / 2.0);
+}
+
+static inline UIEdgeInsets
+LuggMapInsetsAtProgress(UIEdgeInsets from, UIEdgeInsets to, CGFloat progress) {
+  // Ease out cubic
+  CGFloat t = 1.0 - (1.0 - progress) * (1.0 - progress) * (1.0 - progress);
+  return UIEdgeInsetsMake(from.top + (to.top - from.top) * t,
+                          from.left + (to.left - from.left) * t,
+                          from.bottom + (to.bottom - from.bottom) * t,
+                          from.right + (to.right - from.right) * t);
+}
diff --git a/ios/core/StaticMapProviderBase.mm b/ios/core/StaticMapProviderBase.mm
index 711a0e4..6884896 100644
--- a/ios/core/StaticMapProviderBase.mm
+++ b/ios/core/StaticMapProviderBase.mm
@@ -11,6 +11,7 @@
 #import "../LuggMarkerView.h"
 #import "../LuggPolygonView.h"
 #import "../LuggPolylineView.h"
+#import "MapEdgeInsets.h"
 
 #pragma mark - Projection
 
@@ -351,10 +352,9 @@ - (void)updateProjection {
 
   // Edge insets shift the visible center like a live map: the coordinate
   // lands at the center of the inset viewport instead of the view center
-  CGFloat offsetX = (_edgeInsets.left - _edgeInsets.right) / 2.0;
-  CGFloat offsetY = (_edgeInsets.top - _edgeInsets.bottom) / 2.0;
-  _mapRect.origin.x -= offsetX * _mapRect.size.width / size.width;
-  _mapRect.origin.y -= offsetY * _mapRect.size.height / size.height;
+  CGPoint offset = LuggMapInsetOffset(_edgeInsets);
+  _mapRect.origin.x -= offset.x * _mapRect.size.width / size.width;
+  _mapRect.origin.y -= offset.y * _mapRect.size.height / size.height;
 
   _projectionReady = YES;
 
@@ -835,8 +835,10 @@ - (void)fitCoordinates:(NSArray *)coordinates
   }
 
   // Asymmetric padding shifts the visible center, like edge insets
-  center.x -= (edgeInsetsLeft - edgeInsetsRight) / 2.0 * scale;
-  center.y -= (edgeInsetsTop - edgeInsetsBottom) / 2.0 * scale;
+  CGPoint offset = LuggMapInsetOffset(UIEdgeInsetsMake(
+      edgeInsetsTop, edgeInsetsLeft, edgeInsetsBottom, edgeInsetsRight));
+  center.x -= offset.x * scale;
+  center.y -= offset.y * scale;
   _coordinate = MKCoordinateForMapPoint(center);
 
   [self rerenderBaseMap];