From 7120a4b063a45b3d385ad6eb6ed354b871208e2b Mon Sep 17 00:00:00 2001 From: Julian Rex Date: Sat, 12 Jan 2019 14:34:59 -0500 Subject: Clean up --- platform/darwin/src/MGLCluster.h | 12 +- platform/darwin/src/MGLFeature.h | 14 +- platform/darwin/src/MGLFeature.mm | 55 ++-- platform/darwin/src/MGLShapeSource.h | 14 +- platform/darwin/src/MGLShapeSource.mm | 2 - platform/darwin/test/MGLCodingTests.mm | 10 +- .../darwin/test/MGLDocumentationExampleTests.swift | 6 + platform/ios/core-files.txt | 323 --------------------- platform/ios/sdk-files.json | 1 + platform/macos/core-files.txt | 224 -------------- platform/macos/sdk-files.json | 3 + 11 files changed, 60 insertions(+), 604 deletions(-) delete mode 100644 platform/ios/core-files.txt delete mode 100644 platform/macos/core-files.txt diff --git a/platform/darwin/src/MGLCluster.h b/platform/darwin/src/MGLCluster.h index a7caf2ddcf..2b99119b26 100644 --- a/platform/darwin/src/MGLCluster.h +++ b/platform/darwin/src/MGLCluster.h @@ -11,10 +11,11 @@ NS_ASSUME_NONNULL_BEGIN FOUNDATION_EXTERN MGL_EXPORT const NSUInteger MGLClusterIdentifierInvalid; /** - A protocol that (private) feature subclasses (i.e. those already conforming to - the `MGLFeature` protocol) conform to if they are represent clusters. + A protocol that feature subclasses (i.e. those already conforming to + the `MGLFeature` protocol) conform to if they represent clusters. - Currently only subclasses of `MGLPointFeature` support `MGLCluster`. + Currently the only class that conforms to `MGLCluster` is + `MGLPointFeatureCluster` (a subclass of `MGLPointFeature`). To check if a feature is a cluster, check conformity to `MGLCluster`, for example: @@ -31,6 +32,11 @@ FOUNDATION_EXTERN MGL_EXPORT const NSUInteger MGLClusterIdentifierInvalid; throw ExampleError.featureIsNotACluster } + // Currently the only supported class that conforms to `MGLCluster` is + // `MGLPointFeatureCluster` + guard cluster is MGLPointFeatureCluster else { + throw ExampleError.unexpectedFeatureType + } ``` */ MGL_EXPORT diff --git a/platform/darwin/src/MGLFeature.h b/platform/darwin/src/MGLFeature.h index e17b463a7f..51901d73c0 100644 --- a/platform/darwin/src/MGLFeature.h +++ b/platform/darwin/src/MGLFeature.h @@ -187,13 +187,23 @@ MGL_EXPORT #### Related examples See the Dynamically style interactive points example to learn how to initialize - `MGLPointFeature` objects and add it them your map. + `MGLPointFeature` objects and add them to your map. */ MGL_EXPORT @interface MGLPointFeature : MGLPointAnnotation @end - +/** + An `MGLPointFeatureCluster` object associates a point shape (with an optional + identifier and attributes) and represents a point cluster. + + @see `MGLCluster` + + #### Related examples + See the + Clustering point data example to learn how to initialize + clusters and add them to your map. + */ MGL_EXPORT @interface MGLPointFeatureCluster : MGLPointFeature @end diff --git a/platform/darwin/src/MGLFeature.mm b/platform/darwin/src/MGLFeature.mm index 55700b6b22..e471ea2e98 100644 --- a/platform/darwin/src/MGLFeature.mm +++ b/platform/darwin/src/MGLFeature.mm @@ -7,7 +7,6 @@ #import "MGLPolygon.h" #import "MGLValueEvaluator.h" -#import "MGLCluster.h" #import "MGLShape_Private.h" #import "MGLPointCollection_Private.h" #import "MGLPolyline_Private.h" @@ -22,8 +21,10 @@ #import #import -static NSString * const MGLClusterIdentifierKey = @"cluster_id"; -static NSString * const MGLClusterCountKey = @"point_count"; +// Cluster constants +static NSString * const MGLClusterIdentifierKey = @"cluster_id"; +static NSString * const MGLClusterCountKey = @"point_count"; +const NSUInteger MGLClusterIdentifierInvalid = NSUIntegerMax; @interface MGLEmptyFeature () @end @@ -98,17 +99,10 @@ MGL_DEFINE_FEATURE_ATTRIBUTES_GETTER(); @end -const NSUInteger MGLClusterIdentifierInvalid = NSUIntegerMax; - @implementation MGLPointFeatureCluster -// If it turns out we need to cluster other classes, then consider moving the -// following MGLCluster methods into free functions, and generate the subclasses -// at runtime - (NSUInteger)clusterIdentifier { - id feature = MGL_OBJC_DYNAMIC_CAST_AS_PROTOCOL(self, MGLFeature); - - NSNumber *clusterNumber = MGL_OBJC_DYNAMIC_CAST([feature attributeForKey:MGLClusterIdentifierKey], NSNumber); + NSNumber *clusterNumber = MGL_OBJC_DYNAMIC_CAST([self attributeForKey:MGLClusterIdentifierKey], NSNumber); MGLAssert(clusterNumber, @"Clusters should have a cluster_id"); if (!clusterNumber) { @@ -122,15 +116,11 @@ const NSUInteger MGLClusterIdentifierInvalid = NSUIntegerMax; } - (NSUInteger)clusterPointCount { - id feature = MGL_OBJC_DYNAMIC_CAST_AS_PROTOCOL(self, MGLFeature); - - NSNumber *count = MGL_OBJC_DYNAMIC_CAST([feature attributeForKey:MGLClusterCountKey], NSNumber); + NSNumber *count = MGL_OBJC_DYNAMIC_CAST([self attributeForKey:MGLClusterCountKey], NSNumber); MGLAssert(count, @"Clusters should have a point_count"); return [count unsignedIntegerValue]; } - - @end @@ -361,12 +351,11 @@ MGL_DEFINE_FEATURE_ATTRIBUTES_GETTER(); template class GeometryEvaluator { private: - mbgl::PropertyMap _properties; + const mbgl::PropertyMap *shared_properties; public: - - GeometryEvaluator(mbgl::PropertyMap properties = {}): - _properties(properties) + GeometryEvaluator(const mbgl::PropertyMap *properties = nullptr): + shared_properties(properties) {} MGLShape * operator()(const mbgl::EmptyGeometry &) const { @@ -377,15 +366,20 @@ public: MGLShape * operator()(const mbgl::Point &geometry) const { Class pointFeatureClass = [MGLPointFeature class]; - auto clusterIt = _properties.find("cluster"); - if (clusterIt != _properties.end()) { - auto clusterValue = clusterIt->second; - if (clusterValue.template is()) { - if (clusterValue.template get()) { - pointFeatureClass = [MGLPointFeatureCluster class]; + // If we're dealing with a cluster, we should change the class type. + // This could be generic and build the subclass at runtime if it turns + // out we need to support more than point clusters. + if (shared_properties) { + auto clusterIt = shared_properties->find("cluster"); + if (clusterIt != shared_properties->end()) { + auto clusterValue = clusterIt->second; + if (clusterValue.template is()) { + if (clusterValue.template get()) { + pointFeatureClass = [MGLPointFeatureCluster class]; + } } } - } + } MGLPointFeature *feature = [[pointFeatureClass alloc] init]; feature.coordinate = toLocationCoordinate2D(geometry); @@ -436,10 +430,7 @@ public: return [MGLShapeCollectionFeature shapeCollectionWithShapes:shapes]; } -private: - -// mbgl::PropertyMap _properties; - +private: static CLLocationCoordinate2D toLocationCoordinate2D(const mbgl::Point &point) { return CLLocationCoordinate2DMake(point.y, point.x); } @@ -508,7 +499,7 @@ id MGLFeatureFromMBGLFeature(const mbgl::Feature &feature) { ValueEvaluator evaluator; attributes[@(pair.first.c_str())] = mbgl::Value::visit(value, evaluator); } - GeometryEvaluator evaluator(feature.properties); + GeometryEvaluator evaluator(&feature.properties); MGLShape *shape = mapbox::geometry::geometry::visit(feature.geometry, evaluator); if (!feature.id.is()) { shape.identifier = mbgl::FeatureIdentifier::visit(feature.id, ValueEvaluator()); diff --git a/platform/darwin/src/MGLShapeSource.h b/platform/darwin/src/MGLShapeSource.h index 2982fda068..6676cbd02e 100644 --- a/platform/darwin/src/MGLShapeSource.h +++ b/platform/darwin/src/MGLShapeSource.h @@ -5,7 +5,6 @@ NS_ASSUME_NONNULL_BEGIN @protocol MGLFeature; -//@protocol MGLCluster; @class MGLPointFeature; @class MGLPointFeatureCluster; @class MGLShape; @@ -331,8 +330,7 @@ MGL_EXPORT This method supports pagination; you supply an offset (number of features to skip) and a maximum number of features to return. - @param cluster An object that conforms to the `MGLCluster` protocol. Currently - the only types that can conform are private subclasses of `MGLPointFeature`. + @param cluster An object of type `MGLPointFeatureCluster` (that conforms to the `MGLCluster` protocol). @param offset Number of features to skip. @param limit Maximum number of features to return @@ -343,15 +341,14 @@ MGL_EXPORT /** Returns an array of map features that are the immediate children of the specified cluster *on the next zoom level*. The may include features that also conform to - the `MGLCluster` protocol. + the `MGLCluster` protocol (currently only objects of type `MGLPointFeatureCluster`). - @param cluster An object that conforms to the `MGLCluster` protocol. Currently - the only types that can conform are private subclasses of `MGLPointFeature`. + @param cluster An object of type `MGLPointFeatureCluster` (that conforms to the `MGLCluster` protocol). @return An array of objects that conform to the `MGLFeature` protocol. @note The returned array may contain the `cluster` that was passed in, if the next - zoom level doesn't the zoom level for expanding that cluster. See + zoom level doesn't match the zoom level for expanding that cluster. See `-[MGLShapeSource zoomLevelForExpandingCluster:]`. */ - (NSArray> *)childrenOfCluster:(MGLPointFeatureCluster *)cluster; @@ -359,8 +356,7 @@ MGL_EXPORT /** Returns the zoom level at which the given cluster expands. - @param cluster An object that conforms to the `MGLCluster` protocol. Currently - the only types that can conform are private subclasses of `MGLPointFeature`. + @param cluster An object of type `MGLPointFeatureCluster` (that conforms to the `MGLCluster` protocol). @return Zoom level. This should be >= 0; any negative return value should be considered an error. diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm index ac0f404756..fc526f9850 100644 --- a/platform/darwin/src/MGLShapeSource.mm +++ b/platform/darwin/src/MGLShapeSource.mm @@ -211,11 +211,9 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary> *)leavesOfCluster:(MGLPointFeatureCluster *)cluster offset:(NSUInteger)offset limit:(NSUInteger)limit { const std::map options = { { "limit", static_cast(limit) }, diff --git a/platform/darwin/test/MGLCodingTests.mm b/platform/darwin/test/MGLCodingTests.mm index f4e5c8f13e..c22eae81da 100644 --- a/platform/darwin/test/MGLCodingTests.mm +++ b/platform/darwin/test/MGLCodingTests.mm @@ -63,8 +63,7 @@ XCTAssertEqualObjects(pointFeature, unarchivedPointFeature); - // Unarchive process should convert to a cluster -// NSString *subclassName = MGLClusterSubclassNameForFeature(pointFeature); + // Unarchive process should ensure we still have a cluster XCTAssert([unarchivedPointFeature isMemberOfClass:[MGLPointFeatureCluster class]]); id cluster = MGL_OBJC_DYNAMIC_CAST_AS_PROTOCOL(unarchivedPointFeature, MGLCluster); @@ -72,13 +71,6 @@ XCTAssert(cluster); XCTAssert(cluster.clusterIdentifier == 456); XCTAssert(cluster.clusterPointCount == 2); - -// // Archiving shouldn't affect -// [NSKeyedArchiver archiveRootObject:unarchivedPointFeature toFile:filePath]; -// MGLPointFeature *unarchivedPointFeature2 = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath]; -// -// XCTAssert([unarchivedPointFeature2 isMemberOfClass:[MGLPointFeatureCluster class]]); -// XCTAssertEqualObjects(pointFeature, unarchivedPointFeature2); } diff --git a/platform/darwin/test/MGLDocumentationExampleTests.swift b/platform/darwin/test/MGLDocumentationExampleTests.swift index 10308619d2..b59d297f97 100644 --- a/platform/darwin/test/MGLDocumentationExampleTests.swift +++ b/platform/darwin/test/MGLDocumentationExampleTests.swift @@ -433,6 +433,12 @@ class MGLDocumentationExampleTests: XCTestCase, MGLMapViewDelegate { throw ExampleError.featureIsNotACluster } + // Currently the only supported class that conforms to `MGLCluster` is + // `MGLPointFeatureCluster` + guard cluster is MGLPointFeatureCluster else { + throw ExampleError.unexpectedFeatureType + } + //#-end-example-code XCTAssert(cluster.clusterIdentifier == 123) diff --git a/platform/ios/core-files.txt b/platform/ios/core-files.txt deleted file mode 100644 index bcc1a55aa8..0000000000 --- a/platform/ios/core-files.txt +++ /dev/null @@ -1,323 +0,0 @@ -# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js - -# SDK -platform/ios/src/Mapbox.h - -# SDK/Foundation -platform/darwin/src/MGLAccountManager.h -platform/darwin/src/MGLAccountManager.m -platform/darwin/src/MGLAccountManager_Private.h -platform/darwin/src/MGLAttributionInfo.h -platform/darwin/src/MGLAttributionInfo.mm -platform/darwin/src/MGLAttributionInfo_Private.h -platform/darwin/src/MGLFoundation.h -platform/darwin/src/MGLFoundation.mm -platform/darwin/src/MGLFoundation_Private.h -platform/darwin/src/MGLLocationManager.h -platform/darwin/src/MGLLocationManager.m -platform/darwin/src/MGLLocationManager_Private.h -platform/darwin/src/MGLLoggingConfiguration.h -platform/darwin/src/MGLLoggingConfiguration.m -platform/darwin/src/MGLLoggingConfiguration_Private.h -platform/darwin/src/MGLMapCamera.h -platform/darwin/src/MGLMapCamera.mm -platform/darwin/src/MGLMapSnapshotter.h -platform/darwin/src/MGLMapSnapshotter.mm -platform/darwin/src/MGLNetworkConfiguration.h -platform/darwin/src/MGLNetworkConfiguration.m -platform/darwin/src/MGLRendererConfiguration.h -platform/darwin/src/MGLRendererConfiguration.mm -platform/darwin/src/MGLRendererFrontend.h -platform/darwin/src/MGLStyle.h -platform/darwin/src/MGLStyle.mm -platform/darwin/src/MGLStyle_Private.h -platform/darwin/src/MGLTypes.h -platform/darwin/src/MGLTypes.m -platform/darwin/src/MGLValueEvaluator.h - -# SDK/Foundation/Categories -platform/darwin/src/NSArray+MGLAdditions.h -platform/darwin/src/NSArray+MGLAdditions.mm -platform/darwin/src/NSBundle+MGLAdditions.h -platform/darwin/src/NSBundle+MGLAdditions.m -platform/darwin/src/NSComparisonPredicate+MGLAdditions.h -platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm -platform/darwin/src/NSCompoundPredicate+MGLAdditions.h -platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm -platform/darwin/src/NSData+MGLAdditions.h -platform/darwin/src/NSData+MGLAdditions.mm -platform/darwin/src/NSDate+MGLAdditions.h -platform/darwin/src/NSDate+MGLAdditions.mm -platform/darwin/src/NSDictionary+MGLAdditions.h -platform/darwin/src/NSDictionary+MGLAdditions.mm -platform/darwin/src/NSException+MGLAdditions.h -platform/darwin/src/NSExpression+MGLAdditions.h -platform/darwin/src/NSExpression+MGLAdditions.mm -platform/darwin/src/NSExpression+MGLPrivateAdditions.h -platform/darwin/src/NSPredicate+MGLAdditions.h -platform/darwin/src/NSPredicate+MGLAdditions.mm -platform/darwin/src/NSPredicate+MGLPrivateAdditions.h -platform/darwin/src/NSProcessInfo+MGLAdditions.h -platform/darwin/src/NSProcessInfo+MGLAdditions.m -platform/darwin/src/NSString+MGLAdditions.h -platform/darwin/src/NSString+MGLAdditions.m -platform/darwin/src/NSURL+MGLAdditions.h -platform/darwin/src/NSURL+MGLAdditions.m -platform/darwin/src/NSValue+MGLAdditions.h -platform/darwin/src/NSValue+MGLAdditions.m - -# SDK/Foundation/Formatters -platform/darwin/src/MGLClockDirectionFormatter.h -platform/darwin/src/MGLClockDirectionFormatter.m -platform/darwin/src/MGLCompassDirectionFormatter.h -platform/darwin/src/MGLCompassDirectionFormatter.m -platform/darwin/src/MGLCoordinateFormatter.h -platform/darwin/src/MGLCoordinateFormatter.m -platform/darwin/src/MGLDistanceFormatter.h -platform/darwin/src/MGLDistanceFormatter.m - -# SDK/Foundation/Geometry -platform/darwin/src/MGLAnnotation.h -platform/darwin/src/MGLCluster.h -platform/darwin/src/MGLCluster.mm -platform/darwin/src/MGLCluster_Private.h -platform/darwin/src/MGLFeature.h -platform/darwin/src/MGLFeature.mm -platform/darwin/src/MGLFeature_Private.h -platform/darwin/src/MGLGeometry.h -platform/darwin/src/MGLGeometry.mm -platform/darwin/src/MGLGeometry_Private.h -platform/darwin/src/MGLMultiPoint.h -platform/darwin/src/MGLMultiPoint.mm -platform/darwin/src/MGLMultiPoint_Private.h -platform/darwin/src/MGLOverlay.h -platform/darwin/src/MGLPointAnnotation.h -platform/darwin/src/MGLPointAnnotation.mm -platform/darwin/src/MGLPointCollection.h -platform/darwin/src/MGLPointCollection.mm -platform/darwin/src/MGLPointCollection_Private.h -platform/darwin/src/MGLPolygon.h -platform/darwin/src/MGLPolygon.mm -platform/darwin/src/MGLPolygon_Private.h -platform/darwin/src/MGLPolyline.h -platform/darwin/src/MGLPolyline.mm -platform/darwin/src/MGLPolyline_Private.h -platform/darwin/src/MGLShape.h -platform/darwin/src/MGLShape.mm -platform/darwin/src/MGLShapeCollection.h -platform/darwin/src/MGLShapeCollection.mm -platform/darwin/src/MGLShape_Private.h - -# SDK/Foundation/Offline Maps -platform/darwin/src/MGLOfflinePack.h -platform/darwin/src/MGLOfflinePack.mm -platform/darwin/src/MGLOfflinePack_Private.h -platform/darwin/src/MGLOfflineRegion.h -platform/darwin/src/MGLOfflineRegion_Private.h -platform/darwin/src/MGLOfflineStorage.h -platform/darwin/src/MGLOfflineStorage.mm -platform/darwin/src/MGLOfflineStorage_Private.h -platform/darwin/src/MGLShapeOfflineRegion.h -platform/darwin/src/MGLShapeOfflineRegion.mm -platform/darwin/src/MGLShapeOfflineRegion_Private.h -platform/darwin/src/MGLTilePyramidOfflineRegion.h -platform/darwin/src/MGLTilePyramidOfflineRegion.mm -platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h - -# SDK/Foundation/Styling -platform/darwin/src/MGLConversion.h -platform/darwin/src/MGLLight.h -platform/darwin/src/MGLLight.mm -platform/darwin/src/MGLLight_Private.h -platform/darwin/src/MGLStyleValue.h -platform/darwin/src/MGLStyleValue.mm -platform/darwin/src/MGLStyleValue_Private.h - -# SDK/Foundation/Styling/Categories -platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h -platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm - -# SDK/Foundation/Styling/Layers -platform/darwin/src/MGLBackgroundStyleLayer.h -platform/darwin/src/MGLBackgroundStyleLayer.mm -platform/darwin/src/MGLBackgroundStyleLayer_Private.h -platform/darwin/src/MGLCircleStyleLayer.h -platform/darwin/src/MGLCircleStyleLayer.mm -platform/darwin/src/MGLCircleStyleLayer_Private.h -platform/darwin/src/MGLFillExtrusionStyleLayer.h -platform/darwin/src/MGLFillExtrusionStyleLayer.mm -platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h -platform/darwin/src/MGLFillStyleLayer.h -platform/darwin/src/MGLFillStyleLayer.mm -platform/darwin/src/MGLFillStyleLayer_Private.h -platform/darwin/src/MGLForegroundStyleLayer.h -platform/darwin/src/MGLForegroundStyleLayer.mm -platform/darwin/src/MGLHeatmapStyleLayer.h -platform/darwin/src/MGLHeatmapStyleLayer.mm -platform/darwin/src/MGLHeatmapStyleLayer_Private.h -platform/darwin/src/MGLHillshadeStyleLayer.h -platform/darwin/src/MGLHillshadeStyleLayer.mm -platform/darwin/src/MGLHillshadeStyleLayer_Private.h -platform/darwin/src/MGLLineStyleLayer.h -platform/darwin/src/MGLLineStyleLayer.mm -platform/darwin/src/MGLLineStyleLayer_Private.h -platform/darwin/src/MGLOpenGLStyleLayer.h -platform/darwin/src/MGLOpenGLStyleLayer.mm -platform/darwin/src/MGLOpenGLStyleLayer_Private.h -platform/darwin/src/MGLRasterStyleLayer.h -platform/darwin/src/MGLRasterStyleLayer.mm -platform/darwin/src/MGLRasterStyleLayer_Private.h -platform/darwin/src/MGLStyleLayer.h -platform/darwin/src/MGLStyleLayer.mm -platform/darwin/src/MGLStyleLayerManager.h -platform/darwin/src/MGLStyleLayerManager.mm -platform/darwin/src/MGLStyleLayer_Private.h -platform/darwin/src/MGLSymbolStyleLayer.h -platform/darwin/src/MGLSymbolStyleLayer.mm -platform/darwin/src/MGLSymbolStyleLayer_Private.h -platform/darwin/src/MGLVectorStyleLayer.h -platform/darwin/src/MGLVectorStyleLayer.m - -# SDK/Foundation/Styling/Sources -platform/darwin/src/MGLComputedShapeSource.h -platform/darwin/src/MGLComputedShapeSource.mm -platform/darwin/src/MGLComputedShapeSource_Private.h -platform/darwin/src/MGLImageSource.h -platform/darwin/src/MGLImageSource.mm -platform/darwin/src/MGLRasterDEMSource.h -platform/darwin/src/MGLRasterDEMSource.mm -platform/darwin/src/MGLRasterTileSource.h -platform/darwin/src/MGLRasterTileSource.mm -platform/darwin/src/MGLRasterTileSource_Private.h -platform/darwin/src/MGLShapeSource.h -platform/darwin/src/MGLShapeSource.mm -platform/darwin/src/MGLShapeSource_Private.h -platform/darwin/src/MGLSource.h -platform/darwin/src/MGLSource.mm -platform/darwin/src/MGLSource_Private.h -platform/darwin/src/MGLTileSource.h -platform/darwin/src/MGLTileSource.mm -platform/darwin/src/MGLTileSource_Private.h -platform/darwin/src/MGLVectorTileSource.h -platform/darwin/src/MGLVectorTileSource.mm -platform/darwin/src/MGLVectorTileSource_Private.h - -# SDK/Kit -platform/ios/src/MGLCameraChangeReason.h -platform/ios/src/MGLMapAccessibilityElement.h -platform/ios/src/MGLMapAccessibilityElement.mm -platform/ios/src/MGLMapView+IBAdditions.h -platform/ios/src/MGLMapView.h -platform/ios/src/MGLMapView.mm -platform/ios/src/MGLMapViewDelegate.h -platform/ios/src/MGLMapView_Private.h - -# SDK/Kit/Annotations -platform/ios/src/MGLAnnotationContainerView.h -platform/ios/src/MGLAnnotationContainerView.m -platform/ios/src/MGLAnnotationContainerView_Private.h -platform/ios/src/MGLAnnotationImage.h -platform/ios/src/MGLAnnotationImage.m -platform/ios/src/MGLAnnotationImage_Private.h -platform/ios/src/MGLAnnotationView.h -platform/ios/src/MGLAnnotationView.mm -platform/ios/src/MGLAnnotationView_Private.h -platform/ios/src/MGLCalloutView.h -platform/ios/src/MGLCompactCalloutView.h -platform/ios/src/MGLCompactCalloutView.m -platform/ios/src/MGLFaux3DUserLocationAnnotationView.h -platform/ios/src/MGLFaux3DUserLocationAnnotationView.m -platform/ios/src/MGLUserLocation.h -platform/ios/src/MGLUserLocation.m -platform/ios/src/MGLUserLocationAnnotationView.h -platform/ios/src/MGLUserLocationAnnotationView.m -platform/ios/src/MGLUserLocationAnnotationView_Private.h -platform/ios/src/MGLUserLocationHeadingArrowLayer.h -platform/ios/src/MGLUserLocationHeadingArrowLayer.m -platform/ios/src/MGLUserLocationHeadingBeamLayer.h -platform/ios/src/MGLUserLocationHeadingBeamLayer.m -platform/ios/src/MGLUserLocationHeadingIndicator.h -platform/ios/src/MGLUserLocation_Private.h - -# SDK/Kit/Categories -platform/darwin/src/NSCoder+MGLAdditions.h -platform/darwin/src/NSCoder+MGLAdditions.mm -platform/ios/src/NSOrthography+MGLAdditions.h -platform/ios/src/NSOrthography+MGLAdditions.m -platform/ios/src/UIColor+MGLAdditions.h -platform/ios/src/UIColor+MGLAdditions.mm -platform/ios/src/UIDevice+MGLAdditions.h -platform/ios/src/UIDevice+MGLAdditions.m -platform/ios/src/UIImage+MGLAdditions.h -platform/ios/src/UIImage+MGLAdditions.mm -platform/ios/src/UIViewController+MGLAdditions.h -platform/ios/src/UIViewController+MGLAdditions.m - -# SDK/Kit/SMCalloutView -platform/ios/vendor/SMCalloutView/SMCalloutView.h -platform/ios/vendor/SMCalloutView/SMCalloutView.m - -# SDK/Kit/Telemetry -platform/ios/src/MGLTelemetryConfig.h -platform/ios/src/MGLTelemetryConfig.m - -# SDK/Kit/Telemetry/Development -platform/ios/src/MGLSDKUpdateChecker.h -platform/ios/src/MGLSDKUpdateChecker.mm - -# SDK/Kit/Telemetry/Runtime -platform/ios/src/MGLMapboxEvents.h -platform/ios/src/MGLMapboxEvents.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/CLLocation+MMEMobileEvents.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEAPIClient.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECategoryLoader.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMECommonEventData.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConfigurator.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEConstants.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDependencyManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEDispatchManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEvent.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogReportViewController.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventLogger.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsConfiguration.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEHashProvider.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMELocationManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetrics.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEMetricsManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSDateWrapper.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENSURLSessionWrapper.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETimerManager.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETrustKitProvider.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMETypes.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUIApplicationWrapper.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUINavigation.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEUniqueIdentifier.m -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/NSData+MMEGZIP.m - -# SDK/Kit/Telemetry/Runtime/Reachability -platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Reachability/MMEReachability.m - -# SDK/Kit/Telemetry/Runtime/TrustKit -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidator.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKPinningValidatorResult.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TSKTrustKitConfig.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/TrustKit.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/configuration_utils.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/parse_configuration.m - -# SDK/Kit/Telemetry/Runtime/TrustKit/Pinning -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/TSKSPKIHashCache.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Pinning/ssl_pin_verifier.m - -# SDK/Kit/Telemetry/Runtime/TrustKit/Reporting -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKBackgroundReporter.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKPinFailureReport.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/TSKReportsRateLimiter.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/reporting_utils.m -platform/ios/vendor/mapbox-events-ios/vendor/TrustKit/Reporting/vendor_identifier.m - -# SDK/Kit/Views -platform/ios/src/MGLScaleBar.h -platform/ios/src/MGLScaleBar.mm - diff --git a/platform/ios/sdk-files.json b/platform/ios/sdk-files.json index 31eebb0980..0bf09e48fa 100644 --- a/platform/ios/sdk-files.json +++ b/platform/ios/sdk-files.json @@ -136,6 +136,7 @@ "MGLFillStyleLayer.h": "platform/darwin/src/MGLFillStyleLayer.h", "MGLAnnotationImage.h": "platform/ios/src/MGLAnnotationImage.h", "MGLHillshadeStyleLayer.h": "platform/darwin/src/MGLHillshadeStyleLayer.h", + "MGLCluster.h": "platform/darwin/src/MGLCluster.h", "MGLClockDirectionFormatter.h": "platform/darwin/src/MGLClockDirectionFormatter.h", "MGLSymbolStyleLayer.h": "platform/darwin/src/MGLSymbolStyleLayer.h", "MGLAttributionInfo.h": "platform/darwin/src/MGLAttributionInfo.h", diff --git a/platform/macos/core-files.txt b/platform/macos/core-files.txt deleted file mode 100644 index 25a8e86938..0000000000 --- a/platform/macos/core-files.txt +++ /dev/null @@ -1,224 +0,0 @@ -# This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js - -# SDK -platform/macos/src/Mapbox.h - -# SDK/Foundation -platform/darwin/src/MGLAccountManager.h -platform/darwin/src/MGLAccountManager.m -platform/darwin/src/MGLAccountManager_Private.h -platform/darwin/src/MGLAttributionInfo.h -platform/darwin/src/MGLAttributionInfo.mm -platform/darwin/src/MGLAttributionInfo_Private.h -platform/darwin/src/MGLFoundation.h -platform/darwin/src/MGLFoundation.mm -platform/darwin/src/MGLFoundation_Private.h -platform/darwin/src/MGLLoggingConfiguration.h -platform/darwin/src/MGLLoggingConfiguration.m -platform/darwin/src/MGLLoggingConfiguration_Private.h -platform/darwin/src/MGLMapCamera.h -platform/darwin/src/MGLMapCamera.mm -platform/darwin/src/MGLMapSnapshotter.h -platform/darwin/src/MGLMapSnapshotter.mm -platform/darwin/src/MGLNetworkConfiguration.h -platform/darwin/src/MGLNetworkConfiguration.m -platform/darwin/src/MGLRendererConfiguration.h -platform/darwin/src/MGLRendererConfiguration.mm -platform/darwin/src/MGLRendererFrontend.h -platform/darwin/src/MGLStyle.h -platform/darwin/src/MGLStyle.mm -platform/darwin/src/MGLStyle_Private.h -platform/darwin/src/MGLTypes.h -platform/darwin/src/MGLTypes.m -platform/darwin/src/MGLValueEvaluator.h - -# SDK/Foundation/Categories -platform/darwin/src/NSArray+MGLAdditions.h -platform/darwin/src/NSArray+MGLAdditions.mm -platform/darwin/src/NSBundle+MGLAdditions.h -platform/darwin/src/NSBundle+MGLAdditions.m -platform/darwin/src/NSCoder+MGLAdditions.h -platform/darwin/src/NSCoder+MGLAdditions.mm -platform/darwin/src/NSComparisonPredicate+MGLAdditions.h -platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm -platform/darwin/src/NSCompoundPredicate+MGLAdditions.h -platform/darwin/src/NSCompoundPredicate+MGLAdditions.mm -platform/darwin/src/NSDate+MGLAdditions.h -platform/darwin/src/NSDate+MGLAdditions.mm -platform/darwin/src/NSDictionary+MGLAdditions.h -platform/darwin/src/NSDictionary+MGLAdditions.mm -platform/darwin/src/NSException+MGLAdditions.h -platform/darwin/src/NSExpression+MGLAdditions.h -platform/darwin/src/NSExpression+MGLAdditions.mm -platform/darwin/src/NSExpression+MGLPrivateAdditions.h -platform/darwin/src/NSPredicate+MGLAdditions.h -platform/darwin/src/NSPredicate+MGLAdditions.mm -platform/darwin/src/NSPredicate+MGLPrivateAdditions.h -platform/darwin/src/NSProcessInfo+MGLAdditions.h -platform/darwin/src/NSProcessInfo+MGLAdditions.m -platform/darwin/src/NSString+MGLAdditions.h -platform/darwin/src/NSString+MGLAdditions.m -platform/darwin/src/NSURL+MGLAdditions.h -platform/darwin/src/NSURL+MGLAdditions.m -platform/darwin/src/NSValue+MGLAdditions.h -platform/darwin/src/NSValue+MGLAdditions.m - -# SDK/Foundation/Formatters -platform/darwin/src/MGLClockDirectionFormatter.h -platform/darwin/src/MGLClockDirectionFormatter.m -platform/darwin/src/MGLCompassDirectionFormatter.h -platform/darwin/src/MGLCompassDirectionFormatter.m -platform/darwin/src/MGLCoordinateFormatter.h -platform/darwin/src/MGLCoordinateFormatter.m -platform/darwin/src/MGLDistanceFormatter.h -platform/darwin/src/MGLDistanceFormatter.m - -# SDK/Foundation/Geometry -platform/darwin/src/MGLAnnotation.h -platform/darwin/src/MGLCluster.h -platform/darwin/src/MGLCluster.mm -platform/darwin/src/MGLCluster_Private.h -platform/darwin/src/MGLFeature.h -platform/darwin/src/MGLFeature.mm -platform/darwin/src/MGLFeature_Private.h -platform/darwin/src/MGLGeometry.h -platform/darwin/src/MGLGeometry.mm -platform/darwin/src/MGLGeometry_Private.h -platform/darwin/src/MGLMultiPoint.h -platform/darwin/src/MGLMultiPoint.mm -platform/darwin/src/MGLMultiPoint_Private.h -platform/darwin/src/MGLOverlay.h -platform/darwin/src/MGLPointAnnotation.h -platform/darwin/src/MGLPointAnnotation.mm -platform/darwin/src/MGLPointCollection.h -platform/darwin/src/MGLPointCollection.mm -platform/darwin/src/MGLPointCollection_Private.h -platform/darwin/src/MGLPolygon.h -platform/darwin/src/MGLPolygon.mm -platform/darwin/src/MGLPolygon_Private.h -platform/darwin/src/MGLPolyline.h -platform/darwin/src/MGLPolyline.mm -platform/darwin/src/MGLPolyline_Private.h -platform/darwin/src/MGLShape.h -platform/darwin/src/MGLShape.mm -platform/darwin/src/MGLShapeCollection.h -platform/darwin/src/MGLShapeCollection.mm -platform/darwin/src/MGLShape_Private.h - -# SDK/Foundation/Offline Maps -platform/darwin/src/MGLOfflinePack.h -platform/darwin/src/MGLOfflinePack.mm -platform/darwin/src/MGLOfflinePack_Private.h -platform/darwin/src/MGLOfflineRegion.h -platform/darwin/src/MGLOfflineRegion_Private.h -platform/darwin/src/MGLOfflineStorage.h -platform/darwin/src/MGLOfflineStorage.mm -platform/darwin/src/MGLOfflineStorage_Private.h -platform/darwin/src/MGLShapeOfflineRegion.h -platform/darwin/src/MGLShapeOfflineRegion.mm -platform/darwin/src/MGLShapeOfflineRegion_Private.h -platform/darwin/src/MGLTilePyramidOfflineRegion.h -platform/darwin/src/MGLTilePyramidOfflineRegion.mm -platform/darwin/src/MGLTilePyramidOfflineRegion_Private.h - -# SDK/Foundation/Styling -platform/darwin/src/MGLConversion.h -platform/darwin/src/MGLLight.h -platform/darwin/src/MGLLight.mm -platform/darwin/src/MGLLight_Private.h -platform/darwin/src/MGLStyleValue.h -platform/darwin/src/MGLStyleValue.mm -platform/darwin/src/MGLStyleValue_Private.h - -# SDK/Foundation/Styling/Categories -platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h -platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm - -# SDK/Foundation/Styling/Layers -platform/darwin/src/MGLBackgroundStyleLayer.h -platform/darwin/src/MGLBackgroundStyleLayer.mm -platform/darwin/src/MGLBackgroundStyleLayer_Private.h -platform/darwin/src/MGLCircleStyleLayer.h -platform/darwin/src/MGLCircleStyleLayer.mm -platform/darwin/src/MGLCircleStyleLayer_Private.h -platform/darwin/src/MGLFillExtrusionStyleLayer.h -platform/darwin/src/MGLFillExtrusionStyleLayer.mm -platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h -platform/darwin/src/MGLFillStyleLayer.h -platform/darwin/src/MGLFillStyleLayer.mm -platform/darwin/src/MGLFillStyleLayer_Private.h -platform/darwin/src/MGLForegroundStyleLayer.h -platform/darwin/src/MGLForegroundStyleLayer.mm -platform/darwin/src/MGLHeatmapStyleLayer.h -platform/darwin/src/MGLHeatmapStyleLayer.mm -platform/darwin/src/MGLHeatmapStyleLayer_Private.h -platform/darwin/src/MGLHillshadeStyleLayer.h -platform/darwin/src/MGLHillshadeStyleLayer.mm -platform/darwin/src/MGLHillshadeStyleLayer_Private.h -platform/darwin/src/MGLLineStyleLayer.h -platform/darwin/src/MGLLineStyleLayer.mm -platform/darwin/src/MGLLineStyleLayer_Private.h -platform/darwin/src/MGLOpenGLStyleLayer.h -platform/darwin/src/MGLOpenGLStyleLayer.mm -platform/darwin/src/MGLOpenGLStyleLayer_Private.h -platform/darwin/src/MGLRasterStyleLayer.h -platform/darwin/src/MGLRasterStyleLayer.mm -platform/darwin/src/MGLRasterStyleLayer_Private.h -platform/darwin/src/MGLStyleLayer.h -platform/darwin/src/MGLStyleLayer.mm -platform/darwin/src/MGLStyleLayerManager.h -platform/darwin/src/MGLStyleLayerManager.mm -platform/darwin/src/MGLStyleLayer_Private.h -platform/darwin/src/MGLSymbolStyleLayer.h -platform/darwin/src/MGLSymbolStyleLayer.mm -platform/darwin/src/MGLSymbolStyleLayer_Private.h -platform/darwin/src/MGLVectorStyleLayer.h -platform/darwin/src/MGLVectorStyleLayer.m - -# SDK/Foundation/Styling/Sources -platform/darwin/src/MGLComputedShapeSource.h -platform/darwin/src/MGLComputedShapeSource.mm -platform/darwin/src/MGLComputedShapeSource_Private.h -platform/darwin/src/MGLImageSource.h -platform/darwin/src/MGLImageSource.mm -platform/darwin/src/MGLRasterDEMSource.h -platform/darwin/src/MGLRasterDEMSource.mm -platform/darwin/src/MGLRasterTileSource.h -platform/darwin/src/MGLRasterTileSource.mm -platform/darwin/src/MGLRasterTileSource_Private.h -platform/darwin/src/MGLShapeSource.h -platform/darwin/src/MGLShapeSource.mm -platform/darwin/src/MGLShapeSource_Private.h -platform/darwin/src/MGLSource.h -platform/darwin/src/MGLSource.mm -platform/darwin/src/MGLSource_Private.h -platform/darwin/src/MGLTileSource.h -platform/darwin/src/MGLTileSource.mm -platform/darwin/src/MGLTileSource_Private.h -platform/darwin/src/MGLVectorTileSource.h -platform/darwin/src/MGLVectorTileSource.mm -platform/darwin/src/MGLVectorTileSource_Private.h - -# SDK/Kit -platform/macos/src/MGLAnnotationImage.h -platform/macos/src/MGLAnnotationImage.m -platform/macos/src/MGLAnnotationImage_Private.h -platform/macos/src/MGLAttributionButton.h -platform/macos/src/MGLAttributionButton.mm -platform/macos/src/MGLCompassCell.h -platform/macos/src/MGLCompassCell.m -platform/macos/src/MGLMapView+IBAdditions.h -platform/macos/src/MGLMapView+IBAdditions.mm -platform/macos/src/MGLMapView.h -platform/macos/src/MGLMapView.mm -platform/macos/src/MGLMapViewDelegate.h -platform/macos/src/MGLMapView_Private.h -platform/macos/src/MGLOpenGLLayer.h -platform/macos/src/MGLOpenGLLayer.mm - -# SDK/Kit/Categories -platform/macos/src/NSColor+MGLAdditions.h -platform/macos/src/NSColor+MGLAdditions.mm -platform/macos/src/NSImage+MGLAdditions.h -platform/macos/src/NSImage+MGLAdditions.mm - diff --git a/platform/macos/sdk-files.json b/platform/macos/sdk-files.json index 884a925217..a77e157154 100644 --- a/platform/macos/sdk-files.json +++ b/platform/macos/sdk-files.json @@ -51,6 +51,7 @@ "platform/darwin/src/MGLPolygon.mm", "platform/darwin/src/MGLDistanceFormatter.m", "platform/darwin/src/NSProcessInfo+MGLAdditions.m", + "platform/darwin/src/MGLCluster.mm", "platform/darwin/src/MGLFillExtrusionStyleLayer.mm", "platform/darwin/src/MGLOfflineStorage.mm", "platform/darwin/src/NSURL+MGLAdditions.m", @@ -118,6 +119,7 @@ "MGLTilePyramidOfflineRegion.h": "platform/darwin/src/MGLTilePyramidOfflineRegion.h", "NSValue+MGLAdditions.h": "platform/darwin/src/NSValue+MGLAdditions.h", "MGLMapViewDelegate.h": "platform/macos/src/MGLMapViewDelegate.h", + "MGLCluster.h": "platform/darwin/src/MGLCluster.h", "MGLFeature.h": "platform/darwin/src/MGLFeature.h", "MGLStyleLayer.h": "platform/darwin/src/MGLStyleLayer.h", "MGLGeometry.h": "platform/darwin/src/MGLGeometry.h", @@ -165,6 +167,7 @@ "MGLAccountManager_Private.h": "platform/darwin/src/MGLAccountManager_Private.h", "MGLComputedShapeSource_Private.h": "platform/darwin/src/MGLComputedShapeSource_Private.h", "NSException+MGLAdditions.h": "platform/darwin/src/NSException+MGLAdditions.h", + "MGLCluster_Private.h": "platform/darwin/src/MGLCluster_Private.h", "MGLTileSource_Private.h": "platform/darwin/src/MGLTileSource_Private.h", "NSExpression+MGLPrivateAdditions.h": "platform/darwin/src/NSExpression+MGLPrivateAdditions.h", "NSCompoundPredicate+MGLAdditions.h": "platform/darwin/src/NSCompoundPredicate+MGLAdditions.h", -- cgit v1.2.1