Permalink
Browse files

fixup various plugin includes

  • Loading branch information...
Dane Springmeyer
Dane Springmeyer committed Jul 25, 2012
1 parent 4e60c0c commit 6df998cf39ee8fb733537fcc5890dd22b5b3a76a
@@ -40,15 +40,12 @@
using mapnik::query;
using mapnik::box2d;
-using mapnik::coord2d;
-using mapnik::CoordTransform;
using mapnik::Feature;
using mapnik::feature_ptr;
using mapnik::geometry_utils;
using mapnik::transcoder;
using mapnik::feature_factory;
-
geos_featureset::geos_featureset(GEOSGeometry* geometry,
GEOSGeometry* extent,
int identifier,
@@ -27,6 +27,8 @@
#include <mapnik/datasource.hpp>
#include <mapnik/unicode.hpp>
#include <mapnik/wkb.hpp>
+#include <mapnik/projection.hpp>
+#include <mapnik/feature.hpp>
// boost
#include <boost/scoped_ptr.hpp>
@@ -37,7 +37,6 @@
using mapnik::query;
using mapnik::box2d;
-using mapnik::CoordTransform;
using mapnik::Feature;
using mapnik::feature_ptr;
using mapnik::geometry_type;
@@ -39,7 +39,6 @@
using mapnik::query;
using mapnik::box2d;
-using mapnik::CoordTransform;
using mapnik::Feature;
using mapnik::feature_ptr;
using mapnik::geometry_utils;
@@ -44,7 +44,6 @@
using mapnik::query;
using mapnik::box2d;
-using mapnik::CoordTransform;
using mapnik::Feature;
using mapnik::feature_ptr;
using mapnik::geometry_utils;
@@ -33,7 +33,6 @@
#include "raster_featureset.hpp"
using mapnik::query;
-using mapnik::CoordTransform;
using mapnik::image_reader;
using mapnik::Feature;
using mapnik::feature_ptr;
@@ -81,7 +80,7 @@ feature_ptr raster_featureset<LookupPolicy>::next()
if (image_width > 0 && image_height > 0)
{
- CoordTransform t(image_width, image_height, extent_, 0, 0);
+ mapnik::CoordTransform t(image_width, image_height, extent_, 0, 0);
box2d<double> intersect = bbox_.intersect(curIter_->envelope());
box2d<double> ext = t.forward(intersect);
box2d<double> rem = policy_.transform(ext);
@@ -36,7 +36,6 @@ using mapnik::coord2d;
using mapnik::box2d;
using mapnik::Feature;
using mapnik::feature_ptr;
-using mapnik::CoordTransform;
using mapnik::geometry_type;
using mapnik::query;
using mapnik::feature_factory;
@@ -38,7 +38,6 @@
using mapnik::query;
using mapnik::box2d;
-using mapnik::CoordTransform;
using mapnik::Feature;
using mapnik::feature_ptr;
using mapnik::geometry_utils;

0 comments on commit 6df998c

Please sign in to comment.