[SCM] spatialite-tools branch, master, updated. debian/4.0.0-1-33-ga7a885a

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 8a988537123422edd53b80851b1a0d26d0072879
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 30 17:37:46 2013 +0200

    Add man page for: spatialite_osm_net.

diff --git a/debian/changelog b/debian/changelog
index 81e61d2..1ad4f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ spatialite-tools (4.1.1-1) UNRELEASED; urgency=low
     - spatialite_network
     - spatialite_osm_filter
     - spatialite_osm_map
+    - spatialite_osm_net
     (closes: #703344)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 30 Sep 2013 02:35:52 +0200
diff --git a/debian/man/spatialite_osm_map.1.xml b/debian/man/spatialite_osm_net.1.xml
similarity index 57%
copy from debian/man/spatialite_osm_map.1.xml
copy to debian/man/spatialite_osm_net.1.xml
index 3313950..8af7f7f 100644
--- a/debian/man/spatialite_osm_map.1.xml
+++ b/debian/man/spatialite_osm_net.1.xml
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry id='spatialite_osm_map'>
+<refentry id='spatialite_osm_net'>
 
   <refmeta>
-    <refentrytitle>spatialite_osm_map</refentrytitle>
+    <refentrytitle>spatialite_osm_net</refentrytitle>
     <manvolnum>1</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>spatialite_osm_map</refname>
-    <refpurpose>load OSM-XML maps into a SpatiaLite DB</refpurpose>
+    <refname>spatialite_osm_net</refname>
+    <refpurpose>load OSM-XML roads into a SpatiaLite DB</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
-      <command>spatialite_osm_map</command>
+      <command>spatialite_osm_net</command>
       <arg choice='opt'><option>-h</option></arg>
       <arg choice='opt'><option>-o</option> <replaceable>pathname</replaceable></arg>
       <arg choice='opt'><option>-d</option> <replaceable>pathname</replaceable></arg>
+      <arg choice='opt'><option>-T</option> <replaceable>table_name</replaceable></arg>
       <arg choice='opt'><option>-cs</option> <replaceable>num</replaceable></arg>
       <arg choice='opt'><option>-m</option></arg>
       <arg choice='opt'><option>-n</option></arg>
       <arg choice='opt'><option>-jo</option></arg>
+      <arg choice='opt'><option>-2</option></arg>
+      <group>
+        <arg choice='opt'><option>--roads</option></arg>
+        <arg choice='opt'><option>--railways</option></arg>
+      </group>
+      <arg choice='opt'><option>-ot</option> <replaceable>path</replaceable></arg>
+      <arg choice='opt'><option>-tf</option> <replaceable>path</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      <command>spatialite_osm_map</command> is a tool for loading OSM-XML maps
+      <command>spatialite_osm_net</command> is a tool for loading OSM-XML roads
       into a SpatiaLite DB.
     </para>
   </refsect1>
@@ -66,6 +74,14 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>-T</option> <replaceable>table_name</replaceable></term>
+        <term><option>--table</option> <replaceable>table_name</replaceable></term>
+        <listitem>
+          <para>the db table to be feeded</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>-cs</option> <replaceable>num</replaceable></term>
         <term><option>--cache-size</option> <replaceable>num</replaceable></term>
         <listitem>
@@ -97,6 +113,44 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-2</option></term>
+        <term><option>--undirectional</option></term>
+        <listitem>
+          <para>double arcs</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--roads</option></term>
+        <listitem>
+          <para>extract roads (default)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--railways</option></term>
+        <listitem>
+          <para>extract railways</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-ot</option> <replaceable>path</replaceable></term>
+        <term><option>--out-template</option> <replaceable>path</replaceable></term>
+        <listitem>
+          <para>creates a default template-file</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-tf</option> <replaceable>path</replaceable></term>
+        <term><option>--template-file</option> <replaceable>path</replaceable></term>
+        <listitem>
+          <para>using a template-file</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </refsect1>
diff --git a/debian/spatialite-bin.manpages b/debian/spatialite-bin.manpages
index 8df4ca5..6ff94bd 100644
--- a/debian/spatialite-bin.manpages
+++ b/debian/spatialite-bin.manpages
@@ -7,3 +7,4 @@ debian/man/spatialite_gml.1
 debian/man/spatialite_network.1
 debian/man/spatialite_osm_filter.1
 debian/man/spatialite_osm_map.1
+debian/man/spatialite_osm_net.1

-- 
Spatialite Tools