Changeset 686

Timestamp:

04/02/08 17:40:28 (8 months ago)

Author:

nickw

Message:

now distinguishes between lines and polygons for ways

Location:

trunk/plugins/input/osm

Files:

• libMakefile (modified) (1 diff)
• osm.cpp (modified) (2 diffs)
• osm.h (modified) (3 diffs)
• osm_featureset.cpp (modified) (3 diffs)
• render.cpp (modified) (2 diffs)

trunk/plugins/input/osm/libMakefile

@@ -1 @@
-CXXFLAGS = `xml2-config --cflags` -I/usr/local/include/mapnik -I/usr/include/boost -I/usr/include/freetype2 -fPIC -g
+CXXFLAGS = `xml2-config --cflags` -I/usr/local/include/mapnik -I/usr/include/boost -I/usr/include/freetype2  -I/home/nick/mapnik-osm/agg/include  -fPIC -g
 MAPNIK_OSM_OBJ = osmparser.o osm.o osm_datasource.o osm_featureset.o 
 osm.input: $(MAPNIK_OSM_OBJ)

trunk/plugins/input/osm/osm.cpp

@@ -10 +10 @@
 #include <iostream>
 using namespace std;
+
+polygon_types osm_way::ptypes;
 
 bool osm_dataset::load(const char* filename,const std::string& parser)
@@ -175 +177 @@
         return b;
 }
+
+bool osm_way::is_polygon()
+{
+        for(int count=0; count<ptypes.ptypes.size(); count++)
+        {
+                if(keyvals.find(ptypes.ptypes[count].first) != keyvals.end() &&
+                   keyvals[ptypes.ptypes[count].first] == ptypes.ptypes[count].second)
+                {
+                        return true;
+                }
+        }
+        return false;
+}

trunk/plugins/input/osm/osm.h

@@ -6 +6 @@
 #include <map>
 #include <set>
+#include <utility>
 
 struct bounds
 {
-        double w,s,e,n;
-        bounds() { w=-180; s=-90; e=180; n=90; }
-        bounds(double w, double s, double e, double n )
-        { 
-                this->w = w;
-                this->s = s;
-                this->e = e;
-                this->n = n;
-        }
+    double w,s,e,n;
+    bounds() { w=-180; s=-90; e=180; n=90; }
+    bounds(double w, double s, double e, double n )
+    { 
+        this->w = w;
+        this->s = s;
+        this->e = e;
+        this->n = n;
+    }
+};
+
+class polygon_types
+{
+public:
+    std::vector<std::pair<std::string,std::string> > ptypes;
+
+    polygon_types()
+    {
+        ptypes.push_back(std::pair<std::string,std::string>("natural","wood"));
+        ptypes.push_back(std::pair<std::string,std::string>("natural","water"));
+        ptypes.push_back(std::pair<std::string,std::string>("natural","heath"));
+        ptypes.push_back(std::pair<std::string,std::string>("natural","marsh"));
+        ptypes.push_back(std::pair<std::string,std::string>
+                ("landuse","forest"));
+        ptypes.push_back(std::pair<std::string,std::string>
+                ("landuse","industrial"));
+    }
 };
 
 struct osm_item
 {
-        long id;
-        std::map<std::string,std::string> keyvals;      
-        virtual std::string to_string();
+    long id;
+    std::map<std::string,std::string> keyvals;    
+    virtual std::string to_string();
 };
 
@@ -30 +49 @@
 struct osm_node: public osm_item
 {
-        double lat, lon;
-        std::string to_string();
+    double lat, lon;
+    std::string to_string();
 };
 
 struct osm_way: public osm_item
 {
-        std::vector<osm_node*> nodes; 
-        std::string to_string();
-        bounds get_bounds();
+    std::vector<osm_node*> nodes; 
+    std::string to_string();
+    bounds get_bounds();
+    bool is_polygon();
+    static polygon_types ptypes;
 };
 
@@ -44 +65 @@
 {
 private:
-        int next_item_mode;
-        enum {Node, Way };
-        std::vector<osm_node*>::iterator node_i;
-        std::vector<osm_way*>::iterator way_i;
-        std::vector<osm_node*> nodes;
-        std::vector<osm_way*> ways; 
+    int next_item_mode;
+    enum {Node, Way };
+    std::vector<osm_node*>::iterator node_i;
+    std::vector<osm_way*>::iterator way_i;
+    std::vector<osm_node*> nodes;
+    std::vector<osm_way*> ways; 
 
 public:
-        osm_dataset() { node_i=nodes.begin(); way_i=ways.begin();
-                                        next_item_mode=Node; }
-        osm_dataset(const char* name) 
-                { node_i=nodes.begin(); way_i=ways.begin();
-                 next_item_mode=Node; load(name); }
-        bool load(const char* name,const std::string& parser="libxml2");
-        ~osm_dataset();
-        void add_node(osm_node* n) { nodes.push_back(n); }
-        void add_way(osm_way* w) { ways.push_back(w); }
-        std::string to_string();
-        bounds get_bounds();
-        std::set<std::string> get_keys();
-        void rewind_nodes() { node_i=nodes.begin(); }
-        void rewind_ways() { way_i=ways.begin(); }
-        void rewind() { rewind_nodes(); rewind_ways(); next_item_mode=Node; }
-        osm_node * next_node();
-        osm_way * next_way();
-        osm_item * next_item();
-        bool current_item_is_node() { return next_item_mode==Node; }
-        bool current_item_is_way() { return next_item_mode==Way; }
+    osm_dataset() { node_i=nodes.begin(); way_i=ways.begin();
+                    next_item_mode=Node; }
+    osm_dataset(const char* name) 
+        { node_i=nodes.begin(); way_i=ways.begin();
+         next_item_mode=Node; load(name); }
+    bool load(const char* name,const std::string& parser="libxml2");
+    ~osm_dataset();
+    void add_node(osm_node* n) { nodes.push_back(n); }
+    void add_way(osm_way* w) { ways.push_back(w); }
+    std::string to_string();
+    bounds get_bounds();
+    std::set<std::string> get_keys();
+    void rewind_nodes() { node_i=nodes.begin(); }
+    void rewind_ways() { way_i=ways.begin(); }
+    void rewind() { rewind_nodes(); rewind_ways(); next_item_mode=Node; }
+    osm_node * next_node();
+    osm_way * next_way();
+    osm_item * next_item();
+    bool current_item_is_node() { return next_item_mode==Node; }
+    bool current_item_is_way() { return next_item_mode==Way; }
 };
 

trunk/plugins/input/osm/osm_featureset.cpp

@@ -31 +31 @@
 using mapnik::point_impl;
 using mapnik::line_string_impl;
+using mapnik::polygon_impl;
+
+using std::cerr;
+using std::endl;
 
 template <typename filterT>
@@ -85 +89 @@
                                 {
                                         feature=feature_ptr(new Feature(count_++));
-                                        geometry2d *line = new line_string_impl;
-                                        line->set_capacity(static_cast<osm_way*>(cur_item)->
+                                        geometry2d *geom;
+                                        if(static_cast<osm_way*>(cur_item)->is_polygon())
+                                                geom=new polygon_impl;
+                                        else
+                                                geom=new line_string_impl;
+
+                                        geom->set_capacity(static_cast<osm_way*>(cur_item)->
                                                                         nodes.size());
-                                        line->move_to(static_cast<osm_way*>(cur_item)->
+                                        geom->move_to(static_cast<osm_way*>(cur_item)->
                                                                                 nodes[0]->lon,
                                                                 static_cast<osm_way*>(cur_item)->
@@ -96 +105 @@
                                                                 ->nodes.size(); count++)
                                         {
-                                                line->line_to(static_cast<osm_way*>(cur_item)
+                                                geom->line_to(static_cast<osm_way*>(cur_item)
                                                                         ->nodes[count]->lon,
                                                                 static_cast<osm_way*>(cur_item)
                                                                         ->nodes[count]->lat);
                                         }
-                                        feature->add_geometry(line);
+                                        feature->add_geometry(geom);
                                         success=true;
                                 }

trunk/plugins/input/osm/render.cpp

@@ -20 +20 @@
         if(argc < 6)
         {
-                std::cerr<<"Usage: render XMLfile w s e n OSMfile" << std::endl;
+                std::cerr<<"Usage: render XMLfile w s e n [OSMfile]" << std::endl;
                 exit(0);
         }
@@ -32 +32 @@
         load_map(m,argv[1]);
         
-        parameters p;
-        p["type"] = "osm";
-        p["file"] = argv[6];
-        for(int count=0; count<m.layerCount(); count++)
+        if(argc>6)
         {
-                parameters q = m.getLayer(count).datasource()->params();
-                m.getLayer(count).set_datasource(datasource_cache::instance()->
-                create(p));
+                parameters p;
+                p["type"] = "osm";
+                p["file"] = argv[6];
+                for(int count=0; count<m.layerCount(); count++)
+                {
+                        parameters q = m.getLayer(count).datasource()->params();
+                        m.getLayer(count).set_datasource(datasource_cache::instance()->
+                                create(p));
+                }
         }