diff --git a/bindings/python/mapnik_shield_symbolizer.cpp b/bindings/python/mapnik_shield_symbolizer.cpp index 04ea6a4e9..52a05ff79 100644 --- a/bindings/python/mapnik_shield_symbolizer.cpp +++ b/bindings/python/mapnik_shield_symbolizer.cpp @@ -24,6 +24,7 @@ #include #include +#include #include using mapnik::color; @@ -71,13 +72,172 @@ struct shield_symbolizer_pickle_suite : boost::python::pickle_suite }; +namespace { + using namespace boost::python; + + const char *get_filename(mapnik::point_symbolizer& symbolizer) + { + return symbolizer.get_filename().c_str(); + } + + list get_displacement_list(const text_symbolizer& t) + { + mapnik::position pos = t.get_displacement(); + double dx = boost::get<0>(pos); + double dy = boost::get<1>(pos); + boost::python::list disp; + disp.append(dx); + disp.append(dy); + return disp; + } + + list get_anchor_list(const text_symbolizer& t) + { + mapnik::position anch = t.get_anchor(); + double x = boost::get<0>(anch); + double y = boost::get<1>(anch); + boost::python::list anchor; + anchor.append(x); + anchor.append(y); + return anchor; + } +} + void export_shield_symbolizer() { using namespace boost::python; class_< shield_symbolizer, bases >("ShieldSymbolizer", init< std::string const&, std::string const&, unsigned, mapnik::color const&, std::string const&, std::string const&,unsigned,unsigned>("TODO")) - .def_pickle(shield_symbolizer_pickle_suite()) - ; - + //.def_pickle(shield_symbolizer_pickle_suite()) + /*.add_property("anchor", + &get_anchor, + &set_anchor) + */ + .def("anchor",&text_symbolizer::set_anchor) + .def("displacement",&text_symbolizer::set_displacement) + .def("get_anchor",get_anchor_list) + .def("get_displacement",get_displacement_list) + .add_property("allow_overlap", + &shield_symbolizer::get_allow_overlap, + &shield_symbolizer::set_allow_overlap, + "Set/get the allow_overlap property of the label") + .add_property("avoid_edges", + &shield_symbolizer::get_avoid_edges, + &shield_symbolizer::set_avoid_edges, + "Set/get the avoid_edge property of the label") + .add_property("character_spacing", + &shield_symbolizer::get_character_spacing, + &shield_symbolizer::set_character_spacing, + "Set/get the character_spacing property of the label") + /*.add_property("displacement", + &get_text_displacement, + &set_text_displacement) + */ + .add_property("face_name", + make_function(&shield_symbolizer::get_face_name,return_value_policy()), + &shield_symbolizer::set_face_name, + "Set/get the face_name property of the label") + .add_property("fill", + make_function(&shield_symbolizer::get_fill,return_value_policy()), + &shield_symbolizer::set_fill) + .add_property("fontset", + make_function(&shield_symbolizer::get_fontset,return_value_policy()), + &shield_symbolizer::set_fontset) + .add_property("force_odd_labels", + &shield_symbolizer::get_force_odd_labels, + &shield_symbolizer::set_force_odd_labels) + .add_property("halo_fill", + make_function(&shield_symbolizer::get_halo_fill,return_value_policy()), + &shield_symbolizer::set_halo_fill) + .add_property("halo_radius", + &shield_symbolizer::get_halo_radius, + &shield_symbolizer::set_halo_radius) + .add_property("horizontal_alignment", + &shield_symbolizer::get_horizontal_alignment, + &shield_symbolizer::set_horizontal_alignment, + "Set/get the horizontal alignment of the label") + .add_property("justify_alignment", + &shield_symbolizer::get_justify_alignment, + &shield_symbolizer::set_justify_alignment, + "Set/get the text justification") + .add_property("label_placement", + &shield_symbolizer::get_label_placement, + &shield_symbolizer::set_label_placement, + "Set/get the placement of the label") + .add_property("label_position_tolerance", + &shield_symbolizer::get_label_position_tolerance, + &shield_symbolizer::set_label_position_tolerance) + .add_property("label_spacing", + &shield_symbolizer::get_label_spacing, + &shield_symbolizer::set_label_spacing) + .add_property("line_spacing", + &shield_symbolizer::get_line_spacing, + &shield_symbolizer::set_line_spacing) + .add_property("max_char_angle_delta", + &shield_symbolizer::get_max_char_angle_delta, + &shield_symbolizer::set_max_char_angle_delta) + .add_property("minimum_distance", + &shield_symbolizer::get_minimum_distance, + &shield_symbolizer::set_minimum_distance) + .add_property("name", + make_function(&text_symbolizer::get_name,return_value_policy()), + &text_symbolizer::set_name) + .add_property("opacity", + &shield_symbolizer::get_opacity, + &shield_symbolizer::set_opacity, + "Set/get the shield opacity") + /* + .add_property("shield_displacement", + get_shield_displacement, + set_shield_displacement) + */ + /* + .add_property("text_opacity", + &shield_symbolizer::get_text_opacity, + &shield_symbolizer::set_text_opacity, + "Set/get the text opacity") + */ + .add_property("text_opacity", + &shield_symbolizer::get_opacity, + &shield_symbolizer::set_opacity, + "Set/get the text opacity") + /*.add_property("text_transform", + &shield_symbolizer::get_text_transform, + &shield_symbolizer::set_text_transform, + "Set/get the text conversion method") + */ + .add_property("text_ratio", + &shield_symbolizer::get_text_ratio, + &shield_symbolizer::set_text_ratio) + .add_property("text_size", + &shield_symbolizer::get_text_size, + &shield_symbolizer::set_text_size) + .add_property("vertical_alignment", + &shield_symbolizer::get_vertical_alignment, + &shield_symbolizer::set_vertical_alignment, + "Set/get the vertical alignment of the label") + .add_property("wrap_width", + &shield_symbolizer::get_wrap_width, + &shield_symbolizer::set_wrap_width) + .add_property("wrap_character", + &shield_symbolizer::get_wrap_char_string, + &shield_symbolizer::set_wrap_char_from_string) + .add_property("wrap_before", + &shield_symbolizer::get_wrap_before, + &shield_symbolizer::set_wrap_before) + .add_property("no_text", + &shield_symbolizer::get_no_text, + &shield_symbolizer::set_no_text) + .add_property("unlock_image", + &shield_symbolizer::get_unlock_image, + &shield_symbolizer::set_unlock_image) + .add_property("filename", + get_filename, + &shield_symbolizer::set_filename) + /*.add_property("transform", + mapnik::get_svg_transform, + mapnik::set_svg_transform) + */ + ; }