Skip to content

Commit

Permalink
Merge pull request #21 from poulpix/1.3
Browse files Browse the repository at this point in the history
Pull request for V1.3 to master
  • Loading branch information
poulpix authored Nov 23, 2016
2 parents 3e4b9db + 572a2a5 commit 2bf87b1
Show file tree
Hide file tree
Showing 267 changed files with 1,884 additions and 2,077 deletions.
Binary file modified Dependencies/GoogleMaps.framework/Versions/A/GoogleMaps
100644 → 100755
Binary file not shown.
29 changes: 19 additions & 10 deletions Dependencies/GoogleMaps.framework/Versions/A/Headers/GMSAddress.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@

#import <CoreLocation/CoreLocation.h>

#import <GoogleMaps/GMSMapView.h>
#if __has_feature(modules)
@import GoogleMapsBase;
#else
#import <GoogleMapsBase/GoogleMapsBase.h>
#endif
#import <GoogleMaps/GMSDeprecationMacros.h>

GMS_ASSUME_NONNULL_BEGIN

/**
* A result from a reverse geocode request, containing a human-readable address. This class is
Expand All @@ -24,41 +31,41 @@
@property(nonatomic, readonly) CLLocationCoordinate2D coordinate;

/** Street number and name. */
@property(nonatomic, copy, readonly) NSString *thoroughfare;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR thoroughfare;

/** Locality or city. */
@property(nonatomic, copy, readonly) NSString *locality;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR locality;

/** Subdivision of locality, district or park. */
@property(nonatomic, copy, readonly) NSString *subLocality;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR subLocality;

/** Region/State/Administrative area. */
@property(nonatomic, copy, readonly) NSString *administrativeArea;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR administrativeArea;

/** Postal/Zip code. */
@property(nonatomic, copy, readonly) NSString *postalCode;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR postalCode;

/** The country name. */
@property(nonatomic, copy, readonly) NSString *country;
@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR country;

/** An array of NSString containing formatted lines of the address. May be nil. */
@property(nonatomic, copy, readonly) NSArray *lines;
@property(nonatomic, copy, readonly) GMS_NSArrayOf(NSString *) *GMS_NULLABLE_PTR lines;

/**
* Returns the first line of the address.
*
* This method is obsolete and deprecated and will be removed in a future release.
* Use the lines property instead.
*/
- (NSString *)addressLine1 __GMS_AVAILABLE_BUT_DEPRECATED;
- (NSString *GMS_NULLABLE_PTR)addressLine1 __GMS_AVAILABLE_BUT_DEPRECATED;

/**
* Returns the second line of the address.
*
* This method is obsolete and deprecated and will be removed in a future release.
* Use the lines property instead.
*/
- (NSString *)addressLine2 __GMS_AVAILABLE_BUT_DEPRECATED;
- (NSString *GMS_NULLABLE_PTR)addressLine2 __GMS_AVAILABLE_BUT_DEPRECATED;

@end

Expand All @@ -67,3 +74,5 @@
* removed in future releases.
*/
@compatibility_alias GMSReverseGeocodeResult GMSAddress;

GMS_ASSUME_NONNULL_END

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.
28 changes: 21 additions & 7 deletions Dependencies/GoogleMaps.framework/Versions/A/Headers/GMSCameraPosition.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@

#import <CoreLocation/CoreLocation.h>

#if __has_feature(modules)
@import GoogleMapsBase;
#else
#import <GoogleMapsBase/GoogleMapsBase.h>
#endif

GMS_ASSUME_NONNULL_BEGIN

/**
* An immutable class that aggregates all camera position parameters.
*/
@interface GMSCameraPosition : NSObject <NSCopying, NSMutableCopying>
@interface GMSCameraPosition : NSObject<NSCopying, NSMutableCopying>

/**
* Location on the Earth towards which the camera points.
Expand All @@ -33,8 +41,11 @@
@property(nonatomic, readonly) CLLocationDirection bearing;

/**
* The angle, in degrees, of the camera angle from the nadir (directly facing the Earth). 0 is
* straight down, 90 is parallel to the ground. Note that the maximum angle allowed is 45 degrees.
* The angle, in degrees, of the camera from the nadir (directly facing the Earth). 0 is
* straight down, 90 is parallel to the ground. Note that the maximum angle allowed is dependent
* on the zoom. You can think of it as a series of line segments as a function of zoom, rather
* than a step function. For zoom 16 and above, the maximum angle is 65 degrees. For zoom 10 and
* below, the maximum angle is 30 degrees.
*/
@property(nonatomic, readonly) double viewingAngle;

Expand All @@ -43,10 +54,11 @@
* Building a GMSCameraPosition via this initializer (or by the following convenience constructors)
* will implicitly clamp camera values.
*
* @param target location on the earth which the camera points
* @param zoom the zoom level near the center of the screen
* @param bearing of the camera in degrees from true north
* @param viewingAngle in degrees, of the camera angle from the nadir
* @param target Location on the earth towards which the camera points.
* @param zoom The zoom level near the center of the screen.
* @param bearing Bearing of the camera in degrees clockwise from true north.
* @param viewingAngle The angle, in degrees, of the camera angle from the nadir (directly facing
* the Earth)
*/
- (id)initWithTarget:(CLLocationCoordinate2D)target
zoom:(float)zoom
Expand Down Expand Up @@ -115,3 +127,5 @@ FOUNDATION_EXTERN const float kGMSMaxZoomLevel;

/** The minimum zoom (farthest from the Earth's surface) permitted by the map camera. */
FOUNDATION_EXTERN const float kGMSMinZoomLevel;

GMS_ASSUME_NONNULL_END
9 changes: 9 additions & 0 deletions Dependencies/GoogleMaps.framework/Versions/A/Headers/GMSCameraUpdate.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,17 @@
#import <CoreLocation/CoreLocation.h>
#import <UIKit/UIKit.h>

#if __has_feature(modules)
@import GoogleMapsBase;
#else
#import <GoogleMapsBase/GoogleMapsBase.h>
#endif

@class GMSCameraPosition;
@class GMSCoordinateBounds;

GMS_ASSUME_NONNULL_BEGIN

/**
* GMSCameraUpdate represents an update that may be applied to a GMSMapView.
* It encapsulates some logic for modifying the current camera.
Expand Down Expand Up @@ -104,3 +112,4 @@

@end

GMS_ASSUME_NONNULL_END
14 changes: 12 additions & 2 deletions Dependencies/GoogleMaps.framework/Versions/A/Headers/GMSCircle.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@

#import <Foundation/Foundation.h>

#if __has_feature(modules)
@import GoogleMapsBase;
#else
#import <GoogleMapsBase/GoogleMapsBase.h>
#endif

GMS_ASSUME_NONNULL_BEGIN

/**
* A circle on the Earth's surface (spherical cap).
*/
Expand All @@ -31,13 +39,13 @@
@property(nonatomic, assign) CGFloat strokeWidth;

/** The color of this circle's outline. The default value is black. */
@property(nonatomic, strong) UIColor *strokeColor;
@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR strokeColor;

/**
* The interior of the circle is painted with fillColor.
* The default value is nil, resulting in no fill.
*/
@property(nonatomic, strong) UIColor *fillColor;
@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR fillColor;

/**
* Convenience constructor for GMSCircle for a particular position and radius.
Expand All @@ -47,3 +55,5 @@
radius:(CLLocationDistance)radius;

@end

GMS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// GMSCoordinateBounds+GoogleMaps.h
// Google Maps SDK for iOS
//
// Copyright 2013 Google Inc.
//
// Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
// Service: https://developers.google.com/maps/terms
//


#if __has_feature(modules)
@import GoogleMapsBase;
#else
#import <GoogleMapsBase/GoogleMapsBase.h>
#endif

#import <GoogleMaps/GMSProjection.h>

@class GMSPath;

GMS_ASSUME_NONNULL_BEGIN

@interface GMSCoordinateBounds (GoogleMaps)

/**
* Inits with bounds that encompass |region|.
*/
- (id)initWithRegion:(GMSVisibleRegion)region;

/**
* Inits with bounds that encompass |path|.
*/
- (id)initWithPath:(GMSPath *)path;

/**
* Returns a GMSCoordinateBounds representing the current bounds extended to
* include |path|.
*/
- (GMSCoordinateBounds *)includingPath:(GMSPath *)path;

@end

GMS_ASSUME_NONNULL_END
Loading

0 comments on commit 2bf87b1

Please sign in to comment.