From 10162a38a8d4947fb8b0b12496e2a530caf46e29 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Fri, 14 Dec 2012 20:27:54 +0000 Subject: [PATCH] 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 --- doc/reference_raster.xml | 8 +++----- doc/using_raster_dataman.xml | 4 ++-- raster/loader/raster2pgsql.c | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml index baae1e348..07c48e0b5 100644 --- a/doc/reference_raster.xml +++ b/doc/reference_raster.xml @@ -452,7 +452,7 @@ VALUES (1, same_alignment=true boolean - regular_blocking=true + regular_blocking=false boolean num_bands=true @@ -490,7 +490,7 @@ VALUES (1, num_bands number of bands pixel_types reads array of pixel types for each band ensure all band n have same pixel type - regular_blocking apply informational flag to denote all tiles are regularly blocked + regular_blocking sets spatially unique (no two rasters can be spatially the same) and coverage tile (raster is aligned to a coverage) constraints same_alignment ensures they all have same alignment meaning any two tiles you compare will return true for. Refer to srid ensures all have same srid More -- any listed as inputs into the above functions @@ -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 @@ -635,7 +633,7 @@ NOTICE: Adding blocksize-Y constraint same_alignment=true boolean - regular_blocking=true + regular_blocking=false boolean num_bands=true diff --git a/doc/using_raster_dataman.xml b/doc/using_raster_dataman.xml index 572950b17..d3a1dd38b 100644 --- a/doc/using_raster_dataman.xml +++ b/doc/using_raster_dataman.xml @@ -112,7 +112,7 @@ -r - 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. @@ -471,7 +471,7 @@ Available GDAL raster formats: same_alignment A boolean that is true if all the raster tiles have the same alignment . Refer to for more details. - regular_blocking 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 true + regular_blocking If the raster column has the spatially unique and coverage tile constraints, the value with be TRUE. Otherwise, it will be FALSE. num_bands The number of bands in each tile of your raster set. This is the same information as what is provided by diff --git a/raster/loader/raster2pgsql.c b/raster/loader/raster2pgsql.c index b218660e5..c355e2ad4 100644 --- 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 Specify the tablespace for the new table.\n" -- 2.40.0