@lugg/maps 1.1.0 → 1.1.2

package/LuggMaps.podspec

@@ -16,7 +16,20 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift,cpp}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "GoogleMaps"
+  # `$LuggMapsGoogleEnabled = false` in the Podfile drops the Google Maps SDK (Apple Maps only)
+  google_enabled = defined?($LuggMapsGoogleEnabled) ? $LuggMapsGoogleEnabled : true
+  s.pod_target_xcconfig = {
+    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) LUGG_GOOGLE_MAPS_ENABLED=#{google_enabled ? 1 : 0}"
+  }
+  if google_enabled
+    s.dependency "GoogleMaps"
+  else
+    unless defined?($LuggMapsGoogleDisabledLogged)
+      Pod::UI.puts "[LuggMaps] Google Maps SDK is disabled, Apple Maps only.".yellow
+      $LuggMapsGoogleDisabledLogged = true
+    end
+    s.exclude_files = "ios/core/Google*", "ios/core/GMS*"
+  end
   s.frameworks = "MapKit"
 
   install_modules_dependencies(s)

package/README.md

@@ -40,6 +40,16 @@ import { MapView, Marker } from '@lugg/maps';
 
 Google Maps needs an API key on every platform. See [Installation](https://maps.lodev09.com/installation) for Expo, iOS, Android, and web setup.
 
+## AI Skills
+
+Skills give your AI coding agent working knowledge of `@lugg/maps` - setup, camera control, markers and callouts, static maps, advanced patterns, and platform limitations - so it generates correct code without you explaining the library each time.
+
+```sh
+npx skills add lugg/maps
+```
+
+This installs the **Maps Usage** skill into your project. The source lives in [`skills/maps-usage`](skills/maps-usage).
+
 ## Contributing
 
 - [Development workflow](CONTRIBUTING.md#development-workflow)

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

@@ -769,7 +769,11 @@ class GoogleMapProvider(private val context: Context) :
 
   private fun processPendingMarkers() {
     if (googleMap == null) return
-    pendingMarkerViews.forEach { addMarkerViewToMap(it) }
+    pendingMarkerViews.forEach {
+      // markerViewDidLayout adds it once the bitmap can be drawn
+      if (it.hasCustomView && !it.didLayout) return@forEach
+      addMarkerViewToMap(it)
+    }
     pendingMarkerViews.clear()
   }
 

package/ios/LuggMapView.mm

@@ -8,8 +8,10 @@
 #import "LuggTileOverlayView.h"
 #import "core/AppleMapProvider.h"
 #import "core/AppleStaticMapProvider.h"
+#if LUGG_GOOGLE_MAPS_ENABLED
 #import "core/GoogleMapProvider.h"
 #import "core/GoogleStaticMapProvider.h"
+#endif
 #import "core/MapProviderDelegate.h"
 #import "events/CameraIdleEvent.h"
 #import "events/CameraMoveEvent.h"
@@ -329,6 +331,7 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
   if (_providerType == LuggMapViewProvider::Apple) {
     _provider = _staticMode ? [[AppleStaticMapProvider alloc] init]
                             : [[AppleMapProvider alloc] init];
+#if LUGG_GOOGLE_MAPS_ENABLED
   } else if (_staticMode) {
     GoogleStaticMapProvider *google = [[GoogleStaticMapProvider alloc] init];
     google.mapId = _mapId;
@@ -338,6 +341,14 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
     google.mapId = _mapId;
     _provider = google;
   }
+#else
+  } else {
+    NSLog(@"[LuggMaps] provider=\"google\" requested but the Google Maps SDK "
+          @"is excluded ($LuggMapsGoogleEnabled = false); using Apple Maps");
+    _provider = _staticMode ? [[AppleStaticMapProvider alloc] init]
+                            : [[AppleMapProvider alloc] init];
+  }
+#endif
 
   _provider.delegate = self;
   _provider.staticMode = _staticMode;
@@ -617,7 +628,7 @@ static NSCache<NSString *, UIImage *> *StaticSnapshotCache(void) {
   _provider = nil;
   _initialized = NO;
   [self initializeProviderWithCoordinate:coordinate zoom:zoom];
-  if (_providerType == LuggMapViewProvider::Apple) {
+  if ([_provider isKindOfClass:[AppleMapProvider class]]) {
     // The captured camera already includes the previous inset offset.
     [_provider moveCamera:coordinate.latitude
                 longitude:coordinate.longitude

package/ios/core/GoogleMapProvider.mm

@@ -667,6 +667,11 @@ LuggInterfaceStyleFromTheme(facebook::react::LuggMapViewTheme theme) {
   if (!_mapView)
     return;
 
+  // Custom icons rasterize from layout; adding before that shows the SDK's
+  // default pin until markerViewDidLayout re-syncs.
+  if (markerView.hasCustomView && !markerView.didLayout)
+    return;
+
   GMSAdvancedMarker *marker = [[GMSAdvancedMarker alloc] init];
   marker.position = markerView.coordinate;
   marker.title = markerView.title.length > 0 ? markerView.title : nil;

package/lib/typescript/plugin/src/index.d.ts

@@ -10,6 +10,11 @@ export interface MapsPluginProps {
      * Required for Android as it only supports Google Maps.
      */
     androidGoogleMapsApiKey?: string;
+    /**
+     * Whether to link the Google Maps SDK on iOS. Set to `false` when only
+     * Apple Maps is used to drop the SDK from the app. Defaults to `true`.
+     */
+    iosGoogleMapsEnabled?: boolean;
 }
 declare const _default: ConfigPlugin<void | MapsPluginProps>;
 export default _default;

package/lib/typescript/plugin/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../plugin/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAO9E,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;;AAWD,wBAAoE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../plugin/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAO9E,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;;AAkBD,wBAAoE"}

package/lib/typescript/plugin/src/withLuggMapsIOS.d.ts

@@ -1,6 +1,7 @@
 import { type ConfigPlugin } from '@expo/config-plugins';
 export interface MapsIOSPluginProps {
     apiKey?: string;
+    googleEnabled?: boolean;
 }
 export declare const withLuggMapsIOS: ConfigPlugin<MapsIOSPluginProps>;
 //# sourceMappingURL=withLuggMapsIOS.d.ts.map

package/lib/typescript/plugin/src/withLuggMapsIOS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withLuggMapsIOS.d.ts","sourceRoot":"","sources":["../../../../plugin/src/withLuggMapsIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,kBAAkB,CAoC5D,CAAC"}
+{"version":3,"file":"withLuggMapsIOS.d.ts","sourceRoot":"","sources":["../../../../plugin/src/withLuggMapsIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAID,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,kBAAkB,CA8D5D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -78,9 +78,9 @@
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.35.0",
     "@expo/config-plugins": "^56.0.8",
-    "@react-native/babel-preset": "0.85.3",
-    "@react-native/eslint-config": "0.85.3",
-    "@react-native/jest-preset": "0.85.3",
+    "@react-native/babel-preset": "0.86.3",
+    "@react-native/eslint-config": "0.86.3",
+    "@react-native/jest-preset": "0.86.3",
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/jest": "^29.5.14",
     "@types/react": "^19.2.0",
@@ -94,7 +94,7 @@
     "lefthook": "^2.0.3",
     "prettier": "^2.8.8",
     "react": "19.2.3",
-    "react-native": "0.85.3",
+    "react-native": "0.86.3",
     "react-native-builder-bob": "^0.40.13",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",

package/plugin/build/index.d.ts

@@ -10,6 +10,11 @@ export interface MapsPluginProps {
      * Required for Android as it only supports Google Maps.
      */
     androidGoogleMapsApiKey?: string;
+    /**
+     * Whether to link the Google Maps SDK on iOS. Set to `false` when only
+     * Apple Maps is used to drop the SDK from the app. Defaults to `true`.
+     */
+    iosGoogleMapsEnabled?: boolean;
 }
 declare const _default: ConfigPlugin<void | MapsPluginProps>;
 export default _default;

package/plugin/build/index.js

@@ -5,8 +5,11 @@ const withLuggMapsAndroid_1 = require("./withLuggMapsAndroid");
 const withLuggMapsIOS_1 = require("./withLuggMapsIOS");
 const pkg = require('../../package.json');
 const withMaps = (config, props = {}) => {
-    const { iosGoogleMapsApiKey, androidGoogleMapsApiKey } = props ?? {};
-    config = (0, withLuggMapsIOS_1.withLuggMapsIOS)(config, { apiKey: iosGoogleMapsApiKey });
+    const { iosGoogleMapsApiKey, androidGoogleMapsApiKey, iosGoogleMapsEnabled = true, } = props ?? {};
+    config = (0, withLuggMapsIOS_1.withLuggMapsIOS)(config, {
+        apiKey: iosGoogleMapsApiKey,
+        googleEnabled: iosGoogleMapsEnabled,
+    });
     config = (0, withLuggMapsAndroid_1.withLuggMapsAndroid)(config, { apiKey: androidGoogleMapsApiKey });
     return config;
 };

package/plugin/build/withLuggMapsIOS.d.ts

@@ -1,5 +1,6 @@
 import { type ConfigPlugin } from '@expo/config-plugins';
 export interface MapsIOSPluginProps {
     apiKey?: string;
+    googleEnabled?: boolean;
 }
 export declare const withLuggMapsIOS: ConfigPlugin<MapsIOSPluginProps>;

package/plugin/build/withLuggMapsIOS.js

@@ -2,15 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withLuggMapsIOS = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const withLuggMapsIOS = (config, { apiKey }) => {
-    if (!apiKey) {
+const GMS_EXCLUSION_PODFILE_FLAG = '$LuggMapsGoogleEnabled = false';
+const withLuggMapsIOS = (config, { apiKey, googleEnabled = true }) => {
+    config = (0, config_plugins_1.withPodfile)(config, (c) => {
+        if (!googleEnabled) {
+            console.log('[LuggMaps] Google Maps SDK is disabled, Apple Maps only.');
+        }
+        const contents = c.modResults.contents.replace(/^\$LuggMapsGoogleEnabled = false\r?\n/gm, '');
+        c.modResults.contents = googleEnabled
+            ? contents
+            : `${GMS_EXCLUSION_PODFILE_FLAG}\n${contents}`;
+        return c;
+    });
+    if (googleEnabled && !apiKey) {
         return config;
     }
     config = (0, config_plugins_1.withInfoPlist)(config, (c) => {
-        c.modResults.GMSApiKey = apiKey;
+        if (googleEnabled) {
+            c.modResults.GMSApiKey = apiKey;
+        }
+        else {
+            delete c.modResults.GMSApiKey;
+        }
         return c;
     });
     config = (0, config_plugins_1.withAppDelegate)(config, (c) => {
+        if (!googleEnabled) {
+            c.modResults.contents = c.modResults.contents
+                .replace(/^[ \t]*import GoogleMaps\r?\n/gm, '')
+                .replace(/^[ \t]*GMSServices\.provideAPIKey\("[^"\r\n]*"\)\r?\n/gm, '');
+            return c;
+        }
         const contents = c.modResults.contents;
         // Add import for GoogleMaps
         if (!contents.includes('import GoogleMaps')) {
@@ -18,7 +40,7 @@ const withLuggMapsIOS = (config, { apiKey }) => {
         }
         // Add GMSServices.provideAPIKey call
         if (!c.modResults.contents.includes('GMSServices.provideAPIKey')) {
-            c.modResults.contents = c.modResults.contents.replace(/(func application\([^)]+\)[^{]*\{)/, `$1\n    GMSServices.provideAPIKey("${apiKey}")\n`);
+            c.modResults.contents = c.modResults.contents.replace(/(func application\([^)]+\)[^{]*\{)/, `$1\n    GMSServices.provideAPIKey("${apiKey}")`);
         }
         return c;
     });