diff --git a/lib/ios/AirGoogleMaps/AIRDummyView.h b/lib/ios/AirGoogleMaps/AIRDummyView.h index 39428cd948..624c0cb434 100644 --- a/lib/ios/AirGoogleMaps/AIRDummyView.h +++ b/lib/ios/AirGoogleMaps/AIRDummyView.h @@ -5,8 +5,6 @@ // Created by Gil Birman on 10/4/16. // -#ifdef HAVE_GOOGLE_MAPS - #import @@ -14,5 +12,3 @@ @property (nonatomic, weak) UIView *view; - (instancetype)initWithView:(UIView*)view; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRDummyView.m b/lib/ios/AirGoogleMaps/AIRDummyView.m index 70921d1b15..3775394dcb 100644 --- a/lib/ios/AirGoogleMaps/AIRDummyView.m +++ b/lib/ios/AirGoogleMaps/AIRDummyView.m @@ -5,8 +5,6 @@ // Created by Gil Birman on 10/4/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import "AIRDummyView.h" @@ -19,5 +17,3 @@ - (instancetype)initWithView:(UIView*)view return self; } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSMarker.h b/lib/ios/AirGoogleMaps/AIRGMSMarker.h index 79a05ad592..89723ca2a0 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSMarker.h +++ b/lib/ios/AirGoogleMaps/AIRGMSMarker.h @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import @@ -23,5 +21,3 @@ @required -(void)didTapMarker; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSMarker.m b/lib/ios/AirGoogleMaps/AIRGMSMarker.m index 5f270054cf..4e7fdfb095 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSMarker.m +++ b/lib/ios/AirGoogleMaps/AIRGMSMarker.m @@ -5,12 +5,8 @@ // Created by Gil Birman on 9/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGMSMarker.h" @implementation AIRGMSMarker @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSPolygon.h b/lib/ios/AirGoogleMaps/AIRGMSPolygon.h index 3c9947c030..d41c87d5e4 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSPolygon.h +++ b/lib/ios/AirGoogleMaps/AIRGMSPolygon.h @@ -5,8 +5,6 @@ // Created by Gerardo Pacheco 02/05/2017. // -#ifdef HAVE_GOOGLE_MAPS - #import #import @@ -16,5 +14,3 @@ @property (nonatomic, strong) NSString *identifier; @property (nonatomic, copy) RCTBubblingEventBlock onPress; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSPolygon.m b/lib/ios/AirGoogleMaps/AIRGMSPolygon.m index cf66a84bd2..05de0b0290 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSPolygon.m +++ b/lib/ios/AirGoogleMaps/AIRGMSPolygon.m @@ -5,12 +5,8 @@ // Created by Gerardo Pacheco 02/05/2017. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGMSPolygon.h" @implementation AIRGMSPolygon @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSPolyline.h b/lib/ios/AirGoogleMaps/AIRGMSPolyline.h index 417a1b6858..d7ee197831 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSPolyline.h +++ b/lib/ios/AirGoogleMaps/AIRGMSPolyline.h @@ -5,8 +5,6 @@ // Created by Guilherme Pontes 04/05/2017. // -#ifdef HAVE_GOOGLE_MAPS - #import #import @@ -16,5 +14,3 @@ @property (nonatomic, strong) NSString *identifier; @property (nonatomic, copy) RCTBubblingEventBlock onPress; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGMSPolyline.m b/lib/ios/AirGoogleMaps/AIRGMSPolyline.m index fb36a9a49b..86e7ac0555 100644 --- a/lib/ios/AirGoogleMaps/AIRGMSPolyline.m +++ b/lib/ios/AirGoogleMaps/AIRGMSPolyline.m @@ -5,11 +5,7 @@ // Created by Guilherme Pontes 04/05/2017. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGMSPolyline.h" @implementation AIRGMSPolyline @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.h b/lib/ios/AirGoogleMaps/AIRGoogleMap.h index 962eeabc4a..a89db04606 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMap.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.h @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/1/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import #import @@ -70,5 +68,3 @@ + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMap.m b/lib/ios/AirGoogleMaps/AIRGoogleMap.m index 44fd24cc85..93fd376f02 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMap.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMap.m @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/1/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMap.h" #import "AIRGoogleMapMarker.h" #import "AIRGoogleMapMarkerManager.h" @@ -21,20 +19,11 @@ #import #import "RCTConvert+AirMap.h" -#ifdef HAVE_GOOGLE_MAPS_UTILS #import #import #import #import #define REQUIRES_GOOGLE_MAPS_UTILS(feature) do {} while (0) -#else -#define GMUKMLParser void -#define GMUPlacemark void -#define REQUIRES_GOOGLE_MAPS_UTILS(feature) do { \ - [NSException raise:@"ReactNativeMapsDependencyMissing" \ - format:@"Use of " feature "requires Google-Maps-iOS-Utils, you must install via CocoaPods to use this feature"]; \ -} while (0) -#endif id regionAsJSON(MKCoordinateRegion region) { @@ -341,7 +330,7 @@ - (NSString *)paddingAdjustmentBehaviorString return @"automatic"; case kGMSMapViewPaddingAdjustmentBehaviorAlways: return @"always"; - + default: return @"unknown"; } @@ -518,7 +507,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath } + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser { -#ifdef HAVE_GOOGLE_MAPS_UTILS if (marker.style.styleID != nil) { for (GMUStyle *style in parser.styles) { if (style.styleID == marker.style.styleID) { @@ -528,9 +516,6 @@ + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser } return marker.style.iconUrl; -#else - REQUIRES_GOOGLE_MAPS_UTILS("GetIconUrl:parser:"); return @""; -#endif } - (NSString *)KmlSrc { @@ -538,7 +523,6 @@ - (NSString *)KmlSrc { } - (void)setKmlSrc:(NSString *)kmlUrl { -#ifdef HAVE_GOOGLE_MAPS_UTILS _kmlSrc = kmlUrl; @@ -590,11 +574,6 @@ - (void)setKmlSrc:(NSString *)kmlUrl { id event = @{@"markers": markers}; if (self.onKmlReady) self.onKmlReady(event); -#else - REQUIRES_GOOGLE_MAPS_UTILS(); -#endif } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.h b/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.h index 29e322f26a..784bcf6134 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.h @@ -6,8 +6,6 @@ // // -#ifdef HAVE_GOOGLE_MAPS - #import #import @@ -15,5 +13,3 @@ @property (nonatomic, assign) BOOL tooltip; @property (nonatomic, copy) RCTBubblingEventBlock onPress; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.m b/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.m index 3ed9e78a81..acc6b86b7f 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCallout.m @@ -6,8 +6,6 @@ // // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapCallout.h" #import #import @@ -15,5 +13,3 @@ @implementation AIRGoogleMapCallout @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h index 4d70ea33ed..c6f8ecbefa 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h @@ -6,12 +6,8 @@ // // -#ifdef HAVE_GOOGLE_MAPS - #import @interface AIRGoogleMapCalloutManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m index 12d8fcb88e..1828beb8ae 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.m @@ -6,8 +6,6 @@ // // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapCalloutManager.h" #import "AIRGoogleMapCallout.h" #import @@ -25,5 +23,3 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.h b/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.h index 478933ee14..685cc649ec 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.h @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/24/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import "AIRMapCoordinate.h" @@ -20,5 +18,3 @@ @property (nonatomic, assign) int zIndex; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.m b/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.m index f0c73b9c28..c8ab364ebe 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCircle.m @@ -4,7 +4,6 @@ // Created by Nick Italiano on 10/24/16. // -#ifdef HAVE_GOOGLE_MAPS #import #import "AIRGoogleMapCircle.h" #import @@ -57,5 +56,3 @@ -(void)setZIndex:(int)zIndex } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h index 02ce07c4bf..c1de723184 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.h @@ -4,12 +4,8 @@ // Created by Nick Italiano on 10/24/16. // -#ifdef HAVE_GOOGLE_MAPS - #import @interface AIRGoogleMapCircleManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m index d113d04bc9..93afa145fe 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapCircleManager.m @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/24/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapCircleManager.h" #import "AIRGoogleMapCircle.h" #import @@ -33,5 +31,3 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(zIndex, int) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h index eb6978635c..48d0c4eb45 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.h @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/1/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import "AIRGoogleMap.h" @@ -14,5 +12,3 @@ @property (nonatomic, assign) AIRGoogleMap *map; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m index fa6cc2505b..880e6d071e 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/1/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapManager.h" #import @@ -355,7 +353,7 @@ - (UIView *)view AIRGoogleMap *mapView = (AIRGoogleMap *)view; CGPoint touchPoint = [mapView.projection pointForCoordinate:coord]; - + resolve(@{ @"x": @(touchPoint.x), @"y": @(touchPoint.y), @@ -382,7 +380,7 @@ - (UIView *)view AIRGoogleMap *mapView = (AIRGoogleMap *)view; CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:pt]; - + resolve(@{ @"latitude": @(coordinate.latitude), @"longitude": @(coordinate.longitude), @@ -565,5 +563,3 @@ - (void)mapView:(GMSMapView *)mapView [googleMapView didTapPOIWithPlaceID:placeID name:name location:location]; } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h index 1a4c4ff67e..2e8d5cb541 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.h @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/2/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import #import "AIRGMSMarker.h" @@ -47,5 +45,3 @@ - (void)didEndDraggingMarker:(AIRGMSMarker *)marker; - (void)didDragMarker:(AIRGMSMarker *)marker; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m index 9108b793cc..b887737087 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarker.m @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/2/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapMarker.h" #import #import @@ -117,9 +115,9 @@ - (void)hideCalloutView { - (void)redraw { if (!_realMarker.iconView) return; - + BOOL oldValue = _realMarker.tracksViewChanges; - + if (oldValue == YES) { // Immediate refresh, like right now. Not waiting for next frame. @@ -341,5 +339,3 @@ - (BOOL)tracksInfoWindowChanges { } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h index ea52ccd592..f2698dcd0d 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.h @@ -5,12 +5,8 @@ // Created by Gil Birman on 9/2/16. // -#ifdef HAVE_GOOGLE_MAPS - #import @interface AIRGoogleMapMarkerManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m index 2937bd5b0f..357bbc4b0b 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m @@ -5,8 +5,6 @@ // Created by Gil Birman on 9/2/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapMarkerManager.h" #import "AIRGoogleMapMarker.h" #import @@ -83,5 +81,3 @@ - (UIView *)view }]; } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h b/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h index 0fd00ebdf0..0e2c4e278a 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h @@ -4,8 +4,6 @@ // Created by Taro Matsuzawa on 5/3/17. // -#ifdef HAVE_GOOGLE_MAPS - #import #import #import @@ -23,5 +21,3 @@ @property (nonatomic, weak) RCTBridge *bridge; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m b/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m index 20dba83bf1..9caf634aad 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m @@ -3,8 +3,6 @@ // Created by Nick Italiano on 3/5/17. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapOverlay.h" #import @@ -76,5 +74,3 @@ - (void)setBoundsRect:(NSArray *)boundsRect } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.h b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.h index 214e50f415..e7719ebee9 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.h @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import #import "AIRGMSPolygon.h" @@ -28,5 +26,3 @@ @property (nonatomic, assign) BOOL tappable; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.m index 6d162a716f..bbd5d99c94 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygon.m @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapPolygon.h" #import "AIRGMSPolygon.h" #import @@ -96,5 +94,3 @@ - (void)setOnPress:(RCTBubblingEventBlock)onPress { } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h index 89175e73f8..3380c61e3c 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.h @@ -4,12 +4,8 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS - #import @interface AIRGoogleMapPolygonManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m index 7e4e152645..bea20b3bd4 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolygonManager.m @@ -4,7 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS #import "AIRGoogleMapPolygonManager.h" #import @@ -42,5 +41,3 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.h b/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.h index 9524e08806..4d3307cded 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.h @@ -4,7 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS #import #import #import @@ -30,5 +29,3 @@ @property (nonatomic, assign) BOOL tappable; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.m index eca6bf02d6..89ffff8218 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolyline.m @@ -4,7 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS #import #import "AIRGoogleMapPolyline.h" #import "AIRGMSPolyline.h" @@ -111,5 +110,3 @@ - (void)configureStyleSpansIfNeeded { } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h index 7657967f88..82e7b8e203 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.h @@ -4,12 +4,8 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS - #import @interface AIRGoogleMapPolylineManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m index 3ec4718e68..e4c49187f6 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapPolylineManager.m @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/22/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapPolylineManager.h" #import @@ -43,5 +41,3 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m b/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m index fc1547caa0..398d75effb 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapURLTileManager.m @@ -3,8 +3,6 @@ // Created by Nick Italiano on 11/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapUrlTileManager.h" #import "AIRGoogleMapUrlTile.h" @@ -28,5 +26,3 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(minimumZ, NSInteger) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h index 5cf94e07fd..bcc6c67fc1 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.h @@ -3,8 +3,6 @@ // Created by Nick Italiano on 11/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import @@ -17,5 +15,3 @@ @property NSInteger *minimumZ; @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m index 43a0bcc830..a3bd282350 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m @@ -3,8 +3,6 @@ // Created by Nick Italiano on 11/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "AIRGoogleMapUrlTile.h" @implementation AIRGoogleMapUrlTile @@ -47,5 +45,3 @@ - (GMSTileURLConstructor)_getTileURLConstructor } @end - -#endif diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h index cf4fd62b8f..affd718b4e 100644 --- a/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h +++ b/lib/ios/AirGoogleMaps/AIRGoogleMapUrlTileManager.h @@ -3,12 +3,8 @@ // Created by Nick Italiano on 11/5/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import @interface AIRGoogleMapUrlTileManager : RCTViewManager @end - -#endif diff --git a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h index 27eec257fc..7e02d66a00 100644 --- a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h +++ b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.h @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/23/16. // -#ifdef HAVE_GOOGLE_MAPS - #import #import #import @@ -13,5 +11,3 @@ @interface RCTConvert (GMSMapViewType) @end - -#endif diff --git a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m index 5a332f53be..cfceba5590 100644 --- a/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m +++ b/lib/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m @@ -4,8 +4,6 @@ // Created by Nick Italiano on 10/23/16. // -#ifdef HAVE_GOOGLE_MAPS - #import "RCTConvert+GMSMapViewType.h" #import #import @@ -22,5 +20,3 @@ @implementation RCTConvert (GMSMapViewType) } ), kGMSTypeTerrain, intValue) @end - -#endif