diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp index 8859a5455..bd2c96de4 100644 --- a/include/mapnik/symbolizer_utils.hpp +++ b/include/mapnik/symbolizer_utils.hpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -146,9 +147,6 @@ inline std::string symbolizer_name(symbolizer const& sym) return type; } -// https://github.com/mapnik/mapnik/issues/2324 -/* - template class symbolizer_property_value_string { @@ -162,7 +160,7 @@ public: auto const& convert_fun_ptr(std::get<1>(meta_)); if ( convert_fun_ptr ) { - ss << convert_fun_ptr(e); + ss << '\"' << convert_fun_ptr(e) << '\"'; } return ss.str(); } @@ -202,7 +200,7 @@ public: std::ostringstream ss; if (expr) { - ss << '\"' << "FIXME" << '\"'; + ss << '\"' << mapnik::to_expression_string(*expr) << '\"'; } return ss.str(); } @@ -219,7 +217,7 @@ public: std::ostringstream ss; for (std::size_t i = 0; i < dash.size(); ++i) { - ss << dash[i].first << ", " << dash[i].second; + ss << dash[i].first << "," << dash[i].second; if ( i + 1 < dash.size() ) ss << ','; } return ss.str(); @@ -229,7 +227,7 @@ public: std::string operator () ( T const& val ) const { std::ostringstream ss; - ss << val; + ss << '\"' << val << '\"'; return ss.str(); } @@ -261,8 +259,6 @@ struct symbolizer_to_json } }; -*/ - namespace { template