Reflect font_engine,gamma_method + test/python_tests/datasource_test.py:ds.all_features() --> iter(ds)

artemp · artemp · commit 0f0b04882403 · 2024-05-01T10:42:47.000+01:00
Remove boost::python namespace
diff --git a/setup.py b/setup.py
@@ -63,12 +63,14 @@ def check_output(args):
                "src/mapnik_composite_modes.cpp",
                "src/mapnik_coord.cpp",
                "src/mapnik_envelope.cpp",
-               "src/mapnik_geometry.cpp",
-               "src/mapnik_feature.cpp",
-               "src/mapnik_featureset.cpp",
                "src/mapnik_expression.cpp",
                "src/mapnik_datasource.cpp",
                "src/mapnik_datasource_cache.cpp",
+               "src/mapnik_gamma_method.cpp",
+               "src/mapnik_geometry.cpp",
+               "src/mapnik_feature.cpp",
+               "src/mapnik_featureset.cpp",
+               "src/mapnik_font_engine.cpp",
                "src/mapnik_image.cpp",
                "src/mapnik_projection.cpp",
                "src/mapnik_proj_transform.cpp",
diff --git a/src/mapnik_font_engine.cpp b/src/mapnik_font_engine.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,25 +20,21 @@
  *
  *****************************************************************************/
 
+//mapnik
 #include <mapnik/config.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/python.hpp>
-#include <boost/noncopyable.hpp>
-#pragma GCC diagnostic pop
-
 #include <mapnik/font_engine_freetype.hpp>
+//pybind11
+#include <pybind11/pybind11.h>
 
-void export_font_engine()
+namespace py = pybind11;
+
+void export_font_engine(py::module const& m)
 {
     using mapnik::freetype_engine;
-    using namespace boost::python;
-    class_<freetype_engine, boost::noncopyable>("FontEngine", no_init)
-        .def("register_font", &freetype_engine::register_font)
-        .def("register_fonts", &freetype_engine::register_fonts)
-        .def("face_names", &freetype_engine::face_names)
-        .staticmethod("register_font")
-        .staticmethod("register_fonts")
-        .staticmethod("face_names");
+
+    py::class_<freetype_engine>(m, "FontEngine")
+        .def_static("register_font", &freetype_engine::register_font)
+        .def_static("register_fonts", &freetype_engine::register_fonts)
+        .def_static("face_names", &freetype_engine::face_names)
+        ;
 }
diff --git a/src/mapnik_gamma_method.cpp b/src/mapnik_gamma_method.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,22 +20,17 @@
  *
  *****************************************************************************/
 
+// mapnik
 #include <mapnik/config.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/python.hpp>
-#include <boost/noncopyable.hpp>
-#pragma GCC diagnostic pop
-
 #include <mapnik/symbolizer_enumerations.hpp>
-#include "mapnik_enumeration.hpp"
+//pybind11
+#include <pybind11/pybind11.h>
 
-void export_gamma_method()
-{
-    using namespace boost::python;
+namespace py = pybind11;
 
-    mapnik::enumeration_<mapnik::gamma_method_e>("gamma_method")
+void export_gamma_method(py::module const& m)
+{
+    py::enum_<mapnik::gamma_method_enum>(m, "gamma_method")
         .value("POWER", mapnik::gamma_method_enum::GAMMA_POWER)
         .value("LINEAR",mapnik::gamma_method_enum::GAMMA_LINEAR)
         .value("NONE", mapnik::gamma_method_enum::GAMMA_NONE)
diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
@@ -113,9 +113,11 @@ void export_color(py::module const&);
 void export_composite_modes(py::module const&);
 void export_coord(py::module const&);
 void export_envelope(py::module const&);
+void export_gamma_method(py::module const&);
 void export_geometry(py::module const&);
 void export_feature(py::module const&);
 void export_featureset(py::module const&);
+void export_font_engine(py::module const&);
 void export_expression(py::module&);
 void export_datasource(py::module&);
 void export_datasource_cache(py::module const&);
@@ -129,8 +131,10 @@ PYBIND11_MODULE(_mapnik, m) {
  export_coord(m);
  export_envelope(m);
  export_geometry(m);
+ export_gamma_method(m);
  export_feature(m);
  export_featureset(m);
+ export_font_engine(m);
  export_expression(m);
  export_datasource(m);
  export_datasource_cache(m);
diff --git a/test/python_tests/datasource_test.py b/test/python_tests/datasource_test.py
@@ -71,7 +71,7 @@ def test_field_listing():
 def test_total_feature_count_shp():
     if 'shape' in mapnik.DatasourceCache.plugin_names():
         ds = mapnik.Shapefile(file='../data/shp/poly.shp')
-        features = ds.all_features()
+        features = iter(ds)
         num_feats = len(list(features))
         assert num_feats ==  10
 
@@ -83,7 +83,7 @@ def test_total_feature_count_json():
         assert desc['name'] ==  'ogr'
         assert desc['type'] ==  mapnik.DataType.Vector
         assert desc['encoding'] ==  'utf-8'
-        features = ds.all_features()
+        features = iter(ds)
         num_feats = len(list(features))
         assert num_feats ==  5
 
@@ -98,7 +98,7 @@ def test_sqlite_reading():
         assert desc['name'] ==  'sqlite'
         assert desc['type'] ==  mapnik.DataType.Vector
         assert desc['encoding'] ==  'utf-8'
-        features = ds.all_features()
+        features = iter(ds)
         num_feats = len(list(features))
         assert num_feats ==  245
 
@@ -108,16 +108,15 @@ def test_reading_json_from_string():
         json = f.read()
     if 'ogr' in mapnik.DatasourceCache.plugin_names():
         ds = mapnik.Ogr(file=json, layer_by_index=0)
-        features = ds.all_features()
+        features = iter(ds)
         num_feats = len(list(features))
         assert num_feats ==  5
 
 
 def test_feature_envelope():
     if 'shape' in mapnik.DatasourceCache.plugin_names():
         ds = mapnik.Shapefile(file='../data/shp/poly.shp')
-        features = ds.all_features()
-        for feat in features:
+        for feat in ds:
             env = feat.envelope()
             contains = ds.envelope().contains(env)
             assert contains ==  True
@@ -128,19 +127,19 @@ def test_feature_envelope():
 def test_feature_attributes():
     if 'shape' in mapnik.DatasourceCache.plugin_names():
         ds = mapnik.Shapefile(file='../data/shp/poly.shp')
-        features = list(ds.all_features())
+        features = list(iter(ds))
         feat = features[0]
-        attrs = {'PRFEDEA': u'35043411', 'EAS_ID': 168, 'AREA': 215229.266}
+        attrs = {'AREA': 215229.266, 'EAS_ID': 168, 'PRFEDEA': '35043411'}
         assert feat.attributes ==  attrs
-        assert ds.fields(), ['AREA', 'EAS_ID' ==  'PRFEDEA']
-        assert ds.field_types(), ['float', 'int' ==  'str']
+        assert ds.fields(), ['AREA', 'EAS_ID', 'PRFEDEA']
+        assert ds.field_types(), ['float', 'int', 'str']
 
 
 def test_ogr_layer_by_sql():
     if 'ogr' in mapnik.DatasourceCache.plugin_names():
         ds = mapnik.Ogr(file='../data/shp/poly.shp',
                         layer_by_sql='SELECT * FROM poly WHERE EAS_ID = 168')
-        features = ds.all_features()
+        features = iter(ds)
         num_feats = len(list(features))
         assert num_feats ==  1
 
