Updated raster2pgsql help and docs to reflect changes to

regular_blocking.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10842 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index baae1e3487c7ad1e860062f807a4c84b8ced067a..07c48e0b5321bc93b04fecaf2a43aeac6620bc9e 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -452,7 +452,7 @@ VALUES (1,
                        <parameter>same_alignment=true</parameter></paramdef>
                        
                        <paramdef choice="opt"><type>boolean </type>
-                       <parameter>regular_blocking=true</parameter></paramdef>
+                       <parameter>regular_blocking=false</parameter></paramdef>
                        
                        <paramdef choice="opt"><type>boolean </type>
                        <parameter>num_bands=true</parameter></paramdef>
@@ -490,7 +490,7 @@ VALUES (1,
 
                        <listitem><para><varname>num_bands</varname> number of bands</para></listitem>
                        <listitem><para><varname>pixel_types</varname> reads array of pixel types for each band ensure all band n have same pixel type</para></listitem>
-                       <listitem><para><varname>regular_blocking</varname> apply informational flag to denote all tiles are regularly blocked</para></listitem>
+                       <listitem><para><varname>regular_blocking</varname> sets spatially unique (no two rasters can be spatially the same) and coverage tile (raster is aligned to a coverage) constraints</para></listitem>
                        <listitem><para><varname>same_alignment</varname> ensures they all have same alignment meaning any two tiles you compare will return true for. Refer to <xref linkend="RT_ST_SameAlignment" /></para></listitem>
                        <listitem><para><varname>srid</varname> ensures all have same srid</para></listitem>
                        <listitem><para>More -- any listed as inputs into the above functions</para></listitem>
@@ -539,8 +539,6 @@ SELECT ST_AddBand(ST_MakeEmptyRaster(1000, 1000, 0.3, -0.3, 2, 2, 0, 0,4326), 1,
 SELECT AddRasterConstraints('public'::name, 'myrasters2'::name, 'rast'::name,'regular_blocking', 'blocksize');
 -- get notice--
 NOTICE:  Adding regular blocking constraint
-INFO:  The regular_blocking constraint is just a flag indicating that the column "rast" is regularly blocked.  As no function exist yet to assert that a raster column is regularly blocked, it is up to the end-user to ensure that the column is truly regularly blocked.
-CONTEXT:  PL/pgSQL function "addrasterconstraints" line 85 at assignment
 NOTICE:  Adding blocksize-X constraint
 NOTICE:  Adding blocksize-Y constraint</programlisting>
          </refsection>
@@ -635,7 +633,7 @@ NOTICE:  Adding blocksize-Y constraint</programlisting>
                        <parameter>same_alignment=true</parameter></paramdef>
                        
                        <paramdef choice="opt"><type>boolean </type>
-                       <parameter>regular_blocking=true</parameter></paramdef>
+                       <parameter>regular_blocking=false</parameter></paramdef>
                        
                        <paramdef choice="opt"><type>boolean </type>
                        <parameter>num_bands=true</parameter></paramdef>

diff --git a/doc/using_raster_dataman.xml b/doc/using_raster_dataman.xml
index 572950b173e1dcd15a828df0a91e7b1a2c09c3ca..d3a1dd38b5d29c50a58be66fbbe19dbbc40bf5a1 100644 (file)
--- a/doc/using_raster_dataman.xml
+++ b/doc/using_raster_dataman.xml
@@ -112,7 +112,7 @@
                                                        <term>-r </term>
                                                        <listitem>
                                                                <para>
-                                                                       Set the regular blocking constraint.  Only applied if -C flag is also used.
+                                                                       Set the constraints (spatially unique and coverage tile) for regular blocking.  Only applied if -C flag is also used.
                                                                </para>
                                                        </listitem>
                                                </varlistentry>
@@ -471,7 +471,7 @@ Available GDAL raster formats:
                                        <para><varname>same_alignment</varname> A boolean that is true if all the raster tiles have the same alignment . Refer to <xref linkend="RT_ST_SameAlignment" /> for more details.</para>
                                </listitem>
                                <listitem>
-                                       <para><varname>regular_blocking</varname> This is a true/false constraint flag set on the table to denote that the tiles do not overlap, are of the same alignment, pixel size, srid etc. It is not really validated but just taken as a given so should be used for informational.  In the future we plan to properly constrain this so that this information is guaranteed to be right when it returns <varname>true</varname></para>
+                                       <para><varname>regular_blocking</varname> If the raster column has the spatially unique and coverage tile constraints, the value with be TRUE.  Otherwise, it will be FALSE.</para>
                                </listitem>
                                <listitem>
                                        <para><varname>num_bands</varname> The number of bands in each tile of your raster set.  This is the same information as what is provided by <xref linkend="RT_ST_NumBands" /></para>

diff --git a/raster/loader/raster2pgsql.c b/raster/loader/raster2pgsql.c
index b218660e5480940be305b1912bf04e6975f6cd99..c355e2ad419b2216ad7584f1283292b804209a18 100644 (file)
--- a/raster/loader/raster2pgsql.c
+++ b/raster/loader/raster2pgsql.c
@@ -397,8 +397,8 @@ usage() {
                "      if one or more rasters violate the constraint.\n"
                "  -x  Disable setting the max extent constraint.  Only applied if\n"
                "      -C flag is also used.\n"
-               "  -r  Set the regular blocking constraint.  Only applied if -C flag is\n"
-               "      also used.\n"
+               "  -r  Set the constraints (spatially unique and coverage tile) for\n"
+               "      regular blocking.  Only applied if -C flag is also used.\n"
        ));
        printf(_(
                "  -T <tablespace> Specify the tablespace for the new table.\n"