react-native-maps 1.22.5 → 1.25.0-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/android/gradlew.bat +94 -94
  2. package/ios/AirGoogleMaps/AIRGoogleMap.mm +3 -3
  3. package/ios/AirGoogleMaps/AIRGoogleMapManager.mm +3 -3
  4. package/ios/AirGoogleMaps/RNMapsGoogleMapView.h +3 -3
  5. package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm +12 -12
  6. package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm +12 -12
  7. package/ios/AirMaps/AIRMap.mm +3 -3
  8. package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm +11 -11
  9. package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm +11 -10
  10. package/ios/AirMaps/RNMapsAirModule.mm +5 -5
  11. package/ios/AirMaps/RNMapsDefines.h +1 -1
  12. package/ios/AirMaps/RNMapsMapView.h +3 -3
  13. package/ios/AirMaps/RNMapsMapView.mm +12 -12
  14. package/ios/AirMaps/RNMapsMarkerView.mm +11 -10
  15. package/package.json +1 -1
  16. package/plugin/build/ios.js +6 -2
  17. package/react-native-maps.podspec +94 -45
  18. package/react-native.config.js +0 -1
  19. package/src/MapView.tsx +1 -3
  20. package/src/decorateMapComponent.ts +1 -0
  21. package/src/specs/NativeAirMapsModule.ts +1 -1
  22. package/react-native-google-maps.podspec +0 -27
  23. package/react-native-maps-generated.podspec +0 -17
package/android/gradlew.bat CHANGED
@@ -1,94 +1,94 @@
1
- @rem
2
- @rem Copyright 2015 the original author or authors.
3
- @rem
4
- @rem Licensed under the Apache License, Version 2.0 (the "License");
5
- @rem you may not use this file except in compliance with the License.
6
- @rem You may obtain a copy of the License at
7
- @rem
8
- @rem https://www.apache.org/licenses/LICENSE-2.0
9
- @rem
10
- @rem Unless required by applicable law or agreed to in writing, software
11
- @rem distributed under the License is distributed on an "AS IS" BASIS,
12
- @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- @rem See the License for the specific language governing permissions and
14
- @rem limitations under the License.
15
- @rem
16
- @rem SPDX-License-Identifier: Apache-2.0
17
- @rem
18
-
19
- @if "%DEBUG%"=="" @echo off
20
- @rem ##########################################################################
21
- @rem
22
- @rem Gradle startup script for Windows
23
- @rem
24
- @rem ##########################################################################
25
-
26
- @rem Set local scope for the variables with windows NT shell
27
- if "%OS%"=="Windows_NT" setlocal
28
-
29
- set DIRNAME=%~dp0
30
- if "%DIRNAME%"=="" set DIRNAME=.
31
- @rem This is normally unused
32
- set APP_BASE_NAME=%~n0
33
- set APP_HOME=%DIRNAME%
34
-
35
- @rem Resolve any "." and ".." in APP_HOME to make it shorter.
36
- for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37
-
38
- @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39
- set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40
-
41
- @rem Find java.exe
42
- if defined JAVA_HOME goto findJavaFromJavaHome
43
-
44
- set JAVA_EXE=java.exe
45
- %JAVA_EXE% -version >NUL 2>&1
46
- if %ERRORLEVEL% equ 0 goto execute
47
-
48
- echo. 1>&2
49
- echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50
- echo. 1>&2
51
- echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52
- echo location of your Java installation. 1>&2
53
-
54
- goto fail
55
-
56
- :findJavaFromJavaHome
57
- set JAVA_HOME=%JAVA_HOME:"=%
58
- set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59
-
60
- if exist "%JAVA_EXE%" goto execute
61
-
62
- echo. 1>&2
63
- echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64
- echo. 1>&2
65
- echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66
- echo location of your Java installation. 1>&2
67
-
68
- goto fail
69
-
70
- :execute
71
- @rem Setup the command line
72
-
73
- set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
74
-
75
-
76
- @rem Execute Gradle
77
- "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
78
-
79
- :end
80
- @rem End local scope for the variables with windows NT shell
81
- if %ERRORLEVEL% equ 0 goto mainEnd
82
-
83
- :fail
84
- rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
85
- rem the _cmd.exe /c_ return code!
86
- set EXIT_CODE=%ERRORLEVEL%
87
- if %EXIT_CODE% equ 0 set EXIT_CODE=1
88
- if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89
- exit /b %EXIT_CODE%
90
-
91
- :mainEnd
92
- if "%OS%"=="Windows_NT" endlocal
93
-
94
- :omega
1
+ @rem
2
+ @rem Copyright 2015 the original author or authors.
3
+ @rem
4
+ @rem Licensed under the Apache License, Version 2.0 (the "License");
5
+ @rem you may not use this file except in compliance with the License.
6
+ @rem You may obtain a copy of the License at
7
+ @rem
8
+ @rem https://www.apache.org/licenses/LICENSE-2.0
9
+ @rem
10
+ @rem Unless required by applicable law or agreed to in writing, software
11
+ @rem distributed under the License is distributed on an "AS IS" BASIS,
12
+ @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ @rem See the License for the specific language governing permissions and
14
+ @rem limitations under the License.
15
+ @rem
16
+ @rem SPDX-License-Identifier: Apache-2.0
17
+ @rem
18
+
19
+ @if "%DEBUG%"=="" @echo off
20
+ @rem ##########################################################################
21
+ @rem
22
+ @rem Gradle startup script for Windows
23
+ @rem
24
+ @rem ##########################################################################
25
+
26
+ @rem Set local scope for the variables with windows NT shell
27
+ if "%OS%"=="Windows_NT" setlocal
28
+
29
+ set DIRNAME=%~dp0
30
+ if "%DIRNAME%"=="" set DIRNAME=.
31
+ @rem This is normally unused
32
+ set APP_BASE_NAME=%~n0
33
+ set APP_HOME=%DIRNAME%
34
+
35
+ @rem Resolve any "." and ".." in APP_HOME to make it shorter.
36
+ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37
+
38
+ @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39
+ set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40
+
41
+ @rem Find java.exe
42
+ if defined JAVA_HOME goto findJavaFromJavaHome
43
+
44
+ set JAVA_EXE=java.exe
45
+ %JAVA_EXE% -version >NUL 2>&1
46
+ if %ERRORLEVEL% equ 0 goto execute
47
+
48
+ echo. 1>&2
49
+ echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50
+ echo. 1>&2
51
+ echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52
+ echo location of your Java installation. 1>&2
53
+
54
+ goto fail
55
+
56
+ :findJavaFromJavaHome
57
+ set JAVA_HOME=%JAVA_HOME:"=%
58
+ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59
+
60
+ if exist "%JAVA_EXE%" goto execute
61
+
62
+ echo. 1>&2
63
+ echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64
+ echo. 1>&2
65
+ echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66
+ echo location of your Java installation. 1>&2
67
+
68
+ goto fail
69
+
70
+ :execute
71
+ @rem Setup the command line
72
+
73
+ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
74
+
75
+
76
+ @rem Execute Gradle
77
+ "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
78
+
79
+ :end
80
+ @rem End local scope for the variables with windows NT shell
81
+ if %ERRORLEVEL% equ 0 goto mainEnd
82
+
83
+ :fail
84
+ rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
85
+ rem the _cmd.exe /c_ return code!
86
+ set EXIT_CODE=%ERRORLEVEL%
87
+ if %EXIT_CODE% equ 0 set EXIT_CODE=1
88
+ if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89
+ exit /b %EXIT_CODE%
90
+
91
+ :mainEnd
92
+ if "%OS%"=="Windows_NT" endlocal
93
+
94
+ :omega
package/ios/AirGoogleMaps/AIRGoogleMap.mm CHANGED
@@ -50,10 +50,10 @@ id regionAsJSON(MKCoordinateRegion region) {
50
50
  @"longitudeDelta": [NSNumber numberWithDouble:region.span.longitudeDelta],
51
51
  };
52
52
  }
53
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
54
- #import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
53
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
54
+ #import <ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>
55
55
  #else
56
- #import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
56
+ #import "RNMapsAirModuleDelegate.h"
57
57
  #endif
58
58
  @interface AIRGoogleMap () <GMSIndoorDisplayDelegate, RNMapsAirModuleDelegate>
59
59
 
package/ios/AirGoogleMaps/AIRGoogleMapManager.mm CHANGED
@@ -25,10 +25,10 @@
25
25
  #import <MapKit/MapKit.h>
26
26
  #import <QuartzCore/QuartzCore.h>
27
27
 
28
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
29
- #import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
28
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
29
+ #import <ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>
30
30
  #else
31
- #import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
31
+ #import "RNMapsAirModuleDelegate.h"
32
32
  #endif
33
33
 
34
34
  static NSString *const RCTMapViewKey = @"MapView";
package/ios/AirGoogleMaps/RNMapsGoogleMapView.h CHANGED
@@ -10,10 +10,10 @@
10
10
 
11
11
  #import <React/RCTViewComponentView.h>
12
12
  #import <UIKit/UIKit.h>
13
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
14
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
13
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
14
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
15
15
  #else
16
- #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
16
+ #import "RNMapsHostVewDelegate.h"
17
17
  #endif
18
18
  @class AIRGoogleMap;
19
19
 
package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm CHANGED
@@ -11,19 +11,19 @@
11
11
  #import "RNMapsGooglePolygonView.h"
12
12
  #import "AIRGoogleMap.h"
13
13
  #import "AIRGoogleMapManager.h"
14
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
15
- #import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
16
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
17
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
18
- #import <ReactNativeMapsGenerated/EventEmitters.h>
19
- #import <ReactNativeMapsGenerated/Props.h>
20
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
14
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
15
+ #import <ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>
16
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
17
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
18
+ #import <ReactNativeMaps/generated/EventEmitters.h>
19
+ #import <ReactNativeMaps/generated/Props.h>
20
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
21
21
  #else
22
- #import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
23
- #import <react-native-maps-generated/ComponentDescriptors.h>
24
- #import <react-native-maps-generated/EventEmitters.h>
25
- #import <react-native-maps-generated/Props.h>
26
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
22
+ #import "../generated/RNMapsAirModuleDelegate.h"
23
+ #import "../generated/RNMapsSpecs/ComponentDescriptors.h"
24
+ #import "../generated/RNMapsSpecs/EventEmitters.h"
25
+ #import "../generated/RNMapsSpecs/Props.h"
26
+ #import "../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
27
27
  #endif
28
28
  #import "RCTFabricComponentsPlugins.h"
29
29
  #import <React/RCTConversions.h>
package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm CHANGED
@@ -10,19 +10,19 @@
10
10
  #import "RNMapsGooglePolygonView.h"
11
11
  #import "AIRGMSPolygon.h"
12
12
  #import "AIRGoogleMap.h"
13
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
14
- #import <ReactNativeMapsGenerated/RNMapsSpecs.h>
15
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
16
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
17
- #import <ReactNativeMapsGenerated/EventEmitters.h>
18
- #import <ReactNativeMapsGenerated/Props.h>
19
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
13
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
14
+ #import <ReactNativeMaps/generated/RNMapsSpecs.h>
15
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
16
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
17
+ #import <ReactNativeMaps/generated/EventEmitters.h>
18
+ #import <ReactNativeMaps/generated/Props.h>
19
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
20
20
  #else
21
- #import <react-native-maps-generated/RNMapsSpecs.h>
22
- #import <react-native-maps-generated/ComponentDescriptors.h>
23
- #import <react-native-maps-generated/EventEmitters.h>
24
- #import <react-native-maps-generated/Props.h>
25
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
21
+ #import "../generated/RNMapsSpecs/RNMapsSpecs.h"
22
+ #import "../generated/RNMapsSpecs/ComponentDescriptors.h"
23
+ #import "../generated/RNMapsSpecs/EventEmitters.h"
24
+ #import "../generated/RNMapsSpecs/Props.h"
25
+ #import "../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
26
26
  #endif
27
27
 
28
28
  #import "RCTFabricComponentsPlugins.h"
package/ios/AirMaps/AIRMap.mm CHANGED
@@ -26,10 +26,10 @@ const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
26
26
  const CGFloat AIRMapZoomBoundBuffer = 0.01;
27
27
  const NSInteger AIRMapMaxZoomLevel = 20;
28
28
 
29
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
30
- #import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
29
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
30
+ #import <ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>
31
31
  #else
32
- #import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
32
+ #import "RNMapsAirModuleDelegate.h"
33
33
  #endif
34
34
  @interface MKMapView (UIGestureRecognizer)<RNMapsAirModuleDelegate>
35
35
 
package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm CHANGED
@@ -9,18 +9,18 @@
9
9
 
10
10
  #if HAVE_GOOGLE_MAPS == 0
11
11
 
12
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
13
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
14
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
15
- #import <ReactNativeMapsGenerated/EventEmitters.h>
16
- #import <ReactNativeMapsGenerated/Props.h>
17
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
12
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
13
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
14
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
15
+ #import <ReactNativeMaps/generated/EventEmitters.h>
16
+ #import <ReactNativeMaps/generated/Props.h>
17
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
18
18
  #else
19
- #import <react-native-maps-generated/ComponentDescriptors.h>
20
- #import <react-native-maps-generated/EventEmitters.h>
21
- #import <react-native-maps-generated/Props.h>
22
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
23
- #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
19
+ #import "../../generated/RNMapsSpecs/ComponentDescriptors.h"
20
+ #import "../../generated/RNMapsSpecs/EventEmitters.h"
21
+ #import "../../generated/RNMapsSpecs/Props.h"
22
+ #import "../../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
23
+ #import "../../generated/RNMapsHostVewDelegate.h"
24
24
  #endif
25
25
  #import "RCTFabricComponentsPlugins.h"
26
26
  #import <React/RCTConversions.h>
package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm CHANGED
@@ -9,19 +9,20 @@
9
9
 
10
10
  #if HAVE_GOOGLE_MAPS == 0
11
11
 
12
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
13
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
14
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
15
- #import <ReactNativeMapsGenerated/EventEmitters.h>
16
- #import <ReactNativeMapsGenerated/Props.h>
17
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
12
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
13
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
14
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
15
+ #import <ReactNativeMaps/generated/EventEmitters.h>
16
+ #import <ReactNativeMaps/generated/Props.h>
17
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
18
18
  #else
19
- #import <react-native-maps-generated/ComponentDescriptors.h>
20
- #import <react-native-maps-generated/EventEmitters.h>
21
- #import <react-native-maps-generated/Props.h>
22
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
19
+ #import "../../generated/RNMapsSpecs/ComponentDescriptors.h"
20
+ #import "../../generated/RNMapsSpecs/EventEmitters.h"
21
+ #import "../../generated/RNMapsSpecs/Props.h"
22
+ #import "../../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
23
23
  #endif
24
24
 
25
+
25
26
  #import "RCTFabricComponentsPlugins.h"
26
27
  #import <React/RCTConversions.h>
27
28
  #import "PlaceHolderPolygonView.h"
package/ios/AirMaps/RNMapsAirModule.mm CHANGED
@@ -17,12 +17,12 @@
17
17
  #import <MapKit/MapKit.h>
18
18
  #import "RCTConvert+AirMap.h"
19
19
 
20
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
21
- #import <ReactNativeMapsGenerated/RNMapsSpecs.h>
22
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
20
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
21
+ #import <ReactNativeMaps/generated/RNMapsSpecs.h>
22
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
23
23
  #else
24
- #import <react-native-maps-generated/RNMapsSpecs.h>
25
- #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
24
+ #import "RNMapsSpecs.h"
25
+ #import "RNMapsHostVewDelegate.h"
26
26
  #endif
27
27
  @interface RNMapsAirModule()<NativeAirMapsModuleSpec>
28
28
  @end
package/ios/AirMaps/RNMapsDefines.h CHANGED
@@ -1 +1 @@
1
- #define HAVE_GOOGLE_MAPS 0
1
+ #define HAVE_GOOGLE_MAPS 1
package/ios/AirMaps/RNMapsMapView.h CHANGED
@@ -9,10 +9,10 @@
9
9
 
10
10
  #import <React/RCTViewComponentView.h>
11
11
  #import <UIKit/UIKit.h>
12
- #if __has_include(<ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>)
13
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
12
+ #if __has_include(<ReactNativeMaps/generated/RNMapsHostVewDelegate.h>)
13
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
14
14
  #else
15
- #import <react-native-maps-generated/RNMapsHostVewDelegate.h>
15
+ #import "RNMapsHostVewDelegate.h"
16
16
  #endif
17
17
  @class AIRMap;
18
18
 
package/ios/AirMaps/RNMapsMapView.mm CHANGED
@@ -11,19 +11,19 @@
11
11
  #import "AIRMapMarker.h"
12
12
  #import "AIRMapManager.h"
13
13
  #import "RNMapsMarkerView.h"
14
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
15
- #import <ReactNativeMapsGenerated/RNMapsSpecs.h>
16
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
17
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
18
- #import <ReactNativeMapsGenerated/EventEmitters.h>
19
- #import <ReactNativeMapsGenerated/Props.h>
20
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
14
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
15
+ #import <ReactNativeMaps/generated/RNMapsSpecs.h>
16
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
17
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
18
+ #import <ReactNativeMaps/generated/EventEmitters.h>
19
+ #import <ReactNativeMaps/generated/Props.h>
20
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
21
21
  #else
22
- #import <react-native-maps-generated/RNMapsSpecs.h>
23
- #import <react-native-maps-generated/ComponentDescriptors.h>
24
- #import <react-native-maps-generated/EventEmitters.h>
25
- #import <react-native-maps-generated/Props.h>
26
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
22
+ #import "../generated/RNMapsSpecs/RNMapsSpecs.h"
23
+ #import "../generated/RNMapsSpecs/ComponentDescriptors.h"
24
+ #import "../generated/RNMapsSpecs/EventEmitters.h"
25
+ #import "../generated/RNMapsSpecs/Props.h"
26
+ #import "../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
27
27
  #endif
28
28
  #import "RCTFabricComponentsPlugins.h"
29
29
  #import <React/RCTConversions.h>
package/ios/AirMaps/RNMapsMarkerView.mm CHANGED
@@ -10,17 +10,18 @@
10
10
  #import "AIRMap.h"
11
11
  #import "AIRMapMarker.h"
12
12
  #import "AIRMapMarkerManager.h"
13
- #if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
14
- #import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
15
- #import <ReactNativeMapsGenerated/ComponentDescriptors.h>
16
- #import <ReactNativeMapsGenerated/EventEmitters.h>
17
- #import <ReactNativeMapsGenerated/Props.h>
18
- #import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
13
+ #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
14
+ #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
15
+ #import <ReactNativeMaps/generated/ComponentDescriptors.h>
16
+ #import <ReactNativeMaps/generated/EventEmitters.h>
17
+ #import <ReactNativeMaps/generated/Props.h>
18
+ #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
19
19
  #else
20
- #import <react-native-maps-generated/ComponentDescriptors.h>
21
- #import <react-native-maps-generated/EventEmitters.h>
22
- #import <react-native-maps-generated/Props.h>
23
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
20
+ #import "../generated/RNMapsHostVewDelegate.h"
21
+ #import "../generated/RNMapsSpecs/ComponentDescriptors.h"
22
+ #import "../generated/RNMapsSpecs/EventEmitters.h"
23
+ #import "../generated/RNMapsSpecs/Props.h"
24
+ #import "../generated/RNMapsSpecs/RCTComponentViewHelpers.h"
24
25
  #endif
25
26
  #import "RCTFabricComponentsPlugins.h"
26
27
  #import <React/RCTConversions.h>
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "main": "src/index.ts",
6
6
  "author": "Leland Richardson <leland.m.richardson@gmail.com>",
7
7
  "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
8
- "version": "1.22.5",
8
+ "version": "1.25.0-alpha.7",
9
9
  "license": "MIT",
10
10
  "scripts": {
11
11
  "lint": "eslint . --max-warnings 0",
package/plugin/build/ios.js CHANGED
@@ -39,20 +39,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.addMapsCocoapods = exports.removeGoogleMapsAppDelegateInit = exports.addGoogleMapsAppDelegateInit = exports.removeGoogleMapsAppDelegateImport = exports.addGoogleMapsAppDelegateImport = exports.withMapsIOS = exports.MATCH_INIT = void 0;
40
40
  var ios_plugins_1 = require("@expo/config-plugins/build/plugins/ios-plugins");
41
41
  var generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
42
- var debug = require('debug')('expo:config-plugins:ios:maps');
43
42
  exports.MATCH_INIT = /\bsuper\.application\(\w+?, didFinishLaunchingWithOptions: \w+?\)/g;
44
43
  var withMapsIOS = function (config, props) {
45
44
  // Set in Info.plist
46
45
  if (props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey) {
47
46
  config = (0, ios_plugins_1.withInfoPlist)(config, function (conf) { return __awaiter(void 0, void 0, void 0, function () {
48
47
  return __generator(this, function (_a) {
48
+ if (!conf.ios) {
49
+ conf.ios = {};
50
+ }
51
+ if (!conf.ios.infoPlist) {
52
+ conf.ios.infoPlist = {};
53
+ }
49
54
  conf.ios.infoPlist.GMSApiKey = props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey;
50
55
  return [2 /*return*/, conf];
51
56
  });
52
57
  }); });
53
58
  }
54
59
  // Technically adds react-native-maps (Apple maps) and google maps.
55
- debug('Google Maps API Key:', props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey);
56
60
  config = withMapsCocoaPods(config, {
57
61
  useGoogleMaps: !!(props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey),
58
62
  });
package/react-native-maps.podspec CHANGED
@@ -14,60 +14,109 @@ Pod::Spec.new do |s|
14
14
  s.homepage = package["homepage"]
15
15
  s.license = package["license"]
16
16
  s.platform = :ios, "15.1"
17
- s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
17
+ s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag => "v#{s.version}" }
18
18
 
19
- s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
20
- s.module_map = 'ios/AirMaps/module.modulemap'
21
- s.public_header_files = [
22
- 'ios/AirMaps/UIView+AirMap.h',
23
- 'ios/AirMaps/RCTConvert+AirMap.h',
24
- ]
19
+ # Set module_name at the root spec level
25
20
  s.module_name = 'ReactNativeMaps'
26
- s.compiler_flags = folly_compiler_flags
27
- s.dependency 'react-native-maps-generated'
28
- install_modules_dependencies(s)
29
21
 
22
+ # Generated code subspec
23
+ s.subspec 'Generated' do |ss|
24
+ ss.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
25
+ ss.exclude_files = [
26
+ "ios/generated/RCTAppDependencyProvider.h",
27
+ "ios/generated/RCTAppDependencyProvider.mm",
28
+ "ios/generated/RCTThirdPartyComponentsProvider.h",
29
+ "ios/generated/RCTThirdPartyComponentsProvider.mm",
30
+ "ios/generated/RCTModulesConformingToProtocolsProvider.h",
31
+ "ios/generated/RCTModulesConformingToProtocolsProvider.mm",
32
+ ]
33
+ ss.public_header_files = "ios/generated/**/*.h"
34
+ ss.compiler_flags = folly_compiler_flags
35
+ install_modules_dependencies(ss)
36
+ end
37
+
38
+ # Main maps component
39
+ s.subspec 'Maps' do |ss|
40
+ ss.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
41
+ ss.public_header_files = [
42
+ 'ios/AirMaps/UIView+AirMap.h',
43
+ 'ios/AirMaps/RCTConvert+AirMap.h',
44
+ ]
45
+ ss.compiler_flags = folly_compiler_flags
46
+ ss.dependency 'react-native-maps/Generated'
47
+ install_modules_dependencies(ss)
30
48
  # Add script phase to detect Google Maps
31
- s.script_phases = [
32
- {
33
- :name => 'Check react-native-google-Maps Availability',
34
- :script => %(
35
- set -x
36
- echo "Running Google Maps detection script..."
37
- DEFINES_DIR="${PODS_TARGET_SRCROOT}/ios/AirMaps"
38
- DEFINES_FILE="${DEFINES_DIR}/RNMapsDefines.h"
49
+ ss.script_phases = [
50
+ {
51
+ :name => 'react-native-maps patches',
52
+ :script => %(
53
+ set -x
54
+ echo "Running Google Maps detection script..."
55
+ DEFINES_DIR="${PODS_TARGET_SRCROOT}/ios/AirMaps"
56
+ DEFINES_FILE="${DEFINES_DIR}/RNMapsDefines.h"
57
+
58
+ mkdir -p "$DEFINES_DIR"
59
+
60
+ if [ -d "$PODS_ROOT/GoogleMaps" ] && [ -d "$PODS_ROOT/Google-Maps-iOS-Utils" ]; then
61
+ echo "#define HAVE_GOOGLE_MAPS 1" > "$DEFINES_FILE"
62
+ echo "✅ Google Maps libraries detected. HAVE_GOOGLE_MAPS defined."
63
+ else
64
+ echo "#define HAVE_GOOGLE_MAPS 0" > "$DEFINES_FILE"
65
+ echo "❌ Google Maps libraries NOT detected. HAVE_GOOGLE_MAPS set to 0."
66
+ fi
39
67
 
40
- # Standard path
41
- GOOGLE_MAPS_STANDARD_PATH="$PODS_ROOT/Headers/Public/react-native-google-maps/AIRGoogleMap.h"
68
+ if [ -f "$DEFINES_FILE" ]; then
69
+ echo "✅ Successfully wrote to $DEFINES_FILE"
70
+ cat "$DEFINES_FILE"
71
+ else
72
+ echo "❌ ERROR: Failed to write to $DEFINES_FILE"
73
+ fi
42
74
 
43
- # Framework paths
44
- GOOGLE_MAPS_FRAMEWORK_MODULE="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps.modulemap"
45
- GOOGLE_MAPS_UMBRELLA_HEADER="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps-umbrella.h"
75
+ set -e
76
+ echo "🔧 Patching @import GoogleMaps..."
46
77
 
47
- echo "Checking standard path: $GOOGLE_MAPS_STANDARD_PATH"
48
- echo "Checking framework module path: $GOOGLE_MAPS_FRAMEWORK_MODULE"
49
- echo "Checking umbrella header path: $GOOGLE_MAPS_UMBRELLA_HEADER"
78
+ FILES=(
79
+ "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMSMarker+GMUClusteritem.h"
80
+ "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUGeoJSONParser.h"
81
+ "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUPolygon.h"
82
+ "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUWeightedLatLng.h"
83
+ "$PODS_ROOT/GoogleMaps/Maps/Sources/GMSEmpty.h"
84
+ )
50
85
 
51
- # Check if Google Maps is available via any detection method
52
- if [ -f "$GOOGLE_MAPS_STANDARD_PATH" ] || [ -f "$GOOGLE_MAPS_FRAMEWORK_MODULE" ] || [ -f "$GOOGLE_MAPS_UMBRELLA_HEADER" ]; then
53
- echo "#define HAVE_GOOGLE_MAPS 1" > "$DEFINES_FILE"
54
- echo "Google Maps detected. HAVE_GOOGLE_MAPS defined."
55
- else
56
- echo "#define HAVE_GOOGLE_MAPS 0" > "$DEFINES_FILE"
57
- echo "Google Maps not detected."
58
- fi
86
+ for file in "${FILES[@]}"; do
87
+ if [ -f "$file" ]; then
88
+ if grep -q "@import GoogleMaps;" "$file"; then
89
+ sed -i '' 's/@import GoogleMaps;/#import <GoogleMaps\\/GoogleMaps.h>/' "$file"
90
+ echo "✅ Patched: $file"
91
+ else
92
+ echo "ℹ️ No @import in: $file"
93
+ fi
94
+ else
95
+ echo "⚠️ Not found: $file"
96
+ fi
97
+ done
98
+ ),
99
+ :execution_position => :before_compile
100
+ }
101
+ ]
102
+ end
59
103
 
60
- # Verify the file was written
61
- if [ -f "$DEFINES_FILE" ]; then
62
- echo "Successfully wrote to $DEFINES_FILE"
63
- cat "$DEFINES_FILE"
64
- else
65
- echo "ERROR: Failed to write to $DEFINES_FILE"
66
- fi
67
- ),
68
- :execution_position => :before_compile
69
- }
70
- ]
104
+ # Google Maps subspec
105
+ s.subspec 'Google' do |ss|
106
+ ss.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
107
+ ss.resource_bundles = {
108
+ 'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
109
+ }
110
+ # Fixed compiler flags to avoid -Wno warnings
111
+ ss.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
112
+ ss.dependency 'GoogleMaps', '9.3.0'
113
+ ss.dependency 'Google-Maps-iOS-Utils', '6.1.0'
114
+ ss.dependency 'react-native-maps/Generated'
115
+ ss.dependency 'react-native-maps/Maps'
116
+ install_modules_dependencies(ss)
117
+ end
71
118
 
119
+ # By default, use the Maps subspec
120
+ s.default_subspec = 'Maps'
72
121
 
73
122
  end
package/react-native.config.js CHANGED
@@ -4,7 +4,6 @@
4
4
  * This source code is licensed under the MIT license found in the
5
5
  * LICENSE file in the root directory of this source tree.
6
6
  */
7
-
8
7
  module.exports = {
9
8
  dependency: {
10
9
  platforms: {
package/src/MapView.tsx CHANGED
@@ -751,14 +751,12 @@ class MapView extends React.Component<MapViewProps, State> {
751
751
  static Animated: Animated.AnimatedComponent<typeof MapView>;
752
752
  private map: NativeProps['ref'];
753
753
 
754
- private fabricMap =
755
- React.createRef<FabricMapHandle | null>() as React.RefObject<FabricMapHandle | null>;
754
+ private fabricMap = React.createRef<FabricMapHandle>();
756
755
 
757
756
  constructor(props: MapViewProps) {
758
757
  super(props);
759
758
 
760
759
  this.map = React.createRef<MapViewNativeComponentType>();
761
- this.fabricMap = React.createRef<FabricMapHandle | null>();
762
760
  this.state = {
763
761
  isReady: false,
764
762
  };
package/src/decorateMapComponent.ts CHANGED
@@ -126,6 +126,7 @@ export default function decorateMapComponent<Type extends Component>(
126
126
  return components[key];
127
127
  }
128
128
 
129
+ // @ts-ignore
129
130
  const providerInfo = providers[provider];
130
131
  // quick fix. Previous code assumed android | ios
131
132
  if (Platform.OS !== 'android' && Platform.OS !== 'ios') {
package/src/specs/NativeAirMapsModule.ts CHANGED
@@ -2,7 +2,7 @@ import type {TurboModule} from 'react-native';
2
2
  import {TurboModuleRegistry} from 'react-native';
3
3
  import type {Double} from 'react-native/Libraries/Types/CodegenTypes';
4
4
  import type {Camera} from './NativeComponentMapView';
5
- import {Address} from 'react-native-maps';
5
+ import {Address} from '../MapView.types';
6
6
 
7
7
  type LatLng = {
8
8
  latitude: Double;
package/react-native-google-maps.podspec DELETED
@@ -1,27 +0,0 @@
1
- require 'json'
2
- package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
3
-
4
- folly_config = get_folly_config()
5
- folly_compiler_flags = folly_config[:compiler_flags]
6
-
7
- Pod::Spec.new do |s|
8
- s.name = "react-native-google-maps"
9
- s.version = package['version']
10
- s.summary = package["description"]
11
- s.authors = package["author"]
12
- s.homepage = package["homepage"]
13
- s.license = package["license"]
14
- s.platform = :ios, "15.1"
15
- s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
16
- s.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
17
- s.resource_bundles = {
18
- 'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
19
- }
20
- s.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
21
- s.dependency 'GoogleMaps', '9.3.0'
22
- s.dependency 'Google-Maps-iOS-Utils', '6.1.0'
23
- s.dependency 'react-native-maps-generated'
24
- s.dependency 'react-native-maps'
25
- install_modules_dependencies(s)
26
-
27
- end
package/react-native-maps-generated.podspec DELETED
@@ -1,17 +0,0 @@
1
- Pod::Spec.new do |s|
2
- s.name = "react-native-maps-generated"
3
- s.version = "1.22.5"
4
- s.summary = "Generated Fabric code for react-native-maps"
5
- s.description = <<-DESC
6
- This pod contains the Fabric Native Component code generated for react-native-maps.
7
- DESC
8
- s.license = { :type => 'MIT' }
9
- s.homepage = "https://github.com/react-native-maps/react-native-maps"
10
- s.authors = { "react-native-maps" => "https://github.com/react-native-maps" }
11
- s.platform = :ios, "15.1"
12
- s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag => "v1.22.5" }
13
-
14
- s.resource_bundles = {
15
- 'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
16
- }
17
- end