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

[core] Allow the use of special characters in property field names

Browse Source 
Fixes #4336
This commit is contained in:
John Firebaugh
2016-03-23 17:15:18 -07:00
parent 6454847028
commit 2f9e6f4e94
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/util/token.hpp
View File

@@ -8,7 +8,7 @@
namespace mbgl { namespace mbgl {
namespace util { namespace util {
const static std::string tokenReservedChars = "{}()[]<>$=:;.,^"; const static std::string tokenReservedChars = "{}";
// Replaces {tokens} in a string by calling the lookup function. // Replaces {tokens} in a string by calling the lookup function.
template <typename Lookup> template <typename Lookup>

8
test/util/token.cpp
View File

@@ -39,12 +39,12 @@ TEST(Token, replaceTokens) {
if (token == "dashed-property") return "dashed"; if (token == "dashed-property") return "dashed";
return ""; return "";
})); }));
EXPECT_EQ("colonized", mbgl::util::replaceTokens("{colon:property}", [](const std::string& token) -> std::string {
if (token == "colon:property") return "colonized";
return "";
}));
EXPECT_EQ("150 m", mbgl::util::replaceTokens("{HØYDE} m", [](const std::string& token) -> std::string { EXPECT_EQ("150 m", mbgl::util::replaceTokens("{HØYDE} m", [](const std::string& token) -> std::string {
if (token == "HØYDE") return "150"; if (token == "HØYDE") return "150";
return ""; return "";
})); }));
EXPECT_EQ("reserved {for:future} use", mbgl::util::replaceTokens("reserved {for:future} use", [](const std::string& token) -> std::string {
if (token == "for:future") return "unknown";
return "";
}));
} }