diff options
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | man/navit.1 | 2 | ||||
| -rw-r--r-- | navit/item.h | 2 | ||||
| -rw-r--r-- | navit/navit_shipped.xml | 2 | ||||
| -rwxr-xr-x | navit/script/check_itemdef | 4 | ||||
| -rwxr-xr-x | navit/tools/asc2navit | 6 |
7 files changed, 10 insertions, 10 deletions
@@ -86,7 +86,7 @@ navit/graphics.c navit/profile.c navit/popup.c navit/coord.c -navit/osm2navit.c +navit/maptool.c navit/mapset.c navit/plugin.c navit/data_window.c diff --git a/configure.in b/configure.in index 4a0381454..51aca4350 100644 --- a/configure.in +++ b/configure.in @@ -353,7 +353,7 @@ if test "x${graphics_sdl}" = "xyes" ; then fi AM_CONDITIONAL(USE_GRAPHICS_SDL, test "x${graphics_sdl}" = "xyes") -AC_ARG_ENABLE(postgresql, [ --disable-postgresql don't add postgresql support to osm2navit], postgresql=$enableval;postgresql_reason="configure parameter") +AC_ARG_ENABLE(postgresql, [ --disable-postgresql don't add postgresql support to maptool], postgresql=$enableval;postgresql_reason="configure parameter") if test "x${postgresql}" = "xyes" ; then if test -z "$PG_CONFIG"; then AC_PATH_PROG([PG_CONFIG], [pg_config], []) diff --git a/man/navit.1 b/man/navit.1 index c47322ee0..80608bf68 100644 --- a/man/navit.1 +++ b/man/navit.1 @@ -46,4 +46,4 @@ Should you find one, please report it : .SH AUTHOR The navit Team - http://www.navit-project.org .SH SEE ALSO -osm2navit(1) +maptool(1) diff --git a/navit/item.h b/navit/item.h index 3aaa6181c..873968af8 100644 --- a/navit/item.h +++ b/navit/item.h @@ -43,7 +43,7 @@ extern int default_flags[]; /* NOTE: we treat districts as towns for now, since a) navit does not implement district search yet - b) OSM "place=suburb" maps to type_district in osm2navit. with the OSM USA maps, + b) OSM "place=suburb" maps to type_district in maptool. with the OSM USA maps, there are many "suburbs" that users will consider towns (not districts/counties); we want navit's town search to find them */ diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index 7eb4b2290..f08cfd85f 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -229,7 +229,7 @@ Navigation</text></img> <announcement level="1" distance_metric="100"/> <announcement level="2" distance_metric="200"/> </roadprofile> - <!-- Those types do not appear in osm2navit.c and therefore are not used ATM --> + <!-- Those types do not appear in maptool.c and therefore are not used ATM --> <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> <announcement level="0" distance_metric="100"/> <announcement level="1" distance_metric="400"/> diff --git a/navit/script/check_itemdef b/navit/script/check_itemdef index 1aa744421..61ea1cb29 100755 --- a/navit/script/check_itemdef +++ b/navit/script/check_itemdef @@ -19,8 +19,8 @@ do done rm -f check.$$ -echo osm2navit.c -egrep '^ "[nw] +[^ ]+ +[^ ]+' ../osm2navit.c | sed "s/.* //" | sort -u | +echo maptool.c +egrep '^ "[nw] +[^ ]+ +[^ ]+' ../maptool.c | sed "s/.* //" | sort -u | while read -r x do check_item_def "${x%%\\n\"}" diff --git a/navit/tools/asc2navit b/navit/tools/asc2navit index dadef0108..77ba4ad15 100755 --- a/navit/tools/asc2navit +++ b/navit/tools/asc2navit @@ -47,7 +47,7 @@ close $pipe; sub show_help { print "parses one (or multiple) .asc-file(s) (mainly used by poiwarner) and\n"; - print "merges the result into one navit binary mapfile. requires osm2navit (when -x is not set)\n"; + print "merges the result into one navit binary mapfile. requires maptool (when -x is not set)\n"; print "usage: $0 [OPTION] OUT in1.asc [in2.asc [...]]\n"; print " creates one big file called onebigfile\n"; print "usage: $0 [OPTION] IN.asc\n"; @@ -68,9 +68,9 @@ sub preprocess_filelist { } sub open_outputhandle() { - # open the pipe to osm2navit... + # open the pipe to maptool... if (!$write_osm) { - open $pipe, "| osm2navit $filename" or die $!; + open $pipe, "| maptool $filename" or die $!; } else { # or a filehandle open $pipe, ">$filename" or die $!; |