From 8ac87ec5cb2374d212a31942ca19ce395704eb69 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Mon, 19 Nov 2018 15:30:19 +0200 Subject: [PATCH] Refactor util::fontStacks() So that it does not downcast `Layer::Impl` instances. Also, an unneeded `std::vector` construction was removed from `Parser::fontStacks()`. --- src/mbgl/style/layer_impl.cpp | 2 + src/mbgl/style/layer_impl.hpp | 4 ++ src/mbgl/style/layers/symbol_layer_impl.cpp | 27 ++++++++++++ src/mbgl/style/layers/symbol_layer_impl.hpp | 1 + src/mbgl/style/parser.cpp | 5 +-- src/mbgl/style/parser.hpp | 2 +- src/mbgl/util/font_stack.cpp | 30 +------------- .../offline_database/offline_sideload.db | Bin 4096 -> 73728 bytes test/style/style_parser.test.cpp | 39 ++++++++++-------- 9 files changed, 60 insertions(+), 50 deletions(-) diff --git a/src/mbgl/style/layer_impl.cpp b/src/mbgl/style/layer_impl.cpp index a9a3941f3..c6a248de9 100644 --- a/src/mbgl/style/layer_impl.cpp +++ b/src/mbgl/style/layer_impl.cpp @@ -9,5 +9,7 @@ Layer::Impl::Impl(LayerType type_, std::string layerID, std::string sourceID) source(std::move(sourceID)) { } +void Layer::Impl::populateFontStack(std::set&) const {} + } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp index 014fb6034..948bbab61 100644 --- a/src/mbgl/style/layer_impl.hpp +++ b/src/mbgl/style/layer_impl.hpp @@ -41,8 +41,12 @@ public: // Utility function for automatic layer grouping. virtual void stringifyLayout(rapidjson::Writer&) const = 0; + // Returns pointer to the statically allocated layer type info structure. virtual const LayerTypeInfo* getTypeInfo() const noexcept = 0; + // Populates the given \a fontStack with fonts being used by the layer. + virtual void populateFontStack(std::set& fontStack) const; + // Note: LayerType is deprecated, do not use it. const LayerType type; std::string id; diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp index 753b2fa18..e17739168 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.cpp +++ b/src/mbgl/style/layers/symbol_layer_impl.cpp @@ -1,5 +1,7 @@ #include +#include + namespace mbgl { namespace style { @@ -12,5 +14,30 @@ bool SymbolLayer::Impl::hasLayoutDifference(const Layer::Impl& other) const { paint.hasDataDrivenPropertyDifference(impl.paint); } +void SymbolLayer::Impl::populateFontStack(std::set& fontStack) const { + if (layout.get().isUndefined()) { + return; + } + + layout.get().match( + [&] (Undefined) { + fontStack.insert({"Open Sans Regular", "Arial Unicode MS Regular"}); + }, + [&] (const FontStack& constant) { + fontStack.insert(constant); + }, + [&] (const auto& function) { + for (const auto& value : function.possibleOutputs()) { + if (value) { + fontStack.insert(*value); + } else { + Log::Warning(Event::ParseStyle, "Layer '%s' has an invalid value for text-font and will not render text. Output values must be contained as literals within the expression.", id.c_str()); + break; + } + } + } + ); +} + } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp index 21e47ad89..01ff9772b 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.hpp +++ b/src/mbgl/style/layers/symbol_layer_impl.hpp @@ -14,6 +14,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; const LayerTypeInfo* getTypeInfo() const noexcept final; + void populateFontStack(std::set& fontStack) const final; SymbolLayoutProperties::Unevaluated layout; SymbolPaintProperties::Transitionable paint; diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index 77cf23bad..ae298bd91 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -267,14 +267,13 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique } } -std::vector Parser::fontStacks() const { +std::set Parser::fontStacks() const { std::vector> impls; impls.reserve(layers.size()); for (const auto& layer : layers) { impls.emplace_back(layer->baseImpl); } - std::set result = mbgl::fontStacks(impls); - return std::vector(result.begin(), result.end()); + return mbgl::fontStacks(impls); } } // namespace style diff --git a/src/mbgl/style/parser.hpp b/src/mbgl/style/parser.hpp index ec7be038f..f99251908 100644 --- a/src/mbgl/style/parser.hpp +++ b/src/mbgl/style/parser.hpp @@ -43,7 +43,7 @@ public: double pitch = 0; // Statically evaluate layer properties to determine what font stacks are used. - std::vector fontStacks() const; + std::set fontStacks() const; private: void parseTransition(const JSValue&); diff --git a/src/mbgl/util/font_stack.cpp b/src/mbgl/util/font_stack.cpp index 4093a2179..362fdf184 100644 --- a/src/mbgl/util/font_stack.cpp +++ b/src/mbgl/util/font_stack.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -23,35 +22,8 @@ FontStackHash FontStackHasher::operator()(const FontStack& fontStack) const { std::set fontStacks(const std::vector>& layers) { std::set result; - for (const auto& layer : layers) { - if (layer->type != LayerType::Symbol) { - continue; - } - - const SymbolLayer::Impl& impl = dynamic_cast(*layer); - if (impl.layout.get().isUndefined()) { - continue; - } - - impl.layout.get().match( - [&] (Undefined) { - result.insert({"Open Sans Regular", "Arial Unicode MS Regular"}); - }, - [&] (const FontStack& constant) { - result.insert(constant); - }, - [&] (const auto& function) { - for (const auto& value : function.possibleOutputs()) { - if (value) { - result.insert(*value); - } else { - Log::Warning(Event::ParseStyle, "Layer '%s' has an invalid value for text-font and will not render text. Output values must be contained as literals within the expression.", impl.id.c_str()); - break; - } - } - } - ); + layer->populateFontStack(result); } return result; diff --git a/test/fixtures/offline_database/offline_sideload.db b/test/fixtures/offline_database/offline_sideload.db index 8909c402b226547ece61086b4460889329da7d58..6146e30872853f935e585afb96ca03abc3927514 100644 GIT binary patch literal 73728 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 AB>(^b delta 3291 zcmV<13?%b_zyyFGL{m{rX>?^EW^ZzBVRRrf00aO50RTWCAOHXWKL7v#6951J00000 z000003;+NC1ONa4000005C8xG0RR911^@s60g*u)JU;*~1waJ=00065_5c6?01^ZH z1NH(J1NZ;{000000001k69fkr7Z(AB1$1FzY-Mz5Y-MwFX>4V42D3j5PXUv>4OamN zlN1gs0R@vl4krmN0S6Z!9|43blW-0f0Ryv$4gmp^w+}ym0000H2><{969gIH&#nGc z?Qin-<%(X}lk2;GoZ7g5Xt8@ZLQ#7;=qT+DP3g+=rwKl3N4S}?XQ0jW8$e8Lzw&c( z#ePOtd=*0*%xiTUHm_8$-on-ytPC{ zDtb^`&hx4{#u!-!8bOL&mmm9iyfJre7*wR7|Fv zv;LcjI3S29>YM-EH{GvE?K!h<_%=6aSywg2a$DxwrjPE$aKg`4 zw`kkywlB{VsgJR_HjgMEKfHV1u3{QEPr(fQ#?Nilx-^foRmglL)<)n7pE{{ z46Qx__WQ3&6}g$X&k|<&0F&IL^ym3!$z^Ypaa=~)`%{6F^{I7QC=9y&1Z&k_DG|K< z9OX0S=@w`d;Mni}GfgCNz&^QlGbdc6_}#~np8vC$kn;&+c=O3$7P*13HcXwjL{Z7* zr2jb?oZ(l-)bW(o2Zy#z!}N9TRMP7=6oapiGE=L!5{jL@uYI z*5*=PU|Rvm%K$fwMwb_51qRa4KBcX1qZ)%Je3K2%;PiV|;dl}(tpnIZJzSd4SbV8W zB_7%GNGqcVbukViH?s{9i@_=z)&Ww|vI(JCgeRSLrmuxU+Jn()^=?_z#H*E+@mzyF z|ITS3yV}e{*k308*>?b!T7f^O@+8%5l^|HmmIqAki0biwFTRKG>M)XMQtJt9P3Ii{ z0VQlf7=aPQ!H5r!wEo_E@bw{5LwS2eay*Cq9pE?qPi%+aeo(W-`&8QjM9FmqBv4Y& zkbrA|tMe7d^ggkOuGQUJdq;cb4dAX7*LjLe?y?PS>*x5Os{WkL-H-|}smxiR$~9L- zT!4lj{~THv=QE5!=!MZwHYY%&WA(l z|Cxk#FsBvETy$z}O|L|ETVOAHBC3#ZC+b0%P zewvz}m=|=s&n|~hNPFHkd2X%yr+=u>3@9)CP`nX5ZqT3Vpo&LxktM<&a?!`pNGmq% zw|v8YO_M^6(Li4L+TgD8Y7C>q=J~D3Vo94NP%=)p`3htQMS~u%Y^%ek5?fe3F~`@; zFIn$O4{Kw20{@TZbap!h9q9Y51Ema??60 ztKjSL4=L1<-T;=v;!esV4UGp2ChFYHW;Qw-Dt`?_eu!QmvDliM$T6I*1BYurZGf}L zvM+ZWY_^LrqtZQeul%G(;|U(dpzt+iEZ}fuV{F5~R1ou;EMtma828tG9rSmv|7;k4 ztzW_{*JRHhU(VGCOTwLR@b{g{z3i}1BQtU%ggwT4`;t!gRyFU-%N5^7Pt){h9h+Jv zHsL=yoS(`%E*Kw!j{?;5I5%5Zecc#NhTjR?GF&)Ss=~ zQO;Erpi}l|lqj-xchW0Ina|(FDiiLJo@Uxf;djpa^7$v{5@g^AEwrfHK-TZtK;2s8K`c?*L)H@ zEu3#ozy~g2>O29$u&fVN-65NQfven5XxMo(I1)*tT&_k(*jr&HqQ~N0yua=^h^s93 z+8mX_aOqBk%w^*}^ePirPUu??`Rw8c>n<&~f>I@ulhLLLV6P+SdJ;%-oU0MV#V~dn zi331khzWyMgpJbRAE+@207{;W1^;`^pytkLJa;3D?%NhzjkQ$*x!|LJOU;t07s}_) zmt2L|R>{Mq5~o>itNM*@%80*xu`ZlgA0aZjIA?g+T&82dlUw=$iOa*VL^cIah&iIn zGNfEQ7X~M)4>YWm6H@j2bfa-gqOdz}wS?q)PH%(xdw?s#1j4Mvhyb4_9q`1q$rey# zR3xEY{H*^!3bTm4?cB<(XiVb<=HCfJ3_jD)$%7@)o6%t=QIu|b*FzOW=^(%Gp{cM~8kxUTAjZ)$8yqczx)1@^vfXo4Kch;e9K8Et?}2F1>FP-RNRs~+ki(utg)>Q}=kqxuX; Z #include +#include #include @@ -96,11 +97,12 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] { TEST(StyleParser, FontStacks) { style::Parser parser; parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json")); - auto result = parser.fontStacks(); - ASSERT_EQ(3u, result.size()); - ASSERT_EQ(FontStack({"a"}), result[0]); - ASSERT_EQ(FontStack({"a", "b"}), result[1]); - ASSERT_EQ(FontStack({"a", "b", "c"}), result[2]); + std::set expected; + expected.insert(FontStack({"a"})); + expected.insert(FontStack({"a", "b"})); + expected.insert(FontStack({"a", "b", "c"})); + std::set result = parser.fontStacks(); + ASSERT_EQ(expected, result); } TEST(StyleParser, FontStacksNoTextField) { @@ -134,10 +136,11 @@ TEST(StyleParser, FontStacksCaseExpression) { } }] })"); - auto result = parser.fontStacks(); - ASSERT_EQ(2u, result.size()); - ASSERT_EQ(FontStack({"Arial"}), result[0]); - ASSERT_EQ(FontStack({"Helvetica"}), result[1]); + std::set expected; + expected.insert(FontStack({"Arial"})); + expected.insert(FontStack({"Helvetica"})); + std::set result = parser.fontStacks(); + ASSERT_EQ(expected, result); } TEST(StyleParser, FontStacksMatchExpression) { @@ -154,10 +157,11 @@ TEST(StyleParser, FontStacksMatchExpression) { } }] })"); - auto result = parser.fontStacks(); - ASSERT_EQ(2u, result.size()); - ASSERT_EQ(FontStack({"Arial"}), result[0]); - ASSERT_EQ(FontStack({"Helvetica"}), result[1]); + std::set expected; + expected.insert(FontStack({"Arial"})); + expected.insert(FontStack({"Helvetica"})); + std::set result = parser.fontStacks(); + ASSERT_EQ(expected, result); } TEST(StyleParser, FontStacksStepExpression) { @@ -174,10 +178,11 @@ TEST(StyleParser, FontStacksStepExpression) { } }] })"); - auto result = parser.fontStacks(); - ASSERT_EQ(2u, result.size()); - ASSERT_EQ(FontStack({"Arial"}), result[0]); - ASSERT_EQ(FontStack({"Helvetica"}), result[1]); + std::set expected; + expected.insert(FontStack({"Arial"})); + expected.insert(FontStack({"Helvetica"})); + std::set result = parser.fontStacks(); + ASSERT_EQ(expected, result); } TEST(StyleParser, FontStacksGetExpression) {