Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename MapKit category to avoid conflicts with the one in RN #1172

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Rename MapKit category to avoid conflicts with the one in RN #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import <GoogleMaps/GoogleMaps.h>
#import <MapKit/MapKit.h>
#import "AIRGMSMarker.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

@interface AIRGoogleMap : GMSMapView

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMap.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import <GoogleMaps/GoogleMaps.h>
#import <MapKit/MapKit.h>
#import <React/UIView+React.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

id regionAsJSON(MKCoordinateRegion region) {
return @{
Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#import "AIRMapCircle.h"
#import "SMCalloutView.h"
#import "AIRGoogleMapMarker.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

#import <MapKit/MapKit.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "AIRGoogleMapMarker.h"
#import <MapKit/MapKit.h>
#import <React/RCTUIManager.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

@implementation AIRGoogleMapMarkerManager

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import <React/RCTEventDispatcher.h>
#import <React/RCTViewManager.h>
#import <React/UIView+React.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"
#import "AIRGoogleMapPolygon.h"

@interface AIRGoogleMapPolygonManager()
Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#import <React/RCTEventDispatcher.h>
#import <React/RCTViewManager.h>
#import <React/UIView+React.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"
#import "AIRGoogleMapPolyline.h"

@interface AIRGoogleMapPolylineManager()
Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#import <React/RCTComponent.h>
#import "SMCalloutView.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

extern const CLLocationDegrees AIRMapDefaultSpan;
extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapCircle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#import "AIRMapCoordinate.h"
#import "AIRMap.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

@interface AIRMapCircle: MKAnnotationView <MKOverlay>

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#import "SMCalloutView.h"
#import "AIRMapUrlTile.h"
#import "AIRMapSnapshot.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

#import <MapKit/MapKit.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapMarker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#import <React/RCTComponent.h>
#import "AIRMap.h"
#import "SMCalloutView.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

@class RCTBridge;

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapPolygon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#import <React/RCTView.h>
#import "AIRMapCoordinate.h"
#import "AIRMap.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"



Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapPolygonManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#import <React/RCTEventDispatcher.h>
#import <React/RCTViewManager.h>
#import <React/UIView+React.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"
#import "AIRMapMarker.h"
#import "AIRMapPolygon.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapPolyline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#import <React/RCTView.h>
#import "AIRMapCoordinate.h"
#import "AIRMap.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"


@interface AIRMapPolyline: MKAnnotationView <MKOverlay>
Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapPolylineManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#import <React/RCTEventDispatcher.h>
#import <React/RCTViewManager.h>
#import <React/UIView+React.h>
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"
#import "AIRMapMarker.h"
#import "AIRMapPolyline.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/AIRMapUrlTile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import <React/RCTView.h>
#import "AIRMapCoordinate.h"
#import "AIRMap.h"
#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

@interface AIRMapUrlTile : MKAnnotationView <MKOverlay>

Expand Down
2 changes: 1 addition & 1 deletion lib/ios/AirMaps/RCTConvert+MapKit.h → lib/ios/AirMaps/RCTConvert+AirMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#import <MapKit/MapKit.h>
#import <React/RCTConvert.h>

@interface RCTConvert (MapKit)
@interface RCTConvert (AirMap)

+ (MKCoordinateSpan)MKCoordinateSpan:(id)json;
+ (MKCoordinateRegion)MKCoordinateRegion:(id)json;
Expand Down
4 changes: 2 additions & 2 deletions lib/ios/AirMaps/RCTConvert+MapKit.m → lib/ios/AirMaps/RCTConvert+AirMap.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
// Copyright (c) 2015 Facebook. All rights reserved.
//

#import "RCTConvert+MapKit.h"
#import "RCTConvert+AirMap.h"

#import <React/RCTConvert+CoreLocation.h>
#import "AIRMapCoordinate.h"

@implementation RCTConvert (MapKit)
@implementation RCTConvert (AirMap)

+ (MKCoordinateSpan)MKCoordinateSpan:(id)json
{
Expand Down