remove HAVE_GOOGLE_MAPS flag

expo · Oct 25, 2018 · cb9d9ec · cb9d9ec
1 parent ef40dbe
commit cb9d9ec
Show file tree

Hide file tree

Showing 40 changed files with 5 additions and 178 deletions.
diff --git a/lib/ios/AirGoogleMaps/AIRDummyView.h b/lib/ios/AirGoogleMaps/AIRDummyView.h
@@ -5,14 +5,10 @@
 //  Created by Gil Birman on 10/4/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <UIKit/UIKit.h>
 
 
 @interface AIRDummyView : UIView
 @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
@@ -5,8 +5,6 @@
 //  Created by Gil Birman on 10/4/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <Foundation/Foundation.h>
 #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
@@ -5,8 +5,6 @@
 //  Created by Gil Birman on 9/5/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
@@ -23,5 +21,3 @@
 @required
 -(void)didTapMarker;
 @end
-
-#endif
diff --git 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
@@ -5,8 +5,6 @@
 //  Created by Gerardo Pacheco 02/05/2017.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
@@ -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
@@ -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
@@ -5,8 +5,6 @@
 //  Created by Guilherme Pontes 04/05/2017.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/UIView+React.h>
 
@@ -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
@@ -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
@@ -5,8 +5,6 @@
 //  Created by Gil Birman on 9/1/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <UIKit/UIKit.h>
 #import <React/RCTComponent.h>
 #import <React/RCTBridge.h>
@@ -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
@@ -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 <React/RCTBridge.h>
 #import "RCTConvert+AirMap.h"
 
-#ifdef HAVE_GOOGLE_MAPS_UTILS
 #import <Google-Maps-iOS-Utils/GMUKMLParser.h>
 #import <Google-Maps-iOS-Utils/GMUPlacemark.h>
 #import <Google-Maps-iOS-Utils/GMUPoint.h>
 #import <Google-Maps-iOS-Utils/GMUGeometryRenderer.h>
 #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,17 +516,13 @@ + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser
   }
 
   return marker.style.iconUrl;
-#else
-    REQUIRES_GOOGLE_MAPS_UTILS("GetIconUrl:parser:"); return @"";
-#endif
 }
 
 - (NSString *)KmlSrc {
   return _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
@@ -6,14 +6,10 @@
 //
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <UIKit/UIKit.h>
 #import <React/RCTView.h>
 
 @interface AIRGoogleMapCallout : UIView
 @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
@@ -6,14 +6,10 @@
 //
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import "AIRGoogleMapCallout.h"
 #import <React/RCTUtils.h>
 #import <React/RCTView.h>
 #import <React/RCTBridge.h>
 
 @implementation AIRGoogleMapCallout
 @end
-
-#endif
diff --git a/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h b/lib/ios/AirGoogleMaps/AIRGoogleMapCalloutManager.h
@@ -6,12 +6,8 @@
 //
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapCalloutManager : RCTViewManager
 
 @end
-
-#endif
diff --git 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 <React/RCTView.h>
@@ -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
@@ -4,8 +4,6 @@
 //  Created by Nick Italiano on 10/24/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <GoogleMaps/GoogleMaps.h>
 #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
@@ -4,7 +4,6 @@
 //  Created by Nick Italiano on 10/24/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
 #import <UIKit/UIKit.h>
 #import "AIRGoogleMapCircle.h"
 #import <GoogleMaps/GoogleMaps.h>
@@ -57,5 +56,3 @@ -(void)setZIndex:(int)zIndex
 }
 
 @end
-
-#endif
diff --git 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 <React/RCTViewManager.h>
 
 @interface AIRGoogleMapCircleManager : RCTViewManager
 
 @end
-
-#endif
diff --git 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 <React/RCTBridge.h>
@@ -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
@@ -5,14 +5,10 @@
 //  Created by Gil Birman on 9/1/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <React/RCTViewManager.h>
 #import "AIRGoogleMap.h"
 
 @interface AIRGoogleMapManager : RCTViewManager
 @property (nonatomic, assign) AIRGoogleMap *map;
 
 @end
-
-#endif
diff --git 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 <React/RCTViewManager.h>
@@ -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
@@ -5,8 +5,6 @@
 //  Created by Gil Birman on 9/2/16.
 //
 
-#ifdef HAVE_GOOGLE_MAPS
-
 #import <GoogleMaps/GoogleMaps.h>
 #import <React/RCTBridge.h>
 #import "AIRGMSMarker.h"
@@ -47,5 +45,3 @@
 - (void)didEndDraggingMarker:(AIRGMSMarker *)marker;
 - (void)didDragMarker:(AIRGMSMarker *)marker;
 @end
-
-#endif