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

generic set_property_from_xml implementation

Browse source
This commit is contained in:
artemp 2014-07-28 15:08:28 +01:00
parent c93b7fd632
commit 61c0344dd6
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/mapnik/text/properties_util.hpp
View file

@ -32,9 +32,19 @@
namespace mapnik { namespace detail { namespace mapnik { namespace detail {
// text_layout_properties template <typename T, class Enable = void>
struct is_mapnik_enumeration
{
static constexpr bool value = false;
};
template <typename T0, typename T1> template <typename T>
struct is_mapnik_enumeration<T, typename std::enable_if<std::is_enum<typename T::native_type>::value>::type>
{
static constexpr bool value = true;
};
template <typename T0, typename T1, bool is_mapnik_enumeration = false>
struct set_property_from_xml_impl struct set_property_from_xml_impl
{ {
using target_type = T0; using target_type = T0;
@ -57,30 +67,29 @@ struct set_property_from_xml_impl
} }
}; };
template <typename T> template <typename T0, typename T1>
struct set_property_from_xml_impl<text_transform_e, T> struct set_property_from_xml_impl<T0, T1, true>
{ {
using target_type = T; using target_enum_type = T0;
static void apply(T & val, char const* name, xml_node const& node) static void apply(T1 & val, char const* name, xml_node const& node)
{ {
try try
{ {
boost::optional<std::string> enum_str = node.get_opt_attr<std::string>(name); boost::optional<std::string> enum_str = node.get_opt_attr<std::string>(name);
if (enum_str) if (enum_str)
{ {
text_transform_e e; target_enum_type e;
e.from_string(*enum_str); e.from_string(*enum_str);
val = enumeration_wrapper(e); val = enumeration_wrapper(e);
} }
} }
catch (...)//config_error const& ex) catch (...)
{ {
boost::optional<expression_ptr> expr = node.get_opt_attr<expression_ptr>(name); boost::optional<expression_ptr> expr = node.get_opt_attr<expression_ptr>(name);
if (expr) val = *expr; if (expr) val = *expr;
else else
{ {
throw config_error(std::string("set_property_from_xml'"+ std::string(name))); throw config_error(std::string("set_property_from_xml'"+ std::string(name)));
//ex.append_context(std::string("set_property_from_xml'"+ std::string(name) + "'"), node);
} }
} }
} }
@ -91,7 +100,7 @@ struct set_property_from_xml_impl<text_transform_e, T>
template <typename T0, typename T1> template <typename T0, typename T1>
void set_property_from_xml(T1 & val, char const* name, xml_node const& node) void set_property_from_xml(T1 & val, char const* name, xml_node const& node)
{ {
detail::set_property_from_xml_impl<T0,T1>::apply(val, name, node); detail::set_property_from_xml_impl<T0, T1, detail::is_mapnik_enumeration<T0>::value>::apply(val, name, node);
} }
void serialize_property(std::string const& name, symbolizer_base::value_type const& val, boost::property_tree::ptree & node); void serialize_property(std::string const& name, symbolizer_base::value_type const& val, boost::property_tree::ptree & node);