[Git][debian-gis-team/osmctools][stretch-backports] 19 commits: Mark spelling-errors.patch as Forwarded.
Bas Couwenberg
gitlab at salsa.debian.org
Sat Jun 2 08:00:56 BST 2018
Bas Couwenberg pushed to branch stretch-backports at Debian GIS Project / osmctools
Commits:
875c5a53 by Bas Couwenberg at 2017-09-22T18:13:02+02:00
Mark spelling-errors.patch as Forwarded.
- - - - -
532ef117 by Bas Couwenberg at 2017-09-22T20:54:37+02:00
Mark spelling-errors.patch as Applied-Upstream.
- - - - -
290c9442 by Bas Couwenberg at 2017-11-15T22:05:09+01:00
Strip trailing whitespace from changelog.
- - - - -
8affcb73 by Bas Couwenberg at 2017-11-21T10:01:39+01:00
Strip trailing whitespace from changelog & control files.
- - - - -
38eb55de by Bas Couwenberg at 2018-01-21T10:12:45+01:00
Update copyright-format URL to use HTTPS.
- - - - -
0599bf5d by Bas Couwenberg at 2018-03-31T12:36:55+02:00
Update Vcs-* URLs for Salsa.
- - - - -
2b1a8489 by Bas Couwenberg at 2018-03-31T19:06:04+02:00
Bump Standards-Version to 4.1.3, no changes.
- - - - -
39e4306f by Bas Couwenberg at 2018-04-18T20:35:16+02:00
Bump Standards-Version to 4.1.4, no changes.
- - - - -
de0201a9 by Bas Couwenberg at 2018-05-05T20:51:40+02:00
Update watch file for GitLab changes.
- - - - -
8d38fb7e by Bas Couwenberg at 2018-05-07T21:31:11+02:00
Strip trailing whitespace from control & rules files.
- - - - -
1bb87d20 by Bas Couwenberg at 2018-05-30T16:14:48+02:00
New upstream version 0.9
- - - - -
6bef0e01 by Bas Couwenberg at 2018-05-30T16:14:51+02:00
Merge tag 'upstream/0.9'
Upstream version 0.9
- - - - -
fb56f5eb by Bas Couwenberg at 2018-05-30T16:15:31+02:00
New upstream release.
- - - - -
6bc2bda8 by Bas Couwenberg at 2018-05-30T16:16:32+02:00
Update copyright years for Markus Weber.
- - - - -
0f149de3 by Bas Couwenberg at 2018-05-30T16:27:13+02:00
Update manpages for upstream changes.
- - - - -
194a5036 by Bas Couwenberg at 2018-05-30T16:27:27+02:00
Drop patches, applied upstream.
- - - - -
d3849d93 by Bas Couwenberg at 2018-05-30T16:27:53+02:00
Set distribution to unstable.
- - - - -
b9fda2f1 by Bas Couwenberg at 2018-06-02T08:54:58+02:00
Merge tag 'debian/0.9-1' into stretch-backports
- - - - -
bbf5ce3f by Bas Couwenberg at 2018-06-02T08:55:06+02:00
Rebuild for stretch-backports.
- - - - -
15 changed files:
- README.md
- debian/changelog
- debian/control
- debian/copyright
- debian/docs/osmconvert.1
- debian/docs/osmfilter.1
- debian/docs/osmupdate.1
- − debian/patches/series
- − debian/patches/spelling-errors.patch
- debian/rules
- debian/upstream/metadata
- debian/watch
- src/osmconvert.c
- src/osmfilter.c
- src/osmupdate.c
Changes:
=====================================
README.md
=====================================
--- a/README.md
+++ b/README.md
@@ -1,8 +1,22 @@
A few really fast tools to convert, filter and update OpenStreetMap data files<br/>
<br/>
-Current Version: 0.8<br/>
+Current Version: 0.9<br/>
<br/>
Programm desrcriptions:<br/>
https://wiki.openstreetmap.org/wiki/osmconvert <br/>
https://wiki.openstreetmap.org/wiki/osmfilter <br/>
https://wiki.openstreetmap.org/wiki/osmupdate <br/>
+<br/>
+Changelog 0.9<br/>
+<br/>
+osmconvert:<br/>
+new feature: --complete-boundaries<br/>
+new syntax: --complete-multipolygons instead of --complex-ways<br/>
+bug fixed: tag confusion when applying --modify-tags="... add ..."<br/>
+<br/>
+osmconvert and osmfilter:<br/>
+increased hash size from 1000 MB to 1360 MB (--help will show more information on --hash-memory)<br/>
+<br/>
+osmupdate:<br/>
+changed default repository access to HTTPS,<br/>
+allowing new options --complete-multipolygons and --complete-boundaries being relayed to osmconvert<br/>
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+osmctools (0.9-1~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 02 Jun 2018 08:55:01 +0200
+
+osmctools (0.9-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Strip trailing whitespace from changelog & control files.
+ * Update copyright-format URL to use HTTPS.
+ * Update Vcs-* URLs for Salsa.
+ * Bump Standards-Version to 4.1.4, no changes.
+ * Update watch file for GitLab changes.
+ * Strip trailing whitespace from control & rules files.
+ * Update copyright years for Markus Weber.
+ * Update manpages for upstream changes.
+ * Drop patches, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 30 May 2018 16:27:44 +0200
+
osmctools (0.8-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
@@ -103,16 +124,16 @@ osmctools (0.3-1) unstable; urgency=medium
-- Bas Couwenberg <sebastic at xs4all.nl> Sat, 25 Oct 2014 20:45:59 +0200
osmctools (0.1-2) unstable; urgency=medium
-
+
* Fix FTBFS, LDADD against LDFLAGS
* Update watch file
- * Bump standards to 3.8.5.
+ * Bump standards to 3.8.5.
-- Pierre Blanc <pierreblanc75 at gmail.com> Tue, 21 Jan 2014 21:31:43 +0100
osmctools (0.1-1) unstable; urgency=low
- * Initial release (Closes: #722429)
+ * Initial release (Closes: #722429)
* Add VCS-* fields
* Use --with autoreconf
* debian/control Give a better description
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Priority: optional
Build-Depends: debhelper (>= 9),
dh-autoreconf,
zlib1g-dev
-Standards-Version: 4.1.0
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmctools.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmctools.git -b stretch-backports
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmctools
+Vcs-Git: https://salsa.debian.org/debian-gis-team/osmctools.git -b stretch-backports
Homepage: https://gitlab.com/osm-c-tools/osmctools
Package: osmctools
@@ -18,11 +18,10 @@ Depends: wget,
${shlibs:Depends},
${misc:Depends}
Description: Some tools to manipulate OpenStreetMap files
- Small collection of basic OpenStreetMap tools, include converter, filter and
+ Small collection of basic OpenStreetMap tools, include converter, filter and
updater files.
.
Programs include:
osmconvert - Converter of OSM files
osmfilter - The experimental OSM filters data
osmupdate - Update OSM files.
-
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: osmctools
Upstream-Contact: Markus Weber <marqqs at gmx.eu>
Source: https://gitlab.com/osm-c-tools/osmctools
Files: *
-Copyright: 2011-2017, Markus Weber <marqqs at gmx.eu>
+Copyright: 2011-2018, Markus Weber <marqqs at gmx.eu>
License: AGPL-3
Files: debian/*
=====================================
debian/docs/osmconvert.1
=====================================
--- a/debian/docs/osmconvert.1
+++ b/debian/docs/osmconvert.1
@@ -51,10 +51,11 @@ processing, and the program will loose its ability to read
from standard input. It is recommended to use .o5m format as
input format to compensate most of the speed disadvantage.
.PP
-\fB\-\-complex\-ways\fR
+\fB\-\-complex\-multipolygons\fR,
+\fB\-\-complex\-boundaries\fR
.IP
-Same as before, but multipolygons will not be cut at the
-borders too.
+Same as before, but multipolygons resp. boundaries will not be
+cut at the borders too.
.PP
\fB\-\-all\-to\-nodes\fR
.IP
@@ -352,15 +353,15 @@ osmconvert will display all input parameters.
.SH TUNING
.PP
To speed\-up the process, the program uses some main memory for a
-hash table. By default, it uses 480 MB for storing a flag for every
-possible node, 90 for the way flags, and 30 relation flags.
-Every byte holds the flags for 8 ID numbers, i.e., in 480 MB the
-program can store 3840 million flags. As there are less than 1900
-million IDs for nodes at present (July 2012), 240 MB would suffice.
-So, for example, you can decrease the hash sizes to e.g. 240, 30 and
+hash table. By default, it uses 1200 MB for storing a flag for every
+possible node, 150 for the way flags, and 10 relation flags.
+Every byte holds the flags for 8 ID numbers, i.e., in 1200 MB the
+program can store 9600 million flags. As there are less than 5700
+million IDs for nodes at present (May 2018), 720 MB would suffice.
+So, for example, you can decrease the hash sizes to e.g. 720, 80 and
2 MB using this option:
.HP
-\fB\-\-hash\-memory\fR=\fI240\-30\-2\fR
+\fB\-\-hash\-memory\fR=\fI720\-80\-2\fR
.PP
But keep in mind that the OSM database is continuously expanding. For
this reason the program\-own default value is higher than shown in the
@@ -422,7 +423,7 @@ This program is for experimental use. Expect malfunctions and data
loss. Do not use the program in productive or commercial systems.
.PP
There is NO WARRANTY, to the extent permitted by law.
-Please send any bug reports to markus.weber at gmx.com
+Please send any bug reports to marqqs at gmx.eu
.PP
.SH EXAMPLE
.PP
=====================================
debian/docs/osmfilter.1
=====================================
--- a/debian/docs/osmfilter.1
+++ b/debian/docs/osmfilter.1
@@ -325,15 +325,15 @@ You can also use comparisons or add additional tags:
\fB--modify-way-tags="maxspeed>200 add highspeed=yes"\fR
.SH TUNING
To speed\-up the process, the program uses some main memory for a
-hash table. By default, it uses 480 MB for storing a flag for every
-possible node, 90 for the way flags, and 30 relation flags.
-Every byte holds the flags for 8 ID numbers, i.e., in 480 MB the
-program can store 3840 million flags. As there are less than 1900
-million IDs for nodes at present (July 2012), 240 MB would suffice.
-So, for example, you can decrease the hash sizes to e.g. 240, 30 and
+hash table. By default, it uses 1200 MB for storing a flag for every
+possible node, 150 for the way flags, and 10 relation flags.
+Every byte holds the flags for 8 ID numbers, i.e., in 1200 MB the
+program can store 9600 million flags. As there are less than 5700
+million IDs for nodes at present (May 2018), 720 MB would suffice.
+So, for example, you can decrease the hash sizes to e.g. 720, 80 and
2 MB (for relations, 2 flags are needed each) using this option:
.br
-\fB\-\-hash\-memory\fR=\fI240\-30\-2\fR
+\fB\-\-hash\-memory\fR=\fI720\-80\-2\fR
.PP
But keep in mind that the OSM database is continuously expanding. For
this reason the program\-own default value is higher than shown in the
@@ -373,7 +373,7 @@ This program is for experimental use. Expect malfunctions and data
loss. Do not use the program in productive or commercial systems.
.PP
There is NO WARRANTY, to the extent permitted by law.
-Please send any bug reports to markus.weber at gmx.com
+Please send any bug reports to marqqs at gmx.eu
.SH EXAMPLE
osmfilter europe.o5m \-\-keep=amenity=bar \-o=new.o5m
.br
=====================================
debian/docs/osmupdate.1
=====================================
--- a/debian/docs/osmupdate.1
+++ b/debian/docs/osmupdate.1
@@ -125,7 +125,7 @@ This program is for experimental use. Expect malfunctions and data
loss. Do not use the program in productive or commercial systems.
.PP
There is NO WARRANTY, to the extent permitted by law.
-Please send any bug reports to markus.weber at gmx.com
+Please send any bug reports to marqqs at gmx.eu
.SH EXAMPLE
osmupdate old_file.o5m new_file.o5m
.br
=====================================
debian/patches/series deleted
=====================================
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch deleted
=====================================
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix spelling errors.
- * parallely -> parallelly
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/src/osmupdate.c
-+++ b/src/osmupdate.c
-@@ -111,9 +111,9 @@ const char* helptext=
- " changefiles in one run. This ability increases merging speed.\n"
- " Unfortunately, every changefile consumes about 200 MB of main\n"
- " memory while being processed. For this reason, the number of\n"
--" parallely processable changefiles is limited.\n"
-+" parallelly processable changefiles is limited.\n"
- " Use this commandline argument to determine the maximum number\n"
--" of parallely processed changefiles. The default value is 7.\n"
-+" of parallelly processed changefiles. The default value is 7.\n"
- "\n"
- "-t=TEMPPATH\n"
- "--tempfiles=TEMPPATH\n"
-@@ -511,7 +511,7 @@ static char global_osmconvert_arguments[
- // general command line arguments for osmconvert;
- #define max_number_of_changefiles_in_cache 100
- static int global_max_merge= 7;
-- // maximum number of parallely processed changefiles
-+ // maximum number of parallelly processed changefiles
- static const char* global_gzip_parameters= "";
- // parameters for gzip compression
- static char global_base_url[400]=
-@@ -1199,7 +1199,7 @@ return 0;
- continue; // take next parameter
- }
- if(strzcmp(a,"--max-merge=")==0) {
-- // maximum number of parallely processed changefiles
-+ // maximum number of parallelly processed changefiles
- global_max_merge= strtouint32(a+12);
- if(global_max_merge<2) {
- global_max_merge= 2;
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,3 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@ --with autoreconf --parallel
-
=====================================
debian/upstream/metadata
=====================================
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,5 +1,4 @@
---
-Contact: Markus Weber <markus.weber at gmx.com>
Name: osmctools
Repository: https://gitlab.com/osm-c-tools/osmctools.git
Repository-Browse: https://gitlab.com/osm-c-tools/osmctools
=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,6 @@
version=3
opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
-filenamemangle=s/\/(\d\S*)\/archive\.tar\.gz/\/$1\/osmctools-$1\.tar\.gz/g \
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
https://gitlab.com/osm-c-tools/osmctools/tags \
-/osm-c-tools/osmctools/repository/(\d\S*)/archive.tar.gz
+(?:.*?/)?(?:rel|v|osmctools)[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
src/osmconvert.c
=====================================
--- a/src/osmconvert.c
+++ b/src/osmconvert.c
@@ -1,10 +1,10 @@
-// osmconvert 2017-03-30 19:00
-#define VERSION "0.8.7"
+// osmconvert 2018-05-27 12:00
+#define VERSION "0.8.10"
//
// compile this file:
// gcc osmconvert.c -lz -O3 -o osmconvert
//
-// (c) 2011..2017 Markus Weber, Nuernberg
+// (c) 2011..2018 Markus Weber, Nuernberg
// Richard Russo contributed the initiative to --add-bbox-tags option
//
// This program is free software; you can redistribute it and/or
@@ -29,7 +29,8 @@ const char* shorthelptext=
"-b=<x1>,<y1>,<x2>,<y2> apply a border box\n"
"-B=<border_polygon> apply a border polygon\n"
"--complete-ways do not clip ways at the borders\n"
-"--complex-ways do not clip multipolygons at the borders\n"
+"--complete-multipolygons do not clip multipolygons at the borders\n"
+"--complete-boundaries do not clip boundaries at the borders\n"
"--all-to-nodes convert ways and relations to nodes\n"
"--add-bbox-tags add bbox tags to ways and relations\n"
"--add-bboxarea-tags add tags for estimated bbox areas\n"
@@ -121,9 +122,9 @@ const char* helptext=
" from standard input. It is recommended to use .o5m format as\n"
" input format to compensate most of the speed disadvantage.\n"
"\n"
-"--complex-ways\n"
-" Same as before, but multipolygons will not be cut at the\n"
-" borders too.\n"
+"--complete-multipolygons, --complete-boundaries\n"
+" Same as before, but multipolygons resp. boundaries will not\n"
+" be cut at the borders too.\n"
"\n"
"--all-to-nodes\n"
" Some applications do not have the ability to process ways or\n"
@@ -386,15 +387,15 @@ const char* helptext=
"Tuning\n"
"\n"
"To speed-up the process, the program uses some main memory for a\n"
-"hash table. By default, it uses 900 MB for storing a flag for every\n"
-"possible node, 90 for the way flags, and 10 relation flags.\n"
-"Every byte holds the flags for 8 ID numbers, i.e., in 900 MB the\n"
-"program can store 7200 million flags. As there are less than 3200\n"
-"million IDs for nodes at present (Oct 2014), 400 MB would suffice.\n"
-"So, for example, you can decrease the hash sizes to e.g. 400, 50 and\n"
+"hash table. By default, it uses 1200 MB for storing a flag for every\n"
+"possible node, 150 for the way flags, and 10 relation flags.\n"
+"Every byte holds the flags for 8 ID numbers, i.e., in 1200 MB the\n"
+"program can store 9600 million flags. As there are less than 5700\n"
+"million IDs for nodes at present (May 2018), 720 MB would suffice.\n"
+"So, for example, you can decrease the hash sizes to e.g. 720, 80 and\n"
"2 MB using this option:\n"
"\n"
-" --hash-memory=400-50-2\n"
+" --hash-memory=720-80-2\n"
"\n"
"But keep in mind that the OSM database is continuously expanding. For\n"
"this reason the program-own default value is higher than shown in the\n"
@@ -455,7 +456,7 @@ const char* helptext=
"loss. Do not use the program in productive or commercial systems.\n"
"\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-"Please send any bug reports to markus.weber at gmx.com\n\n";
+"Please send any bug reports to marqqs at gmx.eu\n\n";
#define _FILE_OFFSET_BITS 64
#include <zlib.h>
@@ -597,9 +598,15 @@ static char global_csvseparator[16]= "\t"; // separator for csv
static bool global_completeways= false; // when applying borders,
// do not clip ways but include them as whole if at least a single
// of its nodes lies inside the borders;
-static bool global_complexways= false; // same as global_completeways,
+static bool global_complex= false; // one of the following complex
+ // operations has been invoked:
+ // --complete-multipolygons, --complete-boundaries
+static bool global_completemp= false; // same as global_completeways,
// but multipolygons are included completely (with all ways and their
// nodes), even when only a single nodes lies inside the borders;
+static bool global_completeboundaries= false; // same as global_completeways,
+ // but boundaries are included completely (with all ways and their
+ // nodes), even when only a single nodes lies inside the borders;
static int global_calccoords= 0;
// calculate coordinates for all objects;
// 0: no coordinates to calculate; 1: calculate coordinates;
@@ -1614,7 +1621,7 @@ static int hash_ini(int n,int w,int r) {
return 0; // ignore the call of this procedure
// check parameters and store the values
#define D(x,o) if(x<1) x= 1; else if(x>4000) x= 4000; \
- hash__max[o]= x*(1024*1024);
+ hash__max[o]= x*(1024u*1024u);
D(n,0u) D(w,1u) D(r,2u)
#undef D
// allocate memory for each hash table
@@ -2427,11 +2434,11 @@ return 0;
static inline bool read_setjump() {
// store the current position in the file as a destination
// for a jump which will follow later;
- // if global_complexways is false, the call will be ignored;
+ // if global_complex is false, the call will be ignored;
// the position is not stored anew if it has been locked
// with read_infop->lockpos;
// return: jump position has been stored;
- if(!global_complexways)
+ if(!global_complex)
return false;
if(read__jumplock)
return false;
@@ -7330,9 +7337,10 @@ return;
// this module provides procedures to use a temporary file for
// storing a list of ways which have to be marked as 'inside';
-// this is used if option --complex-ways is invoked;
+// this is used if one or both options --complete-multipolygons
+// or --complete-boundaries is invoked;
// as usual, all identifiers of a module have the same prefix,
-// in this case 'posi'; an underline will follow for a global
+// in this case 'cww'; an underline will follow for a global
// accessible identifier, two underlines if the identifier
// is not meant to be accessed from outside this module;
// the sections of private and public definitions are separated
@@ -10240,13 +10248,14 @@ return 1;
int dependencystage;
// stage of the processing of interobject dependencies:
- // interrelation dependencies, --complete-ways or --complex-ways;
+ // interrelation dependencies, --complete-ways,
+ // --complete-multipolygons or --complete-boundaries;
// processing in stages allows us to reprocess parts of the data;
// abbrevation "ht" means hash table (module hash_);
//
// 0: no recursive processing at all;
//
- // option --complex-ways:
+ // option --complete-multipolygons:
// 11: no output;
// for each node which is inside the borders,
// set flag in ht;
@@ -10443,7 +10452,7 @@ return 5;
// (borders to apply AND relations are required) OR
// user wants ways and relations to be converted to nodes
// initiate recursive processing;
- if(global_complexways) {
+ if(global_complex) {
oo__dependencystage(11);
// 11: no output;
// for each node which is inside the borders,
@@ -10483,7 +10492,9 @@ return 28;
else {
oo__dependencystage(0); // no recursive processing
global_completeways= false;
- global_complexways= false;
+ global_complex= false;
+ global_completemp= false;
+ global_completeboundaries= false;
}
// print file timestamp and nothing else if requested
@@ -11241,6 +11252,7 @@ return 23;
bool relinside; // this relation lies inside
bool wayinside; // at least one way lies inside
bool ismp; // this relation is a multipolygon
+ // or a boundary
relinside= wayinside= ismp= false;
refidp= refid; reftypep= reftype; refrolep= refrole;
@@ -11251,7 +11263,7 @@ return 23;
if(!wayinside && rt==1 && (strcmp(rr,"outer")==0 ||
strcmp(rr,"inner")==0) && hash_geti(1,ri))
// referenced object is a way and part of
- // a multipolygon AND lies inside
+ // a multipolygon (or boundary) AND lies inside
wayinside= true;
refidp++; reftypep++; refrolep++;
} // end for every referenced object
@@ -11260,27 +11272,30 @@ return 23;
if(wayinside) { // at least one way lies inside
keyp= key; valp= val;
while(keyp<keye) { // for all key/val pairs of this object
- if(strcmp(*keyp,"type")==0 &&
- strcmp(*valp,"multipolygon")==0) {
- ismp= true;
+ if(strcmp(*keyp,"type")==0) {
+ if(global_completemp &&
+ strcmp(*valp,"multipolygon")==0 ||
+ global_completeboundaries &&
+ strcmp(*valp,"boundary")==0)
+ ismp= true;
break;
}
keyp++; valp++;
} // for all key/val pairs of this object
- if(ismp) { // is multipolygon
+ if(ismp) { // is multipolygon or boundary
refidp= refid; reftypep= reftype; refrolep= refrole;
while(refidp<refide) { // for every referenced object
ri= *refidp; rt= *reftypep; rr= *refrolep;
if(rt==1 && (strcmp(rr,"outer")==0 ||
strcmp(rr,"inner")==0) &&
!hash_geti(1,ri)) { // referenced object
- // is a way and part of the multipolygon AND
- // has not yet a flag in ht
+ // is a way and part of the multipolygon resp.
+ // boundary AND has not yet a flag in ht
cww_ref(ri); // write id of the way
}
refidp++; reftypep++; refrolep++;
} // end for every referenced object
- } // is multipolygon
+ } // is multipolygon or boundary
} // at least one way lies inside
} // relation lies inside
} // relation
@@ -11508,8 +11523,8 @@ return 26;
keyp= key; valp= val;
while(keyp<keye) { // for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_node_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_node_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_node_keyval(modi_check_key,modi_check_val);
}
else
@@ -11651,8 +11666,8 @@ return 26;
while(keyp<keye) {
// for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_node_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_node_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_node_keyval(modi_check_key,modi_check_val);
}
else
@@ -11676,8 +11691,8 @@ return 26;
while(keyp<keye) {
// for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_wayrel_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_wayrel_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_wayrel_keyval(modi_check_key,modi_check_val);
}
else
@@ -11699,8 +11714,8 @@ return 26;
while(keyp<keye) {
// for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_wayrel_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_wayrel_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_wayrel_keyval(modi_check_key,modi_check_val);
}
else
@@ -11823,8 +11838,8 @@ return 26;
while(keyp<keye) {
// for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_node_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_node_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_node_keyval(modi_check_key,modi_check_val);
}
else
@@ -11882,8 +11897,8 @@ return 26;
while(keyp<keye) {
// for all key/val pairs of this object
if(modi_CHECK(otype,*keyp,*valp)) {
- if(modi_check_add) wo_wayrel_keyval(*keyp++,*valp++);
- else keyp++; valp++;
+ if(modi_check_add) wo_wayrel_keyval(*keyp,*valp);
+ keyp++; valp++;
wo_wayrel_keyval(modi_check_key,modi_check_val);
}
else
@@ -12536,7 +12551,7 @@ return true;
if(function_cut_mode==1)
argv[argc++]= "--complete-ways";
if(function_cut_mode==2)
- argv[argc++]= "--complex-ways";
+ argv[argc++]= "--complete-multipolygons";
if(function_only_statistics)
argv[argc++]= "--out-statistics";
else if(function_statistics)
@@ -12896,9 +12911,18 @@ return 0;
global_completeways= true;
continue; // take next parameter
}
- if(strcmp(a,"--complex-ways")==0) {
- // do not clip multipolygons when applying borders
- global_complexways= true;
+ if(strcmp(a,"--complete-multipolygons")==0 ||
+ strcmp(a,"--complex-ways")==0) {
+ // do not clip multipolygons when applying borders;
+ // the term "--complex-ways" is deprecated but still supported;
+ global_complex= true;
+ global_completemp= true;
+ continue; // take next parameter
+ }
+ if(strcmp(a,"--complete-boundaries")==0) {
+ // do not clip boundaries when applying borders
+ global_complex= true;
+ global_completeboundaries= true;
continue; // take next parameter
}
if(strcmp(a,"--all-to-nodes")==0) {
@@ -13072,11 +13096,16 @@ return 2;
PERR("cannot apply --complete-ways when reading standard input.")
return 2;
}
- if(usesstdin && global_complexways) {
- PERR("cannot apply --complex-ways when reading standard input.")
+ if(usesstdin && global_completemp) {
+ PERR("cannot apply --complete-multipolygons when reading"
+ " standard input.")
+return 2;
+ }
+ if(usesstdin && global_completeboundaries) {
+ PERR("cannot apply --complete-boundaries when reading standard input.")
return 2;
}
- if(global_completeways || global_complexways) {
+ if(global_completeways || global_complex) {
uint32_t zlibflags;
zlibflags= zlibCompileFlags();
if(loglevel>=2) {
@@ -13116,7 +13145,9 @@ return 3;
"-b=, -B=, --drop-brokenrefs must not be combined with --diff");
return 6;
}
- if(h_n==0) h_n= 1000; // use standard value if not set otherwise
+ if(h_n==0) { // use standard values if not set otherwise
+ h_n= 1200; h_w= 150; h_r= 10;
+ }
if(h_w==0 && h_r==0) {
// user chose simple form for hash memory value
// take the one given value as reference and determine the
=====================================
src/osmfilter.c
=====================================
--- a/src/osmfilter.c
+++ b/src/osmfilter.c
@@ -1,10 +1,10 @@
-// osmfilter 2017-09-22 14:00
-#define VERSION "1.4.3"
+// osmfilter 2018-05-27 12:00
+#define VERSION "1.4.4"
//
// compile this file:
// gcc osmfilter.c -O3 -o osmfilter
//
-// (c) 2011..2017 Markus Weber, Nuernberg
+// (c) 2011..2018 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
@@ -324,15 +324,15 @@ const char* helptext=
"Tuning\n"
"\n"
"To speed-up the process, the program uses some main memory for a\n"
-"hash table. By default, it uses 900 MB for storing a flag for every\n"
-"possible node, 90 for the way flags, and 10 relation flags.\n"
-"Every byte holds the flags for 8 ID numbers, i.e., in 900 MB the\n"
-"program can store 7200 million flags. As there are less than 3200\n"
-"million IDs for nodes at present (Oct 2014), 400 MB would suffice.\n"
-"So, for example, you can decrease the hash sizes to e.g. 400, 50 and\n"
-"2 MB (for relations, 2 flags are needed each) using this option:\n"
+"hash table. By default, it uses 1200 MB for storing a flag for every\n"
+"possible node, 150 for the way flags, and 10 relation flags.\n"
+"Every byte holds the flags for 8 ID numbers, i.e., in 1200 MB the\n"
+"program can store 9600 million flags. As there are less than 5700\n"
+"million IDs for nodes at present (May 2018), 720 MB would suffice.\n"
+"So, for example, you can decrease the hash sizes to e.g. 720, 80 and\n"
+"2 MB using this option:\n"
"\n"
-" --hash-memory=400-50-2\n"
+" --hash-memory=720-80-2\n"
"\n"
"But keep in mind that the OSM database is continuously expanding. For\n"
"this reason the program-own default value is higher than shown in the\n"
@@ -370,7 +370,7 @@ const char* helptext=
"1000, the length of each key or val is limited to 100.\n"
"\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-"Please send any bug reports to markus.weber at gmx.com\n\n";
+"Please send any bug reports to marqqs at gmx.eu\n\n";
#define _FILE_OFFSET_BITS 64
#include <inttypes.h>
@@ -892,7 +892,7 @@ static int hash_ini(int n,int w,int r) {
return 0; // ignore the call of this procedure
// check parameters and store the values
#define D(x,o) if(x<1) x= 1; else if(x>4000) x= 4000; \
- hash__max[o]= x*(1024*1024);
+ hash__max[o]= x*(1024u*1024u);
D(n,0) D(w,1) D(r,2) D(r,3)
#undef D
// allocate memory for each hash table
@@ -6967,7 +6967,9 @@ return 3;
if(global_recursive) {
int r;
- if(h_n==0) h_n= 1000; // use standard value if not set otherwise
+ if(h_n==0) { // use standard values if not set otherwise
+ h_n= 1200; h_w= 150; h_r= 10;
+ }
if(h_w==0 && h_r==0) {
// user chose simple form for hash memory value
// take the one given value as reference and determine the
@@ -7017,3 +7019,4 @@ return 5;
} // verbose mode
return r;
} // end main()
+
=====================================
src/osmupdate.c
=====================================
--- a/src/osmupdate.c
+++ b/src/osmupdate.c
@@ -1,10 +1,10 @@
-// osmupdate 2017-02-26 16:40
-#define VERSION "0.4.4"
+// osmupdate 2018-05-27 12:00
+#define VERSION "0.4.5"
//
// compile this file:
// gcc osmupdate.c -o osmupdate
//
-// (c) 2011..2017 Markus Weber, Nuernberg
+// (c) 2011..2018 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
@@ -111,9 +111,9 @@ const char* helptext=
" changefiles in one run. This ability increases merging speed.\n"
" Unfortunately, every changefile consumes about 200 MB of main\n"
" memory while being processed. For this reason, the number of\n"
-" parallely processable changefiles is limited.\n"
+" parallelly processable changefiles is limited.\n"
" Use this commandline argument to determine the maximum number\n"
-" of parallely processed changefiles. The default value is 7.\n"
+" of parallelly processed changefiles. The default value is 7.\n"
"\n"
"-t=TEMPPATH\n"
"--tempfiles=TEMPPATH\n"
@@ -165,7 +165,7 @@ const char* helptext=
"loss. Do not use the program in productive or commercial systems.\n"
"\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-"Please send any bug reports to markus.weber at gmx.com\n\n";
+"Please send any bug reports to marqqs at gmx.eu\n\n";
#define _FILE_OFFSET_BITS 64
#include <inttypes.h>
@@ -511,11 +511,11 @@ static char global_osmconvert_arguments[2000]= "";
// general command line arguments for osmconvert;
#define max_number_of_changefiles_in_cache 100
static int global_max_merge= 7;
- // maximum number of parallely processed changefiles
+ // maximum number of parallelly processed changefiles
static const char* global_gzip_parameters= "";
// parameters for gzip compression
static char global_base_url[400]=
- "http://planet.openstreetmap.org/replication";
+ "https://planet.openstreetmap.org/replication";
static char global_base_url_suffix[100]="";
// for old replication URL, to get "day-replication" instead of "day"
@@ -1199,7 +1199,7 @@ return 0;
continue; // take next parameter
}
if(strzcmp(a,"--max-merge=")==0) {
- // maximum number of parallely processed changefiles
+ // maximum number of parallelly processed changefiles
global_max_merge= strtouint32(a+12);
if(global_max_merge<2) {
global_max_merge= 2;
@@ -1280,6 +1280,8 @@ return 0;
return 1;
}
if(strcmp(a,"--complete-ways")==0 ||
+ strcmp(a,"--complete-multipolygons")==0 ||
+ strcmp(a,"--complete-boundaries")==0 ||
strcmp(a,"--complex-ways")==0 ||
strcmp(a,"--drop-brokenrefs")==0 ||
strcmp(a,"--drop-broken-refs")==0) {
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmctools/compare/1499569e66f4d1e7990dcdef930b83d6ff056ba9...bbf5ce3f24e2570085ab681d145dd5e12565c7bf
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmctools/compare/1499569e66f4d1e7990dcdef930b83d6ff056ba9...bbf5ce3f24e2570085ab681d145dd5e12565c7bf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180602/720b386e/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list