Template get/set transform on mapnik:keys + shield_symbolizer properties [WIP] [skip ci]

Author: artemp

src/mapnik_shield_symbolizer.cpp

@@ -43,7 +43,27 @@ void export_shield_symbolizer(py::module const& m)
         .def_property("file",
                       &get_property<shield_symbolizer, mapnik::keys::file>,
                       &set_path_property<shield_symbolizer, mapnik::keys::file>,
-                      "File path or mapnik.PathExpression")
+                      "Shield image file path or mapnik.PathExpression")
+        .def_property("shield_dx",
+                      &get_property<shield_symbolizer, mapnik::keys::shield_dx>,
+                      &set_double_property<shield_symbolizer, mapnik::keys::shield_dx>,
+                      "shield_dx displacement")
+        .def_property("shield_dy",
+                      &get_property<shield_symbolizer, mapnik::keys::shield_dy>,
+                      &set_double_property<shield_symbolizer, mapnik::keys::shield_dy>,
+                      "shield_dy displacement")
+        .def_property("image_transform",
+                      &get_transform<mapnik::keys::image_transform>,
+                      &set_transform<mapnik::keys::image_transform>,
+                      "Shield image transform")
+        .def_property("unlock_image",
+                      &get_property<shield_symbolizer, mapnik::keys::unlock_image>,
+                      &set_boolean_property<shield_symbolizer, mapnik::keys::unlock_image>,
+                      "Unlock shield image")
+        .def_property("offset",
+                      &get_property<shield_symbolizer, mapnik::keys::offset>,
+                      &set_double_property<shield_symbolizer, mapnik::keys::offset>,
+                      "Shield offset")
         ;
 
 }

src/mapnik_symbolizer.cpp

@@ -210,8 +210,8 @@ void export_symbolizer(py::module const& m)
                       &set_enum_property<symbolizer_base, mapnik::composite_mode_e, mapnik::keys::comp_op>,
                       "Composite mode (comp-op)")
         .def_property("geometry_transform",
-                      &get_transform,
-                      &set_transform,
+                      &get_transform<mapnik::keys::geometry_transform>,
+                      &set_transform<mapnik::keys::geometry_transform>,
                       "Geometry transform")
         ;
 

src/mapnik_symbolizer.hpp

@@ -277,17 +277,19 @@ void set(symbolizer_base & sym, Value const& val)
     mapnik::put<Value>(sym, Key, val);
 }
 
-inline std::string get_transform(symbolizer_base const& sym)
+template <auto Key>
+std::string get_transform(symbolizer_base const& sym)
 {
-    auto expr = mapnik::get<mapnik::transform_type>(sym, mapnik::keys::geometry_transform);
+    auto expr = mapnik::get<mapnik::transform_type>(sym, Key);
     if (expr)
         return mapnik::transform_processor_type::to_string(*expr);
     return "";
 }
 
-inline void set_transform(symbolizer_base & sym, std::string const& str)
+template <auto Key>
+void set_transform(symbolizer_base & sym, std::string const& str)
 {
-    mapnik::put(sym, mapnik::keys::geometry_transform, mapnik::parse_transform(str));
+    mapnik::put(sym, Key, mapnik::parse_transform(str));
 }
 
 } // namespace python_mapnik