diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-02-26 16:13:19 -0800 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-03-28 15:05:26 -0700 |
commit | fe301f461071fedc8392103630792fa600a2359c (patch) | |
tree | 8348cefd204811afbad1ec91e870e8e1e6c985e1 | |
parent | 9a69b3a2a5aad733343f15c978b9394fb721b7a2 (diff) | |
download | qtlocation-mapboxgl-fe301f461071fedc8392103630792fa600a2359c.tar.gz |
[ios, macos] Add Mapbox Maps SDK events manager.
-rw-r--r-- | platform/darwin/src/MGLEventsManager.h | 22 | ||||
-rw-r--r-- | platform/darwin/src/MGLEventsManager.m | 27 | ||||
-rw-r--r-- | platform/darwin/src/MGLEventsManager_Private.h | 11 | ||||
-rw-r--r-- | platform/darwin/src/MGLNetworkConfiguration.h | 4 | ||||
-rw-r--r-- | platform/darwin/src/MGLNetworkConfiguration.m | 10 | ||||
-rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 18 | ||||
-rw-r--r-- | platform/ios/sdk-files.json | 3 | ||||
-rw-r--r-- | platform/ios/src/Mapbox.h | 2 | ||||
-rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 12 | ||||
-rw-r--r-- | platform/macos/sdk-files.json | 3 | ||||
-rw-r--r-- | platform/macos/src/Mapbox.h | 2 |
11 files changed, 101 insertions, 13 deletions
diff --git a/platform/darwin/src/MGLEventsManager.h b/platform/darwin/src/MGLEventsManager.h new file mode 100644 index 0000000000..a8d92ebd77 --- /dev/null +++ b/platform/darwin/src/MGLEventsManager.h @@ -0,0 +1,22 @@ +#import <Foundation/Foundation.h> +#import "MGLFoundation.h" + +NS_ASSUME_NONNULL_BEGIN + +typedef void (^MGLEventHandler)(NSString *eventName, NSDictionary *attributes); + +MGL_EXPORT +@interface MGLEventsManager : NSObject + +/** + Returns the shared logging object. + */ +@property (class, nonatomic, readonly) MGLEventsManager *sharedManager; + +@property (nonatomic, copy, nullable) MGLEventHandler handler; + +@property (nonatomic, assign) BOOL shouldHandleEvents; + +@end + +NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLEventsManager.m b/platform/darwin/src/MGLEventsManager.m new file mode 100644 index 0000000000..f46a3196a6 --- /dev/null +++ b/platform/darwin/src/MGLEventsManager.m @@ -0,0 +1,27 @@ +#import "MGLEventsManager_Private.h" +#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR +#import "MGLMapboxEvents.h" +#endif + +@implementation MGLEventsManager + ++ (instancetype)sharedManager +{ + static dispatch_once_t once; + static id sharedConfiguration; + dispatch_once(&once, ^{ + sharedConfiguration = [[self alloc] init]; + }); + return sharedConfiguration; +} + +- (void)handleEvent:(NSString *)eventName withAttributes:(NSDictionary *)attributes { +#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR + [MGLMapboxEvents pushEvent:eventName withAttributes:attributes]; +#endif + if (self.shouldHandleEvents && self.handler) { + self.handler(eventName, attributes); + } +} + +@end diff --git a/platform/darwin/src/MGLEventsManager_Private.h b/platform/darwin/src/MGLEventsManager_Private.h new file mode 100644 index 0000000000..f51768ecb1 --- /dev/null +++ b/platform/darwin/src/MGLEventsManager_Private.h @@ -0,0 +1,11 @@ +#import "MGLEventsManager.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MGLEventsManager (Private) + +- (void)handleEvent:(NSString *)eventName withAttributes:(NSDictionary *)attributes; + +@end + +NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLNetworkConfiguration.h b/platform/darwin/src/MGLNetworkConfiguration.h index e14298f203..6c56050aae 100644 --- a/platform/darwin/src/MGLNetworkConfiguration.h +++ b/platform/darwin/src/MGLNetworkConfiguration.h @@ -2,8 +2,6 @@ #import "MGLFoundation.h" -@protocol MGLMapboxEventsDelegate; - NS_ASSUME_NONNULL_BEGIN /** @@ -34,8 +32,6 @@ MGL_EXPORT */ @property (atomic, strong, null_resettable) NSURLSessionConfiguration *sessionConfiguration; -@property (nonatomic, weak, nullable) id<MGLMapboxEventsDelegate> eventsDelegate; - @end NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLNetworkConfiguration.m b/platform/darwin/src/MGLNetworkConfiguration.m index 00786786d0..5a62a7497b 100644 --- a/platform/darwin/src/MGLNetworkConfiguration.m +++ b/platform/darwin/src/MGLNetworkConfiguration.m @@ -1,6 +1,5 @@ #import "MGLNetworkConfiguration_Private.h" -#import "MGLMapboxEventsDelegate.h" - +#import "MGLEventsManager_Private.h" NSString * const kMGLDownloadPerformanceEvent = @"mobile.performance_trace"; static NSString * const MGLStartTime = @"start_time"; @@ -73,11 +72,8 @@ static NSString * const MGLResourceType = @"resource_type"; - (void)sendEventForURL:(NSString *)urlString withAction:(NSString *)action { if (urlString && [self.events objectForKey:urlString]) { - if ([self.eventsDelegate shouldReceiveEvents]) - { - NSDictionary *eventAttributes = [self eventAttributesForURL:urlString withAction:action]; - [self.eventsDelegate didReceiveEvent:kMGLDownloadPerformanceEvent withAttributes:eventAttributes]; - } + NSDictionary *eventAttributes = [self eventAttributesForURL:urlString withAction:action]; + [[MGLEventsManager sharedManager] handleEvent:kMGLDownloadPerformanceEvent withAttributes:eventAttributes]; [self.events removeObjectForKey:urlString]; } } diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 806afa838c..3e9e8e72bd 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -64,7 +64,13 @@ 1FF48587223710BE00F19727 /* MGLAttributedExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF48585223710BE00F19727 /* MGLAttributedExpression.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FF48588223710BE00F19727 /* MGLAttributedExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF48585223710BE00F19727 /* MGLAttributedExpression.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FF48589223710BE00F19727 /* MGLAttributedExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FF48586223710BE00F19727 /* MGLAttributedExpression.m */; }; + 1FCCEC34222605C400302E3B /* MGLEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC32222605C400302E3B /* MGLEventsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1FCCEC35222605C400302E3B /* MGLEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC32222605C400302E3B /* MGLEventsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1FCCEC36222605C400302E3B /* MGLEventsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCCEC33222605C400302E3B /* MGLEventsManager.m */; }; + 1FCCEC37222605C400302E3B /* MGLEventsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCCEC33222605C400302E3B /* MGLEventsManager.m */; }; + 1FCCEC3A222607A500302E3B /* MGLEventsManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC38222607A500302E3B /* MGLEventsManager_Private.h */; }; 1FF4858A223710BE00F19727 /* MGLAttributedExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FF48586223710BE00F19727 /* MGLAttributedExpression.m */; }; + 1FCCEC3B222607A500302E3B /* MGLEventsManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC38222607A500302E3B /* MGLEventsManager_Private.h */; }; 30E578171DAA85520050F07E /* UIImage+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 30E578111DAA7D690050F07E /* UIImage+MGLAdditions.h */; }; 30E578181DAA85520050F07E /* UIImage+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 30E578111DAA7D690050F07E /* UIImage+MGLAdditions.h */; }; 30E578191DAA855E0050F07E /* UIImage+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 30E578121DAA7D690050F07E /* UIImage+MGLAdditions.mm */; }; @@ -887,6 +893,9 @@ 1FCAE2A020B872A400C577DD /* MGLLocationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLLocationManager.h; sourceTree = "<group>"; }; 1FCAE2A120B872A400C577DD /* MGLLocationManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLLocationManager.m; sourceTree = "<group>"; }; 1FCAE2A620B88B3800C577DD /* MGLLocationManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLLocationManager_Private.h; sourceTree = "<group>"; }; + 1FCCEC32222605C400302E3B /* MGLEventsManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLEventsManager.h; sourceTree = "<group>"; }; + 1FCCEC33222605C400302E3B /* MGLEventsManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLEventsManager.m; sourceTree = "<group>"; }; + 1FCCEC38222607A500302E3B /* MGLEventsManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLEventsManager_Private.h; sourceTree = "<group>"; }; 1FDB00C721F8F14E00D21389 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; }; 1FDB00C821F8F14F00D21389 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Foundation.strings; sourceTree = "<group>"; }; 1FDB00C921F8F15000D21389 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Foundation.stringsdict; sourceTree = "<group>"; }; @@ -2089,8 +2098,11 @@ DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */, DAF0D8171DFE6B2800B28378 /* MGLAttributionInfo_Private.h */, DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */, + 1FCCEC32222605C400302E3B /* MGLEventsManager.h */, 1FF48585223710BE00F19727 /* MGLAttributedExpression.h */, 1FF48586223710BE00F19727 /* MGLAttributedExpression.m */, + 1FCCEC38222607A500302E3B /* MGLEventsManager_Private.h */, + 1FCCEC33222605C400302E3B /* MGLEventsManager.m */, 556660C91E1BF3A900E2C41B /* MGLFoundation.h */, 558DE79E1E5615E400C7916D /* MGLFoundation_Private.h */, 558DE79F1E5615E400C7916D /* MGLFoundation.mm */, @@ -2424,6 +2436,7 @@ 3510FFF01D6D9D8C00F413B2 /* NSExpression+MGLAdditions.h in Headers */, 74CB5EBF219B280400102936 /* MGLHeatmapStyleLayer_Private.h in Headers */, 1FC4817D2098CBC0000D09B4 /* NSPredicate+MGLPrivateAdditions.h in Headers */, + 1FCCEC3A222607A500302E3B /* MGLEventsManager_Private.h in Headers */, 1F2B94C0221636D900210640 /* MGLNetworkConfiguration_Private.h in Headers */, 353AFA141D65AB17005A69F4 /* NSDate+MGLAdditions.h in Headers */, DA8848531CBAFB9800AB86E3 /* MGLCompactCalloutView.h in Headers */, @@ -2460,6 +2473,7 @@ 35D3A1E61E9BE7EB002B38EE /* MGLScaleBar.h in Headers */, 0778DD431F67556700A73B34 /* MGLComputedShapeSource.h in Headers */, 9C188C502242C96F0022FA55 /* MMEDate.h in Headers */, + 1FCCEC34222605C400302E3B /* MGLEventsManager.h in Headers */, 1F6A82A221360F9D00BA5B41 /* MGLLoggingConfiguration.h in Headers */, AC1B0916221CA14D00DB56C8 /* CLLocationManager+MMEMobileEvents.h in Headers */, DA8848311CBAFA6200AB86E3 /* NSString+MGLAdditions.h in Headers */, @@ -2633,6 +2647,7 @@ DABFB86D1CBE9A0F00D62B32 /* MGLAnnotationImage.h in Headers */, DABFB8721CBE9A0F00D62B32 /* MGLUserLocation.h in Headers */, 92FC0AED207CEE16007B6B54 /* MGLShapeOfflineRegion_Private.h in Headers */, + 1FCCEC35222605C400302E3B /* MGLEventsManager.h in Headers */, 927FBD001F4DB05500F8BF1F /* MGLMapSnapshotter.h in Headers */, 3566C7721D4A9198008152BC /* MGLSource_Private.h in Headers */, 353933FF1D3FB7DD003F57D7 /* MGLSymbolStyleLayer.h in Headers */, @@ -2728,6 +2743,7 @@ 353933F91D3FB79F003F57D7 /* MGLLineStyleLayer.h in Headers */, 96E516EB2000560B00A02306 /* MGLUserLocation_Private.h in Headers */, 35D13AB81D3D15E300AFB4E0 /* MGLStyleLayer.h in Headers */, + 1FCCEC3B222607A500302E3B /* MGLEventsManager_Private.h in Headers */, 35136D4D1D4277FC00C20EFD /* MGLSource.h in Headers */, DA35A2BC1CCA9A6900E826B2 /* MGLClockDirectionFormatter.h in Headers */, 96E516E82000560B00A02306 /* MGLAnnotationContainerView_Private.h in Headers */, @@ -3251,6 +3267,7 @@ 0778DD441F67556C00A73B34 /* MGLComputedShapeSource.mm in Sources */, 3557F7B21E1D27D300CCA5E6 /* MGLDistanceFormatter.m in Sources */, 40834C4B1FE05F7500C1BD0D /* TSKPinningValidatorResult.m in Sources */, + 1FCCEC36222605C400302E3B /* MGLEventsManager.m in Sources */, ACA65F472140669000537748 /* MMETrustKitProvider.m in Sources */, 40834BE71FE05E1800C1BD0D /* MMEAPIClient.m in Sources */, DA8848591CBAFB9800AB86E3 /* MGLMapView.mm in Sources */, @@ -3388,6 +3405,7 @@ DAA4E41D1CBB730400178DFB /* MGLGeometry.mm in Sources */, 40834C581FE05F7600C1BD0D /* TSKPinningValidatorResult.m in Sources */, 40834BFB1FE05E1800C1BD0D /* MMEAPIClient.m in Sources */, + 1FCCEC37222605C400302E3B /* MGLEventsManager.m in Sources */, ACA65F482140669100537748 /* MMETrustKitProvider.m in Sources */, DAA4E41F1CBB730400178DFB /* MGLMultiPoint.mm in Sources */, DD0902AA1DB1929D00C5BDCE /* MGLNetworkConfiguration.m in Sources */, diff --git a/platform/ios/sdk-files.json b/platform/ios/sdk-files.json index 67142a8f55..aaeba33061 100644 --- a/platform/ios/sdk-files.json +++ b/platform/ios/sdk-files.json @@ -65,6 +65,7 @@ "platform/darwin/src/MGLComputedShapeSource.mm", "platform/darwin/src/MGLDistanceFormatter.m", "platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorResult.m", + "platform/darwin/src/MGLEventsManager.m", "platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETrustKitProvider.m", "platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEAPIClient.m", "platform/ios/src/MGLMapView.mm", @@ -162,6 +163,7 @@ "MGLVectorStyleLayer.h": "platform/darwin/src/MGLVectorStyleLayer.h", "MGLNetworkConfiguration.h": "platform/darwin/src/MGLNetworkConfiguration.h", "MGLComputedShapeSource.h": "platform/darwin/src/MGLComputedShapeSource.h", + "MGLEventsManager.h": "platform/darwin/src/MGLEventsManager.h", "MGLLoggingConfiguration.h": "platform/darwin/src/MGLLoggingConfiguration.h", "MGLLocationManager.h": "platform/darwin/src/MGLLocationManager.h", "MGLRasterDEMSource.h": "platform/darwin/src/MGLRasterDEMSource.h", @@ -224,6 +226,7 @@ "MGLStyle_Private.h": "platform/darwin/src/MGLStyle_Private.h", "MGLHeatmapStyleLayer_Private.h": "platform/darwin/src/MGLHeatmapStyleLayer_Private.h", "NSPredicate+MGLPrivateAdditions.h": "platform/darwin/src/NSPredicate+MGLPrivateAdditions.h", + "MGLEventsManager_Private.h": "platform/darwin/src/MGLEventsManager_Private.h", "MGLNetworkConfiguration_Private.h": "platform/darwin/src/MGLNetworkConfiguration_Private.h", "NSDate+MGLAdditions.h": "platform/darwin/src/NSDate+MGLAdditions.h", "MGLCompactCalloutView.h": "platform/ios/src/MGLCompactCalloutView.h", diff --git a/platform/ios/src/Mapbox.h b/platform/ios/src/Mapbox.h index f9998225dd..6577f809ef 100644 --- a/platform/ios/src/Mapbox.h +++ b/platform/ios/src/Mapbox.h @@ -73,4 +73,4 @@ FOUNDATION_EXPORT MGL_EXPORT const unsigned char MapboxVersionString[]; #import "MGLLoggingConfiguration.h" #import "MGLNetworkConfiguration.h" #import "MGLAttributedExpression.h" -#import "MGLMapboxEventsDelegate.h" +#import "MGLEventsManager.h" diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 364852ffa3..64e25df2b0 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -33,6 +33,9 @@ 1FC481852098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FC481842098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h */; }; 1FF4858D2237235300F19727 /* MGLAttributedExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FF4858B2237235200F19727 /* MGLAttributedExpression.m */; }; 1FF4858E2237235300F19727 /* MGLAttributedExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF4858C2237235200F19727 /* MGLAttributedExpression.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1FCCEC4122260CCF00302E3B /* MGLEventsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC3E22260CCE00302E3B /* MGLEventsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1FCCEC4222260CCF00302E3B /* MGLEventsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCCEC3F22260CCF00302E3B /* MGLEventsManager.m */; }; + 1FCCEC4322260CCF00302E3B /* MGLEventsManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCCEC4022260CCF00302E3B /* MGLEventsManager_Private.h */; }; 3508EC641D749D39009B0EE4 /* NSExpression+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3508EC621D749D39009B0EE4 /* NSExpression+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3508EC651D749D39009B0EE4 /* NSExpression+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3508EC631D749D39009B0EE4 /* NSExpression+MGLAdditions.mm */; }; 3526EABD1DF9B19800006B43 /* MGLCodingTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3526EABC1DF9B19800006B43 /* MGLCodingTests.mm */; }; @@ -347,6 +350,9 @@ 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; }; 1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mapbox_helmet.pdf; sourceTree = "<group>"; }; 1FC481842098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLPrivateAdditions.h"; sourceTree = "<group>"; }; + 1FCCEC3E22260CCE00302E3B /* MGLEventsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLEventsManager.h; sourceTree = "<group>"; }; + 1FCCEC3F22260CCF00302E3B /* MGLEventsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLEventsManager.m; sourceTree = "<group>"; }; + 1FCCEC4022260CCF00302E3B /* MGLEventsManager_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLEventsManager_Private.h; sourceTree = "<group>"; }; 1FDB00CC21F8F1FD00D21389 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; }; 1FDB00CD21F8F1FF00D21389 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; }; 1FF4858B2237235200F19727 /* MGLAttributedExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLAttributedExpression.m; sourceTree = "<group>"; }; @@ -1212,8 +1218,11 @@ DA00FC881D5EEAC3009AABC8 /* MGLAttributionInfo.h */, DAF0D8151DFE6B1800B28378 /* MGLAttributionInfo_Private.h */, DA00FC891D5EEAC3009AABC8 /* MGLAttributionInfo.mm */, + 1FCCEC4022260CCF00302E3B /* MGLEventsManager_Private.h */, 1FF4858C2237235200F19727 /* MGLAttributedExpression.h */, 1FF4858B2237235200F19727 /* MGLAttributedExpression.m */, + 1FCCEC3E22260CCE00302E3B /* MGLEventsManager.h */, + 1FCCEC3F22260CCF00302E3B /* MGLEventsManager.m */, 556660C51E1BEA0100E2C41B /* MGLFoundation.h */, 558DE7A41E56161C00C7916D /* MGLFoundation_Private.h */, 558DE7A51E56161C00C7916D /* MGLFoundation.mm */, @@ -1350,6 +1359,8 @@ 9250B8C32073C69100EF338C /* MGLShapeOfflineRegion.h in Headers */, 747ABE67219B2C3200523B67 /* MGLSymbolStyleLayer_Private.h in Headers */, DD0902B31DB1AC6400C5BDCE /* MGLNetworkConfiguration.h in Headers */, + 1FCCEC4322260CCF00302E3B /* MGLEventsManager_Private.h in Headers */, + 1FCCEC4122260CCF00302E3B /* MGLEventsManager.h in Headers */, DAE6C3621CC31E0400DB3429 /* MGLOverlay.h in Headers */, DAE6C3651CC31E0400DB3429 /* MGLPolyline.h in Headers */, DAE6C39A1CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.h in Headers */, @@ -1635,6 +1646,7 @@ DD0902B21DB1AC6400C5BDCE /* MGLNetworkConfiguration.m in Sources */, 1F7454A51ECFB00300021D39 /* MGLLight.mm in Sources */, DAE6C3B11CC31EF300DB3429 /* MGLAnnotationImage.m in Sources */, + 1FCCEC4222260CCF00302E3B /* MGLEventsManager.m in Sources */, 3508EC651D749D39009B0EE4 /* NSExpression+MGLAdditions.mm in Sources */, DACC22151CF3D3E200D220D9 /* MGLFeature.mm in Sources */, DA7262081DEEDD460043BB89 /* MGLOpenGLStyleLayer.mm in Sources */, diff --git a/platform/macos/sdk-files.json b/platform/macos/sdk-files.json index cc5a4f45fe..c5094cf8da 100644 --- a/platform/macos/sdk-files.json +++ b/platform/macos/sdk-files.json @@ -14,6 +14,7 @@ "platform/darwin/src/MGLNetworkConfiguration.m", "platform/darwin/src/MGLLight.mm", "platform/macos/src/MGLAnnotationImage.m", + "platform/darwin/src/MGLEventsManager.m", "platform/darwin/src/NSExpression+MGLAdditions.mm", "platform/darwin/src/MGLFeature.mm", "platform/darwin/src/MGLOpenGLStyleLayer.mm", @@ -112,6 +113,7 @@ "MGLCoordinateFormatter.h": "platform/darwin/src/MGLCoordinateFormatter.h", "MGLShapeOfflineRegion.h": "platform/darwin/src/MGLShapeOfflineRegion.h", "MGLNetworkConfiguration.h": "platform/darwin/src/MGLNetworkConfiguration.h", + "MGLEventsManager.h": "platform/darwin/src/MGLEventsManager.h", "MGLOverlay.h": "platform/darwin/src/MGLOverlay.h", "MGLPolyline.h": "platform/darwin/src/MGLPolyline.h", "MGLLineStyleLayer.h": "platform/darwin/src/MGLLineStyleLayer.h", @@ -175,6 +177,7 @@ "MGLNetworkConfiguration_Private.h": "platform/darwin/src/MGLNetworkConfiguration_Private.h", "NSCompoundPredicate+MGLAdditions.h": "platform/darwin/src/NSCompoundPredicate+MGLAdditions.h", "MGLSymbolStyleLayer_Private.h": "platform/darwin/src/MGLSymbolStyleLayer_Private.h", + "MGLEventsManager_Private.h": "platform/darwin/src/MGLEventsManager_Private.h", "NSProcessInfo+MGLAdditions.h": "platform/darwin/src/NSProcessInfo+MGLAdditions.h", "MGLRendererFrontend.h": "platform/darwin/src/MGLRendererFrontend.h", "NSValue+MGLStyleAttributeAdditions.h": "platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h", diff --git a/platform/macos/src/Mapbox.h b/platform/macos/src/Mapbox.h index de14b919e8..38d2b566db 100644 --- a/platform/macos/src/Mapbox.h +++ b/platform/macos/src/Mapbox.h @@ -68,4 +68,4 @@ FOUNDATION_EXPORT MGL_EXPORT const unsigned char MapboxVersionString[]; #import "MGLLoggingConfiguration.h" #import "MGLNetworkConfiguration.h" #import "MGLAttributedExpression.h" -#import "MGLMapboxEventsDelegate.h" +#import "MGLEventsManager.h" |