organicmaps/osmctools
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Current versions

Browse source
This commit is contained in:
Ilya Zverev 2015-09-21 19:11:24 +03:00
parent 944a864629
commit 6da67ed2e1
3 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
osmconvert.c
View file

@ -1,10 +1,10 @@
// osmconvert 2014-11-15 21:10
#define VERSION "0.8.3"
// osmconvert 2015-04-13 14:20
#define VERSION "0.8.4"
//
// compile this file:
// gcc osmconvert.c -lz -O3 -o osmconvert
//
// (c) 2011..2014 Markus Weber, Nuernberg
// (c) 2011..2015 Markus Weber, Nuernberg
// Richard Russo contributed the initiative to --add-bbox-tags option
//
// This program is free software; you can redistribute it and/or
@ -456,6 +456,7 @@ static int loglevel= 0; // logging to stderr;
if((i%16)==0) fprintf(stderr,"\n "); \
fprintf(stderr," %02x",*pp++); } \
fprintf(stderr,"\n"); } }
#define UR(x) if(x){} // result value intentionally ignored
#if __WIN32__
#define NL "\r\n" // use CR/LF as new-line sequence
#define off_t off64_t
@ -5666,7 +5667,7 @@ static bool posr__writemode; // buffer is used for writing
static inline void posr__flush() {
if(!posr__writemode || posr__bufp==posr__buf)
return;
write(posr__fd,posr__buf,(char*)posr__bufp-(char*)posr__buf);
UR(write(posr__fd,posr__buf,(char*)posr__bufp-(char*)posr__buf))
posr__bufp= posr__buf;
} // end posr__flush()
@ -5947,7 +5948,7 @@ static bool rr__writemode; // buffer is used for writing
static inline void rr__flush() {
if(!rr__writemode || rr__bufp==rr__buf)
return;
write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf);
UR(write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf))
rr__bufp= rr__buf;
} // end rr__flush()
@ -6074,7 +6075,7 @@ static bool cwn__writemode; // buffer is used for writing
static inline void cwn__flush() {
if(!cwn__writemode || cwn__bufp==cwn__buf)
return;
write(cwn__fd,cwn__buf,(char*)cwn__bufp-(char*)cwn__buf);
UR(write(cwn__fd,cwn__buf,(char*)cwn__bufp-(char*)cwn__buf))
cwn__bufp= cwn__buf;
} // end cwn__flush()
@ -6205,7 +6206,7 @@ static bool cww__writemode; // buffer is used for writing
static inline void cww__flush() {
if(!cww__writemode || cww__bufp==cww__buf)
return;
write(cww__fd,cww__buf,(char*)cww__bufp-(char*)cww__buf);
UR(write(cww__fd,cww__buf,(char*)cww__bufp-(char*)cww__buf))
cww__bufp= cww__buf;
} // end cww__flush()
@ -11014,7 +11015,7 @@ static bool assistant(int* argcp,char*** argvp) {
"(Zum Schließen dieses Fensters bitte die Eingabetaste druecken.)\n"
};
#define DD(s) fprintf(stderr,"%s",(s[lang])); // display text
#define DI(s) fgets(s,sizeof(s),stdin); \
#define DI(s) s[0]= 0; UR(fgets(s,sizeof(s),stdin)) \
if(strchr(s,'\r')!=NULL) *strchr(s,'\r')= 0; \
if(strchr(s,'\n')!=NULL) *strchr(s,'\n')= 0; // get user's response
bool

9
osmfilter.c
View file

@ -1,10 +1,10 @@
// osmfilter 2014-10-15 12:20
#define VERSION "1.3A"
// osmfilter 2015-04-14 19:50
#define VERSION "1.4.0"
//
// compile this file:
// gcc osmfilter.c -O3 -o osmfilter
//
// (c) 2011..2014 Markus Weber, Nuernberg
// (c) 2011..2015 Markus Weber, Nuernberg
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Affero General Public License
@ -404,6 +404,7 @@ static byte digival_tab[]= {
static int loglevel= 0; // logging to stderr;
// 0: no logging; 1: small logging; 2: normal logging;
// 3: extended logging;
#define UR(x) if(x){} // result value intentionally ignored
#define DP(f) fprintf(stderr,"- Debug: " #f "\n");
#define DPv(f,...) fprintf(stderr,"- Debug: " #f "\n",__VA_ARGS__);
#if __WIN32__
@ -3014,7 +3015,7 @@ static bool rr__writemode; // buffer is used for writing
static void rr__flush() {
if(!rr__writemode || rr__bufp==rr__buf)
return;
write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf);
UR(write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf))
rr__bufp= rr__buf;
} // end rr__flush()

13
osmupdate.c
View file

@ -1,10 +1,10 @@
// osmupdate 2014-10-13 21:00
#define VERSION "0.3H"
// osmupdate 2015-04-15 10:00
#define VERSION "0.4.1"
//
// compile this file:
// gcc osmupdate.c -o osmupdate
//
// (c) 2011..2014 Markus Weber, Nuernberg
// (c) 2011..2015 Markus Weber, Nuernberg
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Affero General Public License
@ -28,11 +28,6 @@ const char* helptext=
"It also can assemble a new .osc or .o5c file which can be used to\n"
"update your OSM data file at a later time.\n"
"\n"
"If there is no file timestamp available within your input file, you\n"
"need to specify the appropriate timestamp manually. In this case, it\n"
"is recommended to pick a timestamp of one or two days earlier than\n"
"necessary, just to be on the save side.\n"
"\n"
"Prequesites\n"
"\n"
"To run this program, please download and install two other programs\n"
@ -107,7 +102,7 @@ const char* helptext=
" and daily changefiles. If you want to limit these changefile\n"
" categories, use one or two of these options and choose that\n"
" category/ies you want to be used.\n"
" The option --sporadic allows to process changefile sources\n"
" The option --sporadic allows processing changefile sources\n"
" which do not have the usual \"minute\", \"hour\" and \"day\"\n"
" subdirectories.\n"
"\n"