implemnent Iterator interface for Featureset object, remove inefficient features method

artemp · artemp · commit 1a4337f1deae · 2016-07-12T12:41:33.000+01:00
diff --git a/mapnik/__init__.py b/mapnik/__init__.py
@@ -278,16 +278,20 @@ class _Geometry(Geometry, _injector):
 
 class _Datasource(Datasource, _injector):
 
-    def featureset(self, fields=None, variables={}):
+    def featureset(self, fields = None, variables = {}):
         query = Query(self.envelope())
         query.set_variables(variables)
         attributes = fields or self.fields()
         for fld in attributes:
             query.add_property_name(fld)
         return self.features(query)
 
+    def __iter__(self, fields = None, variables = {}):
+        return self.featureset(fields, variables)
+    # backward caps helper
     def all_features(self, fields=None, variables={}):
-        return self.featureset(fields, variables).features
+        return self.__iter__(fields, variables)
+
 
 class _Color(Color, _injector):
 
diff --git a/setup.py b/setup.py
@@ -116,7 +116,6 @@ def run(self):
 linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' '))
 linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' '))
 linkflags.extend([
-'-lmapnik',
 '-lmapnik-wkt',
 '-lmapnik-json',
 ] + ['-l%s' % i for i in get_boost_library_names()])
@@ -231,17 +230,19 @@ def run(self):
 if os.environ.get("PYCAIRO", "false") == "true":
     try:
         extra_comp_args.append('-DHAVE_PYCAIRO')
-        extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' '))
-        linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' '))
+        print("-I%s/include/pycairo".format(sys.exec_prefix))
+        extra_comp_args.append("-I{0}/include/pycairo".format(sys.exec_prefix))
+        #extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' '))
+        #linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' '))
     except:
         raise Exception("Failed to find compiler options for pycairo")
 
 if sys.platform == 'darwin':
-    extra_comp_args.append('-mmacosx-version-min=10.8')
+    extra_comp_args.append('-mmacosx-version-min=10.11')
     # silence warning coming from boost python macros which
     # would is hard to silence via pragma
     extra_comp_args.append('-Wno-parentheses-equality')
-    linkflags.append('-mmacosx-version-min=10.8')
+    linkflags.append('-mmacosx-version-min=10.11')
 else:
     linkflags.append('-lrt')
     linkflags.append('-Wl,-z,origin')
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
@@ -36,21 +36,6 @@
 namespace {
 using namespace boost::python;
 
-inline list features(mapnik::featureset_ptr const& itr)
-{
-    list l;
-    while (true)
-    {
-        mapnik::feature_ptr fp = itr->next();
-        if (!fp)
-        {
-            break;
-        }
-        l.append(fp);
-    }
-    return l;
-}
-
 inline object pass_through(object const& o) { return o; }
 
 inline mapnik::feature_ptr next(mapnik::featureset_ptr const& itr)
@@ -70,20 +55,12 @@ inline mapnik::feature_ptr next(mapnik::featureset_ptr const& itr)
 void export_featureset()
 {
     using namespace boost::python;
-    class_<mapnik::Featureset,std::shared_ptr<mapnik::Featureset>,
-        boost::noncopyable>("Featureset",no_init)
-        .def("__iter__",pass_through)
-        .def("next",next)
-        .add_property("features",features,
-                      "The list of features.\n"
-                      "\n"
-                      "Usage:\n"
-                      ">>> m.query_map_point(0, 10, 10)\n"
-                      "<mapnik._mapnik.Featureset object at 0x1004d2938>\n"
-                      ">>> fs = m.query_map_point(0, 10, 10)\n"
-                      ">>> for f in fs.features:\n"
-                      ">>>     print f\n"
-                      "<mapnik.Feature object at 0x105e64140>\n"
-            )
+    // Featureset implements Python iterator interface
+    class_<mapnik::Featureset, std::shared_ptr<mapnik::Featureset>,
+           boost::noncopyable>("Featureset", no_init)
+        .def("__iter__", pass_through)
+        .def("__next__", next)
+        // Python2 support
+        .def("next", next)
         ;
 }
