[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-126-g3e63713
git at osgeo.org
git at osgeo.org
Sun Nov 1 21:30:19 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 3e63713997083aa2d1f08cf96a9fe3762d72d8f0 (commit)
from f19ada929bc8842ec01fd3968a3e914fb042a673 (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 3e63713997083aa2d1f08cf96a9fe3762d72d8f0
Author: Regina Obe <lr at pcorp.us>
Date: Mon Nov 2 00:30:14 2020 -0500
Drop sect2 for ref entries in raster, preventing testing, also get rid of nested reffunsynopsis in ST_Union. Add more logging to xslt. References #4780 for PostGIS 3.1
diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 1f3baa4..d4ebc82 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -9080,11 +9080,8 @@ FROM dummy_rast WHERE rid=2;
</refentry>
</sect1>
- <sect1 id="Raster_Processing">
- <title>Raster Processing</title>
-
- <sect2 id="Raster_Processing_MapAlgebra">
- <title>Map Algebra</title>
+ <sect1 id="Raster_Processing_MapAlgebra">
+ <title>Raster Processing: Map Algebra</title>
<refentry id="RT_ST_Clip">
<refnamediv>
@@ -12091,39 +12088,35 @@ UPDATE wind
<refsynopsisdiv>
<funcsynopsis>
- <funcprototype>
- <funcdef>raster <function>ST_Union</function></funcdef>
- <paramdef><type>setof raster </type> <parameter>rast</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <funcsynopsis>
- <funcprototype>
- <funcdef>raster <function>ST_Union</function></funcdef>
- <paramdef><type>setof raster </type> <parameter>rast</parameter></paramdef>
- <paramdef><type>unionarg[] </type> <parameter>unionargset</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <funcsynopsis>
- <funcprototype>
- <funcdef>raster <function>ST_Union</function></funcdef>
- <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
- <paramdef><type>integer</type> <parameter>nband</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <funcsynopsis>
- <funcprototype>
- <funcdef>raster <function>ST_Union</function></funcdef>
- <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
- <paramdef><type>text</type> <parameter>uniontype</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- <funcsynopsis>
- <funcprototype>
- <funcdef>raster <function>ST_Union</function></funcdef>
- <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
- <paramdef><type>integer</type> <parameter>nband</parameter></paramdef>
- <paramdef><type>text</type> <parameter>uniontype</parameter></paramdef>
- </funcprototype>
+ <funcprototype>
+ <funcdef>raster <function>ST_Union</function></funcdef>
+ <paramdef><type>setof raster </type> <parameter>rast</parameter></paramdef>
+ </funcprototype>
+
+ <funcprototype>
+ <funcdef>raster <function>ST_Union</function></funcdef>
+ <paramdef><type>setof raster </type> <parameter>rast</parameter></paramdef>
+ <paramdef><type>unionarg[] </type> <parameter>unionargset</parameter></paramdef>
+ </funcprototype>
+
+ <funcprototype>
+ <funcdef>raster <function>ST_Union</function></funcdef>
+ <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
+ <paramdef><type>integer</type> <parameter>nband</parameter></paramdef>
+ </funcprototype>
+
+ <funcprototype>
+ <funcdef>raster <function>ST_Union</function></funcdef>
+ <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
+ <paramdef><type>text</type> <parameter>uniontype</parameter></paramdef>
+ </funcprototype>
+
+ <funcprototype>
+ <funcdef>raster <function>ST_Union</function></funcdef>
+ <paramdef><type>setof raster</type> <parameter>rast</parameter></paramdef>
+ <paramdef><type>integer</type> <parameter>nband</parameter></paramdef>
+ <paramdef><type>text</type> <parameter>uniontype</parameter></paramdef>
+ </funcprototype>
</funcsynopsis>
</refsynopsisdiv>
@@ -12188,9 +12181,9 @@ WHERE ST_Intersects(rast, ST_GeomFromText('LINESTRING(230486 887771, 230500 887
</refsection>
</refentry>
- </sect2> <!-- /map algebra -->
+ </sect1> <!-- /map algebra -->
- <sect2 id="Raster_Processing_MapAlgebra_Callbacks">
+ <sect1 id="Raster_Processing_MapAlgebra_Callbacks">
<title>Built-in Map Algebra Callback Functions</title>
<refentry id="RT_ST_Distinct4ma">
@@ -12926,10 +12919,10 @@ WHERE rid = 2;
</refsection>
</refentry>
- </sect2> <!-- /callback -->
+ </sect1> <!-- /callback -->
- <sect2 id="Raster_Processing_DEM">
- <title>DEM (Elevation)</title>
+ <sect1 id="Raster_Processing_DEM">
+ <title>Raster Processing: DEM (Elevation)</title>
<refentry id="RT_ST_Aspect">
<refnamediv>
@@ -13502,10 +13495,10 @@ GROUP BY t1.rast;
</refsection>
</refentry>
- </sect2> <!-- /DEM -->
+ </sect1> <!-- /DEM -->
- <sect2 id="Raster_Processing_Geometry">
- <title>Raster to Geometry</title>
+ <sect1 id="Raster_Processing_Geometry">
+ <title>Raster Processing: Raster to Geometry</title>
<refentry id="RT_Box3D">
<refnamediv>
@@ -13915,9 +13908,7 @@ MULTIPOLYGON(((3427928 5793243.85,3427928 5793243.8,3427928 5793243.75,3427927.8
</refsection>
</refentry>
- </sect2> <!-- /misc -->
-
- </sect1>
+ </sect1> <!-- /misc -->
<sect1 id="RT_Operators">
<title>Raster Operators</title>
diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 78c514e..2b97524 100644
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -114,7 +114,7 @@
(SELECT ST_SetSRID(ST_SetValue(ST_AddBand(ST_MakeEmptyRaster( 100, 100, (i-1)*100, (i-1)*100, 0.0005, -0.0005, 0*i, 0*i), '64BF'), i, (i+1),42949.12345),4326) As rast
FROM generate_series(1,10) As i)
</pgis:pixeltype>
- <pgis:pixeltype ID="NULLRaster" PixType="64BF" createtable="true" nodata="NULL">
+ <pgis:pixeltype ID="NULLRaster" PixType="null" createtable="true" nodata="NULL">
(SELECT NULL::raster As rast
FROM generate_series(1,10) As i)
</pgis:pixeltype>
@@ -127,7 +127,7 @@ DROP TABLE IF EXISTS <xsl:value-of select="$var_logtable" />;
CREATE TABLE <xsl:value-of select="$var_logtable" />(logid serial PRIMARY KEY, log_label text, spatial_class text DEFAULT 'raster', func text, g1 text, g2 text, log_start timestamp, log_end timestamp, log_sql text);
DROP TABLE IF EXISTS <xsl:value-of select="$var_logtable" />_output;
CREATE TABLE <xsl:value-of select="$var_logtable" />_output(logid integer PRIMARY KEY, log_output xml);
- <xsl:apply-templates select="/book/chapter[@id='RT_reference']" />
+ <xsl:apply-templates select="/book/chapter[@id='RT_reference']" />
</xsl:template>
<xsl:template match='chapter'>
<!-- define a table we call pgis_rgarden_mega that will contain a raster column with a band for all types of pixels we support -->
@@ -244,7 +244,6 @@ COMMIT;
<xsl:variable name='fnargs'><xsl:call-template name="listparams"><xsl:with-param name="func" select="." /></xsl:call-template></xsl:variable>
<xsl:variable name='fnname'><xsl:value-of select="funcdef/function"/></xsl:variable>
<xsl:variable name='fndef'><xsl:value-of select="funcdef"/></xsl:variable>
- -- <xsl:value-of select="funcdef"/>
<xsl:variable name='numparams'><xsl:value-of select="count(paramdef/parameter)" /></xsl:variable>
<xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'geography') or contains(text(),'box') ]) + count(paramdef/parameter[contains(text(),'WKT')]) + count(paramdef/parameter[contains(text(),'geomgml')])" /></xsl:variable>
<xsl:variable name='numparamrasts'><xsl:value-of select="count(paramdef/type[contains(text(),'raster') ] )" /></xsl:variable>
@@ -267,6 +266,7 @@ COMMIT;
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
+ SELECT 'Start Considering <xsl:value-of select="funcdef/function" /> <xsl:value-of select="$geoftype" />';
<!-- For each function prototype generate a test sql statement -->
<xsl:choose>
@@ -287,7 +287,8 @@ SELECT 'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select=
</xsl:when>
<!--Start Test aggregate and unary functions -->
<!-- put functions that take only one raster no need to cross with another raster collection, these are unary raster, aggregates, and so forth -->
- <xsl:when test="$numparamrasts = '1' and $numparamgeoms = '0' and not(contains($fnexclude,funcdef/function))" >
+ <xsl:when test="$numparamrasts = '1' and $numparamgeoms = '0' and not(contains($fnexclude,funcdef/function))" >
+ SELECT '<xsl:value-of select="$fnname" />';
<xsl:for-each select="document('')//pgis:pixeltypes/pgis:pixeltype">
SELECT '<xsl:value-of select="$geoftype" /> <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />: Start Testing <xsl:value-of select="@PixType" /> with 1 rast param';
<xsl:choose>
-----------------------------------------------------------------------
Summary of changes:
doc/reference_raster.xml | 89 ++++++++++++++++++---------------------
doc/xsl/raster_gardentest.sql.xsl | 9 ++--
2 files changed, 45 insertions(+), 53 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list