tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] correctly alter sprite URLs when attaching sprite.png/sprite.json filenames

Browse Source
This commit is contained in:
Konstantin Käfer
2017-10-17 14:00:52 -07:00
parent 0cd646180e
commit 9c12a311f2
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mbgl/storage/resource.cpp
View File

@@ -61,17 +61,19 @@ Resource Resource::image(const std::string& url) {
}
Resource Resource::spriteImage(const std::string& base, float pixelRatio) {
return Resource {
Resource::Kind::SpriteImage,
base + (pixelRatio > 1 ? "@2x" : "") + ".png"
};
util::URL url(base);
return Resource{ Resource::Kind::SpriteImage,
base.substr(0, url.path.first + url.path.second) +
(pixelRatio > 1 ? "@2x" : "") + ".png" +
base.substr(url.query.first, url.query.second) };
}
Resource Resource::spriteJSON(const std::string& base, float pixelRatio) {
return Resource {
Resource::Kind::SpriteJSON,
base + (pixelRatio > 1 ? "@2x" : "") + ".json"
};
util::URL url(base);
return Resource{ Resource::Kind::SpriteJSON,
base.substr(0, url.path.first + url.path.second) +
(pixelRatio > 1 ? "@2x" : "") + ".json" +
base.substr(url.query.first, url.query.second) };
}
Resource Resource::glyphs(const std::string& urlTemplate, const FontStack& fontStack, const std::pair<uint16_t, uint16_t>& glyphRange) {

8
test/storage/resource.test.cpp
View File

@@ -115,6 +115,10 @@ TEST(Resource, SpriteImage) {
Resource resource = Resource::spriteImage("http://example.com/sprite", 2.0);
EXPECT_EQ(Resource::Kind::SpriteImage, resource.kind);
EXPECT_EQ("http://example.com/sprite@2x.png", resource.url);
Resource paramResource = Resource::spriteImage("http://example.com/sprite?query=true", 2.0);
EXPECT_EQ(Resource::Kind::SpriteImage, paramResource.kind);
EXPECT_EQ("http://example.com/sprite@2x.png?query=true", paramResource.url);
}
TEST(Resource, Image) {
@@ -129,4 +133,8 @@ TEST(Resource, SpriteJSON) {
Resource resource = Resource::spriteJSON("http://example.com/sprite", 2.0);
EXPECT_EQ(Resource::Kind::SpriteJSON, resource.kind);
EXPECT_EQ("http://example.com/sprite@2x.json", resource.url);
Resource paramResource = Resource::spriteJSON("http://example.com/sprite?query=true", 2.0);
EXPECT_EQ(Resource::Kind::SpriteJSON, paramResource.kind);
EXPECT_EQ("http://example.com/sprite@2x.json?query=true", paramResource.url);
}