[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-24-gc063dad
git at osgeo.org
git at osgeo.org
Sat Dec 26 13:51:55 PST 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via c063dad34d41907d9e65394f340971e53e01df4e (commit)
from d052427a764598f6afe960078a8a61fc7b419479 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c063dad34d41907d9e65394f340971e53e01df4e
Author: Martin Davis <mtnclimb at gmail.com>
Date: Sat Dec 26 13:51:44 2020 -0800
Move doc usage sections into separate chapters
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ade51d..dc396df 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -119,7 +119,6 @@ XML_SOURCES = \
faq.xml \
installation.xml \
administration.xml \
- usage.xml \
database_tuning.xml \
introduction.xml \
performance_tips.xml \
diff --git a/doc/extras.xml b/doc/extras.xml
index 0c0d15f..144782c 100644
--- a/doc/extras.xml
+++ b/doc/extras.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Extras">
+<chapter id="Extras">
<title>PostGIS Extras</title>
<para>This chapter documents features found in the extras folder of the PostGIS source tarballs and source repository. These
are not always packaged with PostGIS binary releases, but are usually plpgsql based or standard shell scripts that can be run as is.</para>
+ &extras_address_standardizer;
&extras_tigergeocoder;
-</sect1>
+</chapter>
diff --git a/doc/extras_tigergeocoder.xml b/doc/extras_tigergeocoder.xml
index d4a2a7f..e117e0f 100644
--- a/doc/extras_tigergeocoder.xml
+++ b/doc/extras_tigergeocoder.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
- <sect2 id="Tiger_Geocoder">
- <sect2info>
+ <sect1 id="Tiger_Geocoder">
+ <sect1info>
<abstract>
<para>A plpgsql based geocoder written to work with the <ulink url="http://www.census.gov/geo/www/tiger/">TIGER (Topologically Integrated Geographic Encoding and Referencing system ) / Line and Master Address database export</ulink> released by the US Census Bureau. </para>
<para>There are four components to the geocoder: the data loader functions, the address normalizer, the address geocoder, and the reverse geocoder. </para>
@@ -42,7 +42,7 @@ you can upgrade the scripts using the accompanying upgrade_geocoder.bat
<note><para>The <varname>tiger</varname> schema must be added to the database search path for the functions to work properly.</para></note>
</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Tiger Geocoder</title>
<para>There are a couple other open source geocoders for PostGIS, that unlike tiger geocoder have the advantage of multi-country geocoding support</para>
@@ -1451,4 +1451,4 @@ true</programlisting>
<para><xref linkend="Get_Geocode_Setting" /></para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
diff --git a/doc/extras_topology.xml b/doc/extras_topology.xml
index e937d60..388f735 100644
--- a/doc/extras_topology.xml
+++ b/doc/extras_topology.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Topology">
+<chapter id="Topology">
<title>Topology</title>
<para>The PostGIS Topology types and functions are used to manage topological objects such as faces, edges and nodes. </para>
<para>Sandro Santilli's presentation at PostGIS Day Paris 2011 conference gives a good synopsis of PostGIS Topology and where it is headed <ulink url="http://strk.kbt.io/projects/postgis/Paris2011_TopologyWithPostGIS_2_0.pdf">Topology with PostGIS 2.0 slide deck</ulink>.</para>
@@ -12,14 +12,14 @@
<para>Functions that are defined in SQL/MM standard are prefixed with ST_ and functions specific to PostGIS are not prefixed.</para>
<para>Topology support is build by default starting with PostGIS 2.0, and can be disabled specifying --without-topology configure option at build time as described in <xref linkend="postgis_installation"/></para>
- <sect2 id="Topology_Types">
- <sect2info>
+ <sect1 id="Topology_Types">
+ <sect1info>
<abstract>
<para>This section lists the PostgreSQL data types installed by PostGIS Topology. Note we describe the casting behavior of these which is very
important especially when designing your own functions.
</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Types</title>
<refentry id="getfaceedges_returntype">
@@ -118,16 +118,16 @@
<para><xref linkend="ValidateTopology"/></para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_Domains">
- <sect2info>
+ <sect1 id="Topology_Domains">
+ <sect1info>
<abstract>
<para>This section lists the PostgreSQL domains installed by PostGIS Topology. Domains can be used like object types as return objects of functions or table columns. The distinction between
a domain and a type is that a domain is an existing type with a check constraint bound to it.
</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Domains</title>
<refentry id="topoelement">
@@ -236,14 +236,14 @@ ERROR: value for domain topology.topoelementarray violates check constraint "di
</para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_ManagementFunctions">
- <sect2info>
+ <sect1 id="Topology_ManagementFunctions">
+ <sect1info>
<abstract>
<para>This section lists the Topology functions for building new Topology schemas, validating topologies, and managing TopoGeometry Columns</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology and TopoGeometry Management</title>
<refentry id="AddTopoGeometryColumn">
<refnamediv>
@@ -641,18 +641,18 @@ face without edges | 0 |
<para><xref linkend="validatetopology_returntype"/>, <xref linkend="Topology_Load_Tiger" /></para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_StatsManagement"
+ <sect1 id="Topology_StatsManagement"
xreflabel="maintaining statistics during topology editing and population" >
- <sect2info>
+ <sect1info>
<abstract>
<para>
This section discusses management of database statistics during
topology building.
</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Statistics Management</title>
<para>
@@ -679,14 +679,14 @@ ANALYZE themeselves, to use updated statistics.
</para>
</note>
- </sect2>
+ </sect1>
- <sect2 id="Topology_Constructors">
- <sect2info>
+ <sect1 id="Topology_Constructors">
+ <sect1info>
<abstract>
<para>This section covers the topology functions for creating new topologies.</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Constructors</title>
<refentry id="CreateTopology">
@@ -1069,14 +1069,14 @@ up to caller, see <xref linkend="Topology_StatsManagement"/>.
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_Editing">
- <sect2info>
+ <sect1 id="Topology_Editing">
+ <sect1info>
<abstract>
<para>This section covers topology functions for adding, moving, deleting, and splitting edges, faces, and nodes. All of these functions are defined by ISO SQL/MM.</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Editors</title>
<refentry id="ST_AddIsoNode">
@@ -1879,10 +1879,10 @@ SELECT topology.ST_RemoveIsoNode('ma_topo', 7 ) As result;
<para><xref linkend="ST_AddIsoNode"/></para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_Accessors">
+ <sect1 id="Topology_Accessors">
<title>Topology Accessors</title>
<refentry id="GetEdgeByPoint">
<refnamediv>
@@ -2438,15 +2438,15 @@ and is thus usable to build edge ring linking.
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="Topology_Processing">
- <sect2info>
+ <sect1 id="Topology_Processing">
+ <sect1info>
<abstract>
<para>This section covers the functions for processing topologies in non-standard ways.</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Processing</title>
<refentry id="TopologyPolygonize">
<refnamediv>
@@ -2755,14 +2755,14 @@ faceid
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="TopoGeometry_Constructors">
- <sect2info>
+ <sect1 id="TopoGeometry_Constructors">
+ <sect1info>
<abstract>
<para>This section covers the topology functions for creating new topogeometries.</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>TopoGeometry Constructors</title>
<refentry id="CreateTopoGeom">
<refnamediv>
@@ -3044,14 +3044,14 @@ SELECT ST_GetFaceGeometry('topo_boston_test', f.face_id)
<para><xref linkend="topoelement"/>, <xref linkend="topoelementarray"/></para>
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="TopoGeometry_Editors">
- <sect2info>
+ <sect1 id="TopoGeometry_Editors">
+ <sect1info>
<abstract>
<para>This section covers the topology functions for editing existing topogeometries.</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>TopoGeometry Editors</title>
<refentry id="clearTopoGeom">
@@ -3205,9 +3205,9 @@ Refer to <xref linkend="toTopoGeom" />.
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="TopoGeom_Accessors">
+ <sect1 id="TopoGeom_Accessors">
<title>TopoGeometry Accessors</title>
<refentry id="GetTopoGeomElementArray">
@@ -3311,10 +3311,10 @@ Refer to <xref linkend="toTopoGeom" />.
</refsection>
</refentry>
- </sect2>
+ </sect1>
- <sect2 id="TopoGeometry_Outputs">
+ <sect1 id="TopoGeometry_Outputs">
<title>TopoGeometry Outputs</title>
<refentry id="AsGML">
<refnamediv>
@@ -3597,14 +3597,14 @@ UNION ALL SELECT ']}'::text as t;
</programlisting>
</refsection>
</refentry>
-</sect2>
+</sect1>
-<sect2 id="Topology_Relationships">
- <sect2info>
+<sect1 id="Topology_Relationships">
+ <sect1info>
<abstract>
<para>This section lists the Topology functions used to check relationships between topogeometries and topology primitives</para>
</abstract>
- </sect2info>
+ </sect1info>
<title>Topology Spatial Relationships</title>
<refentry id="TG_Equals">
<refnamediv>
@@ -3707,5 +3707,5 @@ two topogeometries intersect.
<para><xref linkend="ST_Intersects" /></para>
</refsection>
</refentry>
-</sect2>
</sect1>
+</chapter>
diff --git a/doc/performance_tips.xml b/doc/performance_tips.xml
index e1e583b..e38a357 100644
--- a/doc/performance_tips.xml
+++ b/doc/performance_tips.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="performance_tips">
+<chapter id="performance_tips">
<title>Performance Tips</title>
- <sect2 id="small_tables_large_objects">
+ <sect1 id="small_tables_large_objects">
<title>Small tables of large geometries</title>
- <sect3>
+ <sect2>
<title>Problem description</title>
<para>Current PostgreSQL versions (including 9.6) suffer from a query
@@ -39,9 +39,9 @@
<ulink url="http://archives.postgresql.org/pgsql-performance/2005-02/msg00030.php">http://archives.postgresql.org/pgsql-performance/2005-02/msg00030.php</ulink></para>
<para>and newer thread on PostGIS <ulink url="https://lists.osgeo.org/pipermail/postgis-devel/2017-June/026209.html">https://lists.osgeo.org/pipermail/postgis-devel/2017-June/026209.html</ulink></para>
- </sect3>
+ </sect2>
- <sect3>
+ <sect2>
<title>Workarounds</title>
<para>The PostgreSQL people are trying to solve this issue by making the
@@ -75,10 +75,10 @@ WHERE bbox && ST_SetSRID('BOX3D(0 0,1 1)'::box3d,4326);</programlisting>
triggers, but you also can modify your application to keep the bbox
column current or run the UPDATE query above after every
modification.</para>
- </sect3>
- </sect2>
+ </sect2>
+ </sect1>
- <sect2 id="database_clustering">
+ <sect1 id="database_clustering">
<title>CLUSTERing on geometry indices</title>
<para>For tables that are mostly read-only, and where a single index is
@@ -109,9 +109,9 @@ ALTER TABLE</programlisting>
your geometry column. Additionally, you must use the above method to add
the constraint, using a CHECK constraint like "ALTER TABLE blubb ADD CHECK
(geometry is not null);" will not work.</para>
- </sect2>
+ </sect1>
- <sect2 id="avoiding_dimension_conversion">
+ <sect1 id="avoiding_dimension_conversion">
<title>Avoiding dimension conversion</title>
<para>Sometimes, you happen to have 3D or 4D data in your table, but
@@ -139,6 +139,6 @@ VACUUM FULL ANALYZE mytable;</programlisting>
dimension(the_geom)>2" skips re-writing of geometries that already are
in 2D.</para>
- </sect2>
+ </sect1>
-</sect1>
+</chapter>
diff --git a/doc/postgis.xml b/doc/postgis.xml
index e67559d..e55b2f8 100644
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -18,7 +18,6 @@
<!ENTITY introduction SYSTEM "introduction.xml">
<!ENTITY installation SYSTEM "installation.xml">
<!ENTITY administration SYSTEM "administration.xml">
-<!ENTITY usage SYSTEM "usage.xml">
<!ENTITY using_postgis_dataman SYSTEM "using_postgis_dataman.xml">
<!ENTITY using_postgis_query SYSTEM "using_postgis_query.xml">
<!ENTITY using_raster_dataman SYSTEM "using_raster_dataman.xml">
@@ -181,11 +180,17 @@
&introduction;
&installation;
&administration;
- &usage;
+ &using_postgis_dataman;
+ &using_postgis_query;
+ &performance_tips;
+ &using_postgis_app;
&reference;
- &reference_raster;
&faq;
+ &extras_topology;
+ &using_raster_dataman;
+ &reference_raster;
&faq_raster;
+ &extras;
&postgis_aggs_mm;
&reporting;
&release_notes;
diff --git a/doc/usage.xml b/doc/usage.xml
deleted file mode 100644
index 2c30496..0000000
--- a/doc/usage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="postgis_usage">
- <title>PostGIS Usage</title>
-
- &using_postgis_dataman;
- &using_postgis_query;
- &performance_tips;
- &using_postgis_app;
- &using_raster_dataman;
- &extras_topology;
- &extras_address_standardizer;
- &extras;
-
- <!-- &extras_historytable; why not here/disabled ? -->
- <!-- &extras_tigergeocoder; is in extras.xml -->
-
-</chapter>
diff --git a/doc/using_postgis_app.xml b/doc/using_postgis_app.xml
index 9ba3508..6651749 100644
--- a/doc/using_postgis_app.xml
+++ b/doc/using_postgis_app.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1>
+<chapter>
<title id="using_postgis_applications">Building Applications</title>
- <sect2 id="Using_MapServer">
+ <sect1 id="Using_MapServer">
<title>Using MapServer</title>
<para>The Minnesota MapServer is an internet web-mapping server which
@@ -19,7 +19,7 @@
</listitem>
</itemizedlist>
- <sect3>
+ <sect2>
<title>Basic Usage</title>
<para>To use PostGIS with MapServer, you need to know how to
@@ -168,9 +168,9 @@ END</programlisting>
identifiers. Using the table primary key is the best practice.</para>
</listitem>
</orderedlist>
- </sect3>
+ </sect2>
- <sect3>
+ <sect2>
<title>Frequently Asked Questions</title>
<qandaset>
@@ -266,9 +266,9 @@ postgis# VACUUM ANALYZE;</programlisting>
</qandaset>
- </sect3>
+ </sect2>
- <sect3>
+ <sect2>
<title>Advanced Usage</title>
<para>The <varname>USING</varname> pseudo-SQL clause is used to add some
@@ -330,9 +330,9 @@ postgis# VACUUM ANALYZE;</programlisting>
</varlistentry>
</variablelist>
- </sect3>
+ </sect2>
- <sect3>
+ <sect2>
<title>Examples</title>
<para>Lets start with a simple example and work our way up. Consider the
@@ -435,10 +435,10 @@ END</programlisting>
<para>This annotation layer adds green labels to all the roads when the
scale gets down to 1:20000 or less. It also demonstrates how to use an
SQL join in a <varname>DATA</varname> definition.</para>
- </sect3>
- </sect2>
+ </sect2>
+ </sect1>
- <sect2>
+ <sect1>
<title>Java Clients (JDBC)</title>
<para>Java clients can access PostGIS "geometry" objects in the PostgreSQL
@@ -517,23 +517,23 @@ if( geom.getType() == Geometry.POLYGON ) {
<para>The JavaDoc for the extension objects provides a reference for the
various data accessor functions in the geometric objects.</para>
- </sect2>
+ </sect1>
- <sect2>
+ <sect1>
<title>C Clients (libpq)</title>
<para>...</para>
- <sect3>
+ <sect2>
<title>Text Cursors</title>
<para>...</para>
- </sect3>
+ </sect2>
- <sect3>
+ <sect2>
<title>Binary Cursors</title>
<para>...</para>
- </sect3>
- </sect2>
-</sect1>
+ </sect2>
+ </sect1>
+</chapter>
diff --git a/doc/using_postgis_dataman.xml b/doc/using_postgis_dataman.xml
index 2248d3c..ea35e6c 100644
--- a/doc/using_postgis_dataman.xml
+++ b/doc/using_postgis_dataman.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="using_postgis_dbmanagement">
+<chapter id="using_postgis_dbmanagement">
<title>Data Management</title>
- <sect2 id="RefObject">
+ <sect1 id="RefObject">
<title>GIS Objects</title>
<para>The GIS objects supported by PostGIS are a superset of the "Simple
@@ -12,7 +12,7 @@
<para>PostGIS extends the standard with support for embedded SRID information.</para>
- <sect3 id="OpenGISWKBWKT">
+ <sect2 id="OpenGISWKBWKT">
<title>OpenGIS WKB and WKT</title>
<para>The OpenGIS specification defines two standard ways of expressing
@@ -84,9 +84,9 @@ geometry = ST_GeometryFromText(text WKT, SRID);</programlisting>
<programlisting>INSERT INTO geotable ( the_geom, the_name )
VALUES ( ST_GeomFromText('POINT(-126.4 45.32)', 312), 'A Place');</programlisting>
- </sect3>
+ </sect2>
- <sect3 id="EWKB_EWKT">
+ <sect2 id="EWKB_EWKT">
<title>PostGIS EWKB, EWKT and Canonical Forms</title>
<para>First OpenGIS specifications (prior to 1.2.0) only support 2D geometries,
@@ -234,8 +234,8 @@ geometry
----------------------------------------------------
01010000200400000000000000000000000000000000000000
(1 row)</programlisting>
- </sect3>
- <sect3 id="SQL_MM_Part3">
+ </sect2>
+ <sect2 id="SQL_MM_Part3">
<title>SQL-MM Part 3</title>
<para>The SQL Multimedia Applications Spatial specification extends the
@@ -306,9 +306,9 @@ geometry
<para>All floating point comparisons within the SQL-MM implementation
are performed to a specified tolerance, currently 1E-8.</para>
</note>
- </sect3>
- </sect2>
- <sect2 id="PostGIS_Geography">
+ </sect2>
+ </sect1>
+ <sect1 id="PostGIS_Geography">
<title>PostGIS Geography Type</title>
<para>The geography type provides native support for spatial features represented on "geographic" coordinates (sometimes called "geodetic" coordinates, or "lat/lon", or "lon/lat"). Geographic coordinates are spherical coordinates expressed in angular units (degrees). </para>
@@ -331,7 +331,7 @@ geometry
<para>The geography type uses the PostgreSQL typmod definition format so that a table with a geography field
can be added in a single step. All the standard OGC formats except for curves are supported.</para>
- <sect3 id="Geography_Basics">
+ <sect2 id="Geography_Basics">
<title>Geography Basics</title>
<para>The geography type does not support curves, TINS, or POLYHEDRALSURFACEs, but other geometry types are supported. Standard geometry type data will autocast to geography if it is of SRID 4326. You can also use the EWKT and EWKB
conventions to insert data.</para>
@@ -448,8 +448,8 @@ LINE 1: SELECT 'SRID=26910;POINT(-123 34)'::geography;</programlisting></para>
<para> <ulink url="http://gc.kls2.com/cgi-bin/gc?PATH=SEA-LHR">Great Circle mapper</ulink>
The GEOMETRY type calculates a meaningless cartesian distance between Reykjavik and the straight line path from Seattle to London plotted on a flat map of the world. The nominal units of the result might be called "degrees", but the result doesn't correspond to any true angular difference between the points, so even calling them "degrees" is inaccurate.</para>
- </sect3>
- <sect3 id="PostGIS_GeographyVSGeometry">
+ </sect2>
+ <sect2 id="PostGIS_GeographyVSGeometry">
<title>When to use Geography Data type over Geometry data type</title>
<para>The geography type allows you to store data in longitude/latitude coordinates, but at a cost: there are fewer functions defined on GEOGRAPHY than there are on GEOMETRY; those functions that are defined take more CPU time to execute.</para>
<para>The type you choose should be conditioned on the expected working area of the application you are building. Will your data span the globe or a large continental area, or is it local to a state, county or municipality? </para>
@@ -464,8 +464,8 @@ The GEOMETRY type calculates a meaningless cartesian distance between Reykjavik
what is supported for Geography vs. Geometry. For a brief listing and description of Geography functions, refer to
<xref linkend="PostGIS_GeographyFunctions" />
</para>
- </sect3>
- <sect3 id="PostGIS_Geography_AdvancedFAQ">
+ </sect2>
+ <sect2 id="PostGIS_Geography_AdvancedFAQ">
<title>Geography Advanced FAQ</title>
<qandaset>
<qandaentry>
@@ -520,13 +520,13 @@ The GEOMETRY type calculates a meaningless cartesian distance between Reykjavik
</answer>
</qandaentry>
</qandaset>
- </sect3>
-</sect2>
+ </sect2>
+</sect1>
- <sect2>
+ <sect1>
<title>Spatial Tables</title>
- <sect3 id="Create_Spatial_Table">
+ <sect2 id="Create_Spatial_Table">
<title>Creating a Spatial Table</title>
<para>Creating a table with spatial data, can be done in one step. As shown in the following example
@@ -535,9 +535,9 @@ The GEOMETRY type calculates a meaningless cartesian distance between Reykjavik
<para>We can add additional columns using standard ALTER TABLE command as we do in this next example where we add a 3-D linestring.</para>
<programlisting>ALTER TABLE roads ADD COLUMN geom2 geometry(LINESTRINGZ,4326);</programlisting>
- </sect3>
+ </sect2>
- <sect3 id="geometry_columns">
+ <sect2 id="geometry_columns">
<title>The GEOMETRY_COLUMNS View</title>
<para>The OpenGIS "Simple Features Specification for SQL" defines
@@ -624,9 +624,9 @@ The GEOMETRY type calculates a meaningless cartesian distance between Reykjavik
</listitem>
</varlistentry>
</variablelist>
- </sect3>
+ </sect2>
- <sect3 id="Manual_Register_Spatial_Column">
+ <sect2 id="Manual_Register_Spatial_Column">
<title>Manually Registering Geometry Columns</title>
<para>Two of the cases where you may need this are the case of SQL Views and bulk inserts. For bulk insert case, you can correct the registration in the geometry_columns table
@@ -741,17 +741,17 @@ SELECT f_table_name, f_geometry_column, srid, type
------------------+-------------------+------+-------
vw_pois_ny_parks | geom | 4326 | POINT
vw_pois_ny_parks | geom_2160 | 2160 | POINT</screen>
- </sect3>
-</sect2>
+ </sect2>
+</sect1>
<!-- ============================================================== -->
-<sect2 id="spatial_ref_sys">
+<sect1 id="spatial_ref_sys">
<title>Spatial Reference Systems</title>
<para><ulink url="https://en.wikipedia.org/wiki/Spatial_reference_system">Spatial Reference Systems</ulink> (SRS)
define how geometry is referenced to locations on the Earth's surface.</para>
- <sect3 id="spatial_ref_sys_table">
+ <sect2 id="spatial_ref_sys_table">
<title>SPATIAL_REF_SYS Table</title>
<para>The <varname>SPATIAL_REF_SYS</varname> table used by PostGIS
@@ -875,8 +875,8 @@ SELECT f_table_name, f_geometry_column, srid, type
create a SRS using it, if possible.
</para></listitem>
</itemizedlist>
- </sect3>
- <sect3 id="user-spatial-ref-sys">
+ </sect2>
+ <sect2 id="user-spatial-ref-sys">
<title>User-Defined Spatial Reference Systems</title>
<para>The PostGIS <varname>spatial_ref_sys</varname> table contains over 3000 of
@@ -922,11 +922,11 @@ VALUES ( 990000,
);
</programlisting>
- </sect3>
-</sect2>
+ </sect2>
+</sect1>
<!-- ============================================================== -->
-<sect2 id="OGC_Validity">
+<sect1 id="OGC_Validity">
<title>Geometry Validation</title>
<para>PostGIS is compliant with the Open Geospatial Consortium’s (OGC)
@@ -1260,9 +1260,9 @@ gisdb=# SELECT
constraint checking geometry dimensions, so it is enough to specify 2
there.</para>
</note>
-</sect2>
+</sect1>
- <sect2 id="loading-data">
+ <sect1 id="loading-data">
<title>Loading Spatial Data</title>
<para>Once you have created a spatial table, you are ready to upload spatial
@@ -1270,7 +1270,7 @@ gisdb=# SELECT
PostGIS/PostgreSQL database: using formatted SQL statements or using the
Shapefile loader.</para>
- <sect3 id="load-data-sql">
+ <sect2 id="load-data-sql">
<title>Using SQL to Load Data</title>
<para>If spatial data can be converted to a text representation (as either WKT or WKB), then using
@@ -1299,9 +1299,9 @@ COMMIT;</programlisting>
<para>The SQL file can be loaded into PostgreSQL using <code>psql</code>:</para>
<programlisting>psql -d [database] -f roads.sql</programlisting>
- </sect3>
+ </sect2>
-<sect3 id="shp2pgsql_usage">
+<sect2 id="shp2pgsql_usage">
<title>Using the Shapefile Loader</title>
<para>
@@ -1561,10 +1561,10 @@ AVERYLONGCOLUMNNAME DBFFIELD2</programlisting>
</para>
<programlisting># shp2pgsql shaperoads.shp myschema.roadstable | psql -d roadsdb</programlisting>
-</sect3>
- </sect2>
+</sect2>
+ </sect1>
- <sect2 id="extracting-data">
+ <sect1 id="extracting-data">
<title>Extracting Spatial Data</title>
<para>Spatial data can be extracted from the database using either SQL or the
@@ -1572,7 +1572,7 @@ AVERYLONGCOLUMNNAME DBFFIELD2</programlisting>
the functions available to do comparisons and queries on spatial tables.
</para>
- <sect3 id="extract-data-sql">
+ <sect2 id="extract-data-sql">
<title>Using SQL to Extract Data</title>
<para>The most straightforward way of extracting spatial data out of the
@@ -1658,9 +1658,9 @@ WHERE
<para>Note the use of the SRID 312, to specify the projection of the envelope.</para>
- </sect3>
+ </sect2>
- <sect3 id="pgsql2shp-usage">
+ <sect2 id="pgsql2shp-usage">
<title>Using the Shapefile Dumper</title>
<para>The <filename>pgsql2shp</filename> table dumper connects
@@ -1754,10 +1754,10 @@ WHERE
</listitem>
</varlistentry>
</variablelist>
- </sect3>
- </sect2>
+ </sect2>
+ </sect1>
- <sect2 id="build-indexes">
+ <sect1 id="build-indexes">
<title>Building Spatial Indexes</title>
<para>Indexes make using a spatial database for large data sets
@@ -1810,7 +1810,7 @@ WHERE
and the <ulink url="https://www.postgresql.org/docs/current/indexes.html">PostgreSQL documentation</ulink>.
</para>
- <sect3 id="gist_indexes">
+ <sect2 id="gist_indexes">
<title>GiST Indexes</title>
<para>GiST stands for "Generalized Search Tree" and is a generic form of
@@ -1840,9 +1840,9 @@ WHERE
<para><programlisting>VACUUM ANALYZE [table_name] [(column_name)];</programlisting></para>
- </sect3>
+ </sect2>
- <sect3 id="brin_indexes">
+ <sect2 id="brin_indexes">
<title>BRIN Indexes</title>
<para>BRIN stands for "Block Range Index". It is an general-purpose
@@ -1979,9 +1979,9 @@ CREATE INDEX [indexname] ON [tablename]
and which are static or change infrequently.</para></listitem>
</itemizedlist>
- </sect3>
+ </sect2>
- <sect3 id="spgist_indexes">
+ <sect2 id="spgist_indexes">
<title>SP-GiST Indexes</title>
<para>SP-GiST stands for "Space-Partitioned Generalized Search Tree" and is
@@ -2027,8 +2027,8 @@ CREATE INDEX [indexname] ON [tablename]
<listitem><para> &/&, ~==, @>>, and <<@, for 3-dimensional indexes.</para></listitem>
</itemizedlist>
<para>There is no support for kNN searches at the moment.</para>
- </sect3>
- <sect3 id="tuning-index-usage">
+ </sect2>
+ <sect2 id="tuning-index-usage">
<title>Tuning Index Usage</title>
<para>Ordinarily, indexes invisibly speed up data access: once an index
@@ -2096,7 +2096,7 @@ CREATE INDEX [indexname] ON [tablename]
<ulink url="https://www.postgresql.org/docs/current/runtime-config-query.html">Query Planning</ulink>.
</para>
- </sect3>
- </sect2>
+ </sect2>
+ </sect1>
-</sect1>
+</chapter>
diff --git a/doc/using_postgis_query.xml b/doc/using_postgis_query.xml
index 378ae43..6a02474 100644
--- a/doc/using_postgis_query.xml
+++ b/doc/using_postgis_query.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="using_postgis_query">
+<chapter id="using_postgis_query">
<title>Spatial Queries</title>
<para>The <emphasis>raison d'etre</emphasis> of spatial databases
@@ -10,14 +10,14 @@
appropriate indexes are in place to provide good performance.
</para>
- <sect2 id="eval_spatial_rel">
+ <sect1 id="eval_spatial_rel">
<title>Determining Spatial Relationships</title>
<para>Spatial relationships indicate how two geometries interact with one another.
They are a fundamental capability for querying geometry.
</para>
- <sect3 id="DE-9IM">
+ <sect2 id="DE-9IM">
<title>Dimensionally Extended 9-Intersection Model</title>
<para>According to the <ulink
@@ -286,9 +286,9 @@
</listitem>
</itemizedlist>
- </sect3>
+ </sect2>
- <sect3 id="named-spatial-rel">
+ <sect2 id="named-spatial-rel">
<title>Named Spatial Relationships</title>
<para>To make it easy to determine common spatial relationships,
@@ -316,9 +316,9 @@ FROM city JOIN state ON ST_Intersects(city.geom, state.geom);
<para>For more details and illustrations, see the
<ulink url="https://postgis.net/workshops/postgis-intro/spatial_relationships.html">PostGIS Workshop.</ulink></para>
- </sect3>
+ </sect2>
- <sect3 id="general-spatial-rel">
+ <sect2 id="general-spatial-rel">
<title>General Spatial Relationships</title>
<para>In some cases the named spatial relationships
@@ -450,10 +450,10 @@ FROM lakes a, wharfs b
WHERE a.geom && b.geom
AND ST_Relate(a.geom, b.geom, '102101FF2');</programlisting>
- </sect3>
- </sect2>
+ </sect2>
+ </sect1>
- <sect2 id="using-query-indexes">
+ <sect1 id="using-query-indexes">
<title>Taking Advantage of Indexes</title>
<para>When constructing queries using spatial conditions it is important to
@@ -508,9 +508,9 @@ WHERE ST_DWithin(the_geom, 'SRID=312;POINT(100000 200000)', 100)
The actual distance is then computed to confirm whether to include the record in the result set.
</para>
- </sect2>
+ </sect1>
- <sect2 id="examples_spatial_sql">
+ <sect1 id="examples_spatial_sql">
<title>Examples of Spatial SQL</title>
<para>The examples in this section will make use of two tables, a table
@@ -721,5 +721,5 @@ gid | name | area
</qandaentry>
</qandaset>
- </sect2>
-</sect1>
+ </sect1>
+</chapter>
diff --git a/doc/using_raster_dataman.xml b/doc/using_raster_dataman.xml
index fed8e01..85a5c02 100644
--- a/doc/using_raster_dataman.xml
+++ b/doc/using_raster_dataman.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="using_raster_dataman">
+<chapter id="using_raster_dataman">
<title>Raster Data Management, Queries, and Applications</title>
- <sect2 id="RT_Loading_Rasters">
+ <sect1 id="RT_Loading_Rasters">
<title>Loading and Creating Rasters</title>
<para>For most use cases, you will create PostGIS rasters by loading existing raster files using the packaged <varname>raster2pgsql</varname> raster loader.</para>
- <sect3 id="RT_Raster_Loader">
+ <sect2 id="RT_Raster_Loader">
<title>Using raster2pgsql to load rasters</title>
<para>
The <varname>raster2pgsql</varname> is a raster loader executable that loads GDAL supported raster formats into sql suitable for loading into a PostGIS raster table.
@@ -427,8 +427,8 @@ Available GDAL raster formats:
Arc/Info Export E00 GRID
ZMap Plus Grid
NOAA NGS Geoid Height Grids</screen>
- </sect3>
- <sect3 id="RT_Creating_Rasters">
+ </sect2>
+ <sect2 id="RT_Creating_Rasters">
<title>Creating rasters using PostGIS raster functions</title>
<para>On many occasions, you'll want to create rasters and raster tables right in the database. There are a plethora of functions to do that. The general steps to follow.</para>
<orderedlist>
@@ -448,9 +448,9 @@ Available GDAL raster formats:
<note><para>Pre-2.0 versions of PostGIS raster were based on the envelop rather than the convex hull. For the spatial indexes to work properly you'll need to drop those and replace with convex hull based index.</para></note></listitem>
<listitem><para>Apply raster constraints using <xref linkend="RT_AddRasterConstraints" /></para></listitem>
</orderedlist>
- </sect3>
- </sect2>
- <sect2 id="RT_Raster_Catalog">
+ </sect2>
+ </sect1>
+ <sect1 id="RT_Raster_Catalog">
<title>Raster Catalogs</title>
<para>There are two raster catalog views that come packaged with PostGIS. Both views utilize information embedded in the constraints of the raster tables. As a result
the catalog views are always consistent with the raster data in the tables since the constraints are enforced. </para>
@@ -462,7 +462,7 @@ Available GDAL raster formats:
<para><varname>raster_overviews</varname> this view catalogs all the raster table columns in your database that serve as overviews for a finer grained table. Tables of this type are generated when you use the <varname>-l</varname> switch during load.</para>
</listitem>
</orderedlist>
- <sect3 id="RT_Raster_Columns">
+ <sect2 id="RT_Raster_Columns">
<title>Raster Columns Catalog</title>
<para>The <varname>raster_columns</varname> is a catalog of all raster table columns in your database that are of type raster. It is a view utilizing the constraints on the tables
so the information is always consistent even if you restore one raster table from a backup of another database. The following columns exist in the <varname>raster_columns</varname> catalog.</para>
@@ -522,8 +522,8 @@ Available GDAL raster formats:
<para><varname>spatial_index</varname> A boolean that is true if raster column has a spatial index.</para>
</listitem>
</itemizedlist>
- </sect3>
- <sect3 id="RT_Raster_Overviews">
+ </sect2>
+ <sect2 id="RT_Raster_Overviews">
<title>Raster Overviews</title>
<para><varname>raster_overviews</varname> catalogs information about raster table columns used for overviews and additional information about them that is useful to know when utilizing overviews. Overview tables are cataloged in both <varname>raster_columns</varname> and <varname>raster_overviews</varname> because they are rasters in their own right but also serve an additional special purpose of being a lower resolution caricature of a higher resolution table. These are generated along-side the main raster table when you use the <varname>-l</varname> switch in raster loading or can be generated manually using <xref linkend="RT_AddOverviewConstraints" />.</para>
<para>Overview tables contain the same constraints as other raster tables as well as additional informational only constraints specific to overviews.</para>
@@ -571,13 +571,13 @@ Available GDAL raster formats:
</listitem>
</itemizedlist>
- </sect3>
- </sect2>
- <sect2 id="RT_Raster_Applications">
+ </sect2>
+ </sect1>
+ <sect1 id="RT_Raster_Applications">
<title>Building Custom Applications with PostGIS Raster</title>
<para>The fact that PostGIS raster provides you with SQL functions to render rasters in known image formats gives you a lot of optoins for rendering them.
For example you can use OpenOffice / LibreOffice for rendering as demonstrated in <ulink url="http://www.postgresonline.com/journal/archives/244-Rendering-PostGIS-Raster-graphics-with-LibreOffice-Base-Reports.html">Rendering PostGIS Raster graphics with LibreOffice Base Reports</ulink>. In addition you can use a wide variety of languages as demonstrated in this section.</para>
- <sect3 id="RT_PHP_Output">
+ <sect2 id="RT_PHP_Output">
<title>PHP Example Outputting using ST_AsPNG in concert with other raster functions</title>
<para>In this section, we'll demonstrate how to use the PHP PostgreSQL driver and the <xref linkend="RT_ST_AsGDALRaster" /> family of functions to
output band 1,2,3 of a raster to a PHP request stream that can then be embedded in an img src html tag.</para>
@@ -611,8 +611,8 @@ pg_free_result($result);
if ($row === false) return;
echo pg_unescape_bytea($row[0]);
?>]]></programlisting>
- </sect3>
- <sect3 id="RT_Net_Output_CS">
+ </sect2>
+ <sect2 id="RT_Net_Output_CS">
<title>ASP.NET C# Example Outputting using ST_AsPNG in concert with other raster functions</title>
<para>In this section, we'll demonstrate how to use Npgsql PostgreSQL .NET driver and the <xref linkend="RT_ST_AsGDALRaster" /> family of functions to
output band 1,2,3 of a raster to a PHP request stream that can then be embedded in an img src html tag.</para>
@@ -689,8 +689,8 @@ public class TestRaster : IHttpHandler
return result;
}
}]]></programlisting>
- </sect3>
- <sect3 id="RT_Java_Console_App">
+ </sect2>
+ <sect2 id="RT_Java_Console_App">
<title>Java console app that outputs raster query as Image file</title>
<para>This is a simple java console app that takes a query that returns one image and outputs to specified file.</para>
<para>You can download the latest PostgreSQL JDBC drivers from <ulink url="http://jdbc.postgresql.org/download.html">http://jdbc.postgresql.org/download.html</ulink> </para>
@@ -760,9 +760,9 @@ public class SaveQueryImage {
}
}
}]]></programlisting>
- </sect3>
+ </sect2>
- <sect3 id="RT_PLPython">
+ <sect2 id="RT_PLPython">
<title>Use PLPython to dump out images via SQL</title>
<para>This is a plpython stored function that creates a file in the server directory for each record.
Requires you have plpython installed. Should work fine with both plpythonu and plpython3u.</para>
@@ -789,8 +789,8 @@ $$ LANGUAGE plpythonu;]]></programlisting>
C:/temp/slices4.png
C:/temp/slices5.png
</programlisting>
- </sect3>
- <sect3 id="RasterOutput_PSQL">
+ </sect2>
+ <sect2 id="RasterOutput_PSQL">
<title>Outputting Rasters with PSQL</title>
<para>Sadly PSQL doesn't have easy to use built-in functionality for outputting binaries. This is a bit of a hack that piggy backs on PostgreSQL somewhat legacy large object support. To use first launch your psql commandline connected to your database.
</para>
@@ -812,6 +812,6 @@ $$ LANGUAGE plpythonu;]]></programlisting>
-- this deletes the file from large object storage on db
SELECT lo_unlink(2630819);
</screen>
- </sect3>
- </sect2>
-</sect1>
+ </sect2>
+ </sect1>
+</chapter>
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 1 -
doc/extras.xml | 5 +-
doc/extras_tigergeocoder.xml | 8 +--
doc/extras_topology.xml | 94 +++++++++++++++++------------------
doc/performance_tips.xml | 24 ++++-----
doc/postgis.xml | 11 +++--
doc/usage.xml | 17 -------
doc/using_postgis_app.xml | 40 +++++++--------
doc/using_postgis_dataman.xml | 112 +++++++++++++++++++++---------------------
doc/using_postgis_query.xml | 28 +++++------
doc/using_raster_dataman.xml | 52 ++++++++++----------
11 files changed, 190 insertions(+), 202 deletions(-)
delete mode 100644 doc/usage.xml
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list