From 4926f5b53fac8e1ab9aaf877e81048e262dee8aa Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Mon, 27 Mar 2017 18:24:24 -0400 Subject: [PATCH] Rename MapKit category to avoid conflicts with the one in RN --- lib/ios/AirGoogleMaps/AIRGoogleMap.h | 2 +- lib/ios/AirGoogleMaps/AIRGoogleMap.m | 2 +- lib/ios/AirGoogleMaps/AIRGoogleMapManager.m | 2 +- lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m | 2 +- lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m | 2 +- lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m | 2 +- lib/ios/AirMaps/AIRMap.h | 2 +- lib/ios/AirMaps/AIRMapCircle.h | 2 +- lib/ios/AirMaps/AIRMapManager.m | 2 +- lib/ios/AirMaps/AIRMapMarker.h | 2 +- lib/ios/AirMaps/AIRMapPolygon.h | 2 +- lib/ios/AirMaps/AIRMapPolygonManager.m | 2 +- lib/ios/AirMaps/AIRMapPolyline.h | 2 +- lib/ios/AirMaps/AIRMapPolylineManager.m | 2 +- lib/ios/AirMaps/AIRMapUrlTile.h | 2 +- lib/ios/AirMaps/{RCTConvert+MapKit.h => RCTConvert+AirMap.h} | 2 +- lib/ios/AirMaps/{RCTConvert+MapKit.m => RCTConvert+AirMap.m} | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) rename lib/ios/AirMaps/{RCTConvert+MapKit.h => RCTConvert+AirMap.h} (91%) rename lib/ios/AirMaps/{RCTConvert+MapKit.m => RCTConvert+AirMap.m} (95%) diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.h b/lib/ios/AirGoogleMaps/AIRGoogleMap.h index 8006a804ea..9e6ae8b799 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMap.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.h @@ -10,7 +10,7 @@ #import #import #import "AIRGMSMarker.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @interface AIRGoogleMap : GMSMapView diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.m b/lib/ios/AirGoogleMaps/AIRGoogleMap.m index 8f51c26e77..ca15da04e5 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMap.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.m @@ -14,7 +14,7 @@ #import #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" id regionAsJSON(MKCoordinateRegion region) { return @{ diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m index 6e81c7e9b5..785d58d4d4 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m @@ -23,7 +23,7 @@ #import "AIRMapCircle.h" #import "SMCalloutView.h" #import "AIRGoogleMapMarker.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m index ac2e443478..8be4ba53e9 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m @@ -9,7 +9,7 @@ #import "AIRGoogleMapMarker.h" #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @implementation AIRGoogleMapMarkerManager diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m index 0dd8d54a01..59e239627d 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m @@ -11,7 +11,7 @@ #import #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import "AIRGoogleMapPolygon.h" @interface AIRGoogleMapPolygonManager() diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m index 5fca4e902f..acad1631bd 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m @@ -12,7 +12,7 @@ #import #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import "AIRGoogleMapPolyline.h" @interface AIRGoogleMapPolylineManager() diff --git a/lib/ios/AirMaps/AIRMap.h b/lib/ios/AirMaps/AIRMap.h index b74163cb9a..18c9a0bc05 100644 --- a/lib/ios/AirMaps/AIRMap.h +++ b/lib/ios/AirMaps/AIRMap.h @@ -12,7 +12,7 @@ #import #import "SMCalloutView.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" extern const CLLocationDegrees AIRMapDefaultSpan; extern const NSTimeInterval AIRMapRegionChangeObserveInterval; diff --git a/lib/ios/AirMaps/AIRMapCircle.h b/lib/ios/AirMaps/AIRMapCircle.h index 7d7160e858..83a70f2977 100644 --- a/lib/ios/AirMaps/AIRMapCircle.h +++ b/lib/ios/AirMaps/AIRMapCircle.h @@ -13,7 +13,7 @@ #import "AIRMapCoordinate.h" #import "AIRMap.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @interface AIRMapCircle: MKAnnotationView diff --git a/lib/ios/AirMaps/AIRMapManager.m b/lib/ios/AirMaps/AIRMapManager.m index 1e2c3f5ac5..619142bd66 100644 --- a/lib/ios/AirMaps/AIRMapManager.m +++ b/lib/ios/AirMaps/AIRMapManager.m @@ -24,7 +24,7 @@ #import "SMCalloutView.h" #import "AIRMapUrlTile.h" #import "AIRMapSnapshot.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import diff --git a/lib/ios/AirMaps/AIRMapMarker.h b/lib/ios/AirMaps/AIRMapMarker.h index bbcabf506a..0613544a9c 100644 --- a/lib/ios/AirMaps/AIRMapMarker.h +++ b/lib/ios/AirMaps/AIRMapMarker.h @@ -16,7 +16,7 @@ #import #import "AIRMap.h" #import "SMCalloutView.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @class RCTBridge; diff --git a/lib/ios/AirMaps/AIRMapPolygon.h b/lib/ios/AirMaps/AIRMapPolygon.h index 15def91003..611d942e71 100644 --- a/lib/ios/AirMaps/AIRMapPolygon.h +++ b/lib/ios/AirMaps/AIRMapPolygon.h @@ -12,7 +12,7 @@ #import #import "AIRMapCoordinate.h" #import "AIRMap.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" diff --git a/lib/ios/AirMaps/AIRMapPolygonManager.m b/lib/ios/AirMaps/AIRMapPolygonManager.m index e9be4936aa..543644e82f 100644 --- a/lib/ios/AirMaps/AIRMapPolygonManager.m +++ b/lib/ios/AirMaps/AIRMapPolygonManager.m @@ -15,7 +15,7 @@ #import #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import "AIRMapMarker.h" #import "AIRMapPolygon.h" diff --git a/lib/ios/AirMaps/AIRMapPolyline.h b/lib/ios/AirMaps/AIRMapPolyline.h index 6fb5feadc6..6311c32487 100644 --- a/lib/ios/AirMaps/AIRMapPolyline.h +++ b/lib/ios/AirMaps/AIRMapPolyline.h @@ -12,7 +12,7 @@ #import #import "AIRMapCoordinate.h" #import "AIRMap.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @interface AIRMapPolyline: MKAnnotationView diff --git a/lib/ios/AirMaps/AIRMapPolylineManager.m b/lib/ios/AirMaps/AIRMapPolylineManager.m index d00a9efac9..e064b7c4bd 100644 --- a/lib/ios/AirMaps/AIRMapPolylineManager.m +++ b/lib/ios/AirMaps/AIRMapPolylineManager.m @@ -15,7 +15,7 @@ #import #import #import -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import "AIRMapMarker.h" #import "AIRMapPolyline.h" diff --git a/lib/ios/AirMaps/AIRMapUrlTile.h b/lib/ios/AirMaps/AIRMapUrlTile.h index a33be61d1b..49963d3ee5 100644 --- a/lib/ios/AirMaps/AIRMapUrlTile.h +++ b/lib/ios/AirMaps/AIRMapUrlTile.h @@ -14,7 +14,7 @@ #import #import "AIRMapCoordinate.h" #import "AIRMap.h" -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" @interface AIRMapUrlTile : MKAnnotationView diff --git a/lib/ios/AirMaps/RCTConvert+MapKit.h b/lib/ios/AirMaps/RCTConvert+AirMap.h similarity index 91% rename from lib/ios/AirMaps/RCTConvert+MapKit.h rename to lib/ios/AirMaps/RCTConvert+AirMap.h index 28f60bf96a..fc1059d911 100644 --- a/lib/ios/AirMaps/RCTConvert+MapKit.h +++ b/lib/ios/AirMaps/RCTConvert+AirMap.h @@ -7,7 +7,7 @@ #import #import -@interface RCTConvert (MapKit) +@interface RCTConvert (AirMap) + (MKCoordinateSpan)MKCoordinateSpan:(id)json; + (MKCoordinateRegion)MKCoordinateRegion:(id)json; diff --git a/lib/ios/AirMaps/RCTConvert+MapKit.m b/lib/ios/AirMaps/RCTConvert+AirMap.m similarity index 95% rename from lib/ios/AirMaps/RCTConvert+MapKit.m rename to lib/ios/AirMaps/RCTConvert+AirMap.m index 2e3b11602c..cfdbb17ce2 100644 --- a/lib/ios/AirMaps/RCTConvert+MapKit.m +++ b/lib/ios/AirMaps/RCTConvert+AirMap.m @@ -3,12 +3,12 @@ // Copyright (c) 2015 Facebook. All rights reserved. // -#import "RCTConvert+MapKit.h" +#import "RCTConvert+AirMap.h" #import #import "AIRMapCoordinate.h" -@implementation RCTConvert (MapKit) +@implementation RCTConvert (AirMap) + (MKCoordinateSpan)MKCoordinateSpan:(id)json {