[ios] Speculative fix for failing test: MGLDocumentationExampleTests.testMGLHillshadeStyleLayer()
This commit is contained in:
committed by
Mikhail Pozdnyakov
parent
461358be4b
commit
a6618dc0f9
@@ -7,11 +7,10 @@
|
||||
|
||||
@implementation MGLRasterDEMSource
|
||||
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize {
|
||||
NSString *configurationURLString = configurationURL.mgl_URLByStandardizingScheme.absoluteString;
|
||||
return std::make_unique<mbgl::style::RasterDEMSource>(identifier.UTF8String,
|
||||
configurationURLString.UTF8String,
|
||||
uint16_t(round(tileSize)));
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier urlOrTileset:(mbgl::variant<std::string, mbgl::Tileset>)urlOrTileset tileSize:(uint16_t)tileSize {
|
||||
auto source = std::make_unique<mbgl::style::RasterDEMSource>(identifier.UTF8String,
|
||||
urlOrTileset,
|
||||
tileSize);
|
||||
return source;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -33,15 +33,16 @@ static const CGFloat MGLRasterTileSourceRetinaTileSize = 512;
|
||||
}
|
||||
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize {
|
||||
auto source = [self pendingSourceWithIdentifier:identifier configurationURL:configurationURL tileSize:tileSize];
|
||||
NSString *configurationURLString = configurationURL.mgl_URLByStandardizingScheme.absoluteString;
|
||||
auto source = [self pendingSourceWithIdentifier:identifier urlOrTileset:configurationURLString.UTF8String tileSize:tileSize];
|
||||
return self = [super initWithPendingSource:std::move(source)];
|
||||
}
|
||||
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize {
|
||||
NSString *configurationURLString = configurationURL.mgl_URLByStandardizingScheme.absoluteString;
|
||||
return std::make_unique<mbgl::style::RasterSource>(identifier.UTF8String,
|
||||
configurationURLString.UTF8String,
|
||||
uint16_t(round(tileSize)));
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier urlOrTileset:(mbgl::variant<std::string, mbgl::Tileset>)urlOrTileset tileSize:(uint16_t)tileSize {
|
||||
auto source = std::make_unique<mbgl::style::RasterSource>(identifier.UTF8String,
|
||||
urlOrTileset,
|
||||
tileSize);
|
||||
return source;
|
||||
}
|
||||
|
||||
- (instancetype)initWithIdentifier:(NSString *)identifier tileURLTemplates:(NSArray<NSString *> *)tileURLTemplates options:(nullable NSDictionary<MGLTileSourceOption, id> *)options {
|
||||
@@ -56,7 +57,7 @@ static const CGFloat MGLRasterTileSourceRetinaTileSize = 512;
|
||||
tileSize = static_cast<uint16_t>(round(tileSizeNumber.doubleValue));
|
||||
}
|
||||
|
||||
auto source = std::make_unique<mbgl::style::RasterSource>(identifier.UTF8String, tileSet, tileSize);
|
||||
auto source = [self pendingSourceWithIdentifier:identifier urlOrTileset:tileSet tileSize:tileSize];
|
||||
return self = [super initWithPendingSource:std::move(source)];
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
#import "MGLRasterTileSource.h"
|
||||
|
||||
#include <memory>
|
||||
#include <mbgl/util/variant.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
class Tileset;
|
||||
namespace style {
|
||||
class RasterSource;
|
||||
}
|
||||
@@ -14,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@property (nonatomic, readonly, nullable) mbgl::style::RasterSource *rawSource;
|
||||
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize;
|
||||
- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier urlOrTileset:(mbgl::variant<std::string, mbgl::Tileset>)urlOrTileset tileSize:(uint16_t)tileSize;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user