Skip to content

Commit

Permalink
Update to 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
erichoracek committed Feb 13, 2017
1 parent c109610 commit b09e9d1
Show file tree
Hide file tree
Showing 54 changed files with 4,885 additions and 373 deletions.
Binary file modified Mapbox.framework/Base.lproj/Localizable.strings
Binary file not shown.
2 changes: 0 additions & 2 deletions Mapbox.framework/Headers/MGLAccountManager.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#import <Foundation/Foundation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
Expand Down
2 changes: 0 additions & 2 deletions Mapbox.framework/Headers/MGLAnnotation.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
#import <CoreLocation/CoreLocation.h>
#import <TargetConditionals.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
Expand Down
28 changes: 19 additions & 9 deletions Mapbox.framework/Headers/MGLAnnotationImage.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
#import <UIKit/UIKit.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/** The MGLAnnotationImage class is responsible for presenting point-based annotations visually on a map view. Annotation image objects wrap `UIImage` objects and may be recycled later and put into a reuse queue that is maintained by the map view. */
@interface MGLAnnotationImage : NSObject
/**
The `MGLAnnotationImage` class is responsible for presenting point-based
annotations visually on a map view. Annotation image objects wrap `UIImage`
objects and may be recycled later and put into a reuse queue that is maintained
by the map view.
*/
@interface MGLAnnotationImage : NSObject <NSSecureCoding>

#pragma mark Initializing and Preparing the Image Object

/**
Initializes and returns a new annotation image object.
@param image The image to be displayed for the annotation.
@param reuseIdentifier The string that identifies that this annotation image is reusable.
@return The initialized annotation image object or `nil` if there was a problem initializing the object.
@param reuseIdentifier The string that identifies that this annotation image is
reusable.
@return The initialized annotation image object or `nil` if there was a problem
initializing the object.
*/
+ (instancetype)annotationImageWithImage:(UIImage *)image reuseIdentifier:(NSString *)reuseIdentifier;

Expand All @@ -26,16 +31,21 @@ NS_ASSUME_NONNULL_BEGIN
/**
The string that identifies that this annotation image is reusable. (read-only)
You specify the reuse identifier when you create the image object. You use this type later to retrieve an annotation image object that was created previously but which is currently unused because its annotation is not on screen.
You specify the reuse identifier when you create the image object. You use this
type later to retrieve an annotation image object that was created previously
but which is currently unused because its annotation is not on screen.
If you define distinctly different types of annotations (with distinctly different annotation images to go with them), you can differentiate between the annotation types by specifying different reuse identifiers for each one.
If you define distinctly different types of annotations (with distinctly
different annotation images to go with them), you can differentiate between the
annotation types by specifying different reuse identifiers for each one.
*/
@property (nonatomic, readonly) NSString *reuseIdentifier;

/**
A Boolean value indicating whether the annotation is enabled.
The default value of this property is `YES`. If the value of this property is `NO`, the annotation image ignores touch events and cannot be selected.
The default value of this property is `YES`. If the value of this property is
`NO`, the annotation image ignores touch events and cannot be selected.
*/
@property (nonatomic, getter=isEnabled) BOOL enabled;

Expand Down
4 changes: 1 addition & 3 deletions Mapbox.framework/Headers/MGLAnnotationView.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#import <UIKit/UIKit.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

@protocol MGLAnnotation;
Expand Down Expand Up @@ -52,7 +50,7 @@ typedef NS_ENUM(NSUInteger, MGLAnnotationViewDragState) {
interactivity such as dragging, you can use an `MGLAnnotationImage` instead to
conserve memory and optimize drawing performance.
*/
@interface MGLAnnotationView : UIView
@interface MGLAnnotationView : UIView <NSSecureCoding>

#pragma mark Initializing and Preparing the View

Expand Down
62 changes: 62 additions & 0 deletions Mapbox.framework/Headers/MGLAttributionInfo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <CoreLocation/CoreLocation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
Information about an attribution statement, usually a copyright or trademark
statement, associated with a map content source.
*/
@interface MGLAttributionInfo : NSObject

/**
Returns an initialized attribution info object with the given title and URL.
@param title The attribution statement’s title.
@param URL A URL to more information about the entity named in the attribution.
@return An initialized attribution info object.
*/
- (instancetype)initWithTitle:(NSAttributedString *)title URL:(nullable NSURL *)URL;

/**
The attribution statement’s attributed title text.
*/
@property (nonatomic) NSAttributedString *title;

/**
The URL to more information about the entity named in the attribution.
If this property is set, the attribution statement should be displayed as a
hyperlink or action button. Otherwise, if it is `nil`, the attribution
statement should be displayed as plain text.
*/
@property (nonatomic, nullable) NSURL *URL;

/**
A Boolean value indicating whether the attribution statement is a shortcut to a
feedback tool.
If this property is set, the statement should be treated as a way for the user
to provide feedback rather than an attribution statement.
*/
@property (nonatomic, getter=isFeedbackLink) BOOL feedbackLink;

/**
Returns a copy of the `URL` property modified to account for the given center
coordinate and zoom level.
@param centerCoordinate The map’s center coordinate.
@param zoomLevel The map’s zoom level. See the `MGLMapView.zoomLevel` property
for more information.
@return A modified URL containing a fragment that points to the specified
viewport. If the `feedbackLink` property is set to `NO`, this method returns
`nil`.
*/
- (nullable NSURL *)feedbackURLAtCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(double)zoomLevel;

@end

NS_ASSUME_NONNULL_END
73 changes: 73 additions & 0 deletions Mapbox.framework/Headers/MGLBackgroundStyleLayer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.

#import "MGLStyleValue.h"
#import "MGLStyleLayer.h"

NS_ASSUME_NONNULL_BEGIN

/**
An `MGLBackgroundStyleLayer` is a style layer that covers the entire map. Use a
background style layer to configure a color or pattern to show below all other
map content. If the style’s other layers use the Mapbox Streets source, the
background style layer is responsible for drawing land, whereas the oceans and
other bodies of water are drawn by `MGLFillStyleLayer` objects.
A background style layer is typically the bottommost layer in a style, because
it covers the entire map and can occlude any layers below it. You can therefore
access it by getting the last item in the `MGLStyle.layers` array.
If the background style layer is transparent or omitted from the style, any
portion of the map view that does not show another style layer is transparent.
*/
@interface MGLBackgroundStyleLayer : MGLStyleLayer

- (instancetype)initWithIdentifier:(NSString *)identifier NS_DESIGNATED_INITIALIZER;

#pragma mark - Accessing the Paint Attributes

#if TARGET_OS_IPHONE
/**
The color with which the background will be drawn.
The default value of this property is an `MGLStyleValue` object containing
`UIColor.blackColor`. Set this property to `nil` to reset it to the default
value.
This property is only applied to the style if `backgroundPattern` is set to
`nil`. Otherwise, it is ignored.
*/
@property (nonatomic, null_resettable) MGLStyleValue<UIColor *> *backgroundColor;
#else
/**
The color with which the background will be drawn.
The default value of this property is an `MGLStyleValue` object containing
`NSColor.blackColor`. Set this property to `nil` to reset it to the default
value.
This property is only applied to the style if `backgroundPattern` is set to
`nil`. Otherwise, it is ignored.
*/
@property (nonatomic, null_resettable) MGLStyleValue<NSColor *> *backgroundColor;
#endif

/**
The opacity at which the background will be drawn.
The default value of this property is an `MGLStyleValue` object containing an
`NSNumber` object containing the float `1`. Set this property to `nil` to reset
it to the default value.
*/
@property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *backgroundOpacity;

/**
Name of image in style images to use for drawing an image background. For
seamless patterns, image width and height must be a factor of two (2, 4, 8,
..., 512).
*/
@property (nonatomic, null_resettable) MGLStyleValue<NSString *> *backgroundPattern;

@end

NS_ASSUME_NONNULL_END
56 changes: 43 additions & 13 deletions Mapbox.framework/Headers/MGLCalloutView.h
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
#import <Foundation/Foundation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

@protocol MGLCalloutViewDelegate;
@protocol MGLAnnotation;

/**
A protocol for a `UIView` subclass that displays information about a selected annotation near that annotation.
A protocol for a `UIView` subclass that displays information about a selected
annotation near that annotation.
*/
@protocol MGLCalloutView <NSObject>

/**
An object conforming to the `MGLAnnotation` protocol whose details this callout view displays.
An object conforming to the `MGLAnnotation` protocol whose details this callout
view displays.
*/
@property (nonatomic, strong) id <MGLAnnotation> representedObject;

/**
A view that the user may tap to perform an action. This view is conventionally positioned on the left side of the callout view.
A view that the user may tap to perform an action. This view is conventionally
positioned on the left side of the callout view.
*/
@property (nonatomic, strong) UIView *leftAccessoryView;

/**
A view that the user may tap to perform an action. This view is conventionally positioned on the right side of the callout view.
A view that the user may tap to perform an action. This view is conventionally
positioned on the right side of the callout view.
*/
@property (nonatomic, strong) UIView *rightAccessoryView;

/**
An object conforming to the `MGLCalloutViewDelegate` method that receives messages related to the callout view’s interactive subviews.
An object conforming to the `MGLCalloutViewDelegate` method that receives
messages related to the callout view’s interactive subviews.
*/
@property (nonatomic, weak) id<MGLCalloutViewDelegate> delegate;

/**
Presents a callout view by adding it to `inView` and pointing at the given rect of `inView`’s bounds. Constrains the callout to the bounds of the given view.
Presents a callout view by adding it to `view` and pointing at the given rect
of `view`’s bounds. Constrains the callout to the bounds of the given view.
*/
- (void)presentCalloutFromRect:(CGRect)rect inView:(UIView *)view constrainedToView:(UIView *)constrainedView animated:(BOOL)animated;

Expand All @@ -42,18 +46,42 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)dismissCalloutAnimated:(BOOL)animated;

@optional

/**
A Boolean value indicating whether the callout view should be anchored to
the corresponding annotation. You can adjust the callout view’s precise location by
overriding -[UIView setCenter:]. The callout view will not be anchored to the
annotation if this optional property is unimplemented.
*/
@property (nonatomic, readonly, assign, getter=isAnchoredToAnnotation) BOOL anchoredToAnnotation;

/**
A Boolean value indicating whether the callout view should be dismissed automatically
when the map view’s viewport changes. Note that a single tap on the map view
still dismisses the callout view regardless of the value of this property.
The callout view will be dismissed if this optional property is unimplemented.
*/
@property (nonatomic, readonly, assign) BOOL dismissesAutomatically;

@end

/**
The MGLCalloutViewDelegate protocol defines a set of optional methods that you can use to receive messages from an object that conforms to the MGLCalloutView protocol. The callout view uses these methods to inform the delegate that the user has interacted with the the callout view.
The `MGLCalloutViewDelegate` protocol defines a set of optional methods that
you can use to receive messages from an object that conforms to the
`MGLCalloutView` protocol. The callout view uses these methods to inform the
delegate that the user has interacted with the the callout view.
*/
@protocol MGLCalloutViewDelegate <NSObject>

@optional
/**
Returns a Boolean value indicating whether the entire callout view “highlights” when tapped. The default value is `YES`, which means the callout view highlights when tapped.
Returns a Boolean value indicating whether the entire callout view “highlights”
when tapped. The default value is `YES`, which means the callout view
highlights when tapped.
The return value of this method is ignored unless the delegate also responds to the `-calloutViewTapped` method.
The return value of this method is ignored unless the delegate also responds to
the `-calloutViewTapped` method.
*/
- (BOOL)calloutViewShouldHighlight:(UIView<MGLCalloutView> *)calloutView;

Expand All @@ -63,12 +91,14 @@ NS_ASSUME_NONNULL_BEGIN
- (void)calloutViewTapped:(UIView<MGLCalloutView> *)calloutView;

/**
Called before the callout view appears on screen, or before the appearance animation will start.
Called before the callout view appears on screen, or before the appearance
animation will start.
*/
- (void)calloutViewWillAppear:(UIView<MGLCalloutView> *)calloutView;

/**
Called after the callout view appears on screen, or after the appearance animation is complete.
Called after the callout view appears on screen, or after the appearance
animation is complete.
*/
- (void)calloutViewDidAppear:(UIView<MGLCalloutView> *)calloutView;

Expand Down
Loading

0 comments on commit b09e9d1

Please sign in to comment.