Revert "first attempt at adding pgrouting output format"

This reverts commit 0e2966d.

Author: Tristramg

main.cc

@@ -170,7 +170,7 @@ main(int argc, char** argv)
         ("help,h", "produce help message")
         ("version,v", "show version")
         ("in-format", po::value<string>(&informat)->default_value("auto"), "input data format:\n    auto: \tguess from file extension. If no input file is given, read from stdin\n    bz2: \tbzip2 compressed file\n    stdin: \tstandart input\n    osm: \tuncompressed XML file")
-        ("out-format", po::value<string>(&outformat)->default_value("csv"), "output data format:\n    csv: \tnodes and edges as csv files\n    pg: \tpostgres/postgis database. The database MUST be a postgis geographical database\n    pgr: \tpostgres postgis database with edges formatted for pgrouting package. uses same pg options\n")
+        ("out-format", po::value<string>(&outformat)->default_value("csv"), "output data format:\n    csv: \tnodes and edges as csv files\n    pg: \tpostgres/postgis database. The database MUST be a postgis geographical database")
         ;
 
     string pg_conn, pg_nodes, pg_edges;
@@ -289,8 +289,8 @@ main(int argc, char** argv)
 
     //===================== STEP 2 ==========================//
     Writer * writer;
-    if(outformat == "pg" || outformat == "pgr")
-        writer = new PqWriter(pg_conn, pg_nodes, pg_edges, outformat);
+    if(outformat == "pg")
+        writer = new PqWriter(pg_conn, pg_nodes, pg_edges);
     else if (outformat == "csv")
         writer = new CSVWriter(csv_nodes, csv_edges);
     cout << "Step 2: building edges and saving them" << endl;

pqwriter.cc

@@ -21,7 +21,7 @@
 
 using boost::lexical_cast;
 
-PqWriter::PqWriter(const std::string & conn_str, const std::string & nodes_table, const std::string & edges_table, bool drop_table, const std::string & format) :
+PqWriter::PqWriter(const std::string & conn_str, const std::string & nodes_table, const std::string & edges_table, bool drop_table) :
     nodes_table(nodes_table),
     edges_table(edges_table),
     drop_table(drop_table)
@@ -55,23 +55,14 @@ PqWriter::PqWriter(const std::string & conn_str, const std::string & nodes_table
             std::cerr << "Unable to drop table " << nodes_table <<  PQerrorMessage(conn) << std::endl;
         }
         PQclear(res);
-        
         res = PQexec(conn, ("CREATE TABLE " + nodes_table + " (ID bigint, lon double precision, lat double precision)").c_str());
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
             std::cerr << "Unable to create table " << nodes_table <<  PQerrorMessage(conn) << std::endl;
         }
         PQclear(res);
 
-		if(format == "pg")
-		{
-        	res = PQexec(conn, ("CREATE TABLE " + edges_table + " (ID integer, source bigint, target bigint, length double precision, car smallint, car_rev smallint, bike smallint, bike_rev smallint, foot smallint)").c_str());
-        }
-        else if(format == "pgr")
-        {
-        	res = PQexec(conn, ("CREATE TABLE " + edges_table + " (ID integer, source bigint, x1 float, y1 float, target bigint, x2 float, y2 float, length double precision, to_cost double precision, reverse_cost double precision, rule text, car smallint, car_rev smallint, bike smallint, bike_rev smallint, foot smallint)").c_str());      
-        }   
-           
+        res = PQexec(conn, ("CREATE TABLE " + edges_table + " (ID integer, source bigint, target bigint, length double precision, car smallint, car_rev smallint, bike smallint, bike_rev smallint, foot smallint)").c_str());      
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
             std::cerr << "Unable to create table " << edges_table <<  PQerrorMessage(conn) << std::endl;
@@ -85,33 +76,19 @@ PqWriter::PqWriter(const std::string & conn_str, const std::string & nodes_table
         }
         PQclear(res);
 
-		res = PQexec(conn, ("SELECT AddGeometryColumn('" + edges_table + "','the_geom',4326,'LINESTRING',2)").c_str());
+res = PQexec(conn, ("SELECT AddGeometryColumn('" + edges_table + "','the_geom',4326,'LINESTRING',2)").c_str());
         if (PQresultStatus(res) != PGRES_TUPLES_OK)
         {
             std::cerr << "Unable to add a geometry column on table " << edges_table <<  PQerrorMessage(conn) << std::endl;
         }
         PQclear(res);
     }
 
-	if(format == "pg")
-	{
-    	res = PQprepare(conn,
+    res = PQprepare(conn,
             "add_edge",
-            ("INSERT INTO " + edges_table + 
-  			 " VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)").c_str() ,
+            ("INSERT INTO " + edges_table + " VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)").c_str() ,
             0,
             NULL);
-    }
-    else if(format == "pgr")
-    {
-    	res = PQprepare(conn,
-    	    "add_edge",
-    	    ("INSERT INTO " + edges_table + " (ID, source, x1, y1, target, x2, y2, length, reverse_cost, car,
-    	     car_rev, bike, bike_rev, foot) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)").c_str() ,
-    	    0,
-    	    NULL);
-    }        
-            
     if (PQresultStatus(res) != PGRES_COMMAND_OK)
     {
         std::cerr << "Unable to prepare SQL query for adding edges in table " << edges_table <<  PQerrorMessage(conn) << std::endl;
@@ -137,6 +114,9 @@ PqWriter::PqWriter(const std::string & conn_str, const std::string & nodes_table
     }
     PQclear(res);
 
+
+
+
 }
 
 int PqWriter::save_nodes(const NodeMapType & nodes)
@@ -184,48 +164,20 @@ void PqWriter::save_edge(int edge_id,
 
     PGresult * res;
     std::string tmp_geom = "SRID=4326;LINESTRING(" + geom + ")";
-    
-    if(format == "pg")
-    {
-	    const char * params[10] = {
-	        lexical_cast<std::string>(edge_id).c_str(),
-	        lexical_cast<std::string>(source).c_str(),
-	        lexical_cast<std::string>(target).c_str(),
-	        lexical_cast<std::string>(length).c_str(),
-	        lexical_cast<std::string>(car).c_str(),
-	        lexical_cast<std::string>(car_d).c_str(),
-	        lexical_cast<std::string>(bike).c_str(),
-	        lexical_cast<std::string>(bike_d).c_str(),
-	        lexical_cast<std::string>(foot).c_str(),
-	        tmp_geom.c_str()
-	    };
-	    
-	    res = PQexecPrepared(conn, "add_edge", 10, params, NULL, NULL, 0);
-	}
-	else if(format == "pgr")
-	{
-		const char * params[14] = {
-		    lexical_cast<std::string>(edge_id).c_str(),
-		    lexical_cast<std::string>(source).c_str(),
-		    lexical_cast<std::string>(source.lon).c_str(),
-		    lexical_cast<std::string>(source.lat).c_str(),
-		    lexical_cast<std::string>(target).c_str(),
-		    lexical_cast<std::string>(target.lon).c_str(),
-		    lexical_cast<std::string>(target.lat).c_str(),
-		    lexical_cast<std::string>(length).c_str(),
-		    lexical_cast<std::string>(length).c_str(),
-		    lexical_cast<std::string>(car).c_str(),
-		    lexical_cast<std::string>(car_d).c_str(),
-		    lexical_cast<std::string>(bike).c_str(),
-		    lexical_cast<std::string>(bike_d).c_str(),
-		    lexical_cast<std::string>(foot).c_str(),
-		    tmp_geom.c_str()
-		};
-		
-		res = PQexecPrepared(conn, "add_edge", 14, params, NULL, NULL, 0);
-	}
-
-    
+    const char * params[10] = {
+        lexical_cast<std::string>(edge_id).c_str(),
+        lexical_cast<std::string>(source).c_str(),
+        lexical_cast<std::string>(target).c_str(),
+        lexical_cast<std::string>(length).c_str(),
+        lexical_cast<std::string>(car).c_str(),
+        lexical_cast<std::string>(car_d).c_str(),
+        lexical_cast<std::string>(bike).c_str(),
+        lexical_cast<std::string>(bike_d).c_str(),
+        lexical_cast<std::string>(foot).c_str(),
+        tmp_geom.c_str()
+    };
+
+    res = PQexecPrepared(conn, "add_edge", 10, params, NULL, NULL, 0);
     if (PQresultStatus(res) != PGRES_COMMAND_OK)
     {
         std::cerr << "Unable to add edge in table " << edges_table <<  PQerrorMessage(conn) << std::endl;

pqwriter.h

@@ -27,11 +27,10 @@ class PqWriter : public Writer
     PGconn     *conn;
     std::string nodes_table;
     std::string edges_table;
-    std::string format;
     bool drop_table;
     public:
 
-    PqWriter(const std::string & conn_str, const std::string & nodes_table, const std::string & edges_table, bool drop_table = true, std::string & format);
+    PqWriter(const std::string & conn_str, const std::string & nodes_table, const std::string & edges_table, bool drop_table = true);
 
     int save_nodes(const NodeMapType & nodes);