diff options
Diffstat (limited to 'navit/map')
| -rw-r--r-- | navit/map/binfile/binfile.c | 2 | ||||
| -rw-r--r-- | navit/map/csv/csv.c | 6 | ||||
| -rw-r--r-- | navit/map/filter/filter.c | 2 | ||||
| -rw-r--r-- | navit/map/garmin/garmin.c | 2 | ||||
| -rw-r--r-- | navit/map/garmin_img/garmin_img.c | 2 | ||||
| -rw-r--r-- | navit/map/mg/map.c | 2 | ||||
| -rw-r--r-- | navit/map/shapefile/shapefile.c | 2 | ||||
| -rw-r--r-- | navit/map/textfile/textfile.c | 2 |
8 files changed, 11 insertions, 9 deletions
diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c index 4ca4c6bf5..6b5108659 100644 --- a/navit/map/binfile/binfile.c +++ b/navit/map/binfile/binfile.c @@ -2848,6 +2848,6 @@ plugin_init(void) if (sizeof(struct zip_cd) != 46) { dbg(lvl_error,"error: sizeof(struct zip_cd)=%zu\n",sizeof(struct zip_cd)); } - plugin_register_map_type("binfile", map_new_binfile); + plugin_register_category_map("binfile", map_new_binfile); } diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c index ea36432d1..2726e8ab9 100644 --- a/navit/map/csv/csv.c +++ b/navit/map/csv/csv.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include <errno.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -864,7 +865,8 @@ map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list fclose(fp); } else { - dbg(lvl_error,"Error opening csv map file %s, starting with empty map\n", m->filename); + dbg(lvl_error,"Error opening csv map file '%s': %s\n", m->filename, strerror(errno)); + return NULL; } } else { dbg(lvl_debug,"No data attribute, starting with in-memory map\n"); @@ -878,6 +880,6 @@ void plugin_init(void) { dbg(lvl_debug,"csv: plugin_init\n"); - plugin_register_map_type("csv", map_new_csv); + plugin_register_category_map("csv", map_new_csv); } diff --git a/navit/map/filter/filter.c b/navit/map/filter/filter.c index 63817ecc7..cecae7fc0 100644 --- a/navit/map/filter/filter.c +++ b/navit/map/filter/filter.c @@ -430,6 +430,6 @@ void plugin_init(void) { dbg(lvl_debug,"filter: plugin_init\n"); - plugin_register_map_type("filter", map_filter_new); + plugin_register_category_map("filter", map_filter_new); } diff --git a/navit/map/garmin/garmin.c b/navit/map/garmin/garmin.c index 609bcab0e..d00cb9794 100644 --- a/navit/map/garmin/garmin.c +++ b/navit/map/garmin/garmin.c @@ -993,5 +993,5 @@ gmap_new(struct map_methods *meth, struct attr **attrs, struct callback_list *cb void plugin_init(void) { - plugin_register_map_type("garmin", gmap_new); + plugin_register_category_map("garmin", gmap_new); } diff --git a/navit/map/garmin_img/garmin_img.c b/navit/map/garmin_img/garmin_img.c index 58fe489da..f7dccf89c 100644 --- a/navit/map/garmin_img/garmin_img.c +++ b/navit/map/garmin_img/garmin_img.c @@ -1508,6 +1508,6 @@ map_new_garmin_img(struct map_methods *meth, struct attr **attrs) void plugin_init(void) { - plugin_register_map_type("garmin_img", map_new_garmin_img); + plugin_register_category_map("garmin_img", map_new_garmin_img); } diff --git a/navit/map/mg/map.c b/navit/map/mg/map.c index 9b0805e2d..13561e154 100644 --- a/navit/map/mg/map.c +++ b/navit/map/mg/map.c @@ -609,5 +609,5 @@ map_new_mg(struct map_methods *meth, struct attr **attrs, struct callback_list * void plugin_init(void) { - plugin_register_map_type("mg", map_new_mg); + plugin_register_category_map("mg", map_new_mg); } diff --git a/navit/map/shapefile/shapefile.c b/navit/map/shapefile/shapefile.c index e67aaafee..e3eb4b723 100644 --- a/navit/map/shapefile/shapefile.c +++ b/navit/map/shapefile/shapefile.c @@ -682,7 +682,7 @@ void plugin_init(void) { dbg(lvl_debug,"shapefile: plugin_init\n"); - plugin_register_map_type("shapefile", map_new_shapefile); + plugin_register_category_map("shapefile", map_new_shapefile); } /************************************************************************/ diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c index d70f989f9..43be12368 100644 --- a/navit/map/textfile/textfile.c +++ b/navit/map/textfile/textfile.c @@ -394,6 +394,6 @@ void plugin_init(void) { dbg(lvl_debug,"textfile: plugin_init\n"); - plugin_register_map_type("textfile", map_new_textfile); + plugin_register_category_map("textfile", map_new_textfile); } |