[core] Rationalize Resource initialization
This commit is contained in:
@@ -20,20 +20,6 @@ public:
|
||||
SpriteJSON
|
||||
};
|
||||
|
||||
Resource(Kind kind_, const std::string& url_)
|
||||
: kind(kind_),
|
||||
url(url_) {
|
||||
}
|
||||
|
||||
const Kind kind;
|
||||
const std::string url;
|
||||
|
||||
optional<SystemTimePoint> priorModified;
|
||||
optional<SystemTimePoint> priorExpires;
|
||||
optional<std::string> priorEtag;
|
||||
|
||||
// Includes auxiliary data if this is a tile request.
|
||||
|
||||
struct TileData {
|
||||
std::string urlTemplate;
|
||||
float pixelRatio;
|
||||
@@ -42,7 +28,34 @@ public:
|
||||
int8_t z;
|
||||
};
|
||||
|
||||
Resource(Kind kind_, const std::string& url_, optional<TileData> tileData_ = {})
|
||||
: kind(kind_),
|
||||
url(url_),
|
||||
tileData(tileData_) {
|
||||
}
|
||||
|
||||
static Resource style(const std::string& url);
|
||||
static Resource source(const std::string& url);
|
||||
static Resource tile(const std::string& urlTemplate,
|
||||
float pixelRatio,
|
||||
int32_t x,
|
||||
int32_t y,
|
||||
int8_t z);
|
||||
static Resource glyphs(const std::string& urlTemplate,
|
||||
const std::string& fontStack,
|
||||
const std::pair<uint16_t, uint16_t>& glyphRange);
|
||||
static Resource spriteImage(const std::string& base, float pixelRatio);
|
||||
static Resource spriteJSON(const std::string& base, float pixelRatio);
|
||||
|
||||
const Kind kind;
|
||||
const std::string url;
|
||||
|
||||
// Includes auxiliary data if this is a tile request.
|
||||
optional<TileData> tileData;
|
||||
|
||||
optional<SystemTimePoint> priorModified = {};
|
||||
optional<SystemTimePoint> priorExpires = {};
|
||||
optional<std::string> priorEtag = {};
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
Reference in New Issue
Block a user