[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-429-g2e34b53
git at osgeo.org
git at osgeo.org
Tue Aug 24 22:08:49 PDT 2021
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 2e34b5345425065e56eee17e3a829e53bda5af67 (commit)
from 1b67b830c052a3ce770f47ad04d467acf6087cf8 (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 2e34b5345425065e56eee17e3a829e53bda5af67
Author: Regina Obe <lr at pcorp.us>
Date: Wed Aug 25 01:08:44 2021 -0400
Minor typos and the_geom to geom from Bruce Rindahl. Closes https://github.com/postgis/postgis/pull/629
diff --git a/doc/administration.xml b/doc/administration.xml
index eb7c081..a6204c6 100644
--- a/doc/administration.xml
+++ b/doc/administration.xml
@@ -249,7 +249,7 @@ environment).</para></note>
ALTER EXTENSION postgis_topology UPDATE TO "&last_release_version;";</programlisting>
<para>If you get an error notice something like:</para>
<programlisting>No migration path defined for ... to &last_release_version;</programlisting>
- <para>Then you'll need to backup your database, create a fresh one as described in <xref linkend="create_new_db_extensions" /> and then restore your backup ontop of this new database.</para>
+ <para>Then you'll need to backup your database, create a fresh one as described in <xref linkend="create_new_db_extensions" /> and then restore your backup on top of this new database.</para>
<para>If you get a notice message like:</para>
<programlisting>Version "&last_release_version;" of extension "postgis" is already installed</programlisting>
<para>
diff --git a/doc/extras.xml b/doc/extras.xml
index 144782c..82fc17e 100644
--- a/doc/extras.xml
+++ b/doc/extras.xml
@@ -3,7 +3,7 @@
<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>
+ are not always packaged with PostGIS binary releases, but are usually PL/pgSQL based or standard shell scripts that can be run as is.</para>
&extras_address_standardizer;
&extras_tigergeocoder;
diff --git a/doc/extras_address_standardizer.xml b/doc/extras_address_standardizer.xml
index 8ca5985..f70a6d4 100644
--- a/doc/extras_address_standardizer.xml
+++ b/doc/extras_address_standardizer.xml
@@ -3,7 +3,7 @@
<title>Address Standardizer</title>
<para>This is a fork of the <ulink url="http://www.pagcgeo.org/docs/html/pagc-11.html">PAGC standardizer</ulink> (original code for this portion was <ulink url="http://sourceforge.net/p/pagc/code/360/tree/branches/sew-refactor/postgresql">PAGC PostgreSQL Address Standardizer</ulink>). </para>
<para>The address standardizer is a single line address parser that takes an input address and normalizes it based on a set of rules stored in a table and helper lex and gaz tables.</para>
- <para>The code is built into a single postgresql extension library called <code>address_standardizer</code> which can be installed with <code>CREATE EXTENSION address_standardizer;</code>. In addition to the address_standardizer extension, a sample data extension called <code>address_standardizer_data_us</code> extensions is built, which contains gaz, lex, and rules tables for US data. This extensions can be installed via: <code>CREATE EXTENSION address_standardizer_data_us;</code></para>
+ <para>The code is built into a single PostgreSQL extension library called <code>address_standardizer</code> which can be installed with <code>CREATE EXTENSION address_standardizer;</code>. In addition to the address_standardizer extension, a sample data extension called <code>address_standardizer_data_us</code> extensions is built, which contains gaz, lex, and rules tables for US data. This extensions can be installed via: <code>CREATE EXTENSION address_standardizer_data_us;</code></para>
<para>The code for this extension can be found in the PostGIS <filename>extensions/address_standardizer</filename> and is currently self-contained.</para>
<para>For installation instructions refer to: <xref linkend="installing_pagc_address_standardizer" />.</para>
<sect2 id="Address_Standardizer_Basics"><title>How the Parser Works</title>
diff --git a/doc/extras_historytable.xml b/doc/extras_historytable.xml
index 6b2d4d4..c15120f 100644
--- a/doc/extras_historytable.xml
+++ b/doc/extras_historytable.xml
@@ -82,7 +82,7 @@
<refentry id="Postgis_Enable_History">
<refnamediv>
<refname>Postgis_Enable_History</refname>
- <refpurpose>Registers a tablein the history_information table for tracking and also adds in side line history table and insert, update, delete rules on the table.</refpurpose>
+ <refpurpose>Registers a table in the history_information table for tracking and also adds in side line history table and insert, update, delete rules on the table.</refpurpose>
</refnamediv>
<refsynopsisdiv>
diff --git a/doc/extras_tigergeocoder.xml b/doc/extras_tigergeocoder.xml
index e117e0f..bd39dd3 100644
--- a/doc/extras_tigergeocoder.xml
+++ b/doc/extras_tigergeocoder.xml
@@ -148,7 +148,7 @@ DROP INDEX tiger_data.idx_tiger_data_ma_county_snd_name;
<refsection>
<title>Description</title>
- <para>Generates a script that drops all tables in the specified schema that start with <varname>county_all</varname>, <varname>state_all</varname> or stae code followed by <varname>county</varname> or <varname>state</varname>. This is needed if you are upgrading from <varname>tiger_2010</varname> to <varname>tiger_2011</varname> data.</para>
+ <para>Generates a script that drops all tables in the specified schema that start with <varname>county_all</varname>, <varname>state_all</varname> or state code followed by <varname>county</varname> or <varname>state</varname>. This is needed if you are upgrading from <varname>tiger_2010</varname> to <varname>tiger_2011</varname> data.</para>
<para>Availability: 2.1.0</para>
@@ -514,7 +514,7 @@ false
<title>Description</title>
<para>Given a geometry will return the census tract location of that geometry. NAD 83 long lat is assumed if no spatial ref sys is specified.</para>
- <note><para>This function uses the census <varname>tract</varname> whic is not loaded by default. If you have already loaded your state table, you can load tract
+ <note><para>This function uses the census <varname>tract</varname> which is not loaded by default. If you have already loaded your state table, you can load tract
as well as bg, and tabblock using the <xref linkend="Loader_Generate_Census_Script" /> script.</para>
<para>If you have not loaded your state data yet and want these additional tables loaded, do the following</para>
<programlisting>UPDATE tiger.loader_lookuptables SET load = true WHERE load = false AND lookup_name IN('tract', 'bg', 'tabblock');</programlisting>
diff --git a/doc/extras_topology.xml b/doc/extras_topology.xml
index b74f48b..78ccbfd 100644
--- a/doc/extras_topology.xml
+++ b/doc/extras_topology.xml
@@ -801,7 +801,7 @@ to take care of that.
That the statistics updated by autovacuum
will NOT be visible to transactions which started before autovacuum
process completed, so long-running transactions will need to run
-ANALYZE themeselves, to use updated statistics.
+ANALYZE themselves, to use updated statistics.
</para>
</note>
diff --git a/doc/faq.xml b/doc/faq.xml
index 1d4a065..8bf4b8b 100644
--- a/doc/faq.xml
+++ b/doc/faq.xml
@@ -218,10 +218,10 @@ VALUES (
<emphasis>might</emphasis> meet the condition of interest. The spatial
functions are then use to test the condition exactly.</para>
- <programlisting>SELECT id, the_geom
+ <programlisting>SELECT id, geom
FROM thetable
WHERE
- ST_Contains(the_geom,'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');</programlisting>
+ ST_Contains(geom,'POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))');</programlisting>
</answer>
</qandaentry>
@@ -358,9 +358,9 @@ WHERE ST_DWithin(geocolumn, 'POINT(1000 1000)', 100.0);</programlisting>
the geometries being reprojected must already have an SRID set on
them. Once that is done, a reprojection is as simple as referring to
the desired destination SRID. The below projects a geometry to NAD 83 long lat.
- The below will only work if the srid of the_geom is not -1 (not undefined spatial ref)</para>
+ The below will only work if the srid of geom is not -1 (not undefined spatial ref)</para>
- <programlisting>SELECT ST_Transform(the_geom,4269) FROM geotable;</programlisting>
+ <programlisting>SELECT ST_Transform(geom,4269) FROM geotable;</programlisting>
</answer>
</qandaentry>
@@ -375,7 +375,7 @@ WHERE ST_DWithin(geocolumn, 'POINT(1000 1000)', 100.0);</programlisting>
<programlisting>
--To check number of geometries are really blank
- SELECT count(gid) FROM geotable WHERE the_geom IS NULL;</programlisting>
+ SELECT count(gid) FROM geotable WHERE geom IS NULL;</programlisting>
</answer>
</qandaentry>
@@ -432,7 +432,7 @@ WHERE ST_DWithin(geocolumn, 'POINT(1000 1000)', 100.0);</programlisting>
</para>
<para>Furthermore, PostGIS operations contain error-prevention code which may peturb
- input geometries by tiny amounts in order to prevent robustness errors from occuring.
+ input geometries by tiny amounts in order to prevent robustness errors from occurring.
These minor alterations also may produce computed results which are not fully consistent.
</para>
diff --git a/doc/faq_raster.xml b/doc/faq_raster.xml
index bcf9221..68f90b3 100644
--- a/doc/faq_raster.xml
+++ b/doc/faq_raster.xml
@@ -37,7 +37,7 @@
</question>
<answer>
- <para>PostGIS Raster is part of the PostGIS codebase and generally available with most PostGIS binary distributions. Starting with PostGIS 3.0, PostGIS raster is now a separate extension and requires: `CREATE EXTENSION postgis_raster;` to enable it in your database. If you are compiling your own PostGIS, you will need to compile with GDAL otherwise postgis_raster extension will not be builit.</para>
+ <para>PostGIS Raster is part of the PostGIS codebase and generally available with most PostGIS binary distributions. Starting with PostGIS 3.0, PostGIS raster is now a separate extension and requires: `CREATE EXTENSION postgis_raster;` to enable it in your database. If you are compiling your own PostGIS, you will need to compile with GDAL otherwise postgis_raster extension will not be built.</para>
<para>Refer to <ulink url="http://postgis.net/install/">Download PostGIS binaries</ulink> for popular distributions of PostGIS that include raster support.</para>
</answer>
</qandaentry>
diff --git a/doc/performance_tips.xml b/doc/performance_tips.xml
index e38a357..3b9db46 100644
--- a/doc/performance_tips.xml
+++ b/doc/performance_tips.xml
@@ -61,7 +61,7 @@
example, the commands are like:</para>
<programlisting>SELECT AddGeometryColumn('myschema','mytable','bbox','4326','GEOMETRY','2');
-UPDATE mytable SET bbox = ST_Envelope(ST_Force2D(the_geom));</programlisting>
+UPDATE mytable SET bbox = ST_Envelope(ST_Force2D(geom));</programlisting>
<para>Now change your query to use the && operator against bbox
instead of geom_column, like:</para>
@@ -97,12 +97,12 @@ WHERE bbox && ST_SetSRID('BOX3D(0 0,1 1)'::box3d,4326);</programlisting>
<programlisting>lwgeom=# CLUSTER my_geom_index ON my_table;
ERROR: cannot cluster when index access method does not handle null values
-HINT: You may be able to work around this by marking column "the_geom" NOT NULL.</programlisting>
+HINT: You may be able to work around this by marking column "geom" NOT NULL.</programlisting>
<para>As the HINT message tells you, one can work around this deficiency
by adding a "not null" constraint to the table:</para>
- <programlisting>lwgeom=# ALTER TABLE my_table ALTER COLUMN the_geom SET not null;
+ <programlisting>lwgeom=# ALTER TABLE my_table ALTER COLUMN geom SET not null;
ALTER TABLE</programlisting>
<para>Of course, this will not work if you in fact need NULL values in
@@ -121,7 +121,7 @@ ALTER TABLE</programlisting>
overhead for large geometries. To avoid this overhead, it may be feasible
to pre-drop those additional dimensions once and forever:</para>
- <programlisting>UPDATE mytable SET the_geom = ST_Force2D(the_geom);
+ <programlisting>UPDATE mytable SET geom = ST_Force2D(geom);
VACUUM FULL ANALYZE mytable;</programlisting>
<para>Note that if you added your geometry column using
@@ -136,7 +136,7 @@ VACUUM FULL ANALYZE mytable;</programlisting>
running a simple "VACUUM;" between your UPDATEs. This drastically reduces
the need for temporary disk space. Additionally, if you have mixed
dimension geometries, restricting the UPDATE by "WHERE
- dimension(the_geom)>2" skips re-writing of geometries that already are
+ dimension(geom)>2" skips re-writing of geometries that already are
in 2D.</para>
</sect1>
diff --git a/doc/reference_accessor.xml b/doc/reference_accessor.xml
index 4838163..0a09c18 100644
--- a/doc/reference_accessor.xml
+++ b/doc/reference_accessor.xml
@@ -437,7 +437,7 @@ ST_Dimension
<refsection>
<title>Standard Examples</title>
<programlisting>SELECT sometable.field1, sometable.field1,
- (ST_Dump(sometable.the_geom)).geom AS the_geom
+ (ST_Dump(sometable.geom)).geom AS geom
FROM sometable;
-- Break a compound curve into its constituent linestrings and circularstrings
@@ -911,18 +911,18 @@ FROM (
<title>Examples</title>
<para>General form of query.</para>
<programlisting>SELECT polyTable.field1, polyTable.field1,
- (ST_DumpRings(polyTable.the_geom)).geom As the_geom
+ (ST_DumpRings(polyTable.geom)).geom As geom
FROM polyTable;
</programlisting>
<para>A polygon with a single hole.</para>
-<programlisting>SELECT path, ST_AsEWKT(geom) As the_geom
+<programlisting>SELECT path, ST_AsEWKT(geom) As geom
FROM ST_DumpRings(
ST_GeomFromEWKT('POLYGON((-8149064 5133092 1,-8149064 5132986 1,-8148996 5132839 1,-8148972 5132767 1,-8148958 5132508 1,-8148941 5132466 1,-8148924 5132394 1,
-8148903 5132210 1,-8148930 5131967 1,-8148992 5131978 1,-8149237 5132093 1,-8149404 5132211 1,-8149647 5132310 1,-8149757 5132394 1,
-8150305 5132788 1,-8149064 5133092 1),
(-8149362 5132394 1,-8149446 5132501 1,-8149548 5132597 1,-8149695 5132675 1,-8149362 5132394 1))')
) as foo;
- path | the_geom
+ path | geom
----------------------------------------------------------------------------------------------------------------
{0} | POLYGON((-8149064 5133092 1,-8149064 5132986 1,-8148996 5132839 1,-8148972 5132767 1,-8148958 5132508 1,
| -8148941 5132466 1,-8148924 5132394 1,
@@ -1159,13 +1159,13 @@ POLYGON((20 75,20 150,125 150,125 75,20 75))</programlisting>
<title>Examples</title>
<programlisting>
--If you have a table of polygons
-SELECT gid, ST_ExteriorRing(the_geom) AS ering
+SELECT gid, ST_ExteriorRing(geom) AS ering
FROM sometable;
--If you have a table of MULTIPOLYGONs
--and want to return a MULTILINESTRING composed of the exterior rings of each polygon
-SELECT gid, ST_Collect(ST_ExteriorRing(the_geom)) AS erings
- FROM (SELECT gid, (ST_Dump(the_geom)).geom As the_geom
+SELECT gid, ST_Collect(ST_ExteriorRing(geom)) AS erings
+ FROM (SELECT gid, (ST_Dump(geom)).geom As geom
FROM sometable) As foo
GROUP BY gid;
@@ -1241,13 +1241,13 @@ LINESTRING(0 0 1,1 1 1,1 2 1,1 1 1,0 0 1)
<title>Standard Examples</title>
<programlisting>--Extracting a subset of points from a 3d multipoint
-SELECT n, ST_AsEWKT(ST_GeometryN(the_geom, n)) As geomewkt
+SELECT n, ST_AsEWKT(ST_GeometryN(geom, n)) As geomewkt
FROM (
VALUES (ST_GeomFromEWKT('MULTIPOINT(1 2 7, 3 4 7, 5 6 7, 8 9 10)') ),
( ST_GeomFromEWKT('MULTICURVE(CIRCULARSTRING(2.5 2.5,4.5 2.5, 3.5 3.5), (10 11, 12 11))') )
- )As foo(the_geom)
+ )As foo(geom)
CROSS JOIN generate_series(1,100) n
-WHERE n <= ST_NumGeometries(the_geom);
+WHERE n <= ST_NumGeometries(geom);
n | geomewkt
---+-----------------------------------------
@@ -1260,9 +1260,9 @@ WHERE n <= ST_NumGeometries(the_geom);
--Extracting all geometries (useful when you want to assign an id)
-SELECT gid, n, ST_GeometryN(the_geom, n)
+SELECT gid, n, ST_GeometryN(geom, n)
FROM sometable CROSS JOIN generate_series(1,100) n
-WHERE n <= ST_NumGeometries(the_geom);</programlisting>
+WHERE n <= ST_NumGeometries(geom);</programlisting>
</refsection>
<refsection><title>Polyhedral Surfaces, TIN and Triangle Examples</title>
@@ -1474,10 +1474,10 @@ SELECT ST_AsEWKT(ST_GeometryN(geom,2)) as wkt
<title>Examples</title>
<programlisting>
-SELECT ST_AsText(ST_InteriorRingN(the_geom, 1)) As the_geom
+SELECT ST_AsText(ST_InteriorRingN(geom, 1)) As geom
FROM (SELECT ST_BuildArea(
ST_Collect(ST_Buffer(ST_Point(1,2), 20,3),
- ST_Buffer(ST_Point(1, 2), 10,3))) As the_geom
+ ST_Buffer(ST_Point(1, 2), 10,3))) As geom
) as foo;
</programlisting>
</refsection>
@@ -1942,15 +1942,15 @@ SELECT ST_IsEmpty(ST_GeomFromText('POLYGON((1 2, 3 4, 5 6, 1 2))'));
<refsection>
<title>Examples</title>
- <programlisting>SELECT ST_IsRing(the_geom), ST_IsClosed(the_geom), ST_IsSimple(the_geom)
-FROM (SELECT 'LINESTRING(0 0, 0 1, 1 1, 1 0, 0 0)'::geometry AS the_geom) AS foo;
+ <programlisting>SELECT ST_IsRing(geom), ST_IsClosed(geom), ST_IsSimple(geom)
+FROM (SELECT 'LINESTRING(0 0, 0 1, 1 1, 1 0, 0 0)'::geometry AS geom) AS foo;
st_isring | st_isclosed | st_issimple
-----------+-------------+-------------
t | t | t
(1 row)
-SELECT ST_IsRing(the_geom), ST_IsClosed(the_geom), ST_IsSimple(the_geom)
-FROM (SELECT 'LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'::geometry AS the_geom) AS foo;
+SELECT ST_IsRing(geom), ST_IsClosed(geom), ST_IsSimple(geom)
+FROM (SELECT 'LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'::geometry AS geom) AS foo;
st_isring | st_isclosed | st_issimple
-----------+-------------+-------------
f | t | f
@@ -2117,10 +2117,10 @@ FROM (SELECT 'LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'::geometry AS the_geom) AS foo
<programlisting>
--Return how much byte space Boston takes up in our Mass data set
-SELECT pg_size_pretty(SUM(ST_MemSize(the_geom))) as totgeomsum,
-pg_size_pretty(SUM(CASE WHEN town = 'BOSTON' THEN ST_MemSize(the_geom) ELSE 0 END)) As bossum,
-CAST(SUM(CASE WHEN town = 'BOSTON' THEN ST_MemSize(the_geom) ELSE 0 END)*1.00 /
- SUM(ST_MemSize(the_geom))*100 As numeric(10,2)) As perbos
+SELECT pg_size_pretty(SUM(ST_MemSize(geom))) as totgeomsum,
+pg_size_pretty(SUM(CASE WHEN town = 'BOSTON' THEN ST_MemSize(geom) ELSE 0 END)) As bossum,
+CAST(SUM(CASE WHEN town = 'BOSTON' THEN ST_MemSize(geom) ELSE 0 END)*1.00 /
+ SUM(ST_MemSize(geom))*100 As numeric(10,2)) As perbos
FROM towns;
totgeomsum bossum perbos
@@ -2134,8 +2134,8 @@ SELECT ST_MemSize(ST_GeomFromText('CIRCULARSTRING(220268 150415,220227 150505,22
73
--What percentage of our table is taken up by just the geometry
-SELECT pg_total_relation_size('public.neighborhoods') As fulltable_size, sum(ST_MemSize(the_geom)) As geomsize,
-sum(ST_MemSize(the_geom))*1.00/pg_total_relation_size('public.neighborhoods')*100 As pergeom
+SELECT pg_total_relation_size('public.neighborhoods') As fulltable_size, sum(ST_MemSize(geom)) As geomsize,
+sum(ST_MemSize(geom))*1.00/pg_total_relation_size('public.neighborhoods')*100 As pergeom
FROM neighborhoods;
fulltable_size geomsize pergeom
------------------------------------------------
@@ -2261,8 +2261,8 @@ SELECT ST_NPoints(ST_GeomFromEWKT('LINESTRING(77.29 29.07 1,77.42 29.26 0,77.27
<refsection>
<title>Examples</title>
- <programlisting>SELECT ST_NRings(the_geom) As Nrings, ST_NumInteriorRings(the_geom) As ninterrings
- FROM (SELECT ST_GeomFromText('POLYGON((1 2, 3 4, 5 6, 1 2))') As the_geom) As foo;
+ <programlisting>SELECT ST_NRings(geom) As Nrings, ST_NumInteriorRings(geom) As ninterrings
+ FROM (SELECT ST_GeomFromText('POLYGON((1 2, 3 4, 5 6, 1 2))') As geom) As foo;
nrings | ninterrings
--------+-------------
1 | 0
@@ -2365,13 +2365,13 @@ POLYGON((-7 4.2,-7.1 5,-7.1 4.3,-7 4.2)))'));
<programlisting>
--If you have a regular polygon
-SELECT gid, field1, field2, ST_NumInteriorRings(the_geom) AS numholes
+SELECT gid, field1, field2, ST_NumInteriorRings(geom) AS numholes
FROM sometable;
--If you have multipolygons
--And you want to know the total number of interior rings in the MULTIPOLYGON
-SELECT gid, field1, field2, SUM(ST_NumInteriorRings(the_geom)) AS numholes
-FROM (SELECT gid, field1, field2, (ST_Dump(the_geom)).geom As the_geom
+SELECT gid, field1, field2, SUM(ST_NumInteriorRings(geom)) AS numholes
+FROM (SELECT gid, field1, field2, (ST_Dump(geom)).geom As geom
FROM sometable) As foo
GROUP BY gid, field1,field2;
</programlisting>
diff --git a/doc/reference_bbox.xml b/doc/reference_bbox.xml
index 15055ce..77cab73 100644
--- a/doc/reference_bbox.xml
+++ b/doc/reference_bbox.xml
@@ -183,11 +183,11 @@ instead.
<refsection>
<title>Examples</title>
- <programlisting>SELECT ST_EstimatedExtent('ny', 'edges', 'the_geom');
+ <programlisting>SELECT ST_EstimatedExtent('ny', 'edges', 'geom');
--result--
BOX(-8877653 4912316,-8010225.5 5589284)
-SELECT ST_EstimatedExtent('feature_poly', 'the_geom');
+SELECT ST_EstimatedExtent('feature_poly', 'geom');
--result--
BOX(-124.659652709961 24.6830825805664,-67.7798080444336 49.0012092590332)
</programlisting>
@@ -271,7 +271,7 @@ BOX(-124.659652709961 24.6830825805664,-67.7798080444336 49.0012092590332)
<note>
<para>Pre version 1.3, ST_Expand was used in conjunction with <xref linkend="ST_Distance" /> to do indexable distance queries. For example,
- <code>the_geom && ST_Expand('POINT(10 20)', 10) AND ST_Distance(the_geom, 'POINT(10 20)') < 10</code>.
+ <code>geom && ST_Expand('POINT(10 20)', 10) AND ST_Distance(geom, 'POINT(10 20)') < 10</code>.
This has been replaced by the easier <xref linkend="ST_DWithin" /> construct.</para>
</note>
@@ -365,14 +365,14 @@ SELECT ST_Expand(CAST('BOX3D(778783 2951741 1,794875 2970042.61545891 10)' As bo
<note><para>Examples below use Massachusetts State Plane ft (SRID=2249)</para></note>
<programlisting>
-SELECT ST_Extent(the_geom) as bextent FROM sometable;
+SELECT ST_Extent(geom) as bextent FROM sometable;
st_bextent
------------------------------------
BOX(739651.875 2908247.25,794875.8125 2970042.75)
--Return extent of each category of geometries
-SELECT ST_Extent(the_geom) as bextent
+SELECT ST_Extent(geom) as bextent
FROM sometable
GROUP BY category ORDER BY category;
@@ -384,7 +384,7 @@ GROUP BY category ORDER BY category;
--Force back into a geometry
-- and render the extended text representation of that geometry
-SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
+SELECT ST_SetSRID(ST_Extent(geom),2249) as bextent FROM sometable;
bextent
--------------------------------------------------------------------------------
@@ -438,8 +438,8 @@ SELECT ST_SetSRID(ST_Extent(the_geom),2249) as bextent FROM sometable;
<refsection>
<title>Examples</title>
<programlisting>
-SELECT ST_3DExtent(foo.the_geom) As b3extent
-FROM (SELECT ST_MakePoint(x,y,z) As the_geom
+SELECT ST_3DExtent(foo.geom) As b3extent
+FROM (SELECT ST_MakePoint(x,y,z) As geom
FROM generate_series(1,3) As x
CROSS JOIN generate_series(1,2) As y
CROSS JOIN generate_series(0,2) As Z) As foo;
@@ -448,8 +448,8 @@ FROM (SELECT ST_MakePoint(x,y,z) As the_geom
BOX3D(1 1 0,3 2 2)
--Get the extent of various elevated circular strings
-SELECT ST_3DExtent(foo.the_geom) As b3extent
-FROM (SELECT ST_Translate(ST_Force_3DZ(ST_LineToCurve(ST_Buffer(ST_Point(x,y),1))),0,0,z) As the_geom
+SELECT ST_3DExtent(foo.geom) As b3extent
+FROM (SELECT ST_Translate(ST_Force_3DZ(ST_LineToCurve(ST_Buffer(ST_Point(x,y),1))),0,0,z) As geom
FROM generate_series(1,3) As x
CROSS JOIN generate_series(1,2) As y
CROSS JOIN generate_series(0,2) As Z) As foo;
@@ -497,9 +497,9 @@ FROM (SELECT ST_Translate(ST_Force_3DZ(ST_LineToCurve(ST_Buffer(ST_Point(x,y),1)
<programlisting>
--Return all features that fall reside or partly reside in a US national atlas coordinate bounding box
--It is assumed here that the geometries are stored with SRID = 2163 (US National atlas equal area)
-SELECT feature_id, feature_name, the_geom
+SELECT feature_id, feature_name, geom
FROM features
-WHERE the_geom && ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625),
+WHERE geom && ST_SetSRID(ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625),
ST_Point(-987121.375 ,529933.1875)),2163)</programlisting>
</refsection>
diff --git a/doc/reference_constructor.xml b/doc/reference_constructor.xml
index e3c926c..3548178 100644
--- a/doc/reference_constructor.xml
+++ b/doc/reference_constructor.xml
@@ -96,7 +96,7 @@ MULTICURVE(CIRCULARSTRING(220268 150415,220227 150505,220227 150406),
<title>Examples - Array variant</title>
<para>Using an array constructor for a subquery.</para>
<programlisting>
-SELECT ST_Collect( ARRAY( SELECT the_geom FROM sometable ) );
+SELECT ST_Collect( ARRAY( SELECT geom FROM sometable ) );
</programlisting>
<para>Using an array constructor for values.</para>
<programlisting>
@@ -112,8 +112,8 @@ MULTILINESTRING((1 2,3 4),(3 4,4 5))
<title>Examples - Aggregate variant</title>
<para>Creating multiple collections by grouping geometries in a table.</para>
<programlisting>
-SELECT stusps, ST_Collect(f.the_geom) as geom
- FROM (SELECT stusps, (ST_Dump(the_geom)).geom As the_geom
+SELECT stusps, ST_Collect(f.geom) as geom
+ FROM (SELECT stusps, (ST_Dump(geom)).geom As geom
FROM
somestatetable ) As f
GROUP BY stusps
@@ -309,7 +309,7 @@ SELECT ST_AsEWKT( ST_MakeLine(ST_MakePoint(1,2,3), ST_MakePoint(3,4,5) ));
<para>Create a line from an array formed by a subquery with ordering.</para>
<programlisting>
-SELECT ST_MakeLine( ARRAY( SELECT ST_Centroid(the_geom) FROM visit_locations ORDER BY visit_time) );
+SELECT ST_MakeLine( ARRAY( SELECT ST_Centroid(geom) FROM visit_locations ORDER BY visit_time) );
</programlisting>
<para>Create a 3D line from an array of 3D points</para>
diff --git a/doc/reference_editor.xml b/doc/reference_editor.xml
index 742b81b..bcd5041 100644
--- a/doc/reference_editor.xml
+++ b/doc/reference_editor.xml
@@ -61,9 +61,9 @@ only for those that are not closed.
</para>
<programlisting>
UPDATE sometable
-SET the_geom = ST_AddPoint(the_geom, ST_StartPoint(the_geom))
+SET geom = ST_AddPoint(geom, ST_StartPoint(geom))
FROM sometable
-WHERE ST_IsClosed(the_geom) = false;
+WHERE ST_IsClosed(geom) = false;
</programlisting>
</refsection>
@@ -1121,8 +1121,8 @@ GEOMETRYCOLLECTION(
<title>Examples</title>
<programlisting> -- 2D Example
-SELECT ST_AsText(ST_LineToCurve(foo.the_geom)) As curvedastext,ST_AsText(foo.the_geom) As non_curvedastext
- FROM (SELECT ST_Buffer('POINT(1 3)'::geometry, 3) As the_geom) As foo;
+SELECT ST_AsText(ST_LineToCurve(foo.geom)) As curvedastext,ST_AsText(foo.geom) As non_curvedastext
+ FROM (SELECT ST_Buffer('POINT(1 3)'::geometry, 3) As geom) As foo;
curvedatext non_curvedastext
--------------------------------------------------------------------|-----------------------------------------------------------------
@@ -1545,10 +1545,10 @@ UPDATE sometable
<refsection>
<title>Examples</title>
<programlisting>
-SELECT ST_AsText(the_geom) as line, ST_AsText(ST_Reverse(the_geom)) As reverseline
+SELECT ST_AsText(geom) as line, ST_AsText(ST_Reverse(geom)) As reverseline
FROM
(SELECT ST_MakeLine(ST_Point(1,2),
- ST_Point(1,10)) As the_geom) as foo;
+ ST_Point(1,10)) As geom) as foo;
--result
line | reverseline
---------------------+----------------------
@@ -1662,8 +1662,8 @@ SELECT ST_AsText(ST_SetPoint('LINESTRING(-1 2,-1 3)', 0, 'POINT(-1 1)'));
LINESTRING(-1 1,-1 3)
---Change last point in a line string (lets play with 3d linestring this time)
-SELECT ST_AsEWKT(ST_SetPoint(foo.the_geom, ST_NumPoints(foo.the_geom) - 1, ST_GeomFromEWKT('POINT(-1 1 3)')))
-FROM (SELECT ST_GeomFromEWKT('LINESTRING(-1 2 3,-1 3 4, 5 6 7)') As the_geom) As foo;
+SELECT ST_AsEWKT(ST_SetPoint(foo.geom, ST_NumPoints(foo.geom) - 1, ST_GeomFromEWKT('POINT(-1 1 3)')))
+FROM (SELECT ST_GeomFromEWKT('LINESTRING(-1 2 3,-1 3 4, 5 6 7)') As geom) As foo;
st_asewkt
-----------------------
LINESTRING(-1 2 3,-1 3 4,-1 1 3)
@@ -1796,11 +1796,11 @@ of interest not spawned from one side to the other.
<programlisting>
-- Move all components of the given geometries whose bounding box
-- falls completely on the left of x=0 to +360
-select ST_WrapX(the_geom, 0, 360);
+select ST_WrapX(geom, 0, 360);
-- Move all components of the given geometries whose bounding box
-- falls completely on the left of x=-30 to +360
-select ST_WrapX(the_geom, -30, 360);
+select ST_WrapX(geom, -30, 360);
</programlisting>
</refsection>
@@ -1898,7 +1898,7 @@ select ST_WrapX(the_geom, -30, 360);
<programlisting>
--Snap your geometries to a precision grid of 10^-3
UPDATE mytable
- SET the_geom = ST_SnapToGrid(the_geom, 0.001);
+ SET geom = ST_SnapToGrid(geom, 0.001);
SELECT ST_AsText(ST_SnapToGrid(
ST_GeomFromText('LINESTRING(1.1115678 2.123, 4.111111 3.2374897, 4.11112 3.23748667)'),
diff --git a/doc/reference_exception.xml b/doc/reference_exception.xml
index 8021447..9dce6f5 100644
--- a/doc/reference_exception.xml
+++ b/doc/reference_exception.xml
@@ -40,8 +40,8 @@
<title>Examples</title>
<programlisting>UPDATE sometable
- SET the_geom = PostGIS_AddBBox(the_geom)
- WHERE PostGIS_HasBBox(the_geom) = false;</programlisting>
+ SET geom = PostGIS_AddBBox(geom)
+ WHERE PostGIS_HasBBox(geom) = false;</programlisting>
</refsection>
<!-- Optionally add a "See Also" section -->
@@ -93,12 +93,12 @@
--The force to ST_AsBinary before applying Box2D forces a recalculation of the box, and Box2D applied to the table geometry always
-- returns the cached bounding box.
UPDATE sometable
- SET the_geom = PostGIS_DropBBox(the_geom)
- WHERE Not (Box2D(ST_AsBinary(the_geom)) = Box2D(the_geom));
+ SET geom = PostGIS_DropBBox(geom)
+ WHERE Not (Box2D(ST_AsBinary(geom)) = Box2D(geom));
UPDATE sometable
- SET the_geom = PostGIS_AddBBox(the_geom)
- WHERE Not PostGIS_HasBBOX(the_geom);
+ SET geom = PostGIS_AddBBox(geom)
+ WHERE Not PostGIS_HasBBOX(geom);
</programlisting>
@@ -142,8 +142,8 @@
<refsection>
<title>Examples</title>
- <programlisting>SELECT the_geom
-FROM sometable WHERE PostGIS_HasBBox(the_geom) = false;</programlisting>
+ <programlisting>SELECT geom
+FROM sometable WHERE PostGIS_HasBBox(geom) = false;</programlisting>
</refsection>
<!-- Optionally add a "See Also" section -->
diff --git a/doc/reference_management.xml b/doc/reference_management.xml
index 412863d..88037aa 100644
--- a/doc/reference_management.xml
+++ b/doc/reference_management.xml
@@ -379,7 +379,7 @@ DROP TABLE my_schema.my_spatial_table;
<refsection>
<title>Examples</title>
- <programlisting> SELECT Find_SRID('public', 'tiger_us_state_2007', 'the_geom_4269');
+ <programlisting> SELECT Find_SRID('public', 'tiger_us_state_2007', 'geom_4269');
find_srid
----------
4269
@@ -435,19 +435,19 @@ find_srid
<itemizedlist>
<listitem>
- <para><varname>enforce_dims_the_geom</varname> - ensures every
+ <para><varname>enforce_dims_geom</varname> - ensures every
geometry has the same dimension (see <xref
linkend="ST_NDims" />)</para>
</listitem>
<listitem>
- <para><varname>enforce_geotype_the_geom</varname> - ensures every
+ <para><varname>enforce_geotype_geom</varname> - ensures every
geometry is of the same type (see <xref
linkend="GeometryType" />)</para>
</listitem>
<listitem>
- <para><varname>enforce_srid_the_geom</varname> - ensures every
+ <para><varname>enforce_srid_geom</varname> - ensures every
geometry is in the same projection (see <xref
linkend="ST_SRID" />)</para>
</listitem>
diff --git a/doc/reference_measure.xml b/doc/reference_measure.xml
index abf7125..48f175e 100644
--- a/doc/reference_measure.xml
+++ b/doc/reference_measure.xml
@@ -712,14 +712,14 @@ SELECT ST_3DDistance(poly, mline) As dist3d,
<refsection>
<title>Examples</title>
- <programlisting>SELECT round(CAST(ST_DistanceSphere(ST_Centroid(the_geom), ST_GeomFromText('POINT(-118 38)',4326)) As numeric),2) As dist_meters,
-round(CAST(ST_Distance(ST_Transform(ST_Centroid(the_geom),32611),
+ <programlisting>SELECT round(CAST(ST_DistanceSphere(ST_Centroid(geom), ST_GeomFromText('POINT(-118 38)',4326)) As numeric),2) As dist_meters,
+round(CAST(ST_Distance(ST_Transform(ST_Centroid(geom),32611),
ST_Transform(ST_GeomFromText('POINT(-118 38)', 4326),32611)) As numeric),2) As dist_utm11_meters,
-round(CAST(ST_Distance(ST_Centroid(the_geom), ST_GeomFromText('POINT(-118 38)', 4326)) As numeric),5) As dist_degrees,
-round(CAST(ST_Distance(ST_Transform(the_geom,32611),
+round(CAST(ST_Distance(ST_Centroid(geom), ST_GeomFromText('POINT(-118 38)', 4326)) As numeric),5) As dist_degrees,
+round(CAST(ST_Distance(ST_Transform(geom,32611),
ST_Transform(ST_GeomFromText('POINT(-118 38)', 4326),32611)) As numeric),2) As min_dist_line_point_meters
FROM
- (SELECT ST_GeomFromText('LINESTRING(-118.584 38.374,-118.583 38.5)', 4326) As the_geom) as foo;
+ (SELECT ST_GeomFromText('LINESTRING(-118.584 38.374,-118.583 38.5)', 4326) As geom) as foo;
dist_meters | dist_utm11_meters | dist_degrees | min_dist_line_point_meters
-------------+-------------------+--------------+----------------------------
70424.47 | 70438.00 | 0.72900 | 65871.18
@@ -775,13 +775,13 @@ FROM
<title>Examples</title>
<programlisting>SELECT round(CAST(
- ST_DistanceSpheroid(ST_Centroid(the_geom), ST_GeomFromText('POINT(-118 38)',4326), 'SPHEROID["WGS 84",6378137,298.257223563]')
+ ST_DistanceSpheroid(ST_Centroid(geom), ST_GeomFromText('POINT(-118 38)',4326), 'SPHEROID["WGS 84",6378137,298.257223563]')
As numeric),2) As dist_meters_spheroid,
- round(CAST(ST_DistanceSphere(ST_Centroid(the_geom), ST_GeomFromText('POINT(-118 38)',4326)) As numeric),2) As dist_meters_sphere,
-round(CAST(ST_Distance(ST_Transform(ST_Centroid(the_geom),32611),
+ round(CAST(ST_DistanceSphere(ST_Centroid(geom), ST_GeomFromText('POINT(-118 38)',4326)) As numeric),2) As dist_meters_sphere,
+round(CAST(ST_Distance(ST_Transform(ST_Centroid(geom),32611),
ST_Transform(ST_GeomFromText('POINT(-118 38)', 4326),32611)) As numeric),2) As dist_utm11_meters
FROM
- (SELECT ST_GeomFromText('LINESTRING(-118.584 38.374,-118.583 38.5)', 4326) As the_geom) as foo;
+ (SELECT ST_GeomFromText('LINESTRING(-118.584 38.374,-118.583 38.5)', 4326) As geom) as foo;
dist_meters_spheroid | dist_meters_sphere | dist_utm11_meters
----------------------+--------------------+-------------------
70454.92 | 70424.47 | 70438.00
@@ -1175,22 +1175,22 @@ ST_3DLength
'SPHEROID["GRS_1980",6378137,298.257222101]' )
FROM geometry_table;
-SELECT ST_LengthSpheroid( the_geom, sph_m ) As tot_len,
-ST_LengthSpheroid(ST_GeometryN(the_geom,1), sph_m) As len_line1,
-ST_LengthSpheroid(ST_GeometryN(the_geom,2), sph_m) As len_line2
+SELECT ST_LengthSpheroid( geom, sph_m ) As tot_len,
+ST_LengthSpheroid(ST_GeometryN(geom,1), sph_m) As len_line1,
+ST_LengthSpheroid(ST_GeometryN(geom,2), sph_m) As len_line2
FROM (SELECT ST_GeomFromText('MULTILINESTRING((-118.584 38.374,-118.583 38.5),
- (-71.05957 42.3589 , -71.061 43))') As the_geom,
+ (-71.05957 42.3589 , -71.061 43))') As geom,
CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m) as foo;
tot_len | len_line1 | len_line2
------------------+------------------+------------------
85204.5207562955 | 13986.8725229309 | 71217.6482333646
--3D
-SELECT ST_LengthSpheroid( the_geom, sph_m ) As tot_len,
-ST_LengthSpheroid(ST_GeometryN(the_geom,1), sph_m) As len_line1,
-ST_LengthSpheroid(ST_GeometryN(the_geom,2), sph_m) As len_line2
+SELECT ST_LengthSpheroid( geom, sph_m ) As tot_len,
+ST_LengthSpheroid(ST_GeometryN(geom,1), sph_m) As len_line1,
+ST_LengthSpheroid(ST_GeometryN(geom,2), sph_m) As len_line2
FROM (SELECT ST_GeomFromEWKT('MULTILINESTRING((-118.584 38.374 20,-118.583 38.5 30),
- (-71.05957 42.3589 75, -71.061 43 90))') As the_geom,
+ (-71.05957 42.3589 75, -71.061 43 90))') As geom,
CAST('SPHEROID["GRS_1980",6378137,298.257222101]' As spheroid) As sph_m) as foo;
tot_len | len_line1 | len_line2
@@ -1870,9 +1870,9 @@ FROM ST_GeogFromText('MULTIPOLYGON(((-71.1044543107478 42.340674480411,-71.10445
<refsection>
<title>Examples</title>
<para>Perimeter of a slightly elevated polygon in the air in Massachusetts state plane feet</para>
- <programlisting>SELECT ST_3DPerimeter(the_geom), ST_Perimeter2d(the_geom), ST_Perimeter(the_geom) FROM
+ <programlisting>SELECT ST_3DPerimeter(geom), ST_Perimeter2d(geom), ST_Perimeter(geom) FROM
(SELECT ST_GeomFromEWKT('SRID=2249;POLYGON((743238 2967416 2,743238 2967450 1,
-743265.625 2967416 1,743238 2967416 2))') As the_geom) As foo;
+743265.625 2967416 1,743238 2967416 2))') As geom) As foo;
ST_3DPerimeter | st_perimeter2d | st_perimeter
------------------+------------------+------------------
diff --git a/doc/reference_overlay.xml b/doc/reference_overlay.xml
index f535d13..85f4b2d 100644
--- a/doc/reference_overlay.xml
+++ b/doc/reference_overlay.xml
@@ -47,7 +47,7 @@
<title>Examples</title>
<programlisting>
-- Rely on implicit cast from geometry to box2d for the second parameter
-SELECT ST_ClipByBox2D(the_geom, ST_MakeEnvelope(0,0,10,10)) FROM mytab;
+SELECT ST_ClipByBox2D(geom, ST_MakeEnvelope(0,0,10,10)) FROM mytab;
</programlisting>
</refsection>
<refsection>
@@ -1045,7 +1045,7 @@ st_asewkt
GEOMETRYCOLLECTION(POINT(-2 3 1),LINESTRING(5 5 5,10 10 10),POLYGON((-7 4.2 2,-7.1 4.2 3,-7.1 4.3 2,-7 4.2 2)))
--Examples using new Array construct
-SELECT ST_Union(ARRAY(SELECT the_geom FROM sometable));
+SELECT ST_Union(ARRAY(SELECT geom FROM sometable));
SELECT ST_AsText(ST_Union(ARRAY[ST_GeomFromText('LINESTRING(1 2, 3 4)'),
ST_GeomFromText('LINESTRING(3 4, 4 5)')])) As wktunion;
diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index 1a0ab6b..ab5eb59 100644
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -890,7 +890,7 @@ POLYGON((50 5,10 8,10 10,100 190,150 30,150 10,50 5))
<programlisting>
--Get estimate of infected area based on point observations
SELECT d.disease_type,
- ST_ConvexHull(ST_Collect(d.the_geom)) As the_geom
+ ST_ConvexHull(ST_Collect(d.geom)) As geom
FROM disease_obs As d
GROUP BY d.disease_type;
</programlisting>
@@ -1458,7 +1458,7 @@ LINESTRING Z (-30 -29.7 5,-29 -27 11,-30 -29.7 10,-36 -31 5,-45 -33 1,-46 -32 11
<refsection>
<title>Examples</title>
<programlisting>SELECT d.disease_type,
- ST_MinimumBoundingCircle(ST_Collect(d.the_geom)) As the_geom
+ ST_MinimumBoundingCircle(ST_Collect(d.geom)) As geom
FROM disease_obs As d
GROUP BY d.disease_type;
</programlisting>
@@ -1672,8 +1672,8 @@ It always gives a 2D result even when used on a 3D geometry.</para></note>
<para>Compute an open buffer around roads</para>
<programlisting>
SELECT ST_Union(
- ST_OffsetCurve(f.the_geom, f.width/2, 'quad_segs=4 join=round'),
- ST_OffsetCurve(f.the_geom, -f.width/2, 'quad_segs=4 join=round')
+ ST_OffsetCurve(f.geom, f.width/2, 'quad_segs=4 join=round'),
+ ST_OffsetCurve(f.geom, -f.width/2, 'quad_segs=4 join=round')
) as track
FROM someroadstable;
@@ -1950,8 +1950,8 @@ SELECT ST_AsEWKT(ST_PointOnSurface(ST_GeomFromEWKT('LINESTRING(0 5 1, 0 0 1, 0 1
<refsection>
<title>Examples: Polygonizing single linestrings</title>
<programlisting>
-SELECT ST_AsEWKT(ST_Polygonize(the_geom_4269)) As geomtextrep
-FROM (SELECT the_geom_4269 FROM ma.suffolk_edges ORDER BY tlid LIMIT 45) As foo;
+SELECT ST_AsEWKT(ST_Polygonize(geom_4269)) As geomtextrep
+FROM (SELECT geom_4269 FROM ma.suffolk_edges ORDER BY tlid LIMIT 45) As foo;
geomtextrep
-------------------------------------
@@ -1962,8 +1962,8 @@ geomtextrep
--Use ST_Dump to dump out the polygonize geoms into individual polygons
SELECT ST_AsEWKT((ST_Dump(foofoo.polycoll)).geom) As geomtextrep
-FROM (SELECT ST_Polygonize(the_geom_4269) As polycoll
- FROM (SELECT the_geom_4269 FROM ma.suffolk_edges
+FROM (SELECT ST_Polygonize(geom_4269) As polycoll
+ FROM (SELECT geom_4269 FROM ma.suffolk_edges
ORDER BY tlid LIMIT 45) As foo) As foofoo;
geomtextrep
@@ -2222,14 +2222,14 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
<refsection>
<title>Examples</title>
<para>A circle simplified too much becomes a triangle, medium an octagon, </para>
- <programlisting>SELECT ST_Npoints(the_geom) AS np_before,
- ST_NPoints(ST_Simplify(the_geom,0.1)) AS np01_notbadcircle,
- ST_NPoints(ST_Simplify(the_geom,0.5)) AS np05_notquitecircle,
- ST_NPoints(ST_Simplify(the_geom,1)) AS np1_octagon,
- ST_NPoints(ST_Simplify(the_geom,10)) AS np10_triangle,
- (ST_Simplify(the_geom,100) is null) AS np100_geometrygoesaway
+ <programlisting>SELECT ST_Npoints(geom) AS np_before,
+ ST_NPoints(ST_Simplify(geom,0.1)) AS np01_notbadcircle,
+ ST_NPoints(ST_Simplify(geom,0.5)) AS np05_notquitecircle,
+ ST_NPoints(ST_Simplify(geom,1)) AS np1_octagon,
+ ST_NPoints(ST_Simplify(geom,10)) AS np10_triangle,
+ (ST_Simplify(geom,100) is null) AS np100_geometrygoesaway
FROM
- (SELECT ST_Buffer('POINT(1 3)', 10,12) As the_geom) AS foo;
+ (SELECT ST_Buffer('POINT(1 3)', 10,12) As geom) AS foo;
np_before | np01_notbadcircle | np05_notquitecircle | np1_octagon | np10_triangle | np100_geometrygoesaway
-----------+-------------------+---------------------+-------------+---------------+------------------------
@@ -2277,10 +2277,10 @@ MULTILINESTRING((76 175,90 161),(90 161,101 150),(126 125,126 156.25)))
<title>Examples</title>
<para>Same example as Simplify, but we see Preserve Topology prevents oversimplification. The circle can at most become a square.</para>
<programlisting>
-SELECT ST_Npoints(the_geom) As np_before, ST_NPoints(ST_SimplifyPreserveTopology(the_geom,0.1)) As np01_notbadcircle, ST_NPoints(ST_SimplifyPreserveTopology(the_geom,0.5)) As np05_notquitecircle,
-ST_NPoints(ST_SimplifyPreserveTopology(the_geom,1)) As np1_octagon, ST_NPoints(ST_SimplifyPreserveTopology(the_geom,10)) As np10_square,
-ST_NPoints(ST_SimplifyPreserveTopology(the_geom,100)) As np100_stillsquare
-FROM (SELECT ST_Buffer('POINT(1 3)', 10,12) As the_geom) As foo;
+SELECT ST_Npoints(geom) As np_before, ST_NPoints(ST_SimplifyPreserveTopology(geom,0.1)) As np01_notbadcircle, ST_NPoints(ST_SimplifyPreserveTopology(geom,0.5)) As np05_notquitecircle,
+ST_NPoints(ST_SimplifyPreserveTopology(geom,1)) As np1_octagon, ST_NPoints(ST_SimplifyPreserveTopology(geom,10)) As np10_square,
+ST_NPoints(ST_SimplifyPreserveTopology(geom,100)) As np100_stillsquare
+FROM (SELECT ST_Buffer('POINT(1 3)', 10,12) As geom) As foo;
--result--
np_before | np01_notbadcircle | np05_notquitecircle | np1_octagon | np10_square | np100_stillsquare
diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index d536e15..3556ead 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -11477,7 +11477,7 @@ WITH pr AS
(SELECT ST_Clip(rast,ST_Expand(geom,50) ) As rast, g.geom
FROM aerials.o_2_boston AS r INNER JOIN
-- union our parcels of interest so they form a single geometry we can later intersect with
- (SELECT ST_Union(ST_Transform(the_geom,26986)) AS geom
+ (SELECT ST_Union(ST_Transform(geom,26986)) AS geom
FROM landparcels WHERE pid IN('0303890000', '0303900000')) As g
ON ST_Intersects(rast::geometry, ST_Expand(g.geom,50))
),
diff --git a/doc/reference_relationship.xml b/doc/reference_relationship.xml
index 9716178..efef1ed 100644
--- a/doc/reference_relationship.xml
+++ b/doc/reference_relationship.xml
@@ -676,7 +676,7 @@ SELECT ST_Covers(geog_poly, geog_pt) As poly_covers_pt,
<entry><para> <informalexample>
<programlisting>CREATE TABLE roads (
id serial NOT NULL,
- the_geom geometry,
+ geom geometry,
CONSTRAINT roads_pkey PRIMARY KEY (road_id)
);</programlisting>
</informalexample> </para></entry>
@@ -699,7 +699,7 @@ SELECT ST_Covers(geog_poly, geog_pt) As poly_covers_pt,
<para><informalexample>
<programlisting>SELECT roads.id
FROM roads, highways
-WHERE ST_Crosses(roads.the_geom, highways.the_geom);</programlisting>
+WHERE ST_Crosses(roads.geom, highways.geom);</programlisting>
</informalexample></para>
</refsection>
</refentry>
@@ -875,9 +875,9 @@ FROM (SELECT
</informaltable>
<programlisting>
-SELECT s1.gid, s2.gid, ST_LineCrossingDirection(s1.the_geom, s2.the_geom)
- FROM streets s1 CROSS JOIN streets s2 ON (s1.gid != s2.gid AND s1.the_geom && s2.the_geom )
-WHERE ST_CrossingDirection(s1.the_geom, s2.the_geom) > 0;
+SELECT s1.gid, s2.gid, ST_LineCrossingDirection(s1.geom, s2.geom)
+ FROM streets s1 CROSS JOIN streets s2 ON (s1.gid != s2.gid AND s1.geom && s2.geom )
+WHERE ST_CrossingDirection(s1.geom, s2.geom) > 0;
</programlisting>
</refsection>
@@ -2110,7 +2110,7 @@ ST_DWithin(
-- If the units of the spatial reference is meters then units would be meters
SELECT DISTINCT ON (s.gid) s.gid, s.school_name, s.geom, h.hospital_name
FROM schools s
- LEFT JOIN hospitals h ON ST_DWithin(s.the_geom, h.geom, 3000)
+ LEFT JOIN hospitals h ON ST_DWithin(s.geom, h.geom, 3000)
ORDER BY s.gid, ST_Distance(s.geom, h.geom);
-- The schools with no close hospitals
diff --git a/doc/reference_srs.xml b/doc/reference_srs.xml
index 51f2035..15122ed 100644
--- a/doc/reference_srs.xml
+++ b/doc/reference_srs.xml
@@ -217,11 +217,11 @@ SELECT ST_AsEWKT(ST_Transform(ST_GeomFromEWKT('SRID=2249;CIRCULARSTRING(743238 2
<para>Example of creating a partial functional index. For tables where you are not sure all the geometries
will be filled in, its best to use a partial index that leaves out null geometries which will both conserve space and make your index smaller and more efficient.</para>
<programlisting>
-CREATE INDEX idx_the_geom_26986_parcels
+CREATE INDEX idx_geom_26986_parcels
ON parcels
USING gist
- (ST_Transform(the_geom, 26986))
- WHERE the_geom IS NOT NULL;
+ (ST_Transform(geom, 26986))
+ WHERE geom IS NOT NULL;
</programlisting>
<para>Examples of using PROJ.4 text to transform with custom spatial references.</para>
diff --git a/doc/reference_transaction.xml b/doc/reference_transaction.xml
index c5f1d50..36a0668 100644
--- a/doc/reference_transaction.xml
+++ b/doc/reference_transaction.xml
@@ -53,7 +53,7 @@
SELECT LockRow('towns', '353', 'priscilla');
BEGIN TRANSACTION;
SELECT AddAuth('joey');
- UPDATE towns SET the_geom = ST_Translate(the_geom,2,2) WHERE gid = 353;
+ UPDATE towns SET geom = ST_Translate(geom,2,2) WHERE gid = 353;
COMMIT;
diff --git a/doc/reference_transformation.xml b/doc/reference_transformation.xml
index 887eb2f..9034c9d 100644
--- a/doc/reference_transformation.xml
+++ b/doc/reference_transformation.xml
@@ -91,17 +91,17 @@ z' = z </programlisting> This method is a subcase of the 3D method
<programlisting>
--Rotate a 3d line 180 degrees about the z axis. Note this is long-hand for doing ST_Rotate();
- SELECT ST_AsEWKT(ST_Affine(the_geom, cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), 0, 0, 0, 1, 0, 0, 0)) As using_affine,
- ST_AsEWKT(ST_Rotate(the_geom, pi())) As using_rotate
- FROM (SELECT ST_GeomFromEWKT('LINESTRING(1 2 3, 1 4 3)') As the_geom) As foo;
+ SELECT ST_AsEWKT(ST_Affine(geom, cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), 0, 0, 0, 1, 0, 0, 0)) As using_affine,
+ ST_AsEWKT(ST_Rotate(geom, pi())) As using_rotate
+ FROM (SELECT ST_GeomFromEWKT('LINESTRING(1 2 3, 1 4 3)') As geom) As foo;
using_affine | using_rotate
-----------------------------+-----------------------------
LINESTRING(-1 -2 3,-1 -4 3) | LINESTRING(-1 -2 3,-1 -4 3)
(1 row)
--Rotate a 3d line 180 degrees in both the x and z axis
-SELECT ST_AsEWKT(ST_Affine(the_geom, cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), 0, 0, 0))
- FROM (SELECT ST_GeomFromEWKT('LINESTRING(1 2 3, 1 4 3)') As the_geom) As foo;
+SELECT ST_AsEWKT(ST_Affine(geom, cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), -sin(pi()), 0, sin(pi()), cos(pi()), 0, 0, 0))
+ FROM (SELECT ST_GeomFromEWKT('LINESTRING(1 2 3, 1 4 3)') As geom) As foo;
st_asewkt
-------------------------------
LINESTRING(-1 -2 -3,-1 -4 -3)
@@ -361,8 +361,8 @@ SELECT ST_AsEWKT(ST_RotateZ(ST_GeomFromEWKT('LINESTRING(1 2 3, 1 1 1)'), pi()/2)
LINESTRING(-2 1 3,-1 1 1)
--Rotate a curved circle around z-axis
-SELECT ST_AsEWKT(ST_RotateZ(the_geom, pi()/2))
-FROM (SELECT ST_LineToCurve(ST_Buffer(ST_GeomFromText('POINT(234 567)'), 3)) As the_geom) As foo;
+SELECT ST_AsEWKT(ST_RotateZ(geom, pi()/2))
+FROM (SELECT ST_LineToCurve(ST_Buffer(ST_GeomFromText('POINT(234 567)'), 3)) As geom) As foo;
st_asewkt
----------------------------------------------------------------------------------------------------------------------------
diff --git a/doc/reference_troubleshooting.xml b/doc/reference_troubleshooting.xml
index 607a9a8..5e1f0f5 100644
--- a/doc/reference_troubleshooting.xml
+++ b/doc/reference_troubleshooting.xml
@@ -45,8 +45,8 @@
<title>Examples</title>
<programlisting>UPDATE sometable
- SET the_geom = PostGIS_AddBBox(the_geom)
- WHERE PostGIS_HasBBox(the_geom) = false;</programlisting>
+ SET geom = PostGIS_AddBBox(geom)
+ WHERE PostGIS_HasBBox(geom) = false;</programlisting>
</refsection>
<!-- Optionally add a "See Also" section -->
@@ -98,12 +98,12 @@
--The force to ST_AsBinary before applying Box2D forces a recalculation of the box, and Box2D applied to the table geometry always
-- returns the cached bounding box.
UPDATE sometable
- SET the_geom = PostGIS_DropBBox(the_geom)
- WHERE Not (Box2D(ST_AsBinary(the_geom)) = Box2D(the_geom));
+ SET geom = PostGIS_DropBBox(geom)
+ WHERE Not (Box2D(ST_AsBinary(geom)) = Box2D(geom));
UPDATE sometable
- SET the_geom = PostGIS_AddBBox(the_geom)
- WHERE Not PostGIS_HasBBOX(the_geom);
+ SET geom = PostGIS_AddBBox(geom)
+ WHERE Not PostGIS_HasBBOX(geom);
</programlisting>
@@ -147,8 +147,8 @@
<refsection>
<title>Examples</title>
- <programlisting>SELECT the_geom
-FROM sometable WHERE PostGIS_HasBBox(the_geom) = false;</programlisting>
+ <programlisting>SELECT geom
+FROM sometable WHERE PostGIS_HasBBox(geom) = false;</programlisting>
</refsection>
<!-- Optionally add a "See Also" section -->
diff --git a/doc/reference_validation.xml b/doc/reference_validation.xml
index 7cf7db0..66862f4 100644
--- a/doc/reference_validation.xml
+++ b/doc/reference_validation.xml
@@ -155,9 +155,9 @@ The optional <varname>flags</varname> parameter is a bitfield. It can have the f
<programlisting>
--First 3 Rejects from a successful quintuplet experiment
-SELECT gid, reason(ST_IsValidDetail(the_geom)), ST_AsText(location(ST_IsValidDetail(the_geom))) as location
+SELECT gid, reason(ST_IsValidDetail(geom)), ST_AsText(location(ST_IsValidDetail(geom))) as location
FROM
-(SELECT ST_MakePolygon(ST_ExteriorRing(e.buff), array_agg(f.line)) As the_geom, gid
+(SELECT ST_MakePolygon(ST_ExteriorRing(e.buff), array_agg(f.line)) As geom, gid
FROM (SELECT ST_Buffer(ST_Point(x1*10,y1), z1) As buff, x1*10 + y1*100 + z1*1000 As gid
FROM generate_series(-4,6) x1
CROSS JOIN generate_series(2,5) y1
@@ -170,7 +170,7 @@ FROM (SELECT ST_Buffer(ST_Point(x1*10,y1), z1) As buff, x1*10 + y1*100 + z1*1000
WHERE x1 > y1*0.75 AND z1 < x1*y1) As f
ON (ST_Area(e.buff) > 78 AND ST_Contains(e.buff, f.line))
GROUP BY gid, e.buff) As quintuplet_experiment
-WHERE ST_IsValid(the_geom) = false
+WHERE ST_IsValid(geom) = false
ORDER BY gid
LIMIT 3;
@@ -250,9 +250,9 @@ Self-intersection[150 150]
</programlisting>
<programlisting>
--First 3 Rejects from a successful quintuplet experiment
-SELECT gid, ST_IsValidReason(the_geom) as validity_info
+SELECT gid, ST_IsValidReason(geom) as validity_info
FROM
-(SELECT ST_MakePolygon(ST_ExteriorRing(e.buff), array_agg(f.line)) As the_geom, gid
+(SELECT ST_MakePolygon(ST_ExteriorRing(e.buff), array_agg(f.line)) As geom, gid
FROM (SELECT ST_Buffer(ST_Point(x1*10,y1), z1) As buff, x1*10 + y1*100 + z1*1000 As gid
FROM generate_series(-4,6) x1
CROSS JOIN generate_series(2,5) y1
@@ -265,7 +265,7 @@ FROM (SELECT ST_Buffer(ST_Point(x1*10,y1), z1) As buff, x1*10 + y1*100 + z1*1000
WHERE x1 > y1*0.75 AND z1 < x1*y1) As f
ON (ST_Area(e.buff) > 78 AND ST_Contains(e.buff, f.line))
GROUP BY gid, e.buff) As quintuplet_experiment
-WHERE ST_IsValid(the_geom) = false
+WHERE ST_IsValid(geom) = false
ORDER BY gid
LIMIT 3;
diff --git a/doc/using_postgis_dataman.xml b/doc/using_postgis_dataman.xml
index 00345b8..ef885cf 100644
--- a/doc/using_postgis_dataman.xml
+++ b/doc/using_postgis_dataman.xml
@@ -1487,7 +1487,7 @@ gisdb=# SELECT
<programlisting>ALTER TABLE mytable
ADD CONSTRAINT geometry_valid_check
- CHECK (ST_IsValid(the_geom));</programlisting>
+ CHECK (ST_IsValid(geom));</programlisting>
<para>If you encounter any strange error messages such as "GEOS
Intersection() threw an error!" when calling PostGIS functions with valid
-----------------------------------------------------------------------
Summary of changes:
doc/administration.xml | 2 +-
doc/extras.xml | 2 +-
doc/extras_address_standardizer.xml | 2 +-
doc/extras_historytable.xml | 2 +-
doc/extras_tigergeocoder.xml | 4 +--
doc/extras_topology.xml | 2 +-
doc/faq.xml | 12 ++++----
doc/faq_raster.xml | 2 +-
doc/performance_tips.xml | 10 +++----
doc/reference_accessor.xml | 58 ++++++++++++++++++-------------------
doc/reference_bbox.xml | 24 +++++++--------
doc/reference_constructor.xml | 8 ++---
doc/reference_editor.xml | 22 +++++++-------
doc/reference_exception.xml | 16 +++++-----
doc/reference_management.xml | 8 ++---
doc/reference_measure.xml | 38 ++++++++++++------------
doc/reference_overlay.xml | 4 +--
doc/reference_processing.xml | 38 ++++++++++++------------
doc/reference_raster.xml | 2 +-
doc/reference_relationship.xml | 12 ++++----
doc/reference_srs.xml | 6 ++--
doc/reference_transaction.xml | 2 +-
doc/reference_transformation.xml | 14 ++++-----
doc/reference_troubleshooting.xml | 16 +++++-----
doc/reference_validation.xml | 12 ++++----
doc/using_postgis_dataman.xml | 2 +-
26 files changed, 160 insertions(+), 160 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list