-
Notifications
You must be signed in to change notification settings - Fork 515
MapKit macOS xcode14.0 beta1
Manuel de la Pena edited this page Aug 5, 2022
·
3 revisions
#MapKit.framework https://github.com/xamarin/xamarin-macios/pull/15562
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsRequest.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsRequest.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsRequest.h 2022-02-23 10:56:04.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsRequest.h 2022-05-31 15:02:19.000000000 -0400
@@ -11,6 +11,12 @@
NS_ASSUME_NONNULL_BEGIN
+API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos)
+typedef NS_ENUM(NSInteger, MKDirectionsRoutePreference) {
+ MKDirectionsRoutePreferenceAny = 0,
+ MKDirectionsRoutePreferenceAvoid
+};
+
NS_CLASS_AVAILABLE(10_9, 6_0) __TVOS_AVAILABLE(9_2) API_UNAVAILABLE(watchos)
@interface MKDirectionsRequest : NSObject
@@ -32,6 +38,9 @@
@property (nonatomic, copy, nullable) NSDate *departureDate NS_AVAILABLE(10_9, 7_0);
@property (nonatomic, copy, nullable) NSDate *arrivalDate NS_AVAILABLE(10_9, 7_0);
+@property (nonatomic) MKDirectionsRoutePreference tollPreference API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos); // Default is MKDirectionsRoutePreferenceAny
+@property (nonatomic) MKDirectionsRoutePreference highwayPreference API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos); // Default is MKDirectionsRoutePreferenceAny
+
@end
@interface MKDirectionsRequest (MKDirectionsURL)
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsResponse.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsResponse.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsResponse.h 2022-02-23 10:56:01.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKDirectionsResponse.h 2022-05-31 15:02:17.000000000 -0400
@@ -43,6 +43,10 @@
@property (nonatomic, readonly) NSArray<MKRouteStep *> *steps;
+@property (nonatomic, readonly) BOOL hasTolls API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos); // indicates if the route contains tolls
+
+@property (nonatomic, readonly) BOOL hasHighways API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos); // indicates if the route contains highways
+
@end
NS_CLASS_AVAILABLE(10_9, 7_0) __TVOS_AVAILABLE(9_2) API_UNAVAILABLE(watchos)
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKHybridMapConfiguration.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKHybridMapConfiguration.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKHybridMapConfiguration.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKHybridMapConfiguration.h 2022-05-31 15:02:18.000000000 -0400
@@ -0,0 +1,26 @@
+//
+// MKHybridMapConfiguration.h
+// MapKit
+//
+// Copyright © 2021 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKMapConfiguration.h>
+#import <MapKit/MKPointOfInterestFilter.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+MK_EXTERN
+API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos)
+@interface MKHybridMapConfiguration : MKMapConfiguration
+
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithLandscape:(MKMapLandscape)landscape; // To be removed; please use MKMapElevationStyle.
+- (instancetype)initWithElevationStyle:(MKMapElevationStyle)elevationStyle;
+
+@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter;
+@property (nonatomic) BOOL showsTraffic;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKImageryMapConfiguration.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKImageryMapConfiguration.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKImageryMapConfiguration.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKImageryMapConfiguration.h 2022-05-31 15:02:19.000000000 -0400
@@ -0,0 +1,22 @@
+//
+// MKImageryMapConfiguration.h
+// MapKit
+//
+// Copyright © 2021 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKMapConfiguration.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+MK_EXTERN
+API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos)
+@interface MKImageryMapConfiguration : MKMapConfiguration
+
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithLandscape:(MKMapLandscape)landscape; // To be removed; please use MKMapElevationStyle.
+- (instancetype)initWithElevationStyle:(MKMapElevationStyle)elevationStyle;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundScene.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundScene.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundScene.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundScene.h 2022-05-31 15:02:17.000000000 -0400
@@ -0,0 +1,20 @@
+//
+// MKLookAroundScene.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@interface MKLookAroundScene : NSObject <NSCopying>
+
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSceneRequest.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSceneRequest.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSceneRequest.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSceneRequest.h 2022-05-31 15:02:19.000000000 -0400
@@ -0,0 +1,36 @@
+//
+// MKLookAroundSceneRequest.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#import <CoreLocation/CLLocation.h>
+#import <MapKit/MKFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class MKLookAroundScene;
+@class MKMapItem;
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@interface MKLookAroundSceneRequest : NSObject
+
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
+
+- (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithMapItem:(MKMapItem *)mapItem NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
+@property (nonatomic, readonly, nullable) MKMapItem *mapItem;
+
+@property (nonatomic, readonly, getter=isCancelled) BOOL cancelled;
+@property (nonatomic, readonly, getter=isLoading) BOOL loading;
+
+- (void)getSceneWithCompletionHandler:(void (^)(MKLookAroundScene * _Nullable_result scene, NSError * _Nullable error))completionHandler NS_SWIFT_ASYNC_NAME(getter:scene());
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshot.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshot.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshot.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshot.h 2022-05-31 15:02:18.000000000 -0400
@@ -0,0 +1,29 @@
+//
+// MKLookAroundSnapshot.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKFoundation.h>
+
+#if TARGET_OS_IPHONE
+#import <UIKit/UIImage.h>
+#else
+#import <AppKit/NSImage.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@interface MKLookAroundSnapshot : NSObject
+
+#if TARGET_OS_OSX
+@property (nonatomic, readonly) NSImage *image;
+#else
+@property (nonatomic, readonly) UIImage *image;
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotOptions.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotOptions.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotOptions.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotOptions.h 2022-05-31 15:02:17.000000000 -0400
@@ -0,0 +1,32 @@
+//
+// MKLookAroundSnapshotOptions.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKFoundation.h>
+#import <MapKit/MKGeometry.h>
+
+#if TARGET_OS_IPHONE
+#import <UIKit/UITraitCollection.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class MKPointOfInterestFilter;
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@interface MKLookAroundSnapshotOptions : NSObject
+
+@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter;
+// The size of the image to create. Defaults to 256x256
+@property (nonatomic, assign) CGSize size;
+#if TARGET_OS_IPHONE
+// Set traitCollection.displayScale to specify the scale factor to use when creating the image
+@property (nonatomic, copy) UITraitCollection *traitCollection;
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotter.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotter.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotter.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundSnapshotter.h 2022-05-31 15:02:17.000000000 -0400
@@ -0,0 +1,32 @@
+//
+// MKLookAroundSnapshotter.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class MKLookAroundScene;
+@class MKLookAroundSnapshot;
+@class MKLookAroundSnapshotOptions;
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@interface MKLookAroundSnapshotter : NSObject
+
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
+
+- (instancetype)initWithScene:(MKLookAroundScene *)scene options:(MKLookAroundSnapshotOptions *)options NS_DESIGNATED_INITIALIZER;
+
+// defaults to the main queue
+- (void)getSnapshotWithCompletionHandler:(void (^)(MKLookAroundSnapshot * _Nullable snapshot, NSError * _Nullable error))completionHandler NS_SWIFT_ASYNC_NAME(getter:snapshot());
+- (void)cancel;
+
+@property (nonatomic, readonly, getter=isLoading) BOOL loading;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundViewController.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundViewController.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundViewController.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKLookAroundViewController.h 2022-05-31 15:02:18.000000000 -0400
@@ -0,0 +1,64 @@
+//
+// MKLookAroundViewController.h
+// MapKit
+//
+// Copyright © 2022 Apple, Inc. All rights reserved.
+//
+
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#else
+#import <AppKit/AppKit.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class MKLookAroundScene;
+@class MKPointOfInterestFilter;
+
+@protocol MKLookAroundViewControllerDelegate;
+
+typedef NS_ENUM(NSInteger, MKLookAroundBadgePosition) {
+ MKLookAroundBadgePositionTopLeading = 0,
+ MKLookAroundBadgePositionTopTrailing,
+ MKLookAroundBadgePositionBottomTrailing,
+} API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos);
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+#if TARGET_OS_IPHONE
+@interface MKLookAroundViewController : UIViewController <NSSecureCoding, NSCoding>
+#else
+@interface MKLookAroundViewController : NSViewController <NSSecureCoding, NSCoding>
+#endif
+
+- (instancetype)initWithScene:(MKLookAroundScene *)scene NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, weak, nullable) IBOutlet id <MKLookAroundViewControllerDelegate> delegate;
+
+@property (nonatomic, copy, nullable) MKLookAroundScene *scene;
+
+// Defaults to YES
+@property (nonatomic, assign, getter=isNavigationEnabled) BOOL navigationEnabled;
+
+// Defaults to YES
+@property (nonatomic, assign) BOOL showsRoadLabels;
+
+@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter;
+
+// Defaults to MKLookAroundBadgePositionTopLeading
+@property (nonatomic, assign) MKLookAroundBadgePosition badgePosition;
+
+@end
+
+API_AVAILABLE(ios(16.0), macos(13.0)) API_UNAVAILABLE(watchos, tvos)
+@protocol MKLookAroundViewControllerDelegate <NSObject>
+
+@optional
+- (void)lookAroundViewControllerWillUpdateScene:(MKLookAroundViewController *)viewController;
+- (void)lookAroundViewControllerDidUpdateScene:(MKLookAroundViewController *)viewController;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapCamera.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapCamera.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapCamera.h 2022-02-23 10:56:03.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapCamera.h 2022-05-31 15:02:18.000000000 -0400
@@ -13,6 +13,8 @@
#import <CoreLocation/CoreLocation.h>
#import <CoreGraphics/CoreGraphics.h>
+@class MKMapItem;
+
NS_ASSUME_NONNULL_BEGIN
NS_CLASS_AVAILABLE(10_9, 7_0) __TVOS_AVAILABLE(9_2) API_UNAVAILABLE(watchos)
@@ -35,6 +37,9 @@
pitch:(CGFloat)pitch
heading:(CLLocationDirection)heading NS_AVAILABLE(10_11, 9_0);
++ (instancetype)cameraLookingAtMapItem:(MKMapItem *)mapItem
+ forViewSize:(CGSize)viewSize
+ allowPitch:(BOOL)allowPitch API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos);
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapConfiguration.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapConfiguration.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapConfiguration.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapConfiguration.h 2022-05-31 15:02:18.000000000 -0400
@@ -0,0 +1,37 @@
+//
+// MKMapConfiguration.h
+// MapKit
+//
+// Copyright © 2021 Apple, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// To be removed; please use MKMapElevationStyle.
+typedef NS_ENUM(NSInteger, MKMapLandscape) {
+ MKMapLandscapeDefault = 0,
+ MKMapLandscapeDetailed,
+};
+
+API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos)
+typedef NS_ENUM(NSInteger, MKMapElevationStyle) {
+ MKMapElevationStyleFlat = 0,
+ MKMapElevationStyleRealistic,
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+MK_EXTERN
+API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos)
+@interface MKMapConfiguration : NSObject <NSSecureCoding, NSCopying>
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@property (nonatomic) MKMapLandscape landscape; // To be removed; please use MKMapElevationStyle.
+@property (nonatomic) MKMapElevationStyle elevationStyle;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapView.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapView.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapView.h 2022-02-23 10:56:02.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKMapView.h 2022-06-03 18:08:52.000000000 -0400
@@ -18,12 +18,17 @@
#import <MapKit/MKOverlayView.h>
#endif
+#if TARGET_OS_IOS
+#import <MapKit/MKMapFeatureAnnotation.h>
+#endif
+
@class MKUserLocation;
@class MKMapCamera;
@class MKMapCameraZoomRange;
@class MKMapCameraBoundary;
@class MKClusterAnnotation;
@class MKPointOfInterestFilter;
+@class MKMapConfiguration;
@protocol MKMapViewDelegate;
@@ -35,6 +40,14 @@
MKUserTrackingModeFollowWithHeading API_UNAVAILABLE(macos) API_UNAVAILABLE(tvos), // the map follows the user's location and heading
} API_AVAILABLE(ios(5.0), tvos(9.2), macos(11.0)) API_UNAVAILABLE(watchos);
+#if TARGET_OS_IOS
+typedef NS_OPTIONS(NSInteger, MKMapFeatureOptions) {
+ MKMapFeatureOptionPointsOfInterest = 1 << MKMapFeatureTypePointOfInterest,
+ MKMapFeatureOptionTerritories = 1 << MKMapFeatureTypeTerritory,
+ MKMapFeatureOptionPhysicalFeatures = 1 << MKMapFeatureTypePhysicalFeature,
+} API_AVAILABLE(ios(16.0)) API_UNAVAILABLE(macos, tvos, watchos);
+#endif
+
MK_EXTERN NSString * const MKMapViewDefaultAnnotationViewReuseIdentifier NS_AVAILABLE(10_13, 11_0) __TVOS_AVAILABLE(11_0);
MK_EXTERN NSString * const MKMapViewDefaultClusterAnnotationViewReuseIdentifier NS_AVAILABLE(10_13, 11_0) __TVOS_AVAILABLE(11_0);
@@ -50,7 +63,14 @@
// Changing the map type or region can cause the map to start loading map content.
// The loading delegate methods will be called as map content is loaded.
-@property (nonatomic) MKMapType mapType;
+@property (nonatomic) MKMapType mapType API_DEPRECATED_WITH_REPLACEMENT("Use respective MKMapConfiguration", macos(10.9, API_TO_BE_DEPRECATED), ios(3.0, API_TO_BE_DEPRECATED), tvos(9.2, API_TO_BE_DEPRECATED));
+
+@property (nonatomic, copy) MKMapConfiguration *configuration; // To be removed
+@property (nonatomic, copy) MKMapConfiguration *preferredConfiguration API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos);
+
+#if TARGET_OS_IOS
+@property (nonatomic) MKMapFeatureOptions selectableMapFeatures API_AVAILABLE(ios(16.0)) API_UNAVAILABLE(macos, tvos, watchos);
+#endif
// Region is the coordinate and span of the map.
// Region may be modified to fit the aspect ratio of the view using regionThatFits:.
@@ -114,10 +134,10 @@
@property (nonatomic) BOOL showsCompass NS_AVAILABLE(10_9, 9_0) API_UNAVAILABLE(tvos);
@property (nonatomic) BOOL showsScale NS_AVAILABLE(10_10, 9_0);
-@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter API_AVAILABLE(ios(13.0), macos(10.15), tvos(13.0)) API_UNAVAILABLE(watchos);
+@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter API_DEPRECATED_WITH_REPLACEMENT("Use pointOfInterestFilter on respective MKMapConfiguration", macos(10.15, API_TO_BE_DEPRECATED), ios(13.0, API_TO_BE_DEPRECATED), tvos(13.0, API_TO_BE_DEPRECATED)) API_UNAVAILABLE(watchos);
@property (nonatomic) BOOL showsPointsOfInterest API_DEPRECATED("Use pointOfInterestFilter", macos(10.9, 10.15), ios(7.0, 13.0), tvos(9.0, 13.0)) API_UNAVAILABLE(watchos); // Affects MKMapTypeStandard and MKMapTypeHybrid
-@property (nonatomic) BOOL showsBuildings NS_AVAILABLE(10_9, 7_0); // Affects MKMapTypeStandard
-@property (nonatomic) BOOL showsTraffic NS_AVAILABLE(10_11, 9_0); // Affects MKMapTypeStandard and MKMapTypeHybrid
+@property (nonatomic) BOOL showsBuildings API_DEPRECATED("None", macos(10.9, API_TO_BE_DEPRECATED), ios(7.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED)); // Affects MKMapTypeStandard
+@property (nonatomic) BOOL showsTraffic API_DEPRECATED_WITH_REPLACEMENT("Use showsTraffic on respective MKMapConfiguration", macos(10.11, API_TO_BE_DEPRECATED), ios(9.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED)); // Affects MKMapTypeStandard and MKMapTypeHybrid
// Set to YES to add the user location annotation to the map and start updating its location
@property (nonatomic) BOOL showsUserLocation;
@@ -203,7 +223,7 @@
- (MKOverlayView *)viewForOverlay:(id <MKOverlay>)overlay API_DEPRECATED_WITH_REPLACEMENT("-rendererForOverlay:", ios(4.0, 13.0)) API_UNAVAILABLE(macos, tvos, watchos);
#endif
-// These methods operate implicitly on overlays in MKOverlayLevelAboveLabels and may be deprecated in a future release in favor of the methods that specify the level.
+// These methods operate implicitly on overlays in MKOverlayLevelAboveRoads and may be deprecated in a future release in favor of the methods that specify the level.
- (void)addOverlay:(id <MKOverlay>)overlay NS_AVAILABLE(10_9, 4_0);
- (void)addOverlays:(NSArray<id<MKOverlay>> *)overlays NS_AVAILABLE(10_9, 4_0);
@@ -246,6 +266,9 @@
- (void)mapView:(MKMapView *)mapView didSelectAnnotationView:(MKAnnotationView *)view NS_AVAILABLE(10_9, 4_0);
- (void)mapView:(MKMapView *)mapView didDeselectAnnotationView:(MKAnnotationView *)view NS_AVAILABLE(10_9, 4_0);
+- (void)mapView:(MKMapView *)mapView didSelectAnnotation:(id<MKAnnotation>)annotation API_AVAILABLE(ios(16.0)) API_UNAVAILABLE(macos, tvos, watchos);
+- (void)mapView:(MKMapView *)mapView didDeselectAnnotation:(id<MKAnnotation>)annotation API_AVAILABLE(ios(16.0)) API_UNAVAILABLE(macos, tvos, watchos);
+
- (void)mapViewWillStartLocatingUser:(MKMapView *)mapView NS_AVAILABLE(10_9, 4_0);
- (void)mapViewDidStopLocatingUser:(MKMapView *)mapView NS_AVAILABLE(10_9, 4_0);
- (void)mapView:(MKMapView *)mapView didUpdateUserLocation:(MKUserLocation *)userLocation NS_AVAILABLE(10_9, 4_0);
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKOverlayRenderer.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKOverlayRenderer.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKOverlayRenderer.h 2022-02-23 10:56:03.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKOverlayRenderer.h 2022-05-31 15:02:19.000000000 -0400
@@ -49,6 +49,8 @@
@property (atomic, readonly) CGFloat contentScaleFactor;
+@property (nonatomic, assign) CGBlendMode blendMode API_AVAILABLE(ios(16.0), tvos(16.0)) API_UNAVAILABLE(macos, watchos) API_UNAVAILABLE(macCatalyst);
+
@end
// Road widths are typically not drawn to scale on the map. This function
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKPinAnnotationView.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKPinAnnotationView.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKPinAnnotationView.h 2022-02-23 10:56:04.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKPinAnnotationView.h 2022-05-31 15:02:19.000000000 -0400
@@ -19,7 +19,7 @@
NS_ASSUME_NONNULL_BEGIN
-API_DEPRECATED_WITH_REPLACEMENT("MKMarkerAnnotationView", macos(10.9, API_TO_BE_DEPRECATED), ios(3.0, API_TO_BE_DEPRECATED), tvos(9.2, API_TO_BE_DEPRECATED))
+API_DEPRECATED_WITH_REPLACEMENT("MKMarkerAnnotationView", macos(10.9, 13.0), ios(3.0, 16.0), tvos(9.2, 16.0))
API_UNAVAILABLE(watchos)
@interface MKPinAnnotationView : MKAnnotationView
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKStandardMapConfiguration.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKStandardMapConfiguration.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKStandardMapConfiguration.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MKStandardMapConfiguration.h 2022-05-31 15:02:20.000000000 -0400
@@ -0,0 +1,48 @@
+//
+// MKStandardMapConfiguration.h
+// MapKit
+//
+// Copyright © 2021 Apple, Inc. All rights reserved.
+//
+
+#import <MapKit/MKMapConfiguration.h>
+#import <MapKit/MKPointOfInterestFilter.h>
+
+// To be removed
+typedef NS_ENUM(NSInteger, MKStandardMapConfigurationMapMode) {
+ MKStandardMapConfigurationMapModeDefault = 0,
+ MKStandardMapConfigurationMapModeMuted,
+};
+
+API_AVAILABLE(ios(16.0), tvos(16.0), macos(13.0)) API_UNAVAILABLE(watchos)
+typedef NS_ENUM(NSInteger, MKStandardMapEmphasisStyle) {
+ MKStandardMapEmphasisStyleDefault = 0,
+ MKStandardMapEmphasisStyleMuted,
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+MK_EXTERN
+API_AVAILABLE(ios(16.0), macos(13.0), tvos(16.0)) API_UNAVAILABLE(watchos)
+@interface MKStandardMapConfiguration : MKMapConfiguration
+
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithElevationStyle:(MKMapElevationStyle)elevationStyle;
+- (instancetype)initWithElevationStyle:(MKMapElevationStyle)elevationStyle emphasisStyle:(MKStandardMapEmphasisStyle)emphasisStyle;
+- (instancetype)initWithEmphasisStyle:(MKStandardMapEmphasisStyle)emphasisStyle;
+
+@property (nonatomic) MKStandardMapEmphasisStyle emphasisStyle;
+@property (nonatomic, copy, nullable) MKPointOfInterestFilter *pointOfInterestFilter;
+@property (nonatomic) BOOL showsTraffic;
+
+- (instancetype)initWithMapMode:(MKStandardMapConfigurationMapMode)mode;
+- (instancetype)initWithMapMode:(MKStandardMapConfigurationMapMode)mode landscape:(MKMapLandscape)landscape; // To be removed; please use MKMapElevationStyle.
+- (instancetype)initWithMapMode:(MKStandardMapConfigurationMapMode)mode elevationStyle:(MKMapElevationStyle)elevationStyle;
+@property (nonatomic) MKStandardMapConfigurationMapMode mode;
+@property (nonatomic) BOOL showsBuildings; // To be removed
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.apinotes /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.apinotes
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.apinotes 2022-02-23 02:01:45.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.apinotes 2022-05-28 00:58:03.000000000 -0400
@@ -23,6 +23,12 @@
SwiftName: MKLocalSearch.Request
- Name: MKLocalSearchResponse
SwiftName: MKLocalSearch.Response
+- Name: MKLookAroundBadgePosition
+ SwiftName: MKLookAroundViewController.BadgePosition
+- Name: MKLookAroundSnapshot
+ SwiftName: MKLookAroundSnapshotter.Snapshot
+- Name: MKLookAroundSnapshotOptions
+ SwiftName: MKLookAroundSnapshotter.Options
- Name: MKMapSnapshot
SwiftName: MKMapSnapshotter.Snapshot
- Name: MKMapSnapshotOptions
@@ -185,6 +191,18 @@
SwiftName: MKLocalSearchCompleter.ResultType
- Name: MKLocalSearchResultType
SwiftName: MKLocalSearch.ResultType
+- Name: MKStandardMapConfigurationMapMode
+ SwiftName: MKStandardMapConfiguration.MapMode
+- Name: MKMapLandscape
+ SwiftName: MKMapConfiguration.MapLandscape
+- Name: MKStandardMapEmphasisStyle
+ SwiftName: MKStandardMapConfiguration.EmphasisStyle
+- Name: MKMapElevationStyle
+ SwiftName: MKMapConfiguration.ElevationStyle
+- Name: MKDirectionsRoutePreference
+ SwiftName: MKDirections.RoutePreference
+- Name: MKMapFeatureType
+ SwiftName: MKMapFeatureAnnotation.FeatureType
Typedefs:
- Name: MKDirectionsHandler
SwiftName: MKDirections.DirectionsHandler
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.h 2022-02-12 07:50:32.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/MapKit.framework/Headers/MapKit.h 2022-05-21 08:47:57.000000000 -0400
@@ -63,6 +63,10 @@
#import <MapKit/MKPointOfInterestFilter.h>
#import <MapKit/MKPitchControl.h>
#import <MapKit/MKZoomControl.h>
+#import <MapKit/MKHybridMapConfiguration.h>
+#import <MapKit/MKImageryMapConfiguration.h>
+#import <MapKit/MKMapConfiguration.h>
+#import <MapKit/MKStandardMapConfiguration.h>
#if TARGET_OS_IPHONE
#import <MapKit/MKReverseGeocoder.h>
@@ -75,8 +79,25 @@
#import <MapKit/MKUserTrackingBarButtonItem.h>
#endif // TARGET_OS_IPHONE
+#if TARGET_OS_IOS
+#import <MapKit/MKIconStyle.h>
+#import <MapKit/MKMapFeatureAnnotation.h>
+#import <MapKit/MKMapItemRequest.h>
+#endif
+
#if TARGET_OS_IOS || TARGET_OS_MACCATALYST || TARGET_OS_TV
#import <MapKit/MKUserTrackingButton.h>
#endif // TARGET_OS_IOS || TARGET_OS_MACCATALYST || TARGET_OS_TV
+#if (TARGET_OS_IOS || TARGET_OS_MACCATALYST || TARGET_OS_OSX)
+
+#import <MapKit/MKLookAroundScene.h>
+#import <MapKit/MKLookAroundSceneRequest.h>
+#import <MapKit/MKLookAroundSnapshot.h>
+#import <MapKit/MKLookAroundSnapshotOptions.h>
+#import <MapKit/MKLookAroundSnapshotter.h>
+#import <MapKit/MKLookAroundViewController.h>
+
+#endif // (TARGET_OS_IOS || TARGET_OS_MACCATALYST || TARGET_OS_OSX)
+
#endif // __has_include(<MapKit/MKMapView.h>)
- README
- xcode13.0 Binding Status
- xcode13.1 Binding Status
- xcode13.2 Binding Status
- xcode13.3 Binding Status
- xcode13.4 Binding Status
- xcode14.0 Binding Status
- xcode14.1 Binding Status
- xcode14.2 Binding Status
- xcode14.3 Binding Status
- xcode15.0 Binding Status
- xcode15.1 Binding Status
- xcode15.3 Binding Status
- xcode15.4 Binding Status
- xcode16.0 Binding Status
- xcode16.1 Binding Status
- xcode16.2 Binding Status