Changeset 665

Timestamp:

03/06/08 16:04:47 (9 months ago)

Author:

nickw

Message:

Fixed for unicode change post 0.5

Location:

trunk/plugins/input/osm

Files:

• osm_datasource.cpp (modified) (3 diffs)
• osm_featureset.cpp (modified) (1 diff)
• osmparser.cpp (modified) (1 diff)
• osmtagtypes.h (added)
• render.cpp (modified) (1 diff)
• test2.xml (added)
• test3.xml (added)

trunk/plugins/input/osm/osm_datasource.cpp

@@ -28 +28 @@
 #include "osm_datasource.hpp"
 #include "osm_featureset.hpp"
+#include "osmtagtypes.h"
 #include <set>
 
@@ -53 +54 @@
         if (osm_data_->load(osm_filename.c_str(),parser)==false)
         {
-                throw datasource_exception("Error loading OSM data");
+                //throw datasource_exception("Error loading OSM data");
+                return ;
         }       
+
+        osm_tag_types tagtypes;
+        tagtypes.add_type("maxspeed",mapnik::Integer);
+        tagtypes.add_type("z_order",mapnik::Integer);
 
         osm_data_->rewind();
@@ -63 +69 @@
         // all of type String
         for(std::set<std::string>::iterator i=keys.begin(); i!=keys.end(); i++)
-                desc_.add_descriptor(attribute_descriptor(*i,String));
+                desc_.add_descriptor(attribute_descriptor(*i,tagtypes.get_type(*i)));
 
         // Get the bounds of the data and set extent_ accordingly

trunk/plugins/input/osm/osm_featureset.cpp

@@ -119 +119 @@
                                 //only add if in the specified set of attribute names
                                 if(attribute_names_.find(i->first) != attribute_names_.end())
-                                        (*feature)[i->first] = tr_->transcode(i->second);
+                                        (*feature)[i->first] = tr_->transcode(i->second.c_str());
                                 i++;
                         }

trunk/plugins/input/osm/osmparser.cpp

@@ -72 +72 @@
                         way->id = atol((char*)xid); 
                         cur_item  =  way; 
+                        // Prevent ways with no name being assigned a name of "0"
+                        cur_item->keyvals["name"] = ""; 
                         xmlFree(xid);
                 }

trunk/plugins/input/osm/render.cpp

@@ -16 +16 @@
 
 
-int main()
+int main(int argc,char *argv[])
 {
+        if(argc < 6)
+        {
+                std::cerr<<"Usage: render XMLfile w s e n OSMfile" << std::endl;
+                exit(0);
+        }
+
         datasource_cache::instance()->register_datasources
                 ("/usr/local/lib/mapnik/input");
         freetype_engine::register_font
-                ("/usr/local/lib/mapnik/fonts/Vera.ttf");
+                ("/usr/local/lib/mapnik/fonts/DejaVuSans.ttf");
 
         Map m (800,800);
-        load_map(m,"test.xml");
+        load_map(m,argv[1]);
+        
+        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));
+        }
 
-        Envelope<double> bbox (-1.45,50.90,-1.35,51.00);
+        Envelope<double> bbox (atof(argv[2]),atof(argv[3]),
+                                                        atof(argv[4]),atof(argv[5]));
                                                                                 
         m.zoomToBox(bbox);