TextSymbolizer, PlacementFinder [WIP] [skip ci]

artemp · artemp · commit 8ba5a61f542e · 2024-05-21T11:27:09.000+01:00
diff --git a/demo/python/rundemo.py b/demo/python/rundemo.py
@@ -291,23 +291,24 @@
 # text to label with.  Then there is font size in points (I think?), and colour.
 
 # TODO - currently broken: https://github.com/mapnik/mapnik/issues/2324
-#popplaces_text_sym = mapnik.TextSymbolizer() #mapnik.Expression("[GEONAME]"),
 
-#finder = mapnik.PlacementFinder()
-#finder.face_name = 'DejaVu Sans Book'
-#finder.text_size = 10
-#finder.halo_fill = mapnik.Color(255,255,200)
-#finder.halo_radius = 1.0
-#finder.fill = mapnik.Color("black")
-#finder.format_expression = "[GEONAME]"
+popplaces_text_sym = mapnik.TextSymbolizer() #mapnik.Expression("[GEONAME]"),
 
-# popplaces_text_sym.placement_finder = mapnik.PlacementFinder()
-# popplaces_text_sym.placement_finder.face_name = 'DejaVu Sans Book'
-# popplaces_text_sym.placement_finder.text_size = 10
-# popplaces_text_sym.placement_finder.halo_fill = 'rgba(100%,100%,78.5%,1.0)' #mapnik.Color(R=255,G=255,B=200,A=255)
-# popplaces_text_sym.placement_finder.halo_radius = 1.0
-# popplaces_text_sym.placement_finder.fill = "black"
-# popplaces_text_sym.placement_finder.format_expression = "[GEONAME]"
+# finder = mapnik.PlacementFinder()
+# finder.face_name = 'DejaVu Sans Book'
+# finder.text_size = 10
+# finder.halo_fill = mapnik.Color(255,255,200)
+# finder.halo_radius = 1.0
+# finder.fill = mapnik.Color("black")
+# finder.format_expression = "[GEONAME]"
+
+popplaces_text_sym.placement_finder = mapnik.PlacementFinder()
+popplaces_text_sym.placement_finder.face_name = 'DejaVu Sans Book'
+popplaces_text_sym.placement_finder.text_size = 10
+popplaces_text_sym.placement_finder.halo_fill = 'rgba(100%,100%,78.5%,1.0)' #mapnik.Color(R=255,G=255,B=200,A=255)
+popplaces_text_sym.placement_finder.halo_radius = 1.0
+popplaces_text_sym.placement_finder.fill = "black"
+popplaces_text_sym.placement_finder.format_expression = "[GEONAME]"
 
 
 # We set a "halo" around the text, which looks like an outline if thin enough,
@@ -318,7 +319,7 @@
 #popplaces_text_sym.avoid_edges = True
 #popplaces_text_sym.minimum_padding = 30
 
-#popplaces_rule.symbolizers.append(popplaces_text_sym)
+popplaces_rule.symbolizers.append(popplaces_text_sym)
 
 popplaces_style.rules.append(popplaces_rule)
 
diff --git a/setup.py b/setup.py
@@ -83,6 +83,9 @@ def check_output(args):
                "src/mapnik_line_symbolizer.cpp",
                "src/mapnik_point_symbolizer.cpp",
                "src/mapnik_style.cpp",
+               "src/mapnik_logger.cpp",
+               "src/mapnik_placement_finder.cpp",
+               "src/mapnik_text_symbolizer.cpp",
           ],
           extra_compile_args=extra_comp_args,
           extra_link_args=linkflags,
diff --git a/src/mapnik_logger.cpp b/src/mapnik_logger.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko, Jean-Francois Doyon
+ * Copyright (C) 2024 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,60 +20,41 @@
  *
  *****************************************************************************/
 
+//mapnik
 #include <mapnik/config.hpp>
-
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/python.hpp>
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
-#pragma GCC diagnostic pop
-
 #include <mapnik/debug.hpp>
 #include <mapnik/util/singleton.hpp>
-#include "mapnik_enumeration.hpp"
 
-void export_logger()
+//pybind11
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+
+void export_logger(py::module const& m)
 {
     using mapnik::logger;
     using mapnik::singleton;
     using mapnik::CreateStatic;
-    using namespace boost::python;
 
-    class_<singleton<logger,CreateStatic>,boost::noncopyable>("Singleton",no_init)
-        .def("instance",&singleton<logger,CreateStatic>::instance,
-             return_value_policy<reference_existing_object>())
-        .staticmethod("instance")
-        ;
 
-    enum_<mapnik::logger::severity_type>("severity_type")
+    py::enum_<mapnik::logger::severity_type>(m, "severity_type")
         .value("Debug", logger::debug)
         .value("Warn", logger::warn)
         .value("Error", logger::error)
         .value("None", logger::none)
         ;
 
-    class_<logger,bases<singleton<logger,CreateStatic> >,
-        boost::noncopyable>("logger",no_init)
-        .def("get_severity", &logger::get_severity)
-        .def("set_severity", &logger::set_severity)
-        .def("get_object_severity", &logger::get_object_severity)
-        .def("set_object_severity", &logger::set_object_severity)
-        .def("clear_object_severity", &logger::clear_object_severity)
-        .def("get_format", &logger::get_format,return_value_policy<reference_existing_object>())
-        .def("set_format", &logger::set_format)
-        .def("str", &logger::str)
-        .def("use_file", &logger::use_file)
-        .def("use_console", &logger::use_console)
-        .staticmethod("get_severity")
-        .staticmethod("set_severity")
-        .staticmethod("get_object_severity")
-        .staticmethod("set_object_severity")
-        .staticmethod("clear_object_severity")
-        .staticmethod("get_format")
-        .staticmethod("set_format")
-        .staticmethod("str")
-        .staticmethod("use_file")
-        .staticmethod("use_console")
+    py::class_<logger, std::unique_ptr<logger, py::nodelete>>(m, "logger")
+        .def_static("get_severity", &logger::get_severity)
+        .def_static("set_severity", &logger::set_severity)
+        .def_static("get_object_severity", &logger::get_object_severity)
+        .def_static("set_object_severity", &logger::set_object_severity)
+        .def_static("clear_object_severity", &logger::clear_object_severity)
+        .def_static("get_format", &logger::get_format)
+        .def_static("set_format", &logger::set_format)
+        .def_static("str", &logger::str)
+        .def_static("use_file", &logger::use_file)
+        .def_static("use_console", &logger::use_console)
         ;
 }
diff --git a/src/mapnik_placement_finder.cpp b/src/mapnik_placement_finder.cpp
@@ -22,19 +22,22 @@
 
 
 #include <mapnik/config.hpp>
-
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/python.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#pragma GCC diagnostic pop
-
+#include <mapnik/symbolizer.hpp>
+#include <mapnik/symbolizer_hash.hpp>
+#include <mapnik/symbolizer_utils.hpp>
+#include <mapnik/symbolizer_keys.hpp>
+#include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/text/formatting/text.hpp>
 
+//pybind11
+#include <pybind11/pybind11.h>
+//#include <pybind11/operators.h>
+//#include <pybind11/stl.h>
+//#include <pybind11/stl_bind.h>
+
+namespace py = pybind11;
 
 namespace
 {
@@ -59,7 +62,7 @@ mapnik::symbolizer_base::value_type get_text_size(mapnik::text_placements_dummy
     return finder.defaults.format_defaults.text_size;
 }
 
-void set_fill(mapnik::text_placements_dummy & finder, mapnik::color const& fill )
+void set_fill(mapnik::text_placements_dummy & finder, mapnik::color const& fill)
 {
     finder.defaults.format_defaults.fill = fill;
 }
@@ -102,9 +105,9 @@ std::string get_format_expr(mapnik::text_placements_dummy & finder)
 
 }
 
-void export_placement_finder()
+void export_placement_finder(py::module const& m)
 {
-    using namespace boost::python;
+    //using namespace boost::python;
     //implicitly_convertible<mapnik::symbolizer_base::value_type, mapnik::value_double>();
 /*
   text_placements_ptr placement_finder = std::make_shared<text_placements_dummy>();
@@ -117,15 +120,13 @@ void export_placement_finder()
                   std::make_shared<mapnik::formatting::text_node>(parse_expression("[GEONAME]")));
                 put<text_placements_ptr>(text_sym, keys::text_placements_, placement_finder);
 */
-    class_<mapnik::text_placements_dummy, std::shared_ptr<mapnik::text_placements_dummy>, boost::noncopyable>
-        ("PlacementFinder",
-         "TODO: PlacementFinder docs",
-         init<>("Default ctor"))
-        .add_property("face_name", &get_face_name, &set_face_name, "Font face name")
-        .add_property("text_size", &get_text_size, &set_text_size, "Size of text")
-        .add_property("fill", &get_fill, &set_fill, "Fill")
-        .add_property("halo_fill", &get_halo_fill, &set_halo_fill, "Halo fill")
-        .add_property("halo_radius", &get_halo_radius, &set_halo_radius, "Halo radius")
-        .add_property("format_expression", &get_format_expr, &set_format_expr, "Format expression")
+    py::class_<mapnik::text_placements_dummy, std::shared_ptr<mapnik::text_placements_dummy>>(m, "PlacementFinder")
+        .def(py::init<>(), "Default ctor")
+        .def_property("face_name", &get_face_name, &set_face_name, "Font face name")
+        .def_property("text_size", &get_text_size, &set_text_size, "Size of text")
+        .def_property("fill", &get_fill, &set_fill, "Fill")
+        .def_property("halo_fill", &get_halo_fill, &set_halo_fill, "Halo fill")
+        .def_property("halo_radius", &get_halo_radius, &set_halo_radius, "Halo radius")
+        .def_property("format_expression", &get_format_expr, &set_format_expr, "Format expression")
         ;
 }
diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
@@ -602,13 +602,16 @@ void export_layer(py::module const&);
 void export_map(py::module const&);
 void export_projection(py::module&);
 void export_proj_transform(py::module const&);
-void export_query(py::module const& m);
-void export_rule(py::module const& m);
-void export_symbolizer(py::module const& m);
-void export_polygon_symbolizer(py::module const& m);
-void export_line_symbolizer(py::module const& m);
-void export_point_symbolizer(py::module const& m);
-void export_style(py::module const& m);
+void export_query(py::module const&);
+void export_rule(py::module const&);
+void export_symbolizer(py::module const&);
+void export_polygon_symbolizer(py::module const&);
+void export_line_symbolizer(py::module const&);
+void export_point_symbolizer(py::module const&);
+void export_style(py::module const&);
+void export_logger(py::module const&);
+void export_placement_finder(py::module const&);
+void export_text_symbolizer(py::module const&);
 
 using mapnik::load_map;
 using mapnik::load_map_string;
@@ -641,6 +644,9 @@ PYBIND11_MODULE(_mapnik, m) {
     export_line_symbolizer(m);
     export_point_symbolizer(m);
     export_style(m);
+    export_logger(m);
+    export_placement_finder(m);
+    export_text_symbolizer(m);
 
     m.def("mapnik_version", &mapnik_version,"Get the Mapnik version number");
     m.def("mapnik_version_string", &mapnik_version_string,"Get the Mapnik version string");
diff --git a/src/mapnik_symbolizer.cpp b/src/mapnik_symbolizer.cpp
@@ -38,7 +38,6 @@
 #include <mapnik/group/group_rule.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
 #include <mapnik/util/variant.hpp>
-#include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/transform/parse_transform.hpp>
 #include <mapnik/transform/transform_processor.hpp>
 
@@ -64,7 +63,6 @@ using mapnik::polygon_pattern_symbolizer;
 using mapnik::raster_symbolizer;
 using mapnik::shield_symbolizer;
 using mapnik::text_symbolizer;
-using mapnik::text_placements_dummy;
 using mapnik::building_symbolizer;
 using mapnik::markers_symbolizer;
 using mapnik::debug_symbolizer;
@@ -174,6 +172,7 @@ void export_symbolizer(py::module const& m)
         .def(py::init<point_symbolizer>())
         .def(py::init<line_symbolizer>())
         .def(py::init<line_pattern_symbolizer>())
+        .def(py::init<text_symbolizer>())
         .def("type_name", symbolizer_type_name)
         .def("__hash__", hash_impl)
         .def("__getitem__",&getitem_impl)
@@ -227,49 +226,6 @@ void export_symbolizer(py::module const& m)
     py::implicitly_convertible<debug_symbolizer,symbolizer>();
 }
 
-// void export_text_symbolizer()
-// {
-//     using namespace boost::python;
-//     mapnik::enumeration_<mapnik::label_placement_e>("label_placement")
-//         .value("LINE_PLACEMENT", mapnik::label_placement_enum::LINE_PLACEMENT)
-//         .value("POINT_PLACEMENT", mapnik::label_placement_enum::POINT_PLACEMENT)
-//         .value("VERTEX_PLACEMENT", mapnik::label_placement_enum::VERTEX_PLACEMENT)
-//         .value("INTERIOR_PLACEMENT", mapnik::label_placement_enum::INTERIOR_PLACEMENT);
-
-//     mapnik::enumeration_<mapnik::vertical_alignment_e>("vertical_alignment")
-//         .value("TOP", mapnik::vertical_alignment_enum::V_TOP)
-//         .value("MIDDLE", mapnik::vertical_alignment_enum::V_MIDDLE)
-//         .value("BOTTOM", mapnik::vertical_alignment_enum::V_BOTTOM)
-//         .value("AUTO", mapnik::vertical_alignment_enum::V_AUTO);
-
-//     mapnik::enumeration_<mapnik::horizontal_alignment_e>("horizontal_alignment")
-//         .value("LEFT", mapnik::horizontal_alignment_enum::H_LEFT)
-//         .value("MIDDLE", mapnik::horizontal_alignment_enum::H_MIDDLE)
-//         .value("RIGHT", mapnik::horizontal_alignment_enum::H_RIGHT)
-//         .value("AUTO", mapnik::horizontal_alignment_enum::H_AUTO);
-
-//     mapnik::enumeration_<mapnik::justify_alignment_e>("justify_alignment")
-//         .value("LEFT", mapnik::justify_alignment_enum::J_LEFT)
-//         .value("MIDDLE", mapnik::justify_alignment_enum::J_MIDDLE)
-//         .value("RIGHT", mapnik::justify_alignment_enum::J_RIGHT)
-//         .value("AUTO", mapnik::justify_alignment_enum::J_AUTO);
-
-//     mapnik::enumeration_<mapnik::text_transform_e>("text_transform")
-//         .value("NONE", mapnik::text_transform_enum::NONE)
-//         .value("UPPERCASE", mapnik::text_transform_enum::UPPERCASE)
-//         .value("LOWERCASE", mapnik::text_transform_enum::LOWERCASE)
-//         .value("CAPITALIZE", mapnik::text_transform_enum::CAPITALIZE);
-
-//     mapnik::enumeration_<mapnik::halo_rasterizer_e>("halo_rasterizer")
-//         .value("FULL", mapnik::halo_rasterizer_enum::HALO_RASTERIZER_FULL)
-//         .value("FAST", mapnik::halo_rasterizer_enum::HALO_RASTERIZER_FAST);
-
-//     class_<text_symbolizer>("TextSymbolizer", init<>("Default ctor"))
-//         .def("__hash__",hash_impl_2<text_symbolizer>)
-//         .add_property("placement_finder", &get_placement_finder, &set_placement_finder, "Placement finder")
-//         ;
-
-// }
 
 // void export_shield_symbolizer()
 // {
diff --git a/src/mapnik_symbolizer.hpp b/src/mapnik_symbolizer.hpp
@@ -232,18 +232,6 @@ std::size_t hash_impl_2(T const& sym)
     return mapnik::symbolizer_hash::value<T>(sym);
 }
 
-
-// text symbolizer
-// mapnik::text_placements_ptr get_placement_finder(text_symbolizer const& sym)
-// {
-//     return mapnik::get<mapnik::text_placements_ptr>(sym, mapnik::keys::text_placements_);
-// }
-
-// void set_placement_finder(text_symbolizer & sym, std::shared_ptr<text_placements_dummy> const& finder)
-// {
-//     mapnik::put<mapnik::text_placements_ptr>(sym, mapnik::keys::text_placements_, finder);
-// }
-
 template <typename Value, auto Key>
 auto get(symbolizer_base const& sym) -> Value
 {
diff --git a/src/mapnik_text_symbolizer.cpp b/src/mapnik_text_symbolizer.cpp
