sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

memory_feature - update to use mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-03-13 11:05:56 +01:00
parent 914b8dbd76
commit 6ef63aa7a5
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/memory_featureset.hpp
View file

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