Fix:Core:Renamed data to map to clean up things a bit

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

diff --git a/navit/Makefile.inc b/navit/Makefile.inc
index 5e5ff86..484d9b9 100644 (file)
--- a/navit/Makefile.inc
+++ b/navit/Makefile.inc
@@ -1,5 +1,5 @@
 modulebindingdir=$(pkglibdir)/binding
-moduledatadir=$(pkglibdir)/data
+modulemapdir=$(pkglibdir)/map
 modulefontdir=$(pkglibdir)/font
 modulegraphicsdir=$(pkglibdir)/graphics
 moduleguidir=$(pkglibdir)/gui

diff --git a/navit/configure.in b/navit/configure.in
index 813db68..fcd9d98 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -171,7 +171,7 @@ AC_PROG_LIBTOOL
 AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
 AM_CONDITIONAL(SUPPORT_GLIB, [test "x$glib" = "xno"])
 AM_CONDITIONAL(SUPPORT_EZXML, [test "x$glib" = "xno"])
-AM_CONDITIONAL(DATA_POI_GEODOWNLOAD, [test "x$glib" = "xyes"])
+AM_CONDITIONAL(MAP_POI_GEODOWNLOAD, [test "x$glib" = "xyes"])
 
 AC_CHECK_HEADER(
        zlib.h,
@@ -811,14 +811,14 @@ navit/Makefile
 navit/binding/Makefile
 navit/binding/python/Makefile
 navit/binding/dbus/Makefile
-navit/data/Makefile
-navit/data/mg/Makefile
-navit/data/textfile/Makefile
-navit/data/binfile/Makefile
-navit/data/garmin/Makefile
-navit/data/poi_geodownload/Makefile
-navit/data/poi_geodownload/libmdb/Makefile
-navit/data/poi_geodownload/libmdb/include/Makefile
+navit/map/Makefile
+navit/map/mg/Makefile
+navit/map/textfile/Makefile
+navit/map/binfile/Makefile
+navit/map/garmin/Makefile
+navit/map/poi_geodownload/Makefile
+navit/map/poi_geodownload/libmdb/Makefile
+navit/map/poi_geodownload/libmdb/include/Makefile
 navit/fib-1.1/Makefile
 navit/font/Makefile
 navit/font/freetype/Makefile

diff --git a/navit/navit/Makefile.am b/navit/navit/Makefile.am
index ae1a339..1578442 100644 (file)
--- a/navit/navit/Makefile.am
+++ b/navit/navit/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.inc
-DIST_SUBDIRS=binding data fib-1.1 font gui graphics osd speech support vehicle xpm maps
-SUBDIRS=binding data fib-1.1 font gui graphics osd speech support vehicle xpm
+DIST_SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm maps
+SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
 if BUILD_SAMPLEMAP
   SUBDIRS += maps
 endif

diff --git a/navit/navit/data/binfile/Makefile.am b/navit/navit/data/binfile/Makefile.am
deleted file mode 100644 (file)
index 9f6426d..0000000
--- a/navit/navit/data/binfile/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_binfile
-if PLUGINS
-  moduledata_LTLIBRARIES = libdata_binfile.la
-else
-  noinst_LTLIBRARIES = libdata_binfile.la
-endif
-libdata_binfile_la_SOURCES = binfile.c

diff --git a/navit/navit/data/garmin_img/Makefile.am b/navit/navit/data/garmin_img/Makefile.am
deleted file mode 100644 (file)
index 9e50c62..0000000
--- a/navit/navit/data/garmin_img/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_garmin_img
-moduledata_LTLIBRARIES = libdata_garmin_img.la
-libdata_garmin_img_la_SOURCES = garmin_img.c

diff --git a/navit/navit/data/mg/Makefile.am b/navit/navit/data/mg/Makefile.am
deleted file mode 100644 (file)
index a32fc38..0000000
--- a/navit/navit/data/mg/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_mg
-if PLUGINS
-  moduledata_LTLIBRARIES = libdata_mg.la
-else
-  noinst_LTLIBRARIES = libdata_mg.la
-endif
-libdata_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h

diff --git a/navit/navit/data/poi_geodownload/Makefile.am b/navit/navit/data/poi_geodownload/Makefile.am
deleted file mode 100644 (file)
index 41f25d5..0000000
--- a/navit/navit/data/poi_geodownload/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=libmdb
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=data_poi_geodownload
-moduledata_LTLIBRARIES = libdata_poi_geodownload.la
-libdata_poi_geodownload_la_SOURCES = poi_geodownload.c
-libdata_poi_geodownload_la_LIBADD = -Llibmdb -lmdb

diff --git a/navit/navit/data/textfile/Makefile.am b/navit/navit/data/textfile/Makefile.am
deleted file mode 100644 (file)
index 50aacae..0000000
--- a/navit/navit/data/textfile/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_textfile
-if PLUGINS
-  moduledata_LTLIBRARIES = libdata_textfile.la
-else
-  noinst_LTLIBRARIES = libdata_textfile.la
-endif
-libdata_textfile_la_SOURCES = textfile.c textfile.h

diff --git a/navit/navit/data/Makefile.am b/navit/navit/map/Makefile.am
similarity index 87%
rename from navit/navit/data/Makefile.am
rename to navit/navit/map/Makefile.am
index f05aba1..6a35548 100644 (file)
--- a/navit/navit/data/Makefile.am
+++ b/navit/navit/map/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS=mg textfile binfile
 if HAVELIBGARMIN
 SUBDIRS+=garmin
 endif
-if DATA_POI_GEODOWNLOAD
+if MAP_POI_GEODOWNLOAD
 SUBDIRS+=poi_geodownload
 endif
 

diff --git a/navit/navit/map/binfile/Makefile.am b/navit/navit/map/binfile/Makefile.am
new file mode 100644 (file)
index 0000000..f208994
--- /dev/null
+++ b/navit/navit/map/binfile/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_binfile
+if PLUGINS
+  modulemap_LTLIBRARIES = libmap_binfile.la
+else
+  noinst_LTLIBRARIES = libmap_binfile.la
+endif
+libmap_binfile_la_SOURCES = binfile.c

diff --git a/navit/navit/data/binfile/binfile.c b/navit/navit/map/binfile/binfile.c
similarity index 100%
rename from navit/navit/data/binfile/binfile.c
rename to navit/navit/map/binfile/binfile.c

diff --git a/navit/navit/data/garmin/Makefile.am b/navit/navit/map/garmin/Makefile.am
similarity index 54%
rename from navit/navit/data/garmin/Makefile.am
rename to navit/navit/map/garmin/Makefile.am
index 42f2824..764671b 100644 (file)
--- a/navit/navit/data/garmin/Makefile.am
+++ b/navit/navit/map/garmin/Makefile.am
@@ -1,14 +1,14 @@
 include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@   -I$(top_srcdir)/navit -DMODULE=data_garmin
+AM_CPPFLAGS = @NAVIT_CFLAGS@   -I$(top_srcdir)/navit -DMODULE=map_garmin
 AM_CPPFLAGS+= @LIBGARMIN_CFLAGS@
-INCLUDES=-I$(top_srcdir)/navit/data/garmin/libgarmin
-AM_CPPFLAGS+=-I$(top_srcdir)/navit/data/garmin/libgarmin
+INCLUDES=-I$(top_srcdir)/navit/map/garmin/libgarmin
+AM_CPPFLAGS+=-I$(top_srcdir)/navit/map/garmin/libgarmin
 AM_CPPFLAGS+=-I$(srcdir)
 
-moduledata_LTLIBRARIES = libdata_garmin.la
-libdata_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h
-libdata_garmin_la_LIBADD = @LIBGARMIN_LIBS@
-nodist_libdata_garmin_la_SOURCES = g2nbuiltin.h
+modulemap_LTLIBRARIES = libmap_garmin.la
+libmap_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h
+libmap_garmin_la_LIBADD = @LIBGARMIN_LIBS@
+nodist_libmap_garmin_la_SOURCES = g2nbuiltin.h
 builddir = @builddir@
 
 gar2navit.l$(OBJEXT): g2nbuiltin.h
@@ -26,7 +26,7 @@ gentypes$(EXEEXT): $(gentypes_OBJECTS) $(gentypes_DEPENDENCIES)
        $(CCLD_FOR_BUILD) -o $@ $(gentypes_OBJECTS)
 
 g2nbuiltin.h: gentypes$(EXEEXT) garmintypes.txt
-       ./gentypes$(EXEEXT) $(top_srcdir)/navit/data/garmin/garmintypes.txt $@
+       ./gentypes$(EXEEXT) $(top_srcdir)/navit/map/garmin/garmintypes.txt $@
 
 EXTRA_DIST = garmintypes.txt
 

diff --git a/navit/navit/data/garmin/gar2navit.c b/navit/navit/map/garmin/gar2navit.c
similarity index 100%
rename from navit/navit/data/garmin/gar2navit.c
rename to navit/navit/map/garmin/gar2navit.c

diff --git a/navit/navit/data/garmin/gar2navit.h b/navit/navit/map/garmin/gar2navit.h
similarity index 100%
rename from navit/navit/data/garmin/gar2navit.h
rename to navit/navit/map/garmin/gar2navit.h

diff --git a/navit/navit/data/garmin/garmin.c b/navit/navit/map/garmin/garmin.c
similarity index 100%
rename from navit/navit/data/garmin/garmin.c
rename to navit/navit/map/garmin/garmin.c

diff --git a/navit/navit/data/garmin/garmin.h b/navit/navit/map/garmin/garmin.h
similarity index 100%
rename from navit/navit/data/garmin/garmin.h
rename to navit/navit/map/garmin/garmin.h

diff --git a/navit/navit/data/garmin/garmintypes.txt b/navit/navit/map/garmin/garmintypes.txt
similarity index 100%
rename from navit/navit/data/garmin/garmintypes.txt
rename to navit/navit/map/garmin/garmintypes.txt

diff --git a/navit/navit/data/garmin/gentypes.c b/navit/navit/map/garmin/gentypes.c
similarity index 100%
rename from navit/navit/data/garmin/gentypes.c
rename to navit/navit/map/garmin/gentypes.c

diff --git a/navit/navit/map/garmin_img/Makefile.am b/navit/navit/map/garmin_img/Makefile.am
new file mode 100644 (file)
index 0000000..bd4baae
--- /dev/null
+++ b/navit/navit/map/garmin_img/Makefile.am
@@ -0,0 +1,4 @@
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_garmin_img
+modulemap_LTLIBRARIES = libmap_garmin_img.la
+libmap_garmin_img_la_SOURCES = garmin_img.c

diff --git a/navit/navit/data/garmin_img/garmin_img.c b/navit/navit/map/garmin_img/garmin_img.c
similarity index 100%
rename from navit/navit/data/garmin_img/garmin_img.c
rename to navit/navit/map/garmin_img/garmin_img.c

diff --git a/navit/navit/map/mg/Makefile.am b/navit/navit/map/mg/Makefile.am
new file mode 100644 (file)
index 0000000..e408e6b
--- /dev/null
+++ b/navit/navit/map/mg/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_mg
+if PLUGINS
+  modulemap_LTLIBRARIES = libmap_mg.la
+else
+  noinst_LTLIBRARIES = libmap_mg.la
+endif
+libmap_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h

diff --git a/navit/navit/data/mg/block.c b/navit/navit/map/mg/block.c
similarity index 100%
rename from navit/navit/data/mg/block.c
rename to navit/navit/map/mg/block.c

diff --git a/navit/navit/data/mg/map.c b/navit/navit/map/mg/map.c
similarity index 100%
rename from navit/navit/data/mg/map.c
rename to navit/navit/map/mg/map.c

diff --git a/navit/navit/data/mg/mg.h b/navit/navit/map/mg/mg.h
similarity index 100%
rename from navit/navit/data/mg/mg.h
rename to navit/navit/map/mg/mg.h

diff --git a/navit/navit/data/mg/poly.c b/navit/navit/map/mg/poly.c
similarity index 100%
rename from navit/navit/data/mg/poly.c
rename to navit/navit/map/mg/poly.c

diff --git a/navit/navit/data/mg/street.c b/navit/navit/map/mg/street.c
similarity index 100%
rename from navit/navit/data/mg/street.c
rename to navit/navit/map/mg/street.c

diff --git a/navit/navit/data/mg/town.c b/navit/navit/map/mg/town.c
similarity index 100%
rename from navit/navit/data/mg/town.c
rename to navit/navit/map/mg/town.c

diff --git a/navit/navit/data/mg/tree.c b/navit/navit/map/mg/tree.c
similarity index 100%
rename from navit/navit/data/mg/tree.c
rename to navit/navit/map/mg/tree.c

diff --git a/navit/navit/map/poi_geodownload/Makefile.am b/navit/navit/map/poi_geodownload/Makefile.am
new file mode 100644 (file)
index 0000000..f2d6680
--- /dev/null
+++ b/navit/navit/map/poi_geodownload/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS=libmdb
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=map_poi_geodownload
+modulemap_LTLIBRARIES = libmap_poi_geodownload.la
+libmap_poi_geodownload_la_SOURCES = poi_geodownload.c
+libmap_poi_geodownload_la_LIBADD = -Llibmdb -lmdb

diff --git a/navit/navit/data/poi_geodownload/libmdb/Makefile.am b/navit/navit/map/poi_geodownload/libmdb/Makefile.am
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/Makefile.am
rename to navit/navit/map/poi_geodownload/libmdb/Makefile.am

diff --git a/navit/navit/data/poi_geodownload/libmdb/backend.c b/navit/navit/map/poi_geodownload/libmdb/backend.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/backend.c
rename to navit/navit/map/poi_geodownload/libmdb/backend.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/catalog.c b/navit/navit/map/poi_geodownload/libmdb/catalog.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/catalog.c
rename to navit/navit/map/poi_geodownload/libmdb/catalog.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/data.c b/navit/navit/map/poi_geodownload/libmdb/data.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/data.c
rename to navit/navit/map/poi_geodownload/libmdb/data.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/dump.c b/navit/navit/map/poi_geodownload/libmdb/dump.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/dump.c
rename to navit/navit/map/poi_geodownload/libmdb/dump.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/file.c b/navit/navit/map/poi_geodownload/libmdb/file.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/file.c
rename to navit/navit/map/poi_geodownload/libmdb/file.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/iconv.c b/navit/navit/map/poi_geodownload/libmdb/iconv.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/iconv.c
rename to navit/navit/map/poi_geodownload/libmdb/iconv.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/include/Makefile.am b/navit/navit/map/poi_geodownload/libmdb/include/Makefile.am
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/include/Makefile.am
rename to navit/navit/map/poi_geodownload/libmdb/include/Makefile.am

diff --git a/navit/navit/data/poi_geodownload/libmdb/include/mdbtools.h b/navit/navit/map/poi_geodownload/libmdb/include/mdbtools.h
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/include/mdbtools.h
rename to navit/navit/map/poi_geodownload/libmdb/include/mdbtools.h

diff --git a/navit/navit/data/poi_geodownload/libmdb/index.c b/navit/navit/map/poi_geodownload/libmdb/index.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/index.c
rename to navit/navit/map/poi_geodownload/libmdb/index.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/kkd.c b/navit/navit/map/poi_geodownload/libmdb/kkd.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/kkd.c
rename to navit/navit/map/poi_geodownload/libmdb/kkd.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/like.c b/navit/navit/map/poi_geodownload/libmdb/like.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/like.c
rename to navit/navit/map/poi_geodownload/libmdb/like.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/map.c b/navit/navit/map/poi_geodownload/libmdb/map.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/map.c
rename to navit/navit/map/poi_geodownload/libmdb/map.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/mem.c b/navit/navit/map/poi_geodownload/libmdb/mem.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/mem.c
rename to navit/navit/map/poi_geodownload/libmdb/mem.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/money.c b/navit/navit/map/poi_geodownload/libmdb/money.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/money.c
rename to navit/navit/map/poi_geodownload/libmdb/money.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/options.c b/navit/navit/map/poi_geodownload/libmdb/options.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/options.c
rename to navit/navit/map/poi_geodownload/libmdb/options.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/props.c b/navit/navit/map/poi_geodownload/libmdb/props.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/props.c
rename to navit/navit/map/poi_geodownload/libmdb/props.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/sargs.c b/navit/navit/map/poi_geodownload/libmdb/sargs.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/sargs.c
rename to navit/navit/map/poi_geodownload/libmdb/sargs.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/stats.c b/navit/navit/map/poi_geodownload/libmdb/stats.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/stats.c
rename to navit/navit/map/poi_geodownload/libmdb/stats.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/table.c b/navit/navit/map/poi_geodownload/libmdb/table.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/table.c
rename to navit/navit/map/poi_geodownload/libmdb/table.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/worktable.c b/navit/navit/map/poi_geodownload/libmdb/worktable.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/worktable.c
rename to navit/navit/map/poi_geodownload/libmdb/worktable.c

diff --git a/navit/navit/data/poi_geodownload/libmdb/write.c b/navit/navit/map/poi_geodownload/libmdb/write.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/libmdb/write.c
rename to navit/navit/map/poi_geodownload/libmdb/write.c

diff --git a/navit/navit/data/poi_geodownload/poi_geodownload.c b/navit/navit/map/poi_geodownload/poi_geodownload.c
similarity index 100%
rename from navit/navit/data/poi_geodownload/poi_geodownload.c
rename to navit/navit/map/poi_geodownload/poi_geodownload.c

diff --git a/navit/navit/map/textfile/Makefile.am b/navit/navit/map/textfile/Makefile.am
new file mode 100644 (file)
index 0000000..486bc25
--- /dev/null
+++ b/navit/navit/map/textfile/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_textfile
+if PLUGINS
+  modulemap_LTLIBRARIES = libmap_textfile.la
+else
+  noinst_LTLIBRARIES = libmap_textfile.la
+endif
+libmap_textfile_la_SOURCES = textfile.c textfile.h

diff --git a/navit/navit/data/textfile/textfile.c b/navit/navit/map/textfile/textfile.c
similarity index 100%
rename from navit/navit/data/textfile/textfile.c
rename to navit/navit/map/textfile/textfile.c

diff --git a/navit/navit/data/textfile/textfile.h b/navit/navit/map/textfile/textfile.h
similarity index 100%
rename from navit/navit/data/textfile/textfile.h
rename to navit/navit/map/textfile/textfile.h

diff --git a/navit/navit/plugin.c b/navit/navit/plugin.c
index 6496f74..8849bc1 100644 (file)
--- a/navit/navit/plugin.c
+++ b/navit/navit/plugin.c
@@ -308,7 +308,7 @@ plugins_destroy(struct plugins *pls)
        void *
 plugin_get_type(enum plugin_type type, const char *type_name, const char *name)
 {
-       dbg(1, "type=\"%s\", name=\"%s\"\n", type_name, name);
+       dbg(0, "type=\"%s\", name=\"%s\"\n", type_name, name);
        GList *l,*lpls;
        struct name_val *nv;
        struct plugin *pl;
@@ -323,8 +323,6 @@ plugin_get_type(enum plugin_type type, const char *type_name, const char *name)
        if (!pls)
                return NULL;
        lpls=pls->list;
-       if(!g_ascii_strcasecmp(type_name, "map"))
-               type_name="data";
        filename=g_strjoin("", "lib", type_name, "_", name, NULL);
        corename=g_strjoin("", "lib", type_name, "_", "core", NULL);
        while (lpls) {