[osx] Rewrote platform-osx and osxapp

platform-osx now vends a real NSView subclass, MGLMapView, that is readily embedded inside a Cocoa application for OS X. MGLMapView is backed by an NSOpenGLLayer for optimal performance and integration with other layer-backed views. It supports keyboard shortcuts and several gestures and hosts attribution, zooming, and rotation controls as subviews. osxapp is now a bona fide Cocoa application that embeds MGLMapView inside a XIB. osxapp has preferences and a share button for tight integration with custom styles.

Enabling asynchronous rendering would be more consistent with iOS but increases CPU usage so much, even when idle, that it isn’t worth any performance gain. The bigger issue is that VAOs aren’t being used.

make xpackage creates a static library similar to the one created by make ipackage. make clean cleans additional places where build output ends up.

The OS X minimum deployment target has been increased from 10.9 to 10.10. osxapp’s window has a full size content view, which requires 10.10. Lightweight generics require iOS 9+ and OS X 10.11 regardless, because it was only in that release that Foundation collection classes started adopting lightweight generics.

Shuffled files around and refactored annotations so that iOS and OS X share a good chunk of the annotations code, which now takes advantage of polymorphism. MGLMapView can now display annotations but cannot yet select them. In osxapp, a long press drops a pin, and so does the map view’s context menu.

Annotations have NSPopovers as callouts, and their view controllers can be customized. Annotation image alignment rects are respected for hit testing purposes and for positioning the callout anchor. Callouts in osxapp demonstrate the use of bindings to keep callouts in sync with underlying model objects.

1 files changed, 0 insertions, 49 deletions

diff --git a/include/mbgl/ios/MGLTypes.h b/include/mbgl/ios/MGLTypes.h
deleted file mode 100644
index f36fc3f44e..0000000000
--- a/include/mbgl/ios/MGLTypes.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#pragma once
-
-#if !__has_feature(nullability)
-    #define NS_ASSUME_NONNULL_BEGIN
-    #define NS_ASSUME_NONNULL_END
-    #define nullable
-    #define nonnull
-    #define null_resettable
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-extern NSString * const MGLErrorDomain;
-
-/** The mode used to track the user location on the map. */
-typedef NS_ENUM(NSUInteger, MGLUserTrackingMode) {
-    /** The map does not follow the user location. */
-    MGLUserTrackingModeNone              = 0,
-    /** The map follows the user location. */
-    MGLUserTrackingModeFollow,
-    /** The map follows the user location and rotates when the heading changes. */
-    MGLUserTrackingModeFollowWithHeading,
-    /** The map follows the user location and rotates when the course changes. */
-    MGLUserTrackingModeFollowWithCourse,
-};
-
-NS_ASSUME_NONNULL_END
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wvariadic-macros"
-    #if __has_feature(objc_generics)
-        /** Inserts a type specifier for a pointer to a lightweight generic with the given collection and object classes. Use a `*` for any non-`id` object classes but no `*` for the collection class. */
-        #define NS_ARRAY_OF(ObjectClass...)                 NSArray <ObjectClass>
-        #define NS_MUTABLE_ARRAY_OF(ObjectClass...)         NSMutableArray <ObjectClass>
-        #define NS_SET_OF(ObjectClass...)                   NSSet <ObjectClass>
-        #define NS_MUTABLE_SET_OF(ObjectClass...)           NSMutableSet <ObjectClass>
-        #define NS_DICTIONARY_OF(ObjectClass...)            NSDictionary <ObjectClass>
-        #define NS_MUTABLE_DICTIONARY_OF(ObjectClass...)    NSMutableDictionary <ObjectClass>
-    #else
-        #define NS_ARRAY_OF(ObjectClass...)                 NSArray
-        #define NS_MUTABLE_ARRAY_OF(ObjectClass...)         NSMutableArray
-        #define NS_SET_OF(ObjectClass...)                   NSSet
-        #define NS_MUTABLE_SET_OF(ObjectClass...)           NSMutableSet
-        #define NS_DICTIONARY_OF(ObjectClass...)            NSDictionary
-        #define NS_MUTABLE_DICTIONARY_OF(ObjectClass...)    NSMutableDictionary
-    #endif
-#pragma clang diagnostic pop