From 6ef63aa7a5f89b5f909b41e89202bf8249c5fe15 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Mar 2015 11:05:56 +0100
Subject: [PATCH] memory_feature - update to use mapnik-geometry

---
 include/mapnik/memory_featureset.hpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index 3b7b9e1e4..fbb0d3f5e 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -25,7 +25,8 @@
 
 // mapnik
 #include <mapnik/box2d.hpp>
-#include <mapnik/geometry.hpp>
+#include <mapnik/geometry_impl.hpp>
+#include <mapnik/geometry_envelope.hpp>
 #include <mapnik/featureset.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/memory_datasource.hpp>
@@ -77,17 +78,12 @@ public:
                 }
                 else
                 {
-                    // FIXME
-                    /*
-                    for (std::size_t i=0; i<(*pos_)->num_geometries();++i)
+
+                    new_geometry::geometry const& geom = (*pos_)->get_geometry();
+                    if (bbox_.intersects(new_geometry::envelope(geom)))
                     {
-                        geometry_type const& geom = (*pos_)->get_geometry(i);
-                        if (bbox_.intersects(::mapnik::envelope(geom)))
-                        {
-                            return *pos_++;
-                        }
+                        return *pos_++;
                     }
-                    */
                 }
                 ++pos_;
             }