From 3c9ffdd989117f63d915190061341b222b8ee54b Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 22 Apr 2005 18:52:47 +0000
Subject: [PATCH] only two datasource types for now-(

---
 include/datasource.hh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/datasource.hh b/include/datasource.hh
index 8c94302d2..463062d3f 100644
--- a/include/datasource.hh
+++ b/include/datasource.hh
@@ -30,15 +30,15 @@
 #include "query.hh"
 
 namespace mapnik
-{
+{    
+    typedef ref_ptr<Feature> feature_ptr;
     struct Featureset
     {
         virtual Feature* next()=0;
         virtual ~Featureset() {};
     };
-
-    typedef ref_ptr<Featureset> FeaturesetPtr;
-
+    
+    typedef ref_ptr<Featureset> featureset_ptr;    
     class datasource_exception : public std::exception
     {
     private:
@@ -58,13 +58,11 @@ namespace mapnik
     {
     public:
 	enum {
-	    Point=1,
-	    Line,
-	    Polygon,
+	    Vector,
 	    Raster
 	};
 	virtual int type() const=0;
-	virtual FeaturesetPtr features(const query& q) const=0;
+	virtual featureset_ptr features(const query& q) const=0;
 	virtual const Envelope<double>& envelope() const=0;
 	virtual ~datasource() {};
     };