[ios, macos] Rename MGLGeoJSONSource to MGLShapeSource (#7334)
This commit is contained in:
Jesse Bounds
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
using `-[MGLMapView visibleFeaturesAtPoint:]` and related methods. Each feature
|
||||
object associates a shape with an identifier and attributes as specified by the
|
||||
source. Like ordinary `MGLAnnotation` objects, some kinds of `MGLFeature`
|
||||
objects can also be added to a map view using an `MGLGeoJSONSource` or
|
||||
objects can also be added to a map view using an `MGLShapeSource` or
|
||||
`-[MGLMapView addAnnotations:]` and related methods.
|
||||
*/
|
||||
@protocol MGLFeature <MGLAnnotation>
|
||||
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
layer reference. Note that while it is possible to change this value on feature
|
||||
instances obtained from `-[MGLMapView visibleFeaturesAtPoint:]` and related
|
||||
methods, there will be no effect on the map. Setting this value can be useful
|
||||
when the feature instance is used to initialize an `MGLGeoJSONSource` and that
|
||||
when the feature instance is used to initialize an `MGLShapeSource` and that
|
||||
source is added to the map and styled.
|
||||
*/
|
||||
@property (nonatomic, copy, nullable) id identifier;
|
||||
@@ -87,7 +87,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
layer references. Note that while it is possible to change this value on feature
|
||||
instances obtained from `-[MGLMapView visibleFeaturesAtPoint:]` and related
|
||||
methods, there will be no effect on the map. Setting this value can be useful
|
||||
when the feature instance is used to initialize an `MGLGeoJSONSource` and that
|
||||
when the feature instance is used to initialize an `MGLShapeSource` and that
|
||||
source is added to the map and styled.
|
||||
*/
|
||||
@property (nonatomic, copy) NS_DICTIONARY_OF(NSString *, id) *attributes;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
@note `MGLPointCollection` objects cannot be added to a map view using
|
||||
`-[MGLMapView addAnnotations:]` and related methods. However, when used in a
|
||||
`MGLPointCollectionFeature` to initialize a `MGLGeoJSONSource` that is added
|
||||
`MGLPointCollectionFeature` to initialize a `MGLShapeSource` that is added
|
||||
to the map view's style, the point collection represents as a group of distinct
|
||||
annotations.
|
||||
*/
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<% } else { -%>
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGL<%- camelize(type) %>StyleLayer *layer = [[MGL<%- camelize(type) %>StyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
<% } -%>
|
||||
|
||||
@@ -8,38 +8,38 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@protocol MGLFeature;
|
||||
|
||||
/**
|
||||
Options for `MGLGeoJSONSource` objects.
|
||||
Options for `MGLShapeSource` objects.
|
||||
*/
|
||||
typedef NSString *MGLGeoJSONSourceOption NS_STRING_ENUM;
|
||||
typedef NSString *MGLShapeSourceOption NS_STRING_ENUM;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing a Boolean enabling or disabling clustering.
|
||||
If the `features` property contains point features, setting this option to
|
||||
If the `shape` property contains point shapes, setting this option to
|
||||
`YES` clusters the points by radius into groups. The default value is `NO`.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionClustered;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionClustered;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing an integer; specifies the radius of each
|
||||
cluster if clustering is enabled. A value of 512 produces a radius equal to
|
||||
the width of a tile. The default value is 50.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionClusterRadius;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionClusterRadius;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing an integer; specifies the maximum zoom level at
|
||||
which to cluster points if clustering is enabled. Defaults to one zoom level
|
||||
less than the value of `MGLGeoJSONSourceOptionMaximumZoomLevel` so that, at the
|
||||
maximum zoom level, the features are not clustered.
|
||||
less than the value of `MGLShapeSourceOptionMaximumZoomLevel` so that, at the
|
||||
maximum zoom level, the shapes are not clustered.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionMaximumZoomLevelForClustering;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevelForClustering;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing an integer; specifies the maximum zoom level at
|
||||
which to create vector tiles. A greater value produces greater detail at high
|
||||
zoom levels. The default value is 18.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionMaximumZoomLevel;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevel;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing an integer; specifies the size of the tile
|
||||
@@ -47,27 +47,27 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionMaximumZoomLevel;
|
||||
buffer as wide as the tile itself. Larger values produce fewer rendering
|
||||
artifacts near tile edges and slower performance. The default value is 128.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionBuffer;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionBuffer;
|
||||
|
||||
/**
|
||||
An `NSNumber` object containing a double; specifies the Douglas-Peucker
|
||||
simplification tolerance. A greater value produces simpler geometries and
|
||||
improves performance. The default value is 0.375.
|
||||
*/
|
||||
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance;
|
||||
extern const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance;
|
||||
|
||||
/**
|
||||
A GeoJSON source.
|
||||
A shape source.
|
||||
|
||||
@see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">The
|
||||
style specification.</a>
|
||||
*/
|
||||
@interface MGLGeoJSONSource : MGLSource
|
||||
@interface MGLShapeSource : MGLSource
|
||||
|
||||
#pragma mark Initializing a Source
|
||||
|
||||
/**
|
||||
Returns a GeoJSON source initialized with an identifier, GeoJSON data, and a
|
||||
Returns a shape source initialized with an identifier, GeoJSON data, and a
|
||||
dictionary of options for the source according to the
|
||||
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">style
|
||||
specification</a>.
|
||||
@@ -75,12 +75,12 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
|
||||
@param identifier A string that uniquely identifies the source.
|
||||
@param geoJSONData An `NSData` object representing GeoJSON source code.
|
||||
@param options An `NSDictionary` of options for this source.
|
||||
@return An initialized GeoJSON source.
|
||||
@return An initialized shape source.
|
||||
*/
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier geoJSONData:(NSData *)data options:(nullable NS_DICTIONARY_OF(MGLGeoJSONSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier geoJSONData:(NSData *)data options:(nullable NS_DICTIONARY_OF(MGLShapeSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
/**
|
||||
Returns a GeoJSON source with an identifier, URL, and dictionary of options for
|
||||
Returns a shape source with an identifier, URL, and dictionary of options for
|
||||
the source according to the
|
||||
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">style
|
||||
specification</a>.
|
||||
@@ -89,12 +89,12 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
|
||||
@param URL An HTTP(S) URL, absolute file URL, or local file URL relative to the
|
||||
current application’s resource bundle.
|
||||
@param options An `NSDictionary` of options for this source.
|
||||
@return An initialized GeoJSON source.
|
||||
@return An initialized shape source.
|
||||
*/
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier URL:(NSURL *)url options:(nullable NS_DICTIONARY_OF(MGLGeoJSONSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier URL:(NSURL *)url options:(nullable NS_DICTIONARY_OF(MGLShapeSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
/**
|
||||
Returns a GeoJSON source with an identifier, features dictionary, and dictionary
|
||||
Returns a shape source with an identifier, a shape, and dictionary
|
||||
of options for the source according to the
|
||||
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">style
|
||||
specification</a>.
|
||||
@@ -102,9 +102,9 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
|
||||
@param identifier A string that uniquely identifies the source.
|
||||
@param shape A concrete subclass of `MGLShape`
|
||||
@param options An `NSDictionary` of options for this source.
|
||||
@return An initialized GeoJSON source.
|
||||
@return An initialized shape source.
|
||||
*/
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier shape:(nullable MGLShape *)shape options:(nullable NS_DICTIONARY_OF(MGLGeoJSONSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier shape:(nullable MGLShape *)shape options:(nullable NS_DICTIONARY_OF(MGLShapeSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
#pragma mark Accessing a Source’s Content
|
||||
|
||||
@@ -121,22 +121,22 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
|
||||
/**
|
||||
A GeoJSON representation of the contents of the source.
|
||||
|
||||
Use the `features` property instead to get an object representation of the
|
||||
Use the `shape` property instead to get an object representation of the
|
||||
contents. Alternatively, use `NSJSONSerialization` with the value of this
|
||||
property to transform it into Foundation types.
|
||||
|
||||
If the receiver was initialized using `-initWithIdentifier:URL:options` or
|
||||
`-initWithIdentifier:features:options`, this property is set to `nil`.
|
||||
This property is unavailable until the receiver is passed
|
||||
into `-[MGLStyle addSource]`.
|
||||
`-initWithIdentifier:shape:options`, this property is set to `nil`.
|
||||
This property is unavailable until the receiver is passed into
|
||||
`-[MGLStyle addSource]`.
|
||||
*/
|
||||
@property (nonatomic, nullable, copy) NSData *geoJSONData;
|
||||
|
||||
/**
|
||||
The URL to the GeoJSON document that specifies the contents of the source.
|
||||
|
||||
If the receiver was initialized using `-initWithIdentifier:geoJSONData:options`, this
|
||||
property is set to `nil`.
|
||||
If the receiver was initialized using `-initWithIdentifier:geoJSONData:options`,
|
||||
this property is set to `nil`.
|
||||
*/
|
||||
@property (nonatomic, nullable) NSURL *URL;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#import "MGLGeoJSONSource_Private.h"
|
||||
#import "MGLShapeSource_Private.h"
|
||||
|
||||
#import "MGLMapView_Private.h"
|
||||
#import "MGLSource_Private.h"
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
#include <mbgl/style/sources/geojson_source.hpp>
|
||||
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionClustered = @"MGLGeoJSONSourceOptionClustered";
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionClusterRadius = @"MGLGeoJSONSourceOptionClusterRadius";
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionMaximumZoomLevelForClustering = @"MGLGeoJSONSourceOptionMaximumZoomLevelForClustering";
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionMaximumZoomLevel = @"MGLGeoJSONSourceOptionMaximumZoomLevel";
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionBuffer = @"MGLGeoJSONSourceOptionBuffer";
|
||||
const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance = @"MGLGeoJSONSourceOptionSimplificationTolerance";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionClustered = @"MGLShapeSourceOptionClustered";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionClusterRadius = @"MGLShapeSourceOptionClusterRadius";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevelForClustering = @"MGLShapeSourceOptionMaximumZoomLevelForClustering";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevel = @"MGLShapeSourceOptionMaximumZoomLevel";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionBuffer = @"MGLShapeSourceOptionBuffer";
|
||||
const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance = @"MGLShapeSourceOptionSimplificationTolerance";
|
||||
|
||||
@interface MGLGeoJSONSource ()
|
||||
@interface MGLShapeSource ()
|
||||
|
||||
- (instancetype)initWithRawSource:(mbgl::style::GeoJSONSource *)rawSource NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
@@ -25,7 +25,7 @@ const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance = @"M
|
||||
|
||||
@end
|
||||
|
||||
@implementation MGLGeoJSONSource
|
||||
@implementation MGLShapeSource
|
||||
{
|
||||
std::unique_ptr<mbgl::style::GeoJSONSource> _pendingSource;
|
||||
}
|
||||
@@ -52,7 +52,7 @@ const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance = @"M
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier shape:(nullable MGLShape *)shape options:(NSDictionary<MGLGeoJSONSourceOption,id> *)options
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier shape:(nullable MGLShape *)shape options:(NSDictionary<MGLShapeSourceOption,id> *)options
|
||||
{
|
||||
if (self = [super initWithIdentifier:identifier]) {
|
||||
_shape = shape;
|
||||
@@ -111,32 +111,32 @@ const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance = @"M
|
||||
{
|
||||
auto mbglOptions = mbgl::style::GeoJSONOptions();
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionMaximumZoomLevel]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionMaximumZoomLevel]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.maxzoom = [value integerValue];
|
||||
}
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionBuffer]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionBuffer]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.buffer = [value integerValue];
|
||||
}
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionSimplificationTolerance]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionSimplificationTolerance]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.tolerance = [value doubleValue];
|
||||
}
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionClusterRadius]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionClusterRadius]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.clusterRadius = [value integerValue];
|
||||
}
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionMaximumZoomLevelForClustering]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionMaximumZoomLevelForClustering]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.clusterMaxZoom = [value integerValue];
|
||||
}
|
||||
|
||||
if (id value = self.options[MGLGeoJSONSourceOptionClustered]) {
|
||||
if (id value = self.options[MGLShapeSourceOptionClustered]) {
|
||||
[self validateValue:value];
|
||||
mbglOptions.cluster = [value boolValue];
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
#import "MGLGeoJSONSource.h"
|
||||
#import "MGLShapeSource.h"
|
||||
#import "MGLShapeSource_Private.h"
|
||||
|
||||
#include <mbgl/style/sources/geojson_source.hpp>
|
||||
|
||||
@interface MGLGeoJSONSource (Private)
|
||||
@interface MGLShapeSource (Private)
|
||||
|
||||
- (instancetype)initWithRawSource:(mbgl::style::GeoJSONSource *)rawSource;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#import "MGLSource.h"
|
||||
#import "MGLVectorSource_Private.h"
|
||||
#import "MGLRasterSource.h"
|
||||
#import "MGLGeoJSONSource.h"
|
||||
#import "MGLShapeSource.h"
|
||||
|
||||
#import "MGLAttributionInfo.h"
|
||||
#import "MGLTileSet_Private.h"
|
||||
@@ -167,7 +167,7 @@ static NSURL *MGLStyleURL_emerald;
|
||||
if (auto vectorSource = source->as<mbgl::style::VectorSource>()) {
|
||||
return [[MGLVectorSource alloc] initWithRawSource:vectorSource];
|
||||
} else if (auto geoJSONSource = source->as<mbgl::style::GeoJSONSource>()) {
|
||||
return [[MGLGeoJSONSource alloc] initWithRawSource:geoJSONSource];
|
||||
return [[MGLShapeSource alloc] initWithRawSource:geoJSONSource];
|
||||
} else if (auto rasterSource = source->as<mbgl::style::RasterSource>()) {
|
||||
return [[MGLRasterSource alloc] initWithRawSource:rasterSource];
|
||||
} else {
|
||||
|
||||
@@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
`MGLVectorStyleLayer` is an abstract superclass for style layers whose content
|
||||
is defined by an `MGLGeoJSONSource` or `MGLVectorSource` object.
|
||||
is defined by an `MGLShapeSource` 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
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- (void)testCircleLayer {
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGLCircleStyleLayer *layer = [[MGLCircleStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
[self.mapView.style addLayer:layer];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- (void)testFillLayer {
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
[self.mapView.style addLayer:layer];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
|
||||
@interface MGLFilterTests : MGLStyleLayerTests {
|
||||
MGLGeoJSONSource *source;
|
||||
MGLShapeSource *source;
|
||||
MGLLineStyleLayer *layer;
|
||||
}
|
||||
@end
|
||||
@@ -18,7 +18,7 @@
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
NSData *geoJSONData = [NSData dataWithContentsOfURL:url];
|
||||
source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"test-source" geoJSONData:geoJSONData options:nil];
|
||||
source = [[MGLShapeSource alloc] initWithIdentifier:@"test-source" geoJSONData:geoJSONData options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"test-layer" source:source];
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- (void)testLineLayer {
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
[self.mapView.style addLayer:layer];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- (void)testRasterLayer {
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGLRasterStyleLayer *layer = [[MGLRasterStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
[self.mapView.style addLayer:layer];
|
||||
|
||||
@@ -2,26 +2,26 @@
|
||||
|
||||
#import <Mapbox/Mapbox.h>
|
||||
#import "MGLFeature_Private.h"
|
||||
#import "MGLGeoJSONSource_Private.h"
|
||||
#import "MGLShapeSource_Private.h"
|
||||
#import "MGLSource_Private.h"
|
||||
|
||||
#include <mbgl/style/sources/geojson_source.hpp>
|
||||
|
||||
@interface MGLGeoJSONSourceTests : XCTestCase
|
||||
@interface MGLShapeSourceTests : XCTestCase
|
||||
@end
|
||||
|
||||
@implementation MGLGeoJSONSourceTests
|
||||
@implementation MGLShapeSourceTests
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithOptions {
|
||||
- (void)testMGLShapeSourceWithOptions {
|
||||
NSURL *url = [NSURL URLWithString:@"http://www.mapbox.com/source"];
|
||||
|
||||
NSDictionary *options = @{MGLGeoJSONSourceOptionClustered: @YES,
|
||||
MGLGeoJSONSourceOptionClusterRadius: @42,
|
||||
MGLGeoJSONSourceOptionMaximumZoomLevelForClustering: @98,
|
||||
MGLGeoJSONSourceOptionMaximumZoomLevel: @99,
|
||||
MGLGeoJSONSourceOptionBuffer: @1976,
|
||||
MGLGeoJSONSourceOptionSimplificationTolerance: @0.42};
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" URL:url options:options];
|
||||
NSDictionary *options = @{MGLShapeSourceOptionClustered: @YES,
|
||||
MGLShapeSourceOptionClusterRadius: @42,
|
||||
MGLShapeSourceOptionMaximumZoomLevelForClustering: @98,
|
||||
MGLShapeSourceOptionMaximumZoomLevel: @99,
|
||||
MGLShapeSourceOptionBuffer: @1976,
|
||||
MGLShapeSourceOptionSimplificationTolerance: @0.42};
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" URL:url options:options];
|
||||
|
||||
auto mbglOptions = [source geoJSONOptions];
|
||||
XCTAssertTrue(mbglOptions.cluster);
|
||||
@@ -31,21 +31,21 @@
|
||||
XCTAssertEqual(mbglOptions.buffer, 1976);
|
||||
XCTAssertEqual(mbglOptions.tolerance, 0.42);
|
||||
|
||||
options = @{MGLGeoJSONSourceOptionClustered: @"number 1"};
|
||||
XCTAssertThrows([[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" URL:url options:options]);
|
||||
options = @{MGLShapeSourceOptionClustered: @"number 1"};
|
||||
XCTAssertThrows([[MGLShapeSource alloc] initWithIdentifier:@"source-id" URL:url options:options]);
|
||||
}
|
||||
|
||||
- (void)testNilShape {
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"id" shape:nil options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"id" shape:nil options:nil];
|
||||
XCTAssertNil(source.shape);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithDataMultipleFeatures {
|
||||
- (void)testMGLShapeSourceWithDataMultipleFeatures {
|
||||
|
||||
NSString *geoJSON = @"{\"type\": \"FeatureCollection\",\"features\": [{\"type\": \"Feature\",\"properties\": {},\"geometry\": {\"type\": \"LineString\",\"coordinates\": [[-107.75390625,40.329795743702064],[-104.34814453125,37.64903402157866]]}}]}";
|
||||
|
||||
NSData *data = [geoJSON dataUsingEncoding:NSUTF8StringEncoding];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" geoJSONData:data options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" geoJSONData:data options:nil];
|
||||
|
||||
MGLShapeCollection *collection = (MGLShapeCollection *)source.shape;
|
||||
XCTAssertNotNil(collection);
|
||||
@@ -53,25 +53,25 @@
|
||||
XCTAssertTrue([collection.shapes.firstObject isMemberOfClass:[MGLPolylineFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithSingleFeature {
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"geojson"
|
||||
- (void)testMGLShapeSourceWithSingleFeature {
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"geojson"
|
||||
geoJSONData:[@"{\"type\": \"Point\", \"coordinates\": [0, 0]}" dataUsingEncoding:NSUTF8StringEncoding]
|
||||
options:nil];
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssert([source.shape isKindOfClass:[MGLPointFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithPolylineFeatures {
|
||||
- (void)testMGLShapeSourceWithPolylineFeatures {
|
||||
CLLocationCoordinate2D coordinates[] = { CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(10, 10)};
|
||||
MGLPolylineFeature *polylineFeature = [MGLPolylineFeature polylineWithCoordinates:coordinates count:2];
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:polylineFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:polylineFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLPolylineFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithPolygonFeatures {
|
||||
- (void)testMGLShapeSourceWithPolygonFeatures {
|
||||
CLLocationCoordinate2D coordinates[] = {
|
||||
CLLocationCoordinate2DMake(100.0, 0.0),
|
||||
CLLocationCoordinate2DMake(101.0, 0.0),
|
||||
@@ -101,7 +101,7 @@
|
||||
@"array-of-array-attribute": arrayOfArrays,
|
||||
@"array-of-dictionary-attribute": arrayOfDictionaries};
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:polygonFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:polygonFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
MGLPolygonFeature *expectedPolygonFeature = (MGLPolygonFeature *)source.shape;
|
||||
@@ -117,7 +117,7 @@
|
||||
XCTAssertEqualObjects(expectedPolygonFeature.attributes[@"array-of-dictionary-attribute"], arrayOfDictionaries);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithPolygonFeaturesInculdingInteriorPolygons {
|
||||
- (void)testMGLShapeSourceWithPolygonFeaturesInculdingInteriorPolygons {
|
||||
CLLocationCoordinate2D coordinates[] = {
|
||||
CLLocationCoordinate2DMake(100.0, 0.0),
|
||||
CLLocationCoordinate2DMake(101.0, 0.0),
|
||||
@@ -136,26 +136,26 @@
|
||||
|
||||
MGLPolygonFeature *polygonFeature = [MGLPolygonFeature polygonWithCoordinates:coordinates count:5 interiorPolygons:@[polygon]];
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:polygonFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:polygonFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLPolygonFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithMultiPolylineFeatures {
|
||||
- (void)testMGLShapeSourceWithMultiPolylineFeatures {
|
||||
CLLocationCoordinate2D firstCoordinates[] = { CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(10, 10)};
|
||||
MGLPolylineFeature *firstPolylineFeature = [MGLPolylineFeature polylineWithCoordinates:firstCoordinates count:2];
|
||||
CLLocationCoordinate2D secondCoordinates[] = { CLLocationCoordinate2DMake(0, 0), CLLocationCoordinate2DMake(10, 10)};
|
||||
MGLPolylineFeature *secondPolylineFeature = [MGLPolylineFeature polylineWithCoordinates:secondCoordinates count:2];
|
||||
MGLMultiPolylineFeature *multiPolylineFeature = [MGLMultiPolylineFeature multiPolylineWithPolylines:@[firstPolylineFeature, secondPolylineFeature]];
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:multiPolylineFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:multiPolylineFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLMultiPolylineFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithMultiPolygonFeatures {
|
||||
- (void)testMGLShapeSourceWithMultiPolygonFeatures {
|
||||
CLLocationCoordinate2D coordinates[] = {
|
||||
CLLocationCoordinate2DMake(100.0, 0.0),
|
||||
CLLocationCoordinate2DMake(101.0, 0.0),
|
||||
@@ -177,23 +177,23 @@
|
||||
|
||||
MGLMultiPolygonFeature *multiPolygonFeature = [MGLMultiPolygonFeature multiPolygonWithPolygons:@[firstPolygon, secondPolygon]];
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:multiPolygonFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:multiPolygonFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLMultiPolygonFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithPointFeature {
|
||||
- (void)testMGLShapeSourceWithPointFeature {
|
||||
MGLPointFeature *pointFeature = [MGLPointFeature new];
|
||||
pointFeature.coordinate = CLLocationCoordinate2DMake(100.2, 0.2);
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"souce-id" shape:pointFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"souce-id" shape:pointFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLPointFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithPointCollectionFeature {
|
||||
- (void)testMGLShapeSourceWithPointCollectionFeature {
|
||||
CLLocationCoordinate2D coordinates[] = {
|
||||
CLLocationCoordinate2DMake(100.0, 0.0),
|
||||
CLLocationCoordinate2DMake(101.0, 0.0),
|
||||
@@ -201,13 +201,13 @@
|
||||
CLLocationCoordinate2DMake(100.0, 1.0),
|
||||
CLLocationCoordinate2DMake(100.0, 0.0)};
|
||||
MGLPointCollectionFeature *pointCollectionFeature = [MGLPointCollectionFeature pointCollectionWithCoordinates:coordinates count:5];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"souce-id" shape:pointCollectionFeature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"souce-id" shape:pointCollectionFeature options:nil];
|
||||
|
||||
XCTAssertNotNil(source.shape);
|
||||
XCTAssertTrue([source.shape isMemberOfClass:[MGLPointCollectionFeature class]]);
|
||||
}
|
||||
|
||||
- (void)testMGLGeoJSONSourceWithShapeCollectionFeatures {
|
||||
- (void)testMGLShapeSourceWithShapeCollectionFeatures {
|
||||
CLLocationCoordinate2D coordinates[] = {
|
||||
CLLocationCoordinate2DMake(100.0, 0.0),
|
||||
CLLocationCoordinate2DMake(101.0, 0.0),
|
||||
@@ -243,7 +243,7 @@
|
||||
MGLShapeCollectionFeature *shapeCollectionFeature_1 = [MGLShapeCollectionFeature shapeCollectionWithShapes:@[polygonFeature, polylineFeature, multiPolygonFeature, multiPolylineFeature, pointCollectionFeature, pointFeature, shapeCollectionFeature]];
|
||||
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"source-id" shape:shapeCollectionFeature_1 options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"source-id" shape:shapeCollectionFeature_1 options:nil];
|
||||
|
||||
MGLShapeCollectionFeature *shape = (MGLShapeCollectionFeature *)source.shape;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#import "MGLMapView.h"
|
||||
#import "MGLStyle_Private.h"
|
||||
|
||||
#import "MGLGeoJSONSource.h"
|
||||
#import "MGLShapeSource.h"
|
||||
#import "MGLRasterSource.h"
|
||||
#import "MGLVectorSource.h"
|
||||
|
||||
@@ -121,9 +121,9 @@
|
||||
}
|
||||
|
||||
- (void)testAddingSourcesTwice {
|
||||
MGLGeoJSONSource *geoJSONSource = [[MGLGeoJSONSource alloc] initWithIdentifier:@"geoJSONSource" shape:nil options:nil];
|
||||
[self.style addSource:geoJSONSource];
|
||||
XCTAssertThrowsSpecificNamed([self.style addSource:geoJSONSource], NSException, @"MGLRedundantSourceException");
|
||||
MGLShapeSource *shapeSource = [[MGLShapeSource alloc] initWithIdentifier:@"geoJSONSource" shape:nil options:nil];
|
||||
[self.style addSource:shapeSource];
|
||||
XCTAssertThrowsSpecificNamed([self.style addSource:shapeSource], NSException, @"MGLRedundantSourceException");
|
||||
|
||||
MGLRasterSource *rasterSource = [[MGLRasterSource alloc] initWithIdentifier:@"rasterSource" URL:[NSURL new] tileSize:42];
|
||||
[self.style addSource:rasterSource];
|
||||
@@ -143,7 +143,7 @@
|
||||
}
|
||||
|
||||
- (void)testAddingLayersTwice {
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"geoJSONSource" shape:nil options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"geoJSONSource" shape:nil options:nil];
|
||||
|
||||
MGLBackgroundStyleLayer *backgroundLayer = [[MGLBackgroundStyleLayer alloc] initWithIdentifier:@"backgroundLayer"];
|
||||
[self.style addLayer:backgroundLayer];
|
||||
|
||||
@@ -5,8 +5,8 @@ import Mapbox
|
||||
extension MGLStyleValueTests {
|
||||
|
||||
func testConstantValues() {
|
||||
let geoJSONSource = MGLGeoJSONSource(identifier: "test", shape: nil, options: nil)
|
||||
let symbolStyleLayer = MGLSymbolStyleLayer(identifier: "test", source: geoJSONSource)
|
||||
let shapeSource = MGLShapeSource(identifier: "test", shape: nil, options: nil)
|
||||
let symbolStyleLayer = MGLSymbolStyleLayer(identifier: "test", source: shapeSource)
|
||||
|
||||
// Boolean
|
||||
symbolStyleLayer.iconAllowOverlap = MGLStyleConstantValue(rawValue: true)
|
||||
@@ -22,7 +22,7 @@ extension MGLStyleValueTests {
|
||||
}
|
||||
|
||||
func testFunctions() {
|
||||
let geoJSONSource = MGLGeoJSONSource(identifier: "test", shape: nil, options: nil)
|
||||
let geoJSONSource = MGLShapeSource(identifier: "test", shape: nil, options: nil)
|
||||
let symbolStyleLayer = MGLSymbolStyleLayer(identifier: "test", source: geoJSONSource)
|
||||
|
||||
// Boolean
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- (void)testSymbolLayer {
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *url = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" URL:url options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
MGLSymbolStyleLayer *layer = [[MGLSymbolStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
||||
[self.mapView.style addLayer:layer];
|
||||
|
||||
@@ -54,7 +54,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsRuntimeStylingRows) {
|
||||
MBXSettingsRuntimeStylingWater = 0,
|
||||
MBXSettingsRuntimeStylingRoads,
|
||||
MBXSettingsRuntimeStylingRaster,
|
||||
MBXSettingsRuntimeStylingGeoJSON,
|
||||
MBXSettingsRuntimeStylingShape,
|
||||
MBXSettingsRuntimeStylingSymbols,
|
||||
MBXSettingsRuntimeStylingBuildings,
|
||||
MBXSettingsRuntimeStylingFerry,
|
||||
@@ -65,9 +65,9 @@ typedef NS_ENUM(NSInteger, MBXSettingsRuntimeStylingRows) {
|
||||
MBXSettingsRuntimeStylingStyleQuery,
|
||||
MBXSettingsRuntimeStylingFeatureSource,
|
||||
MBXSettingsRuntimeStylingPointCollection,
|
||||
MBXSettingsRuntimeStylingUpdateGeoJSONSourceData,
|
||||
MBXSettingsRuntimeStylingUpdateGeoJSONSourceURL,
|
||||
MBXSettingsRuntimeStylingUpdateGeoJSONSourceFeatures,
|
||||
MBXSettingsRuntimeStylingUpdateShapeSourceData,
|
||||
MBXSettingsRuntimeStylingUpdateShapeSourceURL,
|
||||
MBXSettingsRuntimeStylingUpdateShapeSourceFeatures,
|
||||
MBXSettingsRuntimeStylingVectorSource,
|
||||
MBXSettingsRuntimeStylingRasterSource,
|
||||
MBXSettingsRuntimeStylingCountryLabels,
|
||||
@@ -316,7 +316,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
@"Style Water With Function",
|
||||
@"Style Roads With Function",
|
||||
@"Add Raster & Apply Function",
|
||||
@"Add GeoJSON & Apply Fill",
|
||||
@"Add Shapes & Apply Fill",
|
||||
@"Style Symbol Color",
|
||||
@"Style Building Fill Color",
|
||||
@"Style Ferry Line Color",
|
||||
@@ -324,12 +324,12 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
@"Style Fill With Filter",
|
||||
@"Style Lines With Filter",
|
||||
@"Style Fill With Numeric Filter",
|
||||
@"Style Query For GeoJSON",
|
||||
@"Query and Style Features",
|
||||
@"Style Feature",
|
||||
@"Style Dynamic Point Collection",
|
||||
@"Update GeoJSON Source: Data",
|
||||
@"Update GeoJSON Source: URL",
|
||||
@"Update GeoJSON Source: Features",
|
||||
@"Update Shape Source: Data",
|
||||
@"Update Shape Source: URL",
|
||||
@"Update Shape Source: Features",
|
||||
@"Style Vector Source",
|
||||
@"Style Raster Source",
|
||||
[NSString stringWithFormat:@"Label Countries in %@", (_usingLocaleBasedCountryLabels ? @"Local Language" : [[NSLocale currentLocale] displayNameForKey:NSLocaleIdentifier value:[self bestLanguageForUser]])],
|
||||
@@ -441,8 +441,8 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
case MBXSettingsRuntimeStylingRaster:
|
||||
[self styleRasterLayer];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingGeoJSON:
|
||||
[self styleGeoJSONSource];
|
||||
case MBXSettingsRuntimeStylingShape:
|
||||
[self styleShapeSource];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingSymbols:
|
||||
[self styleSymbolLayer];
|
||||
@@ -474,14 +474,14 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
case MBXSettingsRuntimeStylingPointCollection:
|
||||
[self styleDynamicPointCollection];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingUpdateGeoJSONSourceURL:
|
||||
[self updateGeoJSONSourceURL];
|
||||
case MBXSettingsRuntimeStylingUpdateShapeSourceURL:
|
||||
[self updateShapeSourceURL];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingUpdateGeoJSONSourceData:
|
||||
[self updateGeoJSONSourceData];
|
||||
case MBXSettingsRuntimeStylingUpdateShapeSourceData:
|
||||
[self updateShapeSourceData];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingUpdateGeoJSONSourceFeatures:
|
||||
[self updateGeoJSONSourceFeatures];
|
||||
case MBXSettingsRuntimeStylingUpdateShapeSourceFeatures:
|
||||
[self updateShapeSourceFeatures];
|
||||
break;
|
||||
case MBXSettingsRuntimeStylingVectorSource:
|
||||
[self styleVectorSource];
|
||||
@@ -764,11 +764,11 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
[self.mapView.style addLayer:rasterLayer];
|
||||
}
|
||||
|
||||
- (void)styleGeoJSONSource
|
||||
- (void)styleShapeSource
|
||||
{
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"ams" URL:geoJSONURL options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"ams" URL:geoJSONURL options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLFillStyleLayer *fillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"test" source:source];
|
||||
@@ -897,7 +897,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
MGLShapeCollectionFeature *features = [MGLShapeCollectionFeature shapeCollectionWithShapes:visibleFeatures];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:querySourceID shape:features options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:querySourceID shape:features options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLFillStyleLayer *fillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:queryLayerID source:source];
|
||||
@@ -913,44 +913,44 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
self.mapView.centerCoordinate = CLLocationCoordinate2DMake(51.068585180672635, -114.06074523925781);
|
||||
|
||||
CLLocationCoordinate2D leafCoords[] = {
|
||||
CLLocationCoordinate2DMake(50.9683733218221,-114.07035827636719),
|
||||
CLLocationCoordinate2DMake(51.02325750523972,-114.06967163085938),
|
||||
CLLocationCoordinate2DMake(51.009434536947786,-114.14245605468749),
|
||||
CLLocationCoordinate2DMake(51.030599281184124,-114.12597656249999),
|
||||
CLLocationCoordinate2DMake(51.060386316691016,-114.21043395996094),
|
||||
CLLocationCoordinate2DMake(51.063838646941576,-114.17816162109375),
|
||||
CLLocationCoordinate2DMake(51.08152779888779,-114.19876098632812),
|
||||
CLLocationCoordinate2DMake(51.08066507029602,-114.16854858398438),
|
||||
CLLocationCoordinate2DMake(51.09662294502995,-114.17472839355469),
|
||||
CLLocationCoordinate2DMake(51.07764539352731,-114.114990234375),
|
||||
CLLocationCoordinate2DMake(51.13670896949613,-114.12391662597656),
|
||||
CLLocationCoordinate2DMake(51.13369295212583,-114.09576416015624),
|
||||
CLLocationCoordinate2DMake(51.17546878815025,-114.07585144042969),
|
||||
CLLocationCoordinate2DMake(51.140155605265896,-114.04632568359375),
|
||||
CLLocationCoordinate2DMake(51.15049396880196,-114.01542663574219),
|
||||
CLLocationCoordinate2DMake(51.088860342359965,-114.00924682617186),
|
||||
CLLocationCoordinate2DMake(51.12205789681453,-113.94813537597656),
|
||||
CLLocationCoordinate2DMake(51.106539930027225,-113.94882202148438),
|
||||
CLLocationCoordinate2DMake(51.117747873223344,-113.92616271972656),
|
||||
CLLocationCoordinate2DMake(51.10093493903458,-113.92616271972656),
|
||||
CLLocationCoordinate2DMake(51.10697105503078,-113.90625),
|
||||
CLLocationCoordinate2DMake(51.09144802136697,-113.9117431640625),
|
||||
CLLocationCoordinate2DMake(51.04916446529361,-113.97010803222655),
|
||||
CLLocationCoordinate2DMake(51.045279344649146,-113.9398956298828),
|
||||
CLLocationCoordinate2DMake(51.022825599852496,-114.06211853027344),
|
||||
CLLocationCoordinate2DMake(51.045279344649146,-113.9398956298828),
|
||||
CLLocationCoordinate2DMake(51.022825599852496,-114.06211853027344),
|
||||
CLLocationCoordinate2DMake(51.022825599852496,-114.06280517578125),
|
||||
CLLocationCoordinate2DMake(50.968805734317804,-114.06280517578125),
|
||||
CLLocationCoordinate2DMake(50.9683733218221,-114.07035827636719),
|
||||
{50.9683733218221,-114.07035827636719},
|
||||
{51.02325750523972,-114.06967163085938},
|
||||
{51.009434536947786,-114.14245605468749},
|
||||
{51.030599281184124,-114.12597656249999},
|
||||
{51.060386316691016,-114.21043395996094},
|
||||
{51.063838646941576,-114.17816162109375},
|
||||
{51.08152779888779,-114.19876098632812},
|
||||
{51.08066507029602,-114.16854858398438},
|
||||
{51.09662294502995,-114.17472839355469},
|
||||
{51.07764539352731,-114.114990234375},
|
||||
{51.13670896949613,-114.12391662597656},
|
||||
{51.13369295212583,-114.09576416015624},
|
||||
{51.17546878815025,-114.07585144042969},
|
||||
{51.140155605265896,-114.04632568359375},
|
||||
{51.15049396880196,-114.01542663574219},
|
||||
{51.088860342359965,-114.00924682617186},
|
||||
{51.12205789681453,-113.94813537597656},
|
||||
{51.106539930027225,-113.94882202148438},
|
||||
{51.117747873223344,-113.92616271972656},
|
||||
{51.10093493903458,-113.92616271972656},
|
||||
{51.10697105503078,-113.90625},
|
||||
{51.09144802136697,-113.9117431640625},
|
||||
{51.04916446529361,-113.97010803222655},
|
||||
{51.045279344649146,-113.9398956298828},
|
||||
{51.022825599852496,-114.06211853027344},
|
||||
{51.045279344649146,-113.9398956298828},
|
||||
{51.022825599852496,-114.06211853027344},
|
||||
{51.022825599852496,-114.06280517578125},
|
||||
{50.968805734317804,-114.06280517578125},
|
||||
{50.9683733218221,-114.07035827636719},
|
||||
};
|
||||
NSUInteger coordsCount = sizeof(leafCoords) / sizeof(leafCoords[0]);
|
||||
|
||||
MGLPolygonFeature *feature = [MGLPolygonFeature polygonWithCoordinates:leafCoords count:coordsCount];
|
||||
feature.identifier = @"leaf-feature";
|
||||
feature.attributes = @{@"color": @"red"};
|
||||
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"leaf-source" shape:feature options:nil];
|
||||
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"leaf-source" shape:feature options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"leaf-fill-layer" source:source];
|
||||
@@ -960,14 +960,14 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
[self.mapView.style addLayer:layer];
|
||||
}
|
||||
|
||||
- (void)updateGeoJSONSourceData
|
||||
- (void)updateShapeSourceData
|
||||
{
|
||||
[self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40.329795743702064, -107.75390625) zoomLevel:11 animated:NO];
|
||||
|
||||
NSString *geoJSON = @"{\"type\": \"FeatureCollection\",\"features\": [{\"type\": \"Feature\",\"properties\": {},\"geometry\": {\"type\": \"LineString\",\"coordinates\": [[-107.75390625,40.329795743702064],[-104.34814453125,37.64903402157866]]}}]}";
|
||||
|
||||
NSData *data = [geoJSON dataUsingEncoding:NSUTF8StringEncoding];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"mutable-data-source-id" geoJSONData:data options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-id" geoJSONData:data options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"mutable-data-layer-id" source:source];
|
||||
@@ -981,13 +981,13 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
});
|
||||
}
|
||||
|
||||
- (void)updateGeoJSONSourceURL
|
||||
- (void)updateShapeSourceURL
|
||||
{
|
||||
[self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(48.668731, -122.857151) zoomLevel:11 animated:NO];
|
||||
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"polyline" ofType:@"geojson"];
|
||||
NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"mutable-data-source-url-id" URL:geoJSONURL options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-url-id" URL:geoJSONURL options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"mutable-data-layer-url-id" source:source];
|
||||
@@ -1003,7 +1003,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
});
|
||||
}
|
||||
|
||||
- (void)updateGeoJSONSourceFeatures
|
||||
- (void)updateShapeSourceFeatures
|
||||
{
|
||||
[self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(-41.1520, 288.6592) zoomLevel:10 animated:NO];
|
||||
|
||||
@@ -1026,9 +1026,8 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
MGLPolygonFeature *smallBoxFeature = [MGLPolygonFeature polygonWithCoordinates:smallBox count:sizeof(smallBox)/sizeof(smallBox[0])];
|
||||
MGLPolygonFeature *largeBoxFeature = [MGLPolygonFeature polygonWithCoordinates:largeBox count:sizeof(largeBox)/sizeof(largeBox[0])];
|
||||
|
||||
MGLShapeCollectionFeature *collection = [MGLShapeCollectionFeature shapeCollectionWithShapes:@[smallBoxFeature]];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"mutable-data-source-features-id"
|
||||
shape:collection
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-features-id"
|
||||
shape:smallBoxFeature
|
||||
options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
@@ -1052,7 +1051,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
{36.99508088541243, -109.04007911682129},
|
||||
};
|
||||
MGLPointCollectionFeature *feature = [MGLPointCollectionFeature pointCollectionWithCoordinates:coordinates count:4];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"wiggle-source" shape:feature options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"wiggle-source" shape:feature options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLCircleStyleLayer *layer = [[MGLCircleStyleLayer alloc] initWithIdentifier:@"wiggle-layer" source:source];
|
||||
@@ -1119,7 +1118,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
|
||||
|
||||
MGLPolylineFeature *routeLine = [MGLPolylineFeature polylineWithCoordinates:coords count:count];
|
||||
|
||||
MGLGeoJSONSource *routeSource = [[MGLGeoJSONSource alloc] initWithIdentifier:@"style-route-source" shape:routeLine options:nil];
|
||||
MGLShapeSource *routeSource = [[MGLShapeSource alloc] initWithIdentifier:@"style-route-source" shape:routeLine options:nil];
|
||||
[self.mapView.style addSource:routeSource];
|
||||
|
||||
MGLLineStyleLayer *baseRouteLayer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"style-base-route-layer" source:routeSource];
|
||||
|
||||
@@ -76,10 +76,10 @@
|
||||
354B839C1D2E9B48005D9406 /* MBXUserLocationAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 354B839B1D2E9B48005D9406 /* MBXUserLocationAnnotationView.m */; };
|
||||
35599DED1D46F14E0048254D /* MGLStyleValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35599DEA1D46F14E0048254D /* MGLStyleValue.mm */; };
|
||||
35599DEE1D46F14E0048254D /* MGLStyleValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35599DEA1D46F14E0048254D /* MGLStyleValue.mm */; };
|
||||
3566C7661D4A77BA008152BC /* MGLGeoJSONSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C7641D4A77BA008152BC /* MGLGeoJSONSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C7671D4A77BA008152BC /* MGLGeoJSONSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C7641D4A77BA008152BC /* MGLGeoJSONSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C7681D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3566C7651D4A77BA008152BC /* MGLGeoJSONSource.mm */; };
|
||||
3566C7691D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3566C7651D4A77BA008152BC /* MGLGeoJSONSource.mm */; };
|
||||
3566C7661D4A77BA008152BC /* MGLShapeSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C7641D4A77BA008152BC /* MGLShapeSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C7671D4A77BA008152BC /* MGLShapeSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C7641D4A77BA008152BC /* MGLShapeSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C7681D4A77BA008152BC /* MGLShapeSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3566C7651D4A77BA008152BC /* MGLShapeSource.mm */; };
|
||||
3566C7691D4A77BA008152BC /* MGLShapeSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3566C7651D4A77BA008152BC /* MGLShapeSource.mm */; };
|
||||
3566C76C1D4A8DFA008152BC /* MGLRasterSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C76A1D4A8DFA008152BC /* MGLRasterSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C76D1D4A8DFA008152BC /* MGLRasterSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3566C76A1D4A8DFA008152BC /* MGLRasterSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3566C76E1D4A8DFA008152BC /* MGLRasterSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3566C76B1D4A8DFA008152BC /* MGLRasterSource.mm */; };
|
||||
@@ -155,12 +155,12 @@
|
||||
408AA8581DAEDA1E00022900 /* NSDictionary+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 408AA8561DAEDA0800022900 /* NSDictionary+MGLAdditions.mm */; };
|
||||
408AA8591DAEDA1E00022900 /* NSDictionary+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 408AA8561DAEDA0800022900 /* NSDictionary+MGLAdditions.mm */; };
|
||||
40CF6DBB1DAC3C6600A4D18B /* MGLShape_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40CF6DBA1DAC3C1800A4D18B /* MGLShape_Private.h */; };
|
||||
40CFA6511D7875BB008103BD /* MGLGeoJSONSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40CFA6501D787579008103BD /* MGLGeoJSONSourceTests.mm */; };
|
||||
40CFA6511D7875BB008103BD /* MGLShapeSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40CFA6501D787579008103BD /* MGLShapeSourceTests.mm */; };
|
||||
40EDA1C01CFE0E0200D9EA68 /* MGLAnnotationContainerView.h in Headers */ = {isa = PBXBuildFile; fileRef = 40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */; };
|
||||
40EDA1C11CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */; };
|
||||
40EDA1C21CFE0E0500D9EA68 /* MGLAnnotationContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */; };
|
||||
40F887701D7A1E58008ECB67 /* MGLGeoJSONSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */; };
|
||||
40F887711D7A1E59008ECB67 /* MGLGeoJSONSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */; };
|
||||
40F887701D7A1E58008ECB67 /* MGLShapeSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */; };
|
||||
40F887711D7A1E59008ECB67 /* MGLShapeSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */; };
|
||||
40FDA76B1CCAAA6800442548 /* MBXAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */; };
|
||||
554180421D2E97DE00012372 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554180411D2E97DE00012372 /* OpenGLES.framework */; };
|
||||
55D8C9961D0F18CE00F42F10 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 55D8C9951D0F18CE00F42F10 /* libsqlite3.tbd */; };
|
||||
@@ -538,8 +538,8 @@
|
||||
354B839A1D2E9B48005D9406 /* MBXUserLocationAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXUserLocationAnnotationView.h; sourceTree = "<group>"; };
|
||||
354B839B1D2E9B48005D9406 /* MBXUserLocationAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXUserLocationAnnotationView.m; sourceTree = "<group>"; };
|
||||
35599DEA1D46F14E0048254D /* MGLStyleValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLStyleValue.mm; sourceTree = "<group>"; };
|
||||
3566C7641D4A77BA008152BC /* MGLGeoJSONSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLGeoJSONSource.h; sourceTree = "<group>"; };
|
||||
3566C7651D4A77BA008152BC /* MGLGeoJSONSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLGeoJSONSource.mm; sourceTree = "<group>"; };
|
||||
3566C7641D4A77BA008152BC /* MGLShapeSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLShapeSource.h; sourceTree = "<group>"; };
|
||||
3566C7651D4A77BA008152BC /* MGLShapeSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLShapeSource.mm; sourceTree = "<group>"; };
|
||||
3566C76A1D4A8DFA008152BC /* MGLRasterSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterSource.h; sourceTree = "<group>"; };
|
||||
3566C76B1D4A8DFA008152BC /* MGLRasterSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterSource.mm; sourceTree = "<group>"; };
|
||||
3566C7701D4A9198008152BC /* MGLSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLSource_Private.h; sourceTree = "<group>"; };
|
||||
@@ -593,10 +593,10 @@
|
||||
408AA8551DAEDA0800022900 /* NSDictionary+MGLAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+MGLAdditions.h"; sourceTree = "<group>"; };
|
||||
408AA8561DAEDA0800022900 /* NSDictionary+MGLAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSDictionary+MGLAdditions.mm"; sourceTree = "<group>"; };
|
||||
40CF6DBA1DAC3C1800A4D18B /* MGLShape_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLShape_Private.h; sourceTree = "<group>"; };
|
||||
40CFA6501D787579008103BD /* MGLGeoJSONSourceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLGeoJSONSourceTests.mm; path = ../../darwin/test/MGLGeoJSONSourceTests.mm; sourceTree = "<group>"; };
|
||||
40CFA6501D787579008103BD /* MGLShapeSourceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLShapeSourceTests.mm; path = ../../darwin/test/MGLShapeSourceTests.mm; sourceTree = "<group>"; };
|
||||
40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationContainerView.h; sourceTree = "<group>"; };
|
||||
40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLAnnotationContainerView.m; sourceTree = "<group>"; };
|
||||
40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLGeoJSONSource_Private.h; sourceTree = "<group>"; };
|
||||
40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLShapeSource_Private.h; sourceTree = "<group>"; };
|
||||
40FDA7691CCAAA6800442548 /* MBXAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBXAnnotationView.h; sourceTree = "<group>"; };
|
||||
40FDA76A1CCAAA6800442548 /* MBXAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBXAnnotationView.m; sourceTree = "<group>"; };
|
||||
554180411D2E97DE00012372 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
|
||||
@@ -848,9 +848,9 @@
|
||||
35136D4B1D4277FC00C20EFD /* MGLSource.mm */,
|
||||
350098B91D480108004B2AF0 /* MGLVectorSource.h */,
|
||||
350098BA1D480108004B2AF0 /* MGLVectorSource.mm */,
|
||||
3566C7641D4A77BA008152BC /* MGLGeoJSONSource.h */,
|
||||
40F8876F1D7A1DB8008ECB67 /* MGLGeoJSONSource_Private.h */,
|
||||
3566C7651D4A77BA008152BC /* MGLGeoJSONSource.mm */,
|
||||
3566C7641D4A77BA008152BC /* MGLShapeSource.h */,
|
||||
40F8876F1D7A1DB8008ECB67 /* MGLShapeSource_Private.h */,
|
||||
3566C7651D4A77BA008152BC /* MGLShapeSource.mm */,
|
||||
3566C76A1D4A8DFA008152BC /* MGLRasterSource.h */,
|
||||
3566C76B1D4A8DFA008152BC /* MGLRasterSource.mm */,
|
||||
404C26E01D89B877000AA13D /* MGLTileSet.h */,
|
||||
@@ -962,7 +962,7 @@
|
||||
40CFA64E1D78754A008103BD /* Sources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
40CFA6501D787579008103BD /* MGLGeoJSONSourceTests.mm */,
|
||||
40CFA6501D787579008103BD /* MGLShapeSourceTests.mm */,
|
||||
4085AF081D933DEA00F11B22 /* MGLTileSetTests.mm */,
|
||||
);
|
||||
name = Sources;
|
||||
@@ -1442,7 +1442,7 @@
|
||||
7E016D7E1D9E86BE00A29A21 /* MGLPolyline+MGLAdditions.h in Headers */,
|
||||
35D13AB71D3D15E300AFB4E0 /* MGLStyleLayer.h in Headers */,
|
||||
DA88488E1CBB047F00AB86E3 /* reachability.h in Headers */,
|
||||
40F887701D7A1E58008ECB67 /* MGLGeoJSONSource_Private.h in Headers */,
|
||||
40F887701D7A1E58008ECB67 /* MGLShapeSource_Private.h in Headers */,
|
||||
350098DC1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.h in Headers */,
|
||||
DA8848231CBAFA6200AB86E3 /* MGLOfflineStorage_Private.h in Headers */,
|
||||
404326891D5B9B27007111BD /* MGLAnnotationContainerView_Private.h in Headers */,
|
||||
@@ -1485,7 +1485,7 @@
|
||||
DAD165781CF4CDFF001FF4B9 /* MGLShapeCollection.h in Headers */,
|
||||
DAED38631D62D0FC00D7640F /* NSURL+MGLAdditions.h in Headers */,
|
||||
DA88481E1CBAFA6200AB86E3 /* MGLMultiPoint_Private.h in Headers */,
|
||||
3566C7661D4A77BA008152BC /* MGLGeoJSONSource.h in Headers */,
|
||||
3566C7661D4A77BA008152BC /* MGLShapeSource.h in Headers */,
|
||||
35CE61821D4165D9004F2359 /* UIColor+MGLAdditions.h in Headers */,
|
||||
35B82BF81D6C5F8400B1B721 /* NSPredicate+MGLAdditions.h in Headers */,
|
||||
DA35A29E1CC9E94C00E826B2 /* MGLCoordinateFormatter.h in Headers */,
|
||||
@@ -1548,7 +1548,7 @@
|
||||
DABFB8641CBE99E500D62B32 /* MGLOfflineStorage.h in Headers */,
|
||||
DAD165791CF4CDFF001FF4B9 /* MGLShapeCollection.h in Headers */,
|
||||
4049C29E1DB6CD6C00B3F799 /* MGLPointCollection.h in Headers */,
|
||||
3566C7671D4A77BA008152BC /* MGLGeoJSONSource.h in Headers */,
|
||||
3566C7671D4A77BA008152BC /* MGLShapeSource.h in Headers */,
|
||||
DA35A29F1CC9E94C00E826B2 /* MGLCoordinateFormatter.h in Headers */,
|
||||
404C26E31D89B877000AA13D /* MGLTileSet.h in Headers */,
|
||||
DABFB8611CBE99E500D62B32 /* MGLMultiPoint.h in Headers */,
|
||||
@@ -1585,7 +1585,7 @@
|
||||
353933F31D3FB753003F57D7 /* MGLCircleStyleLayer.h in Headers */,
|
||||
3538AA1E1D542239008EC33D /* MGLForegroundStyleLayer.h in Headers */,
|
||||
30E578181DAA85520050F07E /* UIImage+MGLAdditions.h in Headers */,
|
||||
40F887711D7A1E59008ECB67 /* MGLGeoJSONSource_Private.h in Headers */,
|
||||
40F887711D7A1E59008ECB67 /* MGLShapeSource_Private.h in Headers */,
|
||||
DABFB8631CBE99E500D62B32 /* MGLOfflineRegion.h in Headers */,
|
||||
DA35A2B21CCA141D00E826B2 /* MGLCompassDirectionFormatter.h in Headers */,
|
||||
DABFB8731CBE9A9900D62B32 /* Mapbox.h in Headers */,
|
||||
@@ -1929,7 +1929,7 @@
|
||||
357579871D502AFE000B822E /* MGLLineStyleLayerTests.m in Sources */,
|
||||
357579891D502B06000B822E /* MGLCircleStyleLayerTests.m in Sources */,
|
||||
DA2207BF1DC0805F0002F84D /* MGLStyleValueTests.swift in Sources */,
|
||||
40CFA6511D7875BB008103BD /* MGLGeoJSONSourceTests.mm in Sources */,
|
||||
40CFA6511D7875BB008103BD /* MGLShapeSourceTests.mm in Sources */,
|
||||
DA35A2C51CCA9F8300E826B2 /* MGLClockDirectionFormatterTests.m in Sources */,
|
||||
35B8E08C1D6C8B5100E768D2 /* MGLFilterTests.mm in Sources */,
|
||||
DD58A4C61D822BD000E1F038 /* MGLExpressionTests.mm in Sources */,
|
||||
@@ -1961,7 +1961,7 @@
|
||||
35136D3C1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */,
|
||||
350098DE1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */,
|
||||
DA6408DD1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */,
|
||||
3566C7681D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */,
|
||||
3566C7681D4A77BA008152BC /* MGLShapeSource.mm in Sources */,
|
||||
400533021DB0862B0069F638 /* NSArray+MGLAdditions.mm in Sources */,
|
||||
35136D421D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */,
|
||||
3538AA1F1D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */,
|
||||
@@ -2036,7 +2036,7 @@
|
||||
35136D3D1D42272500C20EFD /* MGLCircleStyleLayer.mm in Sources */,
|
||||
350098DF1D484E60004B2AF0 /* NSValue+MGLStyleAttributeAdditions.mm in Sources */,
|
||||
DA6408DE1DA4E7D300908C90 /* MGLVectorStyleLayer.m in Sources */,
|
||||
3566C7691D4A77BA008152BC /* MGLGeoJSONSource.mm in Sources */,
|
||||
3566C7691D4A77BA008152BC /* MGLShapeSource.mm in Sources */,
|
||||
400533031DB086490069F638 /* NSArray+MGLAdditions.mm in Sources */,
|
||||
35136D431D42274500C20EFD /* MGLRasterStyleLayer.mm in Sources */,
|
||||
3538AA201D542239008EC33D /* MGLForegroundStyleLayer.m in Sources */,
|
||||
|
||||
@@ -66,7 +66,7 @@ custom_categories:
|
||||
- name: Data Sources
|
||||
children:
|
||||
- MGLSource
|
||||
- MGLGeoJSONSource
|
||||
- MGLShapeSource
|
||||
- MGLRasterSource
|
||||
- MGLTileSet
|
||||
- MGLVectorSource
|
||||
|
||||
@@ -44,7 +44,7 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[];
|
||||
#import "MGLOpenGLStyleLayer.h"
|
||||
#import "MGLSource.h"
|
||||
#import "MGLVectorSource.h"
|
||||
#import "MGLGeoJSONSource.h"
|
||||
#import "MGLShapeSource.h"
|
||||
#import "MGLRasterSource.h"
|
||||
#import "MGLTilePyramidOfflineRegion.h"
|
||||
#import "MGLTypes.h"
|
||||
|
||||
@@ -691,7 +691,7 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio
|
||||
|
||||
NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
|
||||
NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
|
||||
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithIdentifier:@"ams" URL:geoJSONURL options:nil];
|
||||
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"ams" URL:geoJSONURL options:nil];
|
||||
[self.mapView.style addSource:source];
|
||||
|
||||
MGLFillStyleLayer *fillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"test" source:source];
|
||||
|
||||
@@ -60,7 +60,7 @@ custom_categories:
|
||||
- name: Data Sources
|
||||
children:
|
||||
- MGLSource
|
||||
- MGLGeoJSONSource
|
||||
- MGLShapeSource
|
||||
- MGLRasterSource
|
||||
- MGLTileSet
|
||||
- MGLVectorSource
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
352742821D4C243B00A1ECE6 /* MGLSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 352742801D4C243B00A1ECE6 /* MGLSource.mm */; };
|
||||
352742851D4C244700A1ECE6 /* MGLRasterSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 352742831D4C244700A1ECE6 /* MGLRasterSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
352742861D4C244700A1ECE6 /* MGLRasterSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 352742841D4C244700A1ECE6 /* MGLRasterSource.mm */; };
|
||||
352742891D4C245800A1ECE6 /* MGLGeoJSONSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 352742871D4C245800A1ECE6 /* MGLGeoJSONSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3527428A1D4C245800A1ECE6 /* MGLGeoJSONSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 352742881D4C245800A1ECE6 /* MGLGeoJSONSource.mm */; };
|
||||
352742891D4C245800A1ECE6 /* MGLShapeSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 352742871D4C245800A1ECE6 /* MGLShapeSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3527428A1D4C245800A1ECE6 /* MGLShapeSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 352742881D4C245800A1ECE6 /* MGLShapeSource.mm */; };
|
||||
3527428D1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3527428B1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3527428E1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3527428C1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.mm */; };
|
||||
352742A11D4C25BD00A1ECE6 /* MGLStyleValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3527429E1D4C25BD00A1ECE6 /* MGLStyleValue.mm */; };
|
||||
@@ -93,9 +93,9 @@
|
||||
DA839EA01CC2E3400062CAFB /* MapDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA839E9E1CC2E3400062CAFB /* MapDocument.xib */; };
|
||||
DA839EA21CC2E3400062CAFB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA839EA11CC2E3400062CAFB /* Assets.xcassets */; };
|
||||
DA839EA51CC2E3400062CAFB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA839EA31CC2E3400062CAFB /* MainMenu.xib */; };
|
||||
DA87A9981DC9D88400810D09 /* MGLGeoJSONSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA87A9961DC9D88400810D09 /* MGLGeoJSONSourceTests.mm */; };
|
||||
DA87A9981DC9D88400810D09 /* MGLShapeSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA87A9961DC9D88400810D09 /* MGLShapeSourceTests.mm */; };
|
||||
DA87A9991DC9D88400810D09 /* MGLTileSetTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA87A9971DC9D88400810D09 /* MGLTileSetTests.mm */; };
|
||||
DA87A99C1DC9D8DD00810D09 /* MGLGeoJSONSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DA87A99B1DC9D8DD00810D09 /* MGLGeoJSONSource_Private.h */; };
|
||||
DA87A99C1DC9D8DD00810D09 /* MGLShapeSource_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DA87A99B1DC9D8DD00810D09 /* MGLShapeSource_Private.h */; };
|
||||
DA87A99E1DC9DC2100810D09 /* MGLFilterTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35C5D84B1D6DD75B00E95907 /* MGLFilterTests.mm */; };
|
||||
DA87A9A01DC9DC6200810D09 /* MGLValueEvaluator.h in Headers */ = {isa = PBXBuildFile; fileRef = DA87A99F1DC9DC6200810D09 /* MGLValueEvaluator.h */; };
|
||||
DA87A9A11DC9DCB400810D09 /* MGLRuntimeStylingHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8F257B1D51C5F40010E6B5 /* MGLRuntimeStylingHelper.m */; };
|
||||
@@ -254,8 +254,8 @@
|
||||
352742801D4C243B00A1ECE6 /* MGLSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLSource.mm; sourceTree = "<group>"; };
|
||||
352742831D4C244700A1ECE6 /* MGLRasterSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterSource.h; sourceTree = "<group>"; };
|
||||
352742841D4C244700A1ECE6 /* MGLRasterSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRasterSource.mm; sourceTree = "<group>"; };
|
||||
352742871D4C245800A1ECE6 /* MGLGeoJSONSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLGeoJSONSource.h; sourceTree = "<group>"; };
|
||||
352742881D4C245800A1ECE6 /* MGLGeoJSONSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLGeoJSONSource.mm; sourceTree = "<group>"; };
|
||||
352742871D4C245800A1ECE6 /* MGLShapeSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLShapeSource.h; sourceTree = "<group>"; };
|
||||
352742881D4C245800A1ECE6 /* MGLShapeSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLShapeSource.mm; sourceTree = "<group>"; };
|
||||
3527428B1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCircleStyleLayer.h; sourceTree = "<group>"; };
|
||||
3527428C1D4C24AB00A1ECE6 /* MGLCircleStyleLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLCircleStyleLayer.mm; sourceTree = "<group>"; };
|
||||
3527429E1D4C25BD00A1ECE6 /* MGLStyleValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLStyleValue.mm; sourceTree = "<group>"; };
|
||||
@@ -344,9 +344,9 @@
|
||||
DA839EA11CC2E3400062CAFB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
DA839EA41CC2E3400062CAFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
|
||||
DA839EA61CC2E3400062CAFB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
DA87A9961DC9D88400810D09 /* MGLGeoJSONSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLGeoJSONSourceTests.mm; sourceTree = "<group>"; };
|
||||
DA87A9961DC9D88400810D09 /* MGLShapeSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLShapeSourceTests.mm; sourceTree = "<group>"; };
|
||||
DA87A9971DC9D88400810D09 /* MGLTileSetTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLTileSetTests.mm; sourceTree = "<group>"; };
|
||||
DA87A99B1DC9D8DD00810D09 /* MGLGeoJSONSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLGeoJSONSource_Private.h; sourceTree = "<group>"; };
|
||||
DA87A99B1DC9D8DD00810D09 /* MGLShapeSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLShapeSource_Private.h; sourceTree = "<group>"; };
|
||||
DA87A99F1DC9DC6200810D09 /* MGLValueEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLValueEvaluator.h; sourceTree = "<group>"; };
|
||||
DA8933A61CCD287300E68420 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MGLAnnotationCallout.xib; sourceTree = "<group>"; };
|
||||
DA8933AC1CCD290700E68420 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
@@ -557,9 +557,9 @@
|
||||
DA8F25951D51CAC70010E6B5 /* MGLVectorSource.h */,
|
||||
DA7DC9801DED5F5C0027472F /* MGLVectorSource_Private.h */,
|
||||
DA8F25961D51CAC70010E6B5 /* MGLVectorSource.mm */,
|
||||
352742871D4C245800A1ECE6 /* MGLGeoJSONSource.h */,
|
||||
DA87A99B1DC9D8DD00810D09 /* MGLGeoJSONSource_Private.h */,
|
||||
352742881D4C245800A1ECE6 /* MGLGeoJSONSource.mm */,
|
||||
352742871D4C245800A1ECE6 /* MGLShapeSource.h */,
|
||||
DA87A99B1DC9D8DD00810D09 /* MGLShapeSource_Private.h */,
|
||||
352742881D4C245800A1ECE6 /* MGLShapeSource.mm */,
|
||||
352742831D4C244700A1ECE6 /* MGLRasterSource.h */,
|
||||
DA7DC9821DED647F0027472F /* MGLRasterSource_Private.h */,
|
||||
352742841D4C244700A1ECE6 /* MGLRasterSource.mm */,
|
||||
@@ -648,7 +648,7 @@
|
||||
DA87A99A1DC9D88800810D09 /* Sources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
DA87A9961DC9D88400810D09 /* MGLGeoJSONSourceTests.mm */,
|
||||
DA87A9961DC9D88400810D09 /* MGLShapeSourceTests.mm */,
|
||||
DA87A9971DC9D88400810D09 /* MGLTileSetTests.mm */,
|
||||
);
|
||||
name = Sources;
|
||||
@@ -1019,7 +1019,7 @@
|
||||
35602C001D3EA9B40050646F /* MGLForegroundStyleLayer.h in Headers */,
|
||||
DAE6C35D1CC31E0400DB3429 /* MGLMapCamera.h in Headers */,
|
||||
DAE6C3B41CC31EF300DB3429 /* MGLCompassCell.h in Headers */,
|
||||
DA87A99C1DC9D8DD00810D09 /* MGLGeoJSONSource_Private.h in Headers */,
|
||||
DA87A99C1DC9D8DD00810D09 /* MGLShapeSource_Private.h in Headers */,
|
||||
3537CA741D3F93A600380318 /* MGLStyle_Private.h in Headers */,
|
||||
DA8F259A1D51CAD00010E6B5 /* MGLSource_Private.h in Headers */,
|
||||
DA8F25931D51CA750010E6B5 /* MGLSymbolStyleLayer.h in Headers */,
|
||||
@@ -1032,7 +1032,7 @@
|
||||
408AA85B1DAEECFE00022900 /* MGLShape_Private.h in Headers */,
|
||||
DACC22181CF3D4F700D220D9 /* MGLFeature_Private.h in Headers */,
|
||||
DA6408D71DA4E5DA00908C90 /* MGLVectorStyleLayer.h in Headers */,
|
||||
352742891D4C245800A1ECE6 /* MGLGeoJSONSource.h in Headers */,
|
||||
352742891D4C245800A1ECE6 /* MGLShapeSource.h in Headers */,
|
||||
408AA8671DAEEE3900022900 /* NSDictionary+MGLAdditions.h in Headers */,
|
||||
DAE6C3671CC31E0400DB3429 /* MGLStyle.h in Headers */,
|
||||
);
|
||||
@@ -1268,7 +1268,7 @@
|
||||
DAE6C3851CC31E2A00DB3429 /* MGLAccountManager.m in Sources */,
|
||||
DA00FC8B1D5EEAC3009AABC8 /* MGLAttributionInfo.mm in Sources */,
|
||||
DAE6C3921CC31E2A00DB3429 /* MGLPolyline.mm in Sources */,
|
||||
3527428A1D4C245800A1ECE6 /* MGLGeoJSONSource.mm in Sources */,
|
||||
3527428A1D4C245800A1ECE6 /* MGLShapeSource.mm in Sources */,
|
||||
DAE6C3B51CC31EF300DB3429 /* MGLCompassCell.m in Sources */,
|
||||
DA8F25901D51CA600010E6B5 /* MGLRasterStyleLayer.mm in Sources */,
|
||||
DAD165751CF4CD7A001FF4B9 /* MGLShapeCollection.mm in Sources */,
|
||||
@@ -1306,7 +1306,7 @@
|
||||
DA87A9A31DCACC5000810D09 /* MGLRasterStyleLayerTests.m in Sources */,
|
||||
DA87A9991DC9D88400810D09 /* MGLTileSetTests.mm in Sources */,
|
||||
DA35A2A81CC9F41600E826B2 /* MGLCoordinateFormatterTests.m in Sources */,
|
||||
DA87A9981DC9D88400810D09 /* MGLGeoJSONSourceTests.mm in Sources */,
|
||||
DA87A9981DC9D88400810D09 /* MGLShapeSourceTests.mm in Sources */,
|
||||
DA87A9A21DC9DCF100810D09 /* MGLFillStyleLayerTests.m in Sources */,
|
||||
3599A3E81DF70E2000E77FB2 /* MGLStyleValueTests.m in Sources */,
|
||||
DAEDC4321D6033F1000224FF /* MGLAttributionInfoTests.m in Sources */,
|
||||
|
||||
@@ -42,7 +42,7 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[];
|
||||
#import "MGLOpenGLStyleLayer.h"
|
||||
#import "MGLSource.h"
|
||||
#import "MGLVectorSource.h"
|
||||
#import "MGLGeoJSONSource.h"
|
||||
#import "MGLShapeSource.h"
|
||||
#import "MGLRasterSource.h"
|
||||
#import "MGLTilePyramidOfflineRegion.h"
|
||||
#import "MGLTypes.h"
|
||||
|
||||
Reference in New Issue
Block a user