diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-10-05 00:50:48 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-10-06 15:19:38 -0700 |
commit | 0acf1ed5969cdf8ff428beea1b5cdc8d64bfc10f (patch) | |
tree | 0610d378b7fb7a5fbd2715775f0696304f74e187 | |
parent | 50d2c01d7d0bad1aa1dee1a028e06f49f33c9b4c (diff) | |
download | qtlocation-mapboxgl-0acf1ed5969cdf8ff428beea1b5cdc8d64bfc10f.tar.gz |
[ios, macos] Renamed files to match renamed classes
20 files changed, 243 insertions, 211 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.h b/platform/darwin/src/MGLBackgroundStyleLayer.h index d464eb49f2..1a4c64dedf 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.h +++ b/platform/darwin/src/MGLBackgroundStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLBaseStyleLayer.h b/platform/darwin/src/MGLBaseStyleLayer.h deleted file mode 100644 index cfdc03962f..0000000000 --- a/platform/darwin/src/MGLBaseStyleLayer.h +++ /dev/null @@ -1,65 +0,0 @@ -#import <Foundation/Foundation.h> - -#import "MGLTypes.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - `MGLStyleLayer` is an abstract base class for style layers. A style layer - manages the layout and appearance of content at a specific z-index in a style. - An `MGLStyle` object consists of one or more `MGLStyleLayer` objects. - - Each style layer defined by the style JSON file is represented at runtime by an - `MGLStyleLayer` object, which you can use to refine the map’s appearance. You - can also add and remove style layers dynamically. - - Do not create instances of this class directly, and do not create your own - subclasses of this class. Instead, create instances of - `MGLBackgroundStyleLayer` and the concrete subclasses of - `MGLForegroundStyleLayer`. - */ -@interface MGLStyleLayer : NSObject - -#pragma mark Initializing a Style Layer - -/** - Returns a style layer object initialized with the given identifier. - - After initializing and configuring the style layer, add it to a map view’s - style using the `-[MGLStyle addLayer:]` or - `-[MGLStyle insertLayer:belowLayer:]` method. - - @param identifier A string that uniquely identifies the layer in the style to - which it is added. - @return An initialized style layer. - */ -- (instancetype)initWithIdentifier:(NSString *)identifier; - -#pragma mark Identifying a Style Layer - -/** - A string that uniquely identifies the style layer in the style to which it is - added. - */ -@property (nonatomic, copy, readonly) NSString *identifier; - -#pragma mark Configuring a Style Layer’s Visibility - -/** - Whether this layer is displayed. A value of `NO` hides the layer. - */ -@property (nonatomic, assign, getter=isVisible) BOOL visible; - -/** - The maximum zoom level at which the layer gets parsed and appears. - */ -@property (nonatomic, assign) float maximumZoomLevel; - -/** - The minimum zoom level at which the layer gets parsed and appears. - */ -@property (nonatomic, assign) float minimumZoomLevel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLBaseStyleLayer.mm b/platform/darwin/src/MGLBaseStyleLayer.mm deleted file mode 100644 index 8a599e67c7..0000000000 --- a/platform/darwin/src/MGLBaseStyleLayer.mm +++ /dev/null @@ -1,52 +0,0 @@ -#import "MGLBaseStyleLayer.h" - -#import "MGLStyleLayer_Private.h" -#import "MGLMapView_Private.h" - -#include <mbgl/style/layer.hpp> - -@implementation MGLStyleLayer - -- (instancetype)initWithIdentifier:(NSString *)identifier -{ - if (self = [super init]) { - _identifier = identifier; - } - return self; -} - -- (void)setVisible:(BOOL)visible -{ - mbgl::style::VisibilityType v = visible - ? mbgl::style::VisibilityType::Visible - : mbgl::style::VisibilityType::None; - self.layer->setVisibility(v); -} - -- (BOOL)isVisible -{ - mbgl::style::VisibilityType v = self.layer->getVisibility(); - return (v == mbgl::style::VisibilityType::Visible); -} - -- (void)setMaximumZoomLevel:(float)maximumZoomLevel -{ - self.layer->setMaxZoom(maximumZoomLevel); -} - -- (float)maximumZoomLevel -{ - return self.layer->getMaxZoom(); -} - -- (void)setMinimumZoomLevel:(float)minimumZoomLevel -{ - self.layer->setMinZoom(minimumZoomLevel); -} - -- (float)minimumZoomLevel -{ - return self.layer->getMinZoom(); -} - -@end diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index bddc6bf525..d056815b9d 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLVectorStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLFillStyleLayer.h b/platform/darwin/src/MGLFillStyleLayer.h index ff1edddd5a..8776c1755f 100644 --- a/platform/darwin/src/MGLFillStyleLayer.h +++ b/platform/darwin/src/MGLFillStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLVectorStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLForegroundStyleLayer.h b/platform/darwin/src/MGLForegroundStyleLayer.h new file mode 100644 index 0000000000..cb98876810 --- /dev/null +++ b/platform/darwin/src/MGLForegroundStyleLayer.h @@ -0,0 +1,45 @@ +#import <Foundation/Foundation.h> + +#import "MGLStyleLayer.h" + +NS_ASSUME_NONNULL_BEGIN + +@class MGLSource; + +/** + `MGLForegroundStyleLayer` is an abstract superclass for style layers whose + content is defined by an `MGLSource` object. + + Do not create instances of this class directly, and do not create your own + subclasses of this class. Instead, create instances of `MGLRasterStyleLayer` + and the concrete subclasses of `MGLVectorStyleLayer`. + */ +@interface MGLForegroundStyleLayer : MGLStyleLayer + +#pragma mark Initializing a Style Layer + +/** + Returns a foreground style layer initialized with an identifier and source. + + After initializing and configuring the style layer, add it to a map view’s + style using the `-[MGLStyle addLayer:]` or + `-[MGLStyle insertLayer:belowLayer:]` method. + + @param identifier A string that uniquely identifies the source in the style to + which it is added. + @param source The source from which to obtain the data to style. If the source + has not yet been added to the current style, the behavior is undefined. + @return An initialized foreground style layer. + */ +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; + +#pragma mark Specifying a Style Layer’s Content + +/** + Identifier of the source from which the receiver obtains the data to style. + */ +@property (nonatomic, readonly, nullable) NSString *sourceIdentifier; + +@end + +NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLForegroundStyleLayer.m b/platform/darwin/src/MGLForegroundStyleLayer.m new file mode 100644 index 0000000000..e3af963313 --- /dev/null +++ b/platform/darwin/src/MGLForegroundStyleLayer.m @@ -0,0 +1,13 @@ +#import "MGLForegroundStyleLayer.h" +#import "MGLSource.h" + +@implementation MGLForegroundStyleLayer + +- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source { + if (self = [super initWithIdentifier:identifier]) { + _sourceIdentifier = source.identifier; + } + return self; +} + +@end diff --git a/platform/darwin/src/MGLLineStyleLayer.h b/platform/darwin/src/MGLLineStyleLayer.h index f8a9970f31..d3969ddd34 100644 --- a/platform/darwin/src/MGLLineStyleLayer.h +++ b/platform/darwin/src/MGLLineStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLVectorStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLRasterStyleLayer.h b/platform/darwin/src/MGLRasterStyleLayer.h index d0a08c8223..90af43c7a1 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.h +++ b/platform/darwin/src/MGLRasterStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLForegroundStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLSource.h b/platform/darwin/src/MGLSource.h index 79f6ce491f..ec3733bf08 100644 --- a/platform/darwin/src/MGLSource.h +++ b/platform/darwin/src/MGLSource.h @@ -2,8 +2,8 @@ /** A source supplies data to be shown on the map. Sources don't contain styling - details like color or width. Use subclasses of `MGLBaseStyleLayer` to give - visual representation to sources. + details like color or width. Use subclasses of `MGLStyleLayer` to give visual + representation to sources. You should use the concrete subclasses of `MGLSource` to create vector, raster, GeoJSON, and other source types. diff --git a/platform/darwin/src/MGLStyleLayer.h b/platform/darwin/src/MGLStyleLayer.h index 763854f44c..cfdc03962f 100644 --- a/platform/darwin/src/MGLStyleLayer.h +++ b/platform/darwin/src/MGLStyleLayer.h @@ -1,73 +1,64 @@ #import <Foundation/Foundation.h> -#import "MGLBaseStyleLayer.h" +#import "MGLTypes.h" NS_ASSUME_NONNULL_BEGIN -@class MGLSource; - /** - `MGLForegroundStyleLayer` is an abstract superclass for style layers whose - content is defined by an `MGLSource` object. + `MGLStyleLayer` is an abstract base class for style layers. A style layer + manages the layout and appearance of content at a specific z-index in a style. + An `MGLStyle` object consists of one or more `MGLStyleLayer` objects. + + Each style layer defined by the style JSON file is represented at runtime by an + `MGLStyleLayer` object, which you can use to refine the map’s appearance. You + can also add and remove style layers dynamically. Do not create instances of this class directly, and do not create your own - subclasses of this class. Instead, create instances of `MGLRasterStyleLayer` - and the concrete subclasses of `MGLVectorStyleLayer`. + subclasses of this class. Instead, create instances of + `MGLBackgroundStyleLayer` and the concrete subclasses of + `MGLForegroundStyleLayer`. */ -@interface MGLForegroundStyleLayer : MGLStyleLayer +@interface MGLStyleLayer : NSObject #pragma mark Initializing a Style Layer /** - Returns a foreground style layer initialized with an identifier and source. + Returns a style layer object initialized with the given identifier. After initializing and configuring the style layer, add it to a map view’s style using the `-[MGLStyle addLayer:]` or `-[MGLStyle insertLayer:belowLayer:]` method. - @param identifier A string that uniquely identifies the source in the style to + @param identifier A string that uniquely identifies the layer in the style to which it is added. - @param source The source from which to obtain the data to style. If the source - has not yet been added to the current style, the behavior is undefined. - @return An initialized foreground style layer. + @return An initialized style layer. */ -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithIdentifier:(NSString *)identifier; -#pragma mark Specifying a Style Layer’s Content +#pragma mark Identifying a Style Layer /** - Identifier of the source from which the receiver obtains the data to style. + A string that uniquely identifies the style layer in the style to which it is + added. */ -@property (nonatomic, readonly, nullable) NSString *sourceIdentifier; +@property (nonatomic, copy, readonly) NSString *identifier; -@end +#pragma mark Configuring a Style Layer’s Visibility /** - `MGLVectorStyleLayer` is an abstract superclass for style layers whose content - is defined by an `MGLGeoJSONSource` or `MGLVectorSource` object. - - Do not create instances of this class directly, and do not create your own - subclasses of this class. Instead, create instances of the following concrete - subclasses: `MGLCircleStyleLayer`, `MGLFillStyleLayer`, `MGLLineStyleLayer`, - and `MGLSymbolStyleLayer`. + Whether this layer is displayed. A value of `NO` hides the layer. */ -@interface MGLVectorStyleLayer : MGLForegroundStyleLayer - -#pragma mark Refining a Style Layer’s Content +@property (nonatomic, assign, getter=isVisible) BOOL visible; /** - Identifier of the layer within the source identified by the `sourceIdentifier` - property from which the receiver obtains the data to style. + The maximum zoom level at which the layer gets parsed and appears. */ -@property (nonatomic, nullable) NSString *sourceLayerIdentifier; +@property (nonatomic, assign) float maximumZoomLevel; /** - A predicate that corresponds to the layer's <a href='https://www.mapbox.com/mapbox-gl-style-spec/#types-filter'>filter</a>. - - The predicate's left expression must be a string that identifies a feature - property, or one of the special keys. + The minimum zoom level at which the layer gets parsed and appears. */ -@property (nonatomic, nullable) NSPredicate *predicate; +@property (nonatomic, assign) float minimumZoomLevel; @end diff --git a/platform/darwin/src/MGLStyleLayer.h.ejs b/platform/darwin/src/MGLStyleLayer.h.ejs index e27808bfc7..c688f1db5f 100644 --- a/platform/darwin/src/MGLStyleLayer.h.ejs +++ b/platform/darwin/src/MGLStyleLayer.h.ejs @@ -9,7 +9,11 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGL<%- +(type === 'background' ? '' : + (type === 'raster' ? 'Foreground' : + 'Vector')) +%>StyleLayer.h" NS_ASSUME_NONNULL_BEGIN @@ -60,11 +64,11 @@ typedef NS_ENUM(NSUInteger, MGL<%- camelize(type) %>StyleLayer<%- camelize(prope `-[MGLStyle layerWithIdentifier:]` method. */ <% } -%> -@interface MGL<%- camelize(type) %>StyleLayer : <%- -(type === 'background' ? 'MGLStyleLayer' : - (type === 'raster' ? 'MGLForegroundStyleLayer' : - 'MGLVectorStyleLayer')) -%> +@interface MGL<%- camelize(type) %>StyleLayer : MGL<%- +(type === 'background' ? '' : + (type === 'raster' ? 'Foreground' : + 'Vector')) +%>StyleLayer <% if (type === 'background') { -%> - (instancetype)initWithIdentifier:(NSString *)identifier NS_DESIGNATED_INITIALIZER; diff --git a/platform/darwin/src/MGLStyleLayer.mm b/platform/darwin/src/MGLStyleLayer.mm index b0fbb38dc9..a2bb1fc2cf 100644 --- a/platform/darwin/src/MGLStyleLayer.mm +++ b/platform/darwin/src/MGLStyleLayer.mm @@ -1,28 +1,50 @@ #import "MGLStyleLayer_Private.h" -#import "MGLSource.h" +#import "MGLMapView_Private.h" -@implementation MGLForegroundStyleLayer +#include <mbgl/style/layer.hpp> -- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source { - if (self = [super initWithIdentifier:identifier]) { - _sourceIdentifier = source.identifier; +@implementation MGLStyleLayer + +- (instancetype)initWithIdentifier:(NSString *)identifier +{ + if (self = [super init]) { + _identifier = identifier; } return self; } -@end +- (void)setVisible:(BOOL)visible +{ + mbgl::style::VisibilityType v = visible + ? mbgl::style::VisibilityType::Visible + : mbgl::style::VisibilityType::None; + self.layer->setVisibility(v); +} + +- (BOOL)isVisible +{ + mbgl::style::VisibilityType v = self.layer->getVisibility(); + return (v == mbgl::style::VisibilityType::Visible); +} + +- (void)setMaximumZoomLevel:(float)maximumZoomLevel +{ + self.layer->setMaxZoom(maximumZoomLevel); +} -@implementation MGLVectorStyleLayer +- (float)maximumZoomLevel +{ + return self.layer->getMaxZoom(); +} -- (void)setPredicate:(NSPredicate *)predicate { - [NSException raise:@"MGLAbstractClassException" - format:@"MGLVectorLayer is an abstract class"]; +- (void)setMinimumZoomLevel:(float)minimumZoomLevel +{ + self.layer->setMinZoom(minimumZoomLevel); } -- (NSPredicate *)predicate { - [NSException raise:@"MGLAbstractClassException" - format:@"MGLVectorLayer is an abstract class"]; - return nil; +- (float)minimumZoomLevel +{ + return self.layer->getMinZoom(); } @end diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index 45387bdf87..c12471a0d3 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. #import "MGLStyleAttributeValue.h" -#import "MGLBaseStyleLayer.h" +#import "MGLVectorStyleLayer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLVectorStyleLayer.h b/platform/darwin/src/MGLVectorStyleLayer.h new file mode 100644 index 0000000000..c9272ac89b --- /dev/null +++ b/platform/darwin/src/MGLVectorStyleLayer.h @@ -0,0 +1,36 @@ +#import <Foundation/Foundation.h> + +#import "MGLForegroundStyleLayer.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + `MGLVectorStyleLayer` is an abstract superclass for style layers whose content + is defined by an `MGLGeoJSONSource` or `MGLVectorSource` object. + + Do not create instances of this class directly, and do not create your own + subclasses of this class. Instead, create instances of the following concrete + subclasses: `MGLCircleStyleLayer`, `MGLFillStyleLayer`, `MGLLineStyleLayer`, + and `MGLSymbolStyleLayer`. + */ +@interface MGLVectorStyleLayer : MGLForegroundStyleLayer + +#pragma mark Refining a Style Layer’s Content + +/** + Identifier of the layer within the source identified by the `sourceIdentifier` + property from which the receiver obtains the data to style. + */ +@property (nonatomic, nullable) NSString *sourceLayerIdentifier; + +/** + A predicate that corresponds to the layer's <a href='https://www.mapbox.com/mapbox-gl-style-spec/#types-filter'>filter</a>. + + The predicate's left expression must be a string that identifies a feature + property, or one of the special keys. + */ +@property (nonatomic, nullable) NSPredicate *predicate; + +@end + +NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MGLVectorStyleLayer.m b/platform/darwin/src/MGLVectorStyleLayer.m new file mode 100644 index 0000000000..174256cbdd --- /dev/null +++ b/platform/darwin/src/MGLVectorStyleLayer.m @@ -0,0 +1,16 @@ +#import "MGLVectorStyleLayer.h" + +@implementation MGLVectorStyleLayer + +- (void)setPredicate:(NSPredicate *)predicate { + [NSException raise:@"MGLAbstractClassException" + format:@"MGLVectorLayer is an abstract class"]; +} + +- (NSPredicate *)predicate { + [NSException raise:@"MGLAbstractClassException" + format:@"MGLVectorLayer is an abstract class"]; + return nil; +} + +@end diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 2a6d6a7c84..5c4523fa4f 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -70,10 +70,10 @@ 3534C7931D4BC95400D874A4 /* MGLStyleAttributeFunction_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 3534C7911D4BC95400D874A4 /* MGLStyleAttributeFunction_Private.h */; }; 3534C7951D4BD1D400D874A4 /* MGLStyleAttributeValue_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 3534C7941D4BD1D400D874A4 /* MGLStyleAttributeValue_Private.h */; }; 3534C7961D4BD1D400D874A4 /* MGLStyleAttributeValue_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 3534C7941D4BD1D400D874A4 /* MGLStyleAttributeValue_Private.h */; }; - 3538AA1D1D542239008EC33D /* MGLBaseStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA1B1D542239008EC33D /* MGLBaseStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3538AA1E1D542239008EC33D /* MGLBaseStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA1B1D542239008EC33D /* MGLBaseStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3538AA1F1D542239008EC33D /* MGLBaseStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA1C1D542239008EC33D /* MGLBaseStyleLayer.mm */; }; - 3538AA201D542239008EC33D /* MGLBaseStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA1C1D542239008EC33D /* MGLBaseStyleLayer.mm */; }; + 3538AA1D1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA1B1D542239008EC33D /* MGLForegroundStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3538AA1E1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA1B1D542239008EC33D /* MGLForegroundStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3538AA1F1D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA1C1D542239008EC33D /* MGLForegroundStyleLayer.m */; }; + 3538AA201D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA1C1D542239008EC33D /* MGLForegroundStyleLayer.m */; }; 353933F21D3FB753003F57D7 /* MGLCircleStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 353933F11D3FB753003F57D7 /* MGLCircleStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 353933F31D3FB753003F57D7 /* MGLCircleStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 353933F11D3FB753003F57D7 /* MGLCircleStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 353933F51D3FB785003F57D7 /* MGLBackgroundStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 353933F41D3FB785003F57D7 /* MGLBackgroundStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -219,6 +219,10 @@ DA35A2CA1CCAAAD200E826B2 /* NSValue+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DA35A2C71CCAAAD200E826B2 /* NSValue+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA35A2CB1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */; }; DA35A2CC1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */; }; + DA6408DB1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6408D91DA4E7D300908C90 /* MGLVectorStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + DA6408DC1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6408D91DA4E7D300908C90 /* MGLVectorStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + DA6408DD1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6408DA1DA4E7D300908C90 /* MGLVectorStyleLayer.m */; }; + DA6408DE1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6408DA1DA4E7D300908C90 /* MGLVectorStyleLayer.m */; }; DA737EE11D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DA737EE01D056A4E005BDA16 /* MGLMapViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA737EE21D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DA737EE01D056A4E005BDA16 /* MGLMapViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA821D061CCC6D59007508D4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */; }; @@ -522,8 +526,8 @@ 35305D471D22AA450007D005 /* NSData+MGLAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSData+MGLAdditions.mm"; sourceTree = "<group>"; }; 3534C7911D4BC95400D874A4 /* MGLStyleAttributeFunction_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleAttributeFunction_Private.h; sourceTree = "<group>"; }; 3534C7941D4BD1D400D874A4 /* MGLStyleAttributeValue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleAttributeValue_Private.h; sourceTree = "<group>"; }; - 3538AA1B1D542239008EC33D /* MGLBaseStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLBaseStyleLayer.h; sourceTree = "<group>"; }; - 3538AA1C1D542239008EC33D /* MGLBaseStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLBaseStyleLayer.mm; sourceTree = "<group>"; }; + 3538AA1B1D542239008EC33D /* MGLForegroundStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLForegroundStyleLayer.h; sourceTree = "<group>"; }; + 3538AA1C1D542239008EC33D /* MGLForegroundStyleLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLForegroundStyleLayer.m; sourceTree = "<group>"; }; 353933F11D3FB753003F57D7 /* MGLCircleStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCircleStyleLayer.h; sourceTree = "<group>"; }; 353933F41D3FB785003F57D7 /* MGLBackgroundStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLBackgroundStyleLayer.h; sourceTree = "<group>"; }; 353933F71D3FB79F003F57D7 /* MGLLineStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLLineStyleLayer.h; sourceTree = "<group>"; }; @@ -635,6 +639,8 @@ DA35A2C81CCAAAD200E826B2 /* NSValue+MGLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSValue+MGLAdditions.m"; sourceTree = "<group>"; }; DA35A2D11CCAB25200E826B2 /* jazzy.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = jazzy.yml; sourceTree = "<group>"; }; DA4A26961CB6E795000B7809 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DA6408D91DA4E7D300908C90 /* MGLVectorStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLVectorStyleLayer.h; sourceTree = "<group>"; }; + DA6408DA1DA4E7D300908C90 /* MGLVectorStyleLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLVectorStyleLayer.m; sourceTree = "<group>"; }; DA737EE01D056A4E005BDA16 /* MGLMapViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLMapViewDelegate.h; sourceTree = "<group>"; }; DA821D041CCC6D59007508D4 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; }; DA821D051CCC6D59007508D4 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; }; @@ -845,6 +851,8 @@ 35136D3B1D42272500C20EFD /* MGLCircleStyleLayer.mm */, 35D13AC11D3D19DD00AFB4E0 /* MGLFillStyleLayer.h */, 35D13AC21D3D19DD00AFB4E0 /* MGLFillStyleLayer.mm */, + 3538AA1B1D542239008EC33D /* MGLForegroundStyleLayer.h */, + 3538AA1C1D542239008EC33D /* MGLForegroundStyleLayer.m */, 353933F71D3FB79F003F57D7 /* MGLLineStyleLayer.h */, 35136D3E1D42273000C20EFD /* MGLLineStyleLayer.mm */, 353933FA1D3FB7C0003F57D7 /* MGLRasterStyleLayer.h */, @@ -854,8 +862,8 @@ 35D13AB61D3D15E300AFB4E0 /* MGLStyleLayer.mm */, 353933FD1D3FB7DD003F57D7 /* MGLSymbolStyleLayer.h */, 35136D441D42275100C20EFD /* MGLSymbolStyleLayer.mm */, - 3538AA1B1D542239008EC33D /* MGLBaseStyleLayer.h */, - 3538AA1C1D542239008EC33D /* MGLBaseStyleLayer.mm */, + DA6408D91DA4E7D300908C90 /* MGLVectorStyleLayer.h */, + DA6408DA1DA4E7D300908C90 /* MGLVectorStyleLayer.m */, ); name = Layers; sourceTree = "<group>"; @@ -1434,6 +1442,7 @@ DA35A2C91CCAAAD200E826B2 /* NSValue+MGLAdditions.h in Headers */, 350098CF1D482E10004B2AF0 /* NSArray+MGLStyleAttributeAdditions_Private.h in Headers */, 3510FFEA1D6D9C7A00F413B2 /* NSComparisonPredicate+MGLAdditions.h in Headers */, + DA6408DB1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */, DA8848571CBAFB9800AB86E3 /* MGLMapboxEvents.h in Headers */, DA8848311CBAFA6200AB86E3 /* NSString+MGLAdditions.h in Headers */, 353933F81D3FB79F003F57D7 /* MGLLineStyleLayer.h in Headers */, @@ -1469,7 +1478,7 @@ DA88484F1CBAFB9800AB86E3 /* MGLAnnotationImage_Private.h in Headers */, 3534C7921D4BC95400D874A4 /* MGLStyleAttributeFunction_Private.h in Headers */, DA8847F21CBAFA5100AB86E3 /* MGLMapCamera.h in Headers */, - 3538AA1D1D542239008EC33D /* MGLBaseStyleLayer.h in Headers */, + 3538AA1D1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */, DA8847F51CBAFA5100AB86E3 /* MGLOfflineRegion.h in Headers */, DA737EE11D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */, DA8848851CBB033F00AB86E3 /* FABKitProtocol.h in Headers */, @@ -1551,9 +1560,10 @@ DABFB8681CBE99E500D62B32 /* MGLPolyline.h in Headers */, 3534C7931D4BC95400D874A4 /* MGLStyleAttributeFunction_Private.h in Headers */, DABFB86F1CBE9A0F00D62B32 /* MGLMapView.h in Headers */, + DA6408DC1DA4E7D300908C90 /* MGLVectorStyleLayer.h in Headers */, 353933F31D3FB753003F57D7 /* MGLCircleStyleLayer.h in Headers */, 3593E5271D529EDC006D9365 /* UIColor+MGLStyleAttributeAdditions_Private.h in Headers */, - 3538AA1E1D542239008EC33D /* MGLBaseStyleLayer.h in Headers */, + 3538AA1E1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */, 40F887711D7A1E59008ECB67 /* MGLGeoJSONSource_Private.h in Headers */, DABFB8631CBE99E500D62B32 /* MGLOfflineRegion.h in Headers */, DA35A2B21CCA141D00E826B2 /* MGLCompassDirectionFormatter.h in Headers */, @@ -1925,9 +1935,10 @@ DA8848251CBAFA6200AB86E3 /* MGLPointAnnotation.m in Sources */, 35136D3C1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */, 350098DE1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */, + DA6408DD1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */, 3566C7681D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */, 35136D421D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */, - 3538AA1F1D542239008EC33D /* MGLBaseStyleLayer.mm in Sources */, + 3538AA1F1D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */, DA88482D1CBAFA6200AB86E3 /* NSBundle+MGLAdditions.m in Sources */, DA88485B1CBAFB9800AB86E3 /* MGLUserLocation.m in Sources */, 350098BD1D480108004B2AF0 /* MGLVectorSource.mm in Sources */, @@ -1994,9 +2005,10 @@ DAA4E42E1CBB730400178DFB /* MGLAPIClient.m in Sources */, 35136D3D1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */, 350098DF1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */, + DA6408DE1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */, 3566C7691D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */, 35136D431D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */, - 3538AA201D542239008EC33D /* MGLBaseStyleLayer.mm in Sources */, + 3538AA201D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */, DAA4E4201CBB730400178DFB /* MGLOfflinePack.mm in Sources */, DAA4E4331CBB730400178DFB /* MGLUserLocation.m in Sources */, 350098BE1D480108004B2AF0 /* MGLVectorSource.mm in Sources */, diff --git a/platform/ios/src/Mapbox.h b/platform/ios/src/Mapbox.h index 535e00e01e..a187737023 100644 --- a/platform/ios/src/Mapbox.h +++ b/platform/ios/src/Mapbox.h @@ -33,7 +33,8 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLShapeCollection.h" #import "MGLStyle.h" #import "MGLStyleLayer.h" -#import "MGLBaseStyleLayer.h" +#import "MGLForegroundStyleLayer.h" +#import "MGLVectorStyleLayer.h" #import "MGLFillStyleLayer.h" #import "MGLLineStyleLayer.h" #import "MGLSymbolStyleLayer.h" diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 54d141e739..6855b66a17 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -26,16 +26,16 @@ 3529039B1D6C63B80002C7DF /* NSPredicate+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 352903991D6C63B80002C7DF /* NSPredicate+MGLAdditions.h */; }; 3529039C1D6C63B80002C7DF /* NSPredicate+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3529039A1D6C63B80002C7DF /* NSPredicate+MGLAdditions.mm */; }; 3537CA741D3F93A600380318 /* MGLStyle_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 3537CA731D3F93A600380318 /* MGLStyle_Private.h */; }; - 3538AA231D542685008EC33D /* MGLBaseStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA211D542685008EC33D /* MGLBaseStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3538AA241D542685008EC33D /* MGLBaseStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA221D542685008EC33D /* MGLBaseStyleLayer.mm */; }; + 3538AA231D542685008EC33D /* MGLStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3538AA211D542685008EC33D /* MGLStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3538AA241D542685008EC33D /* MGLStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3538AA221D542685008EC33D /* MGLStyleLayer.mm */; }; 353BAEF81D6463B8009A8DA9 /* amsterdam.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 358EB3AE1D61F0DB00E46D9C /* amsterdam.geojson */; }; 355BA4ED1D41633E00CCC6D5 /* NSColor+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 355BA4EB1D41633E00CCC6D5 /* NSColor+MGLAdditions.h */; }; 355BA4EE1D41633E00CCC6D5 /* NSColor+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 355BA4EC1D41633E00CCC6D5 /* NSColor+MGLAdditions.mm */; }; 35602BFA1D3EA99F0050646F /* MGLFillStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 35602BF81D3EA99F0050646F /* MGLFillStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 35602BFB1D3EA99F0050646F /* MGLFillStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35602BF91D3EA99F0050646F /* MGLFillStyleLayer.mm */; }; 35602BFF1D3EA9B40050646F /* MGLStyleLayer_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 35602BFC1D3EA9B40050646F /* MGLStyleLayer_Private.h */; }; - 35602C001D3EA9B40050646F /* MGLStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 35602BFD1D3EA9B40050646F /* MGLStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 35602C011D3EA9B40050646F /* MGLStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35602BFE1D3EA9B40050646F /* MGLStyleLayer.mm */; }; + 35602C001D3EA9B40050646F /* MGLForegroundStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 35602BFD1D3EA9B40050646F /* MGLForegroundStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 35602C011D3EA9B40050646F /* MGLForegroundStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 35602BFE1D3EA9B40050646F /* MGLForegroundStyleLayer.m */; }; 35724FC41D630502002A4AB4 /* amsterdam.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 358EB3AE1D61F0DB00E46D9C /* amsterdam.geojson */; }; 3593E52A1D52A628006D9365 /* MGLStyleAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 3593E5281D52A628006D9365 /* MGLStyleAttribute.h */; }; 3593E52B1D52A628006D9365 /* MGLStyleAttribute.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3593E5291D52A628006D9365 /* MGLStyleAttribute.mm */; }; @@ -64,6 +64,8 @@ DA35A2CF1CCAAED300E826B2 /* NSValue+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DA35A2CD1CCAAED300E826B2 /* NSValue+MGLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA35A2D01CCAAED300E826B2 /* NSValue+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35A2CE1CCAAED300E826B2 /* NSValue+MGLAdditions.m */; }; DA5589771D320C41006B7F64 /* wms.json in Resources */ = {isa = PBXBuildFile; fileRef = DA5589761D320C41006B7F64 /* wms.json */; }; + DA6408D71DA4E5DA00908C90 /* MGLVectorStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6408D51DA4E5DA00908C90 /* MGLVectorStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + DA6408D81DA4E5DA00908C90 /* MGLVectorStyleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6408D61DA4E5DA00908C90 /* MGLVectorStyleLayer.m */; }; DA839E971CC2E3400062CAFB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E961CC2E3400062CAFB /* AppDelegate.m */; }; DA839E9A1CC2E3400062CAFB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E991CC2E3400062CAFB /* main.m */; }; DA839E9D1CC2E3400062CAFB /* MapDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E9C1CC2E3400062CAFB /* MapDocument.m */; }; @@ -234,15 +236,15 @@ 352903991D6C63B80002C7DF /* NSPredicate+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+MGLAdditions.h"; sourceTree = "<group>"; }; 3529039A1D6C63B80002C7DF /* NSPredicate+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSPredicate+MGLAdditions.mm"; sourceTree = "<group>"; }; 3537CA731D3F93A600380318 /* MGLStyle_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyle_Private.h; sourceTree = "<group>"; }; - 3538AA211D542685008EC33D /* MGLBaseStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLBaseStyleLayer.h; sourceTree = "<group>"; }; - 3538AA221D542685008EC33D /* MGLBaseStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLBaseStyleLayer.mm; sourceTree = "<group>"; }; + 3538AA211D542685008EC33D /* MGLStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleLayer.h; sourceTree = "<group>"; }; + 3538AA221D542685008EC33D /* MGLStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLStyleLayer.mm; sourceTree = "<group>"; }; 355BA4EB1D41633E00CCC6D5 /* NSColor+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSColor+MGLAdditions.h"; sourceTree = "<group>"; }; 355BA4EC1D41633E00CCC6D5 /* NSColor+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSColor+MGLAdditions.mm"; sourceTree = "<group>"; }; 35602BF81D3EA99F0050646F /* MGLFillStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLFillStyleLayer.h; sourceTree = "<group>"; }; 35602BF91D3EA99F0050646F /* MGLFillStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLFillStyleLayer.mm; sourceTree = "<group>"; }; 35602BFC1D3EA9B40050646F /* MGLStyleLayer_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleLayer_Private.h; sourceTree = "<group>"; }; - 35602BFD1D3EA9B40050646F /* MGLStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleLayer.h; sourceTree = "<group>"; }; - 35602BFE1D3EA9B40050646F /* MGLStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLStyleLayer.mm; sourceTree = "<group>"; }; + 35602BFD1D3EA9B40050646F /* MGLForegroundStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLForegroundStyleLayer.h; sourceTree = "<group>"; }; + 35602BFE1D3EA9B40050646F /* MGLForegroundStyleLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLForegroundStyleLayer.m; sourceTree = "<group>"; }; 358EB3AE1D61F0DB00E46D9C /* amsterdam.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = amsterdam.geojson; path = ../../darwin/test/amsterdam.geojson; sourceTree = "<group>"; }; 3593E5281D52A628006D9365 /* MGLStyleAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleAttribute.h; sourceTree = "<group>"; }; 3593E5291D52A628006D9365 /* MGLStyleAttribute.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLStyleAttribute.mm; sourceTree = "<group>"; }; @@ -276,6 +278,8 @@ DA35A2CD1CCAAED300E826B2 /* NSValue+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSValue+MGLAdditions.h"; sourceTree = "<group>"; }; DA35A2CE1CCAAED300E826B2 /* NSValue+MGLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSValue+MGLAdditions.m"; sourceTree = "<group>"; }; DA5589761D320C41006B7F64 /* wms.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = wms.json; sourceTree = "<group>"; }; + DA6408D51DA4E5DA00908C90 /* MGLVectorStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLVectorStyleLayer.h; sourceTree = "<group>"; }; + DA6408D61DA4E5DA00908C90 /* MGLVectorStyleLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLVectorStyleLayer.m; sourceTree = "<group>"; }; DA839E921CC2E3400062CAFB /* Mapbox GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DA839E951CC2E3400062CAFB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; DA839E961CC2E3400062CAFB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; @@ -452,23 +456,25 @@ 35136D471D42295400C20EFD /* Layers */ = { isa = PBXGroup; children = ( - 3538AA211D542685008EC33D /* MGLBaseStyleLayer.h */, - 3538AA221D542685008EC33D /* MGLBaseStyleLayer.mm */, DA8F25851D51C9E10010E6B5 /* MGLBackgroundStyleLayer.h */, DA8F25861D51C9E10010E6B5 /* MGLBackgroundStyleLayer.mm */, 3527428B1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.h */, 3527428C1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.mm */, 35602BF81D3EA99F0050646F /* MGLFillStyleLayer.h */, 35602BF91D3EA99F0050646F /* MGLFillStyleLayer.mm */, + 35602BFD1D3EA9B40050646F /* MGLForegroundStyleLayer.h */, + 35602BFE1D3EA9B40050646F /* MGLForegroundStyleLayer.m */, DA8F25891D51CA540010E6B5 /* MGLLineStyleLayer.h */, DA8F258A1D51CA540010E6B5 /* MGLLineStyleLayer.mm */, DA8F258D1D51CA600010E6B5 /* MGLRasterStyleLayer.h */, DA8F258E1D51CA600010E6B5 /* MGLRasterStyleLayer.mm */, - 35602BFD1D3EA9B40050646F /* MGLStyleLayer.h */, + 3538AA211D542685008EC33D /* MGLStyleLayer.h */, 35602BFC1D3EA9B40050646F /* MGLStyleLayer_Private.h */, - 35602BFE1D3EA9B40050646F /* MGLStyleLayer.mm */, + 3538AA221D542685008EC33D /* MGLStyleLayer.mm */, DA8F25911D51CA750010E6B5 /* MGLSymbolStyleLayer.h */, DA8F25921D51CA750010E6B5 /* MGLSymbolStyleLayer.mm */, + DA6408D51DA4E5DA00908C90 /* MGLVectorStyleLayer.h */, + DA6408D61DA4E5DA00908C90 /* MGLVectorStyleLayer.m */, ); name = Layers; sourceTree = "<group>"; @@ -906,10 +912,10 @@ DAE6C3A61CC31E9400DB3429 /* MGLMapViewDelegate.h in Headers */, DAE6C38B1CC31E2A00DB3429 /* MGLOfflinePack_Private.h in Headers */, DACC22141CF3D3E200D220D9 /* MGLFeature.h in Headers */, - 3538AA231D542685008EC33D /* MGLBaseStyleLayer.h in Headers */, + 3538AA231D542685008EC33D /* MGLStyleLayer.h in Headers */, DAE6C35C1CC31E0400DB3429 /* MGLGeometry.h in Headers */, DAE6C35A1CC31E0400DB3429 /* MGLAccountManager.h in Headers */, - 35602C001D3EA9B40050646F /* MGLStyleLayer.h in Headers */, + 35602C001D3EA9B40050646F /* MGLForegroundStyleLayer.h in Headers */, DAE6C35D1CC31E0400DB3429 /* MGLMapCamera.h in Headers */, DAE6C3B41CC31EF300DB3429 /* MGLCompassCell.h in Headers */, DA8F25A91D51CB270010E6B5 /* NSNumber+MGLStyleAttributeAdditions.h in Headers */, @@ -923,6 +929,7 @@ DA35A2AD1CCA091800E826B2 /* MGLCompassDirectionFormatter.h in Headers */, 352742851D4C244700A1ECE6 /* MGLRasterSource.h in Headers */, DACC22181CF3D4F700D220D9 /* MGLFeature_Private.h in Headers */, + DA6408D71DA4E5DA00908C90 /* MGLVectorStyleLayer.h in Headers */, 352742891D4C245800A1ECE6 /* MGLGeoJSONSource.h in Headers */, DAE6C3671CC31E0400DB3429 /* MGLStyle.h in Headers */, ); @@ -1123,12 +1130,12 @@ DAE6C3941CC31E2A00DB3429 /* MGLStyle.mm in Sources */, DAE6C3871CC31E2A00DB3429 /* MGLGeometry.mm in Sources */, 3527428E1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.mm in Sources */, - 35602C011D3EA9B40050646F /* MGLStyleLayer.mm in Sources */, + 35602C011D3EA9B40050646F /* MGLForegroundStyleLayer.m in Sources */, 3527427D1D4C238F00A1ECE6 /* NSColor+MGLStyleAttributeAdditions.m in Sources */, DA8F25881D51C9E10010E6B5 /* MGLBackgroundStyleLayer.mm in Sources */, DAE6C3B81CC31EF300DB3429 /* MGLMapView+IBAdditions.mm in Sources */, DA35A2D01CCAAED300E826B2 /* NSValue+MGLAdditions.m in Sources */, - 3538AA241D542685008EC33D /* MGLBaseStyleLayer.mm in Sources */, + 3538AA241D542685008EC33D /* MGLStyleLayer.mm in Sources */, DA35A2C01CCA9B1A00E826B2 /* MGLClockDirectionFormatter.m in Sources */, DAE6C3BA1CC31EF300DB3429 /* MGLOpenGLLayer.mm in Sources */, DAE6C38A1CC31E2A00DB3429 /* MGLMultiPoint.mm in Sources */, @@ -1136,6 +1143,7 @@ DA35A2A61CC9EB2700E826B2 /* MGLCoordinateFormatter.m in Sources */, 352742821D4C243B00A1ECE6 /* MGLSource.mm in Sources */, DAE6C3881CC31E2A00DB3429 /* MGLMapCamera.mm in Sources */, + DA6408D81DA4E5DA00908C90 /* MGLVectorStyleLayer.m in Sources */, DA8F25B31D51CB270010E6B5 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */, DAE6C3911CC31E2A00DB3429 /* MGLPolygon.mm in Sources */, DAE6C39B1CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.m in Sources */, diff --git a/platform/macos/src/Mapbox.h b/platform/macos/src/Mapbox.h index 0217bca44a..6323196ba4 100644 --- a/platform/macos/src/Mapbox.h +++ b/platform/macos/src/Mapbox.h @@ -30,7 +30,8 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLShapeCollection.h" #import "MGLStyle.h" #import "MGLStyleLayer.h" -#import "MGLBaseStyleLayer.h" +#import "MGLForegroundStyleLayer.h" +#import "MGLVectorStyleLayer.h" #import "MGLFillStyleLayer.h" #import "MGLLineStyleLayer.h" #import "MGLSymbolStyleLayer.h" |