diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
| commit | a6b1773a44d4ef086eb30967cb041cb64312650a (patch) | |
| tree | ec293e38c9ec3ef1f32195f0d5071f73b88497ed /platform/ios/src/Mapbox.h | |
| parent | dad57df38ef86363da9bff2e62f3fddc5688f0cf (diff) | |
| parent | e2fde9cc4eff3de5ab2f513d0c24ad5471d147e6 (diff) | |
| download | qtlocation-mapboxgl-a6b1773a44d4ef086eb30967cb041cb64312650a.tar.gz | |
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master
Also reran make style-code and manually discarded anything related to fill extrusion layers.
Diffstat (limited to 'platform/ios/src/Mapbox.h')
| -rw-r--r-- | platform/ios/src/Mapbox.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/ios/src/Mapbox.h b/platform/ios/src/Mapbox.h index 7664695315..69c718ddea 100644 --- a/platform/ios/src/Mapbox.h +++ b/platform/ios/src/Mapbox.h @@ -19,7 +19,6 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLMapCamera.h" #import "MGLMapView.h" #import "MGLMapView+IBAdditions.h" -#import "MGLMapView+MGLCustomStyleLayerAdditions.h" #import "MGLMapViewDelegate.h" #import "MGLMultiPoint.h" #import "MGLOfflinePack.h" @@ -42,9 +41,11 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLRasterStyleLayer.h" #import "MGLCircleStyleLayer.h" #import "MGLBackgroundStyleLayer.h" +#import "MGLOpenGLStyleLayer.h" #import "MGLSource.h" +#import "MGLTileSource.h" #import "MGLVectorSource.h" -#import "MGLGeoJSONSource.h" +#import "MGLShapeSource.h" #import "MGLRasterSource.h" #import "MGLTilePyramidOfflineRegion.h" #import "MGLTypes.h" @@ -53,4 +54,4 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "NSValue+MGLAdditions.h" #import "NSValue+MGLStyleEnumAttributeAdditions.h" #import "MGLStyleValue.h" -#import "MGLTileSet.h" +#import "MGLAttributionInfo.h" |