Fix:maptool:pgsql compiles again

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4609 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/maptool/maptool.c b/navit/navit/maptool/maptool.c
index c045dee..771b80d 100644 (file)
--- a/navit/navit/maptool/maptool.c
+++ b/navit/navit/maptool/maptool.c
@@ -172,6 +172,7 @@ struct maptool_params {
        FILE *ways_split;
        char *timestamp;
        char *result;
+       char *dbstr;
 };
 
 static int

diff --git a/navit/navit/maptool/osm_psql.c b/navit/navit/maptool/osm_psql.c
index f116b41..53ba780 100644 (file)
--- a/navit/navit/maptool/osm_psql.c
+++ b/navit/navit/maptool/osm_psql.c
@@ -28,7 +28,7 @@
 #include <libpq-fe.h>
 
 int
-map_collect_data_osm_db(char *dbstr, FILE *out_ways, FILE *out_way2poi, FILE *out_nodes, FILE *out_turn_restrictions, FILE *out_boundaries)
+map_collect_data_osm_db(char *dbstr, struct maptool_osm *osm)
 {
        PGconn *conn;
        PGresult *res,*node,*way,*tag;
@@ -108,7 +108,7 @@ map_collect_data_osm_db(char *dbstr, FILE *out_ways, FILE *out_way2poi, FILE *ou
                                if (tag_id > id)
                                        break;
                        }
-                       osm_end_node(out_nodes);
+                       osm_end_node(osm);
                }
                PQclear(tag);
                PQclear(node);
@@ -169,7 +169,7 @@ map_collect_data_osm_db(char *dbstr, FILE *out_ways, FILE *out_way2poi, FILE *ou
                                        break;
                        }
                        if (tagged)
-                               osm_end_way(out_ways, out_way2poi);
+                               osm_end_way(osm);
                }
                PQclear(tag);
                PQclear(node);