sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add quoting for relevant types

Browse source
This commit is contained in:
artemp 2013-12-06 13:11:24 +00:00
parent 12dbc035cc
commit fb63d51b37
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/mapnik/symbolizer_utils.hpp
View file

@ -147,11 +147,12 @@ public:
std::string operator () ( path_expression_ptr const& expr) const
{
std::ostringstream ss;
if (expr)
{
return path_processor::to_string(*expr);
ss << '\"' << path_processor::to_string(*expr) << '\"';
}
return std::string();
return ss.str();
}
std::string operator () (text_placements_ptr const& expr) const
@ -166,20 +167,29 @@ public:
std::string operator () (transform_type const& expr) const
{
std::ostringstream ss;
if (expr)
{
return transform_processor_type::to_string(*expr);
ss << '\"' << transform_processor_type::to_string(*expr) << '\"';
}
return std::string();
return ss.str();
}
std::string operator () (expression_ptr const& expr) const
{
std::ostringstream ss;
if (expr)
{
return mapnik::to_expression_string(*expr);
ss << '\"' << mapnik::to_expression_string(*expr) << '\"';
}
return std::string();
return ss.str();
}
std::string operator () (color const& c) const
{
std::ostringstream ss;
ss << '\"' << c << '\"';
return ss.str();
}
std::string operator () (dash_array const& dash) const
@ -188,7 +198,7 @@ public:
for (std::size_t i = 0; i < dash.size(); ++i)
{
ss << dash[i].first << ", " << dash[i].second;
if ( i + 1 < dash.size() ) ss << ",";
if ( i + 1 < dash.size() ) ss << ',';
}
return ss.str();
}