diff options
Diffstat (limited to 'navit/maptool/maptool.c')
| -rw-r--r-- | navit/maptool/maptool.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c index 2d35fe516..b1db65eeb 100644 --- a/navit/maptool/maptool.c +++ b/navit/maptool/maptool.c @@ -279,7 +279,6 @@ usage(void) fprintf(f,"maptool --protobuf -i planet.osm.pbf planet.bin\n"); fprintf(f,"Available switches:\n"); fprintf(f,"-h (--help) : this screen\n"); - fprintf(f,"-5 (--md5) <file> : set file where to write md5 sum\n"); fprintf(f,"-6 (--64bit) : set zip 64 bit compression\n"); fprintf(f,"-a (--attr-debug-level) <level> : control which data is included in the debug attribute\n"); fprintf(f,"-c (--dump-coordinates) : dump coordinates after phase 1\n"); @@ -324,7 +323,6 @@ struct maptool_params { int process_relations; char *protobufdb; char *protobufdb_operation; - char *md5file; int start; int end; int dump; @@ -357,7 +355,6 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index) int pos,c,i; static struct option long_options[] = { - {"md5", 1, 0, '5'}, {"64bit", 0, 0, '6'}, {"attr-debug-level", 1, 0, 'a'}, {"binfile", 0, 0, 'b'}, @@ -389,7 +386,7 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index) {"index-size", 0, 0, 'x'}, {0, 0, 0, 0} }; - c = getopt_long (argc, argv, "5:6B:DEMNO:PS:Wa:bc" + c = getopt_long (argc, argv, "6B:DEMNO:PS:Wa:bc" #ifdef HAVE_POSTGRESQL "d:" #endif @@ -397,9 +394,6 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index) if (c == -1) return 1; switch (c) { - case '5': - p->md5file=optarg; - break; case '6': p->zip64=1; break; @@ -812,8 +806,6 @@ maptool_assemble_map(struct maptool_params *p, char *suffix, char **filenames, c zip_set_timestamp(zip_info, p->timestamp); zip_set_maxnamelen(zip_info, 14+strlen(suffix0)); zip_set_compression_level(zip_info, p->compression_level); - if (p->md5file) - zip_set_md5(zip_info, 1); if(!zip_open(zip_info, p->result, zipdir, zipindex)) { fprintf(stderr,"Fatal: Could not write output file.\n"); exit(1); @@ -860,7 +852,6 @@ maptool_assemble_map(struct maptool_params *p, char *suffix, char **filenames, c unlink("coords.tmp"); } if (last) { - unsigned char md5_data[16]; zipnum=zip_get_zipnum(zip_info); add_aux_tiles("auxtiles.txt", zip_info); write_countrydir(zip_info,p->max_index_size); @@ -869,14 +860,6 @@ maptool_assemble_map(struct maptool_params *p, char *suffix, char **filenames, c zip_write_index(zip_info); zip_write_directory(zip_info); zip_close(zip_info); - if (p->md5file && zip_get_md5(zip_info, md5_data)) { - FILE *md5=fopen(p->md5file,"w"); - int i; - for (i = 0 ; i < 16 ; i++) - fprintf(md5,"%02x",md5_data[i]); - fprintf(md5,"\n"); - fclose(md5); - } if (!p->keep_tmpfiles) { remove_countryfiles(); tempfile_unlink("index",""); |