[mkgmap-splitter] 01/06: Imported Upstream version 0.0.0+svn425

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Jun 4 06:57:12 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mkgmap-splitter.

commit 5ef509f5d43824a7c18915fcd7b16dd185389166
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jun 4 08:18:19 2015 +0200

    Imported Upstream version 0.0.0+svn425
---
 doc/splitter.1                        | 22 +++++++++++-----------
 doc/splitter.1.xml                    | 34 +++++++++++++++++-----------------
 doc/splitter.txt                      | 17 ++++++++++++++++-
 resources/splitter-version.properties |  4 ++--
 4 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/doc/splitter.1 b/doc/splitter.1
index 4092458..db02a05 100644
--- a/doc/splitter.1
+++ b/doc/splitter.1
@@ -35,7 +35,7 @@ Tiles join exactly with no overlap or gaps.
 .PP
 You will need a lot of memory on your computer if you intend to split a
 large area.
-A few options allow to configure how much memory you need.
+A few options allow configuring how much memory you need.
 With the default parameters, you need about 4-5 bytes for every node and
 way.
 This doesn't sound a lot but there are about 1700 million nodes in the
@@ -116,19 +116,10 @@ The o5m format is faster to read, but requires more space on the disk.
 There are a number of options to fine tune things that you might want to
 try.
 .TP 
-\*(T<\fB\-\-wanted\-admin\-level=\fR\*(T>\fIint\fR
-Specifies the lowest admin_level value of boundary relations that 
-should be kept complete. Used to filter boundary relations for
-problem-list processing. The default value 5 means that 
-boundary relations are kept complete when the admin_level is
-5 or higher (5..11).
-The parameter is ignored if \*(T<\fB\-\-keep\-complete=false\fR\*(T>. 
-Default: 5
-.TP 
 \*(T<\fB\-\-boundary\-tags=\fR\*(T>\fIstring\fR
 A comma separated list of tag values for relations.
 Used to filter multipolygon and boundary relations for
-problem-list processing.
+problem-list processing. See also option \-\-wanted\-admin\-level.
 Default: use-exclude-list
 .TP 
 \*(T<\fB\-\-cache=\fR\*(T>\fIstring\fR
@@ -352,6 +343,15 @@ Debugging: stop after a given program phase.
 Can be split, gen-problem-list, or handle-problem-list.
 Default is dist which means execute all phases.
 .TP 
+\*(T<\fB\-\-wanted\-admin\-level=\fR\*(T>\fIint\fR
+Specifies the lowest admin_level value of boundary relations that 
+should be kept complete. Used to filter boundary relations for
+problem-list processing. The default value 5 means that 
+boundary relations are kept complete when the admin_level is
+5 or higher (5..11).
+The parameter is ignored if \*(T<\fB\-\-keep\-complete=false\fR\*(T>. 
+Default: 5
+.TP 
 \*(T<\fB\-\-write\-kml=\fR\*(T>\fIpath\fR
 The name of a kml file to write out the areas to.
 This is in addition to \*(T<\fIareas.list\fR\*(T>
diff --git a/doc/splitter.1.xml b/doc/splitter.1.xml
index e570b2a..43fb6c4 100644
--- a/doc/splitter.1.xml
+++ b/doc/splitter.1.xml
@@ -46,7 +46,7 @@
     <para>
       You will need a lot of memory on your computer if you intend to split a
       large area.
-      A few options allow to configure how much memory you need.
+      A few options allow configuring how much memory you need.
       With the default parameters, you need about 4-5 bytes for every node and
       way.
       This doesn't sound a lot but there are about 1700 million nodes in the
@@ -146,27 +146,12 @@ JAVA_OPTS="<replaceable>-Xmx512m</replaceable>" <command>mkgmap-splitter</comman
     <variablelist>
 
       <varlistentry>
-        <term><option>--wanted-admin-level=<replaceable>string</replaceable></option></term>
-        <listitem>
-          <para>
-            Specifies the lowest admin_level value of boundary relations that 
-						should be kept complete. Used to filter boundary relations for
-            problem-list processing. The default value 5 means that 
-            boundary relations are kept complete when the admin_level is
-            5 or higher (5..11). 
-						The parameter is ignored if <option>--keep-complete=false</option>.
-            Default: 5
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><option>--boundary-tags=<replaceable>string</replaceable></option></term>
         <listitem>
           <para>
             A comma separated list of tag values for relations.
             Used to filter multipolygon and boundary relations for
-            problem-list processing.
+            problem-list processing. See also <option>option --wanted-admin-level</option>.
             Default: use-exclude-list
           </para>
         </listitem>
@@ -542,6 +527,21 @@ way:2784765 # Ferry Guernsey - Jersey
       </varlistentry>
 
       <varlistentry>
+        <term><option>--wanted-admin-level=<replaceable>string</replaceable></option></term>
+        <listitem>
+          <para>
+            Specifies the lowest admin_level value of boundary relations that 
+						should be kept complete. Used to filter boundary relations for
+            problem-list processing. The default value 5 means that 
+            boundary relations are kept complete when the admin_level is
+            5 or higher (5..11). 
+						The parameter is ignored if <option>--keep-complete=false</option>.
+            Default: 5
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>--write-kml=<replaceable>path</replaceable></option></term>
         <listitem>
           <para>
diff --git a/doc/splitter.txt b/doc/splitter.txt
index f56afc1..b14ee53 100644
--- a/doc/splitter.txt
+++ b/doc/splitter.txt
@@ -18,7 +18,7 @@ The two most important features are:
 == First ==
 
 You will need a lot of memory on your computer if you intend to split a large
-area. A few options allow to configure how much memory you need.  With the
+area. A few options allow configuring how much memory you need.  With the
 default parameters, you need about 4-5 bytes for every node and way. This
 doesn't sound a lot but there are about 1700 million nodes in the whole planet
 file and so you cannot process the whole planet in one pass file on a 32 bit
@@ -80,6 +80,12 @@ format is faster to read, but requires more space on the disk.
 
 There are a number of options to fine tune things that you might want to try.
 
+; --boundary-tags=use-exclude-list
+:   A comma separated list of tag values for relations.
+Used to filter multipolygon and boundary relations for
+problem-list processing. See also option --wanted-admin-level.
+Default: use-exclude-list
+
 ; --cache=
 :   Deprecated, now does nothing.
 
@@ -213,6 +219,15 @@ Set =0 to disable.  Default is 120.
 gen-problem-list, or handle-problem-list Default is dist which means execute
 all phases.
 
+; --wanted-admin-level
+:   Specifies the lowest admin_level value of boundary relations that 
+should be kept complete. Used to filter boundary relations for
+problem-list processing. The default value 5 means that 
+boundary relations are kept complete when the admin_level is
+5 or higher (5..11).
+The parameter is ignored if --keep-complete=false. 
+Default: 5
+
 ;--write-kml
 :  The name of a kml file to write out the areas to. This is in addition to
 areas.list (which is always written out).
diff --git a/resources/splitter-version.properties b/resources/splitter-version.properties
index b3dd098..353d041 100644
--- a/resources/splitter-version.properties
+++ b/resources/splitter-version.properties
@@ -1,2 +1,2 @@
-svn.version: 423
-build.timestamp: 2015-05-22T08:27:25+0100
+svn.version: 425
+build.timestamp: 2015-06-02T07:29:21+0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap-splitter.git



More information about the Pkg-grass-devel mailing list