[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 92fb2d3b8f8fbc0f7c938d1301f8b549343dd9a8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 30 17:26:42 2013 +0200

    Add man page for: spatialite_osm_map.

diff --git a/debian/changelog b/debian/changelog
index a2b2013..81e61d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ spatialite-tools (4.1.1-1) UNRELEASED; urgency=low
     - spatialite_gml
     - spatialite_network
     - spatialite_osm_filter
+    - spatialite_osm_map
     (closes: #703344)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 30 Sep 2013 02:35:52 +0200
diff --git a/debian/man/spatialite_osm_filter.1.xml b/debian/man/spatialite_osm_map.1.xml
similarity index 77%
copy from debian/man/spatialite_osm_filter.1.xml
copy to debian/man/spatialite_osm_map.1.xml
index 523141c..3313950 100644
--- a/debian/man/spatialite_osm_filter.1.xml
+++ b/debian/man/spatialite_osm_map.1.xml
@@ -1,26 +1,26 @@
 <?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_filter'>
+<refentry id='spatialite_osm_map'>
 
   <refmeta>
-    <refentrytitle>spatialite_osm_filter</refentrytitle>
+    <refentrytitle>spatialite_osm_map</refentrytitle>
     <manvolnum>1</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>spatialite_osm_filter</refname>
-    <refpurpose>loading OSM-XML maps into a SpatiaLite DB</refpurpose>
+    <refname>spatialite_osm_map</refname>
+    <refpurpose>load OSM-XML maps into a SpatiaLite DB</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
-      <command>spatialite_osm_filter</command>
+      <command>spatialite_osm_map</command>
       <arg choice='opt'><option>-h</option></arg>
       <arg choice='opt'><option>-o</option> <replaceable>pathname</replaceable></arg>
-      <arg choice='opt'><option>-w</option> <replaceable>pathname</replaceable></arg>
       <arg choice='opt'><option>-d</option> <replaceable>pathname</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>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -28,8 +28,8 @@
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      <command>spatialite_osm_filter</command> is a tool for loading OSM-XML
-      maps into a SpatiaLite DB.
+      <command>spatialite_osm_map</command> is a tool for loading OSM-XML maps
+      into a SpatiaLite DB.
     </para>
   </refsect1>
 
@@ -49,15 +49,11 @@
         <term><option>-o</option> <replaceable>pathname</replaceable></term>
         <term><option>--osm-path</option> <replaceable>pathname</replaceable></term>
         <listitem>
-          <para>the OSM-XML (output) file path</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-w</option> <replaceable>pathname</replaceable></term>
-        <term><option>--wkt-mask-path</option> <replaceable>pathname</replaceable></term>
-        <listitem>
-          <para>path of text file [WKT mask]</para>
+          <para>the OSM-XML file path</para>
+          <para>
+             both OSM-XML (*.osm) and OSM-ProtoBuf (*.osm.pbf) are
+             indifferently supported.
+          </para>
         </listitem>
       </varlistentry>
 
@@ -86,6 +82,14 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>-n</option></term>
+        <term><option>--no-spatial-index</option></term>
+        <listitem>
+          <para>suppress R*Tree generation</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>-jo</option></term>
         <term><option>--journal-off</option></term>
         <listitem>
diff --git a/debian/spatialite-bin.manpages b/debian/spatialite-bin.manpages
index 69e8125..8df4ca5 100644
--- a/debian/spatialite-bin.manpages
+++ b/debian/spatialite-bin.manpages
@@ -6,3 +6,4 @@ debian/man/spatialite_dxf.1
 debian/man/spatialite_gml.1
 debian/man/spatialite_network.1
 debian/man/spatialite_osm_filter.1
+debian/man/spatialite_osm_map.1

-- 
Spatialite Tools