Skip to content

Commit 09c6d9d

Browse files
lelandrichardsonlelandrichardson
authored
Merge pull request react-native-maps#1138 from janicduplessis/rct-convert
Use local RCTConvert+MapKit instead of the one in React Native
2 parents 4f991b6 + 038056f commit 09c6d9d

19 files changed

+58
-32
lines changed

‎example/ios/AirMapsExplorer.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2166AB341D82EC56007538D7 /* AIRMapPolyline.m in Sources */ = {isa = PBXBuildFile; fileRef = 2166AB121D82EC56007538D7 /* AIRMapPolyline.m */; };
2626
2166AB351D82EC56007538D7 /* AIRMapPolylineManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2166AB141D82EC56007538D7 /* AIRMapPolylineManager.m */; };
2727
2166AB361D82EC56007538D7 /* SMCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2166AB171D82EC56007538D7 /* SMCalloutView.m */; };
28-
2166AB3E1D82EC56007538D7 /* RCTConvert+MoreMapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 2166AB281D82EC56007538D7 /* RCTConvert+MoreMapKit.m */; };
28+
2166AB3E1D82EC56007538D7 /* RCTConvert+MapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 2166AB281D82EC56007538D7 /* RCTConvert+MapKit.m */; };
2929
21D346651D933B8C002BAD8A /* AIRMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D346621D933B8C002BAD8A /* AIRMapUrlTile.m */; };
3030
21D346661D933B8C002BAD8A /* AIRMapUrlTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D346641D933B8C002BAD8A /* AIRMapUrlTileManager.m */; };
3131
21E6570A1D77591400B75EE5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E657091D77591400B75EE5 /* SystemConfiguration.framework */; };
@@ -106,8 +106,8 @@
106106
2166AB141D82EC56007538D7 /* AIRMapPolylineManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapPolylineManager.m; sourceTree = "<group>"; };
107107
2166AB161D82EC56007538D7 /* SMCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMCalloutView.h; sourceTree = "<group>"; };
108108
2166AB171D82EC56007538D7 /* SMCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMCalloutView.m; sourceTree = "<group>"; };
109-
2166AB271D82EC56007538D7 /* RCTConvert+MoreMapKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+MoreMapKit.h"; sourceTree = "<group>"; };
110-
2166AB281D82EC56007538D7 /* RCTConvert+MoreMapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+MoreMapKit.m"; sourceTree = "<group>"; };
109+
2166AB271D82EC56007538D7 /* RCTConvert+MapKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+MapKit.h"; sourceTree = "<group>"; };
110+
2166AB281D82EC56007538D7 /* RCTConvert+MapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+MapKit.m"; sourceTree = "<group>"; };
111111
21D346611D933B8C002BAD8A /* AIRMapUrlTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTile.h; sourceTree = "<group>"; };
112112
21D346621D933B8C002BAD8A /* AIRMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapUrlTile.m; sourceTree = "<group>"; };
113113
21D346631D933B8C002BAD8A /* AIRMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTileManager.h; sourceTree = "<group>"; };
@@ -242,8 +242,8 @@
242242
21D346631D933B8C002BAD8A /* AIRMapUrlTileManager.h */,
243243
21D346641D933B8C002BAD8A /* AIRMapUrlTileManager.m */,
244244
2166AB151D82EC56007538D7 /* Callout */,
245-
2166AB271D82EC56007538D7 /* RCTConvert+MoreMapKit.h */,
246-
2166AB281D82EC56007538D7 /* RCTConvert+MoreMapKit.m */,
245+
2166AB271D82EC56007538D7 /* RCTConvert+MapKit.h */,
246+
2166AB281D82EC56007538D7 /* RCTConvert+MapKit.m */,
247247
);
248248
name = AirMaps;
249249
path = ../../ios/AirMaps;
@@ -528,7 +528,7 @@
528528
8697D6221DBEDE6100DB7D0F /* AIRGoogleMapCircle.m in Sources */,
529529
2166AB321D82EC56007538D7 /* AIRMapPolygon.m in Sources */,
530530
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
531-
2166AB3E1D82EC56007538D7 /* RCTConvert+MoreMapKit.m in Sources */,
531+
2166AB3E1D82EC56007538D7 /* RCTConvert+MapKit.m in Sources */,
532532
8697D6251DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m in Sources */,
533533
13B07FC11A68108700A75B9A /* main.m in Sources */,
534534
86DE6F8B1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m in Sources */,

‎ios/AirGoogleMaps/AIRGoogleMap.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
#import <UIKit/UIKit.h>
99
#import <React/RCTComponent.h>
10-
#import <React/RCTConvert+MapKit.h>
1110
#import <GoogleMaps/GoogleMaps.h>
1211
#import <MapKit/MapKit.h>
1312
#import "AIRGMSMarker.h"
13+
#import "RCTConvert+MapKit.h"
1414

1515
@interface AIRGoogleMap : GMSMapView
1616

‎ios/AirGoogleMaps/AIRGoogleMap.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#import "AIRGoogleMapUrlTile.h"
1414
#import <GoogleMaps/GoogleMaps.h>
1515
#import <MapKit/MapKit.h>
16-
#import <React/RCTConvert+MapKit.h>
1716
#import <React/UIView+React.h>
17+
#import "RCTConvert+MapKit.h"
1818

1919
id regionAsJSON(MKCoordinateRegion region) {
2020
return @{

‎ios/AirGoogleMaps/AIRGoogleMapManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#import <React/RCTBridge.h>
1212
#import <React/RCTUIManager.h>
1313
#import <React/RCTConvert+CoreLocation.h>
14-
#import <React/RCTConvert+MapKit.h>
1514
#import <React/RCTEventDispatcher.h>
1615
#import <React/RCTViewManager.h>
1716
#import <React/RCTConvert.h>
@@ -24,6 +23,7 @@
2423
#import "AIRMapCircle.h"
2524
#import "SMCalloutView.h"
2625
#import "AIRGoogleMapMarker.h"
26+
#import "RCTConvert+MapKit.h"
2727

2828
#import <MapKit/MapKit.h>
2929

‎ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#import "AIRGoogleMapMarkerManager.h"
99
#import "AIRGoogleMapMarker.h"
1010
#import <MapKit/MapKit.h>
11-
#import <React/RCTConvert+MapKit.h>
1211
#import <React/RCTUIManager.h>
12+
#import "RCTConvert+MapKit.h"
1313

1414
@implementation AIRGoogleMapMarkerManager
1515

‎ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import <React/RCTEventDispatcher.h>
1212
#import <React/RCTViewManager.h>
1313
#import <React/UIView+React.h>
14-
#import "RCTConvert+MoreMapKit.h"
14+
#import "RCTConvert+MapKit.h"
1515
#import "AIRGoogleMapPolygon.h"
1616

1717
@interface AIRGoogleMapPolygonManager()

‎ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import <React/RCTEventDispatcher.h>
1313
#import <React/RCTViewManager.h>
1414
#import <React/UIView+React.h>
15-
#import "RCTConvert+MoreMapKit.h"
15+
#import "RCTConvert+MapKit.h"
1616
#import "AIRGoogleMapPolyline.h"
1717

1818
@interface AIRGoogleMapPolylineManager()

‎ios/AirMaps.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
1125B2E41C4AD3DA007D0023 /* AIRMapPolygonManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1125B2D21C4AD3DA007D0023 /* AIRMapPolygonManager.m */; };
2121
1125B2E51C4AD3DA007D0023 /* AIRMapPolyline.m in Sources */ = {isa = PBXBuildFile; fileRef = 1125B2D41C4AD3DA007D0023 /* AIRMapPolyline.m */; };
2222
1125B2E61C4AD3DA007D0023 /* AIRMapPolylineManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1125B2D61C4AD3DA007D0023 /* AIRMapPolylineManager.m */; };
23-
1125B2E71C4AD3DA007D0023 /* RCTConvert+MoreMapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1125B2D91C4AD3DA007D0023 /* RCTConvert+MoreMapKit.m */; };
2423
1125B2F21C4AD445007D0023 /* SMCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1125B2F11C4AD445007D0023 /* SMCalloutView.m */; };
24+
19DABC7F1E7C9D3C00F41150 /* RCTConvert+MapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DABC7E1E7C9D3C00F41150 /* RCTConvert+MapKit.m */; };
2525
DA6C26381C9E2AFE0035349F /* AIRMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */; };
2626
DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C263D1C9E324A0035349F /* AIRMapUrlTileManager.m */; };
2727
/* End PBXBuildFile section */
@@ -65,11 +65,11 @@
6565
1125B2D41C4AD3DA007D0023 /* AIRMapPolyline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRMapPolyline.m; path = AirMaps/AIRMapPolyline.m; sourceTree = SOURCE_ROOT; };
6666
1125B2D51C4AD3DA007D0023 /* AIRMapPolylineManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRMapPolylineManager.h; path = AirMaps/AIRMapPolylineManager.h; sourceTree = SOURCE_ROOT; };
6767
1125B2D61C4AD3DA007D0023 /* AIRMapPolylineManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRMapPolylineManager.m; path = AirMaps/AIRMapPolylineManager.m; sourceTree = SOURCE_ROOT; };
68-
1125B2D81C4AD3DA007D0023 /* RCTConvert+MoreMapKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RCTConvert+MoreMapKit.h"; path = "AirMaps/RCTConvert+MoreMapKit.h"; sourceTree = SOURCE_ROOT; };
69-
1125B2D91C4AD3DA007D0023 /* RCTConvert+MoreMapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RCTConvert+MoreMapKit.m"; path = "AirMaps/RCTConvert+MoreMapKit.m"; sourceTree = SOURCE_ROOT; };
7068
1125B2F01C4AD445007D0023 /* SMCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SMCalloutView.h; path = AirMaps/Callout/SMCalloutView.h; sourceTree = SOURCE_ROOT; };
7169
1125B2F11C4AD445007D0023 /* SMCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SMCalloutView.m; path = AirMaps/Callout/SMCalloutView.m; sourceTree = SOURCE_ROOT; };
7270
11FA5C511C4A1296003AC2EE /* libAirMaps.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAirMaps.a; sourceTree = BUILT_PRODUCTS_DIR; };
71+
19DABC7D1E7C9D3C00F41150 /* RCTConvert+MapKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+MapKit.h"; sourceTree = "<group>"; };
72+
19DABC7E1E7C9D3C00F41150 /* RCTConvert+MapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+MapKit.m"; sourceTree = "<group>"; };
7373
DA6C26361C9E2AFE0035349F /* AIRMapUrlTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTile.h; sourceTree = "<group>"; };
7474
DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapUrlTile.m; sourceTree = "<group>"; };
7575
DA6C263C1C9E324A0035349F /* AIRMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTileManager.h; sourceTree = "<group>"; };
@@ -132,11 +132,10 @@
132132
1125B2D31C4AD3DA007D0023 /* AIRMapPolyline.h */,
133133
1125B2D51C4AD3DA007D0023 /* AIRMapPolylineManager.h */,
134134
1125B2D61C4AD3DA007D0023 /* AIRMapPolylineManager.m */,
135-
21B6E2D21D99B886007E664F /* AIRMapSnapshot.h */,
136135
1125B2F01C4AD445007D0023 /* SMCalloutView.h */,
137136
1125B2F11C4AD445007D0023 /* SMCalloutView.m */,
138-
1125B2D81C4AD3DA007D0023 /* RCTConvert+MoreMapKit.h */,
139-
1125B2D91C4AD3DA007D0023 /* RCTConvert+MoreMapKit.m */,
137+
19DABC7D1E7C9D3C00F41150 /* RCTConvert+MapKit.h */,
138+
19DABC7E1E7C9D3C00F41150 /* RCTConvert+MapKit.m */,
140139
DA6C26361C9E2AFE0035349F /* AIRMapUrlTile.h */,
141140
DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */,
142141
DA6C263C1C9E324A0035349F /* AIRMapUrlTileManager.h */,
@@ -207,10 +206,10 @@
207206
1125B2E01C4AD3DA007D0023 /* AIRMapManager.m in Sources */,
208207
1125B2E61C4AD3DA007D0023 /* AIRMapPolylineManager.m in Sources */,
209208
1125B2DD1C4AD3DA007D0023 /* AIRMapCircle.m in Sources */,
209+
19DABC7F1E7C9D3C00F41150 /* RCTConvert+MapKit.m in Sources */,
210210
1125B2E51C4AD3DA007D0023 /* AIRMapPolyline.m in Sources */,
211211
DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */,
212212
1125B2DA1C4AD3DA007D0023 /* AIRMap.m in Sources */,
213-
1125B2E71C4AD3DA007D0023 /* RCTConvert+MoreMapKit.m in Sources */,
214213
1125B2DF1C4AD3DA007D0023 /* AIRMapCoordinate.m in Sources */,
215214
1125B2F21C4AD445007D0023 /* SMCalloutView.m in Sources */,
216215
1125B2E11C4AD3DA007D0023 /* AIRMapMarker.m in Sources */,

‎ios/AirMaps/AIRMap.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#import <MapKit/MapKit.h>
1111
#import <UIKit/UIKit.h>
1212

13-
#import <React/RCTConvert+MapKit.h>
1413
#import <React/RCTComponent.h>
1514
#import "SMCalloutView.h"
15+
#import "RCTConvert+MapKit.h"
1616

1717
extern const CLLocationDegrees AIRMapDefaultSpan;
1818
extern const NSTimeInterval AIRMapRegionChangeObserveInterval;

‎ios/AirMaps/AIRMapCircle.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
#import <MapKit/MapKit.h>
99
#import <UIKit/UIKit.h>
1010

11-
#import <React/RCTConvert+MapKit.h>
1211
#import <React/RCTComponent.h>
1312
#import <React/RCTView.h>
1413

1514
#import "AIRMapCoordinate.h"
1615
#import "AIRMap.h"
16+
#import "RCTConvert+MapKit.h"
1717

1818
@interface AIRMapCircle: MKAnnotationView <MKOverlay>
1919

0 commit comments

Comments
 (0)