From 19c5577f528c8b96ff909b9fb8ffb9a591e56219 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Sat, 11 Jun 2011 19:06:15 +0000 Subject: [PATCH] Removed the ST_SummaryStats wrappers: ST_Sum, ST_Mean, ST_Stddev, ST_MinMax. Only ST_Count is preserved as it has a shortcut for when "exclude_nodata_value" is FALSE. Refactored regression test for rt_transform due to removal of some ST_SummaryStats wrappers and make the tests no longer about being exact to specific values but more about being in the appropriate contexts. Associated ticket is #1005 and to some degree, #985. git-svn-id: http://svn.osgeo.org/postgis/trunk@7375 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/rtpostgis.sql.in.c | 252 ------------- raster/test/regress/Makefile.in | 4 - raster/test/regress/rt_mean.sql | 94 ----- raster/test/regress/rt_mean_expected | 11 - raster/test/regress/rt_minmax.sql | 93 ----- raster/test/regress/rt_minmax_expected | 10 - raster/test/regress/rt_stddev.sql | 93 ----- raster/test/regress/rt_stddev_expected | 11 - raster/test/regress/rt_sum.sql | 95 ----- raster/test/regress/rt_sum_expected | 11 - raster/test/regress/rt_transform.sql | 423 ++++++++++++---------- raster/test/regress/rt_transform_expected | 18 +- 12 files changed, 243 insertions(+), 872 deletions(-) delete mode 100644 raster/test/regress/rt_mean.sql delete mode 100644 raster/test/regress/rt_mean_expected delete mode 100644 raster/test/regress/rt_minmax.sql delete mode 100644 raster/test/regress/rt_minmax_expected delete mode 100644 raster/test/regress/rt_stddev.sql delete mode 100644 raster/test/regress/rt_stddev_expected delete mode 100644 raster/test/regress/rt_sum.sql delete mode 100644 raster/test/regress/rt_sum_expected diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c index ff735094b..adf92c3e6 100644 --- a/raster/rt_pg/rtpostgis.sql.in.c +++ b/raster/rt_pg/rtpostgis.sql.in.c @@ -575,258 +575,6 @@ CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, s AS $$ SELECT _st_count($1, $2, 1, TRUE, $3) $$ LANGUAGE 'SQL' STABLE STRICT; ------------------------------------------------------------------------ --- ST_Sum and ST_ApproxSum ------------------------------------------------------------------------ -CREATE OR REPLACE FUNCTION st_sum(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, $3, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_sum(rast raster, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, 1, $2, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rast raster, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, TRUE, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rast raster, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, 1, $2, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rast raster, sample_percent double precision) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, 1, TRUE, $2) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, 1, $3, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4, $5) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, $3, TRUE, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, 1, $3, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, sample_percent double precision) - RETURNS double precision - AS $$ SELECT sum FROM st_summarystats($1, $2, 1, TRUE, $3) $$ - LANGUAGE 'SQL' STABLE STRICT; - ------------------------------------------------------------------------ --- ST_Mean and ST_ApproxMean ------------------------------------------------------------------------ -CREATE OR REPLACE FUNCTION st_mean(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, $3, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_mean(rast raster, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, 1, $2, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rast raster, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, TRUE, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rast raster, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, 1, $2, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rast raster, sample_percent double precision) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, 1, TRUE, $2) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, 1, $3, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4, $5) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, $3, TRUE, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, 1, $3, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, sample_percent double precision) - RETURNS double precision - AS $$ SELECT mean FROM st_summarystats($1, $2, 1, TRUE, $3) $$ - LANGUAGE 'SQL' STABLE STRICT; - ------------------------------------------------------------------------ --- ST_StdDev and ST_ApproxStdDev ------------------------------------------------------------------------ -CREATE OR REPLACE FUNCTION st_stddev(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_stddev(rast raster, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, 1, $2, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, TRUE, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, 1, $2, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, sample_percent double precision) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, 1, TRUE, $2) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, exclude_nodata_value boolean) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, $3, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4, $5) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, nband int, sample_percent double precision) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, TRUE, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, $3, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, sample_percent double precision) - RETURNS double precision - AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, TRUE, $3) $$ - LANGUAGE 'SQL' STABLE STRICT; - ------------------------------------------------------------------------ --- ST_MinMax and ST_ApproxMinMax ------------------------------------------------------------------------ -CREATE OR REPLACE FUNCTION st_minmax(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_minmax(rast raster, exclude_nodata_value boolean, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, 1, $2, 1) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, nband int, sample_percent double precision, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, TRUE, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, 1, $2, $3) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, sample_percent double precision, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, 1, TRUE, $2) $$ - LANGUAGE 'SQL' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, exclude_nodata_value boolean, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, $3, 1) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, nband int DEFAULT 1, exclude_nodata_value boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4, $5) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, TRUE, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, exclude_nodata_value boolean, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, $3, $4) $$ - LANGUAGE 'SQL' STABLE STRICT; - -CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, sample_percent double precision, OUT min double precision, OUT max double precision) - RETURNS record - AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, TRUE, $3) $$ - LANGUAGE 'SQL' STABLE STRICT; - ----------------------------------------------------------------------- -- ST_Histogram and ST_ApproxHistogram ----------------------------------------------------------------------- diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in index 187a27048..998d99766 100644 --- a/raster/test/regress/Makefile.in +++ b/raster/test/regress/Makefile.in @@ -70,10 +70,6 @@ TEST_BANDPROPS = \ rt_set_band_properties.sql \ rt_summarystats.sql \ rt_count.sql \ - rt_sum.sql \ - rt_mean.sql \ - rt_stddev.sql \ - rt_minmax.sql \ rt_histogram.sql \ rt_quantile.sql \ rt_valuecount.sql \ diff --git a/raster/test/regress/rt_mean.sql b/raster/test/regress/rt_mean.sql deleted file mode 100644 index 0186738d0..000000000 --- a/raster/test/regress/rt_mean.sql +++ /dev/null @@ -1,94 +0,0 @@ -SELECT round(ST_Mean( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1, TRUE -)::numeric, 3); -SELECT round(ST_Mean( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1 -)::numeric, 3); -SELECT round(ST_Mean( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , FALSE -)::numeric, 3); -SELECT round(ST_Mean( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) -)::numeric, 3); -BEGIN; -CREATE TEMP TABLE test - ON COMMIT DROP AS - SELECT - rast.rast - FROM ( - SELECT ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) AS rast - ) AS rast - FULL JOIN ( - SELECT generate_series(1, 10) AS id - ) AS id - ON 1 = 1; -SELECT round(ST_Mean('test', 'rast', 1, TRUE)::numeric, 3); -SELECT round(ST_Mean('test', 'rast', 1, FALSE)::numeric, 3); -SELECT round(ST_Mean('test', 'rast', 1)::numeric, 3); -SELECT round(ST_Mean('test', 'rast', FALSE)::numeric, 3); -SELECT round(ST_Mean('test', 'rast')::numeric, 3); -ROLLBACK; - diff --git a/raster/test/regress/rt_mean_expected b/raster/test/regress/rt_mean_expected deleted file mode 100644 index f8e2229f7..000000000 --- a/raster/test/regress/rt_mean_expected +++ /dev/null @@ -1,11 +0,0 @@ --3.429 --3.429 --0.069 --3.429 -BEGIN --3.429 --0.069 --3.429 --0.069 --3.429 -COMMIT diff --git a/raster/test/regress/rt_minmax.sql b/raster/test/regress/rt_minmax.sql deleted file mode 100644 index e5ddbcf6f..000000000 --- a/raster/test/regress/rt_minmax.sql +++ /dev/null @@ -1,93 +0,0 @@ -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , TRUE -); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , FALSE -); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ), - 1, TRUE -); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ), - 1 -); -BEGIN; -CREATE TEMP TABLE test - ON COMMIT DROP AS - SELECT - rast.rast - FROM ( - SELECT ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) AS rast - ) AS rast - FULL JOIN ( - SELECT generate_series(1, 10) AS id - ) AS id - ON 1 = 1; -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax('test', 'rast', 1, TRUE); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax('test', 'rast', 1, FALSE); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax('test', 'rast', 1); -SELECT round(min::numeric, 3), round(max::numeric, 3) FROM ST_MinMax('test', 'rast'); -ROLLBACK; diff --git a/raster/test/regress/rt_minmax_expected b/raster/test/regress/rt_minmax_expected deleted file mode 100644 index 51bcc6b62..000000000 --- a/raster/test/regress/rt_minmax_expected +++ /dev/null @@ -1,10 +0,0 @@ --10.000|3.142 --10.000|3.142 --10.000|3.142 --10.000|3.142 -BEGIN --10.000|3.142 --10.000|3.142 --10.000|3.142 --10.000|3.142 -COMMIT diff --git a/raster/test/regress/rt_stddev.sql b/raster/test/regress/rt_stddev.sql deleted file mode 100644 index 68fbe0fad..000000000 --- a/raster/test/regress/rt_stddev.sql +++ /dev/null @@ -1,93 +0,0 @@ -SELECT round(ST_StdDev( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1, TRUE -)::numeric, 3); -SELECT round(ST_StdDev( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1 -)::numeric, 3); -SELECT round(ST_StdDev( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , FALSE -)::numeric, 3); -SELECT round(ST_StdDev( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) -)::numeric, 3); -BEGIN; -CREATE TEMP TABLE test - ON COMMIT DROP AS - SELECT - rast.rast - FROM ( - SELECT ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) AS rast - ) AS rast - FULL JOIN ( - SELECT generate_series(1, 10) AS id - ) AS id - ON 1 = 1; -SELECT round(ST_StdDev('test', 'rast', 1, TRUE)::numeric, 3); -SELECT round(ST_StdDev('test', 'rast', 1, FALSE)::numeric, 3); -SELECT round(ST_StdDev('test', 'rast', 1)::numeric, 3); -SELECT round(ST_StdDev('test', 'rast', FALSE)::numeric, 3); -SELECT round(ST_StdDev('test', 'rast')::numeric, 3); -ROLLBACK; diff --git a/raster/test/regress/rt_stddev_expected b/raster/test/regress/rt_stddev_expected deleted file mode 100644 index a129db2ed..000000000 --- a/raster/test/regress/rt_stddev_expected +++ /dev/null @@ -1,11 +0,0 @@ -6.571 -6.571 -1.046 -6.571 -BEGIN -6.571 -1.046 -6.571 -1.046 -6.571 -COMMIT diff --git a/raster/test/regress/rt_sum.sql b/raster/test/regress/rt_sum.sql deleted file mode 100644 index 33e46af7a..000000000 --- a/raster/test/regress/rt_sum.sql +++ /dev/null @@ -1,95 +0,0 @@ -SELECT round(ST_Sum( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1, TRUE -)::numeric, 3); -SELECT round(ST_Sum( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1 -)::numeric, 3); -SELECT round(ST_Sum( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , FALSE -)::numeric, 3); -SELECT round(ST_Sum( - ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) -)::numeric, 3); - -BEGIN; -CREATE TEMP TABLE test - ON COMMIT DROP AS - SELECT - rast.rast - FROM ( - SELECT ST_SetValue( - ST_SetValue( - ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, 10, 10, 2, 2, 0, 0,-1) - , 1, '64BF', 0, 0 - ) - , 1, 1, 1, -10 - ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) AS rast - ) AS rast - FULL JOIN ( - SELECT generate_series(1, 10) AS id - ) AS id - ON 1 = 1; -SELECT round(ST_Sum('test', 'rast', 1, TRUE)::numeric, 3); -SELECT round(ST_Sum('test', 'rast', 1, FALSE)::numeric, 3); -SELECT round(ST_Sum('test', 'rast', 1)::numeric, 3); -SELECT round(ST_Sum('test', 'rast', TRUE)::numeric, 3); -SELECT round(ST_Sum('test', 'rast')::numeric, 3); -ROLLBACK; - diff --git a/raster/test/regress/rt_sum_expected b/raster/test/regress/rt_sum_expected deleted file mode 100644 index db22b9453..000000000 --- a/raster/test/regress/rt_sum_expected +++ /dev/null @@ -1,11 +0,0 @@ --6.858 --6.858 --6.858 --6.858 -BEGIN --68.584 --68.584 --68.584 --68.584 --68.584 -COMMIT diff --git a/raster/test/regress/rt_transform.sql b/raster/test/regress/rt_transform.sql index d600f1f7d..20a86b8fe 100644 --- a/raster/test/regress/rt_transform.sql +++ b/raster/test/regress/rt_transform.sql @@ -5,230 +5,275 @@ INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4tex INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (1004269,'EPSG',4269,'GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]]','+proj=longlat +ellps=GRS80 +datum=NAD83 +no_defs '); END; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310) AS rast -) foo; + , 1003310 + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003309) AS rast -) foo; + , 1003309 + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1003310) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1004269) AS rast -) foo; + , 1004269 + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310, NULL) AS rast -) foo; + , 1003310, NULL + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310, 'Bilinear') AS rast -) foo; + , 1003310, 'Bilinear' + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310, 'Bilinear', NULL) AS rast -) foo; + , 1003310, 'Bilinear', NULL + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310, 'Cubic', 0.0) AS rast -) foo; + , 1003310, 'Cubic', 0.0 + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1003309) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003310, 'NearestNeighbour', 0.0) AS rast -) foo; + , 1003310, 'NearestNeighbour', 0.0 + ) AS rast + ) foo +) bar; SELECT - ST_SRID(rast), - ST_Width(rast), - ST_Height(rast), - ST_NumBands(rast), - round(ST_ScaleX(rast)::numeric, 3), - round(ST_ScaleY(rast)::numeric, 3), - ST_Count(rast), - round(ST_Mean(rast)::numeric, 3) -FROM (SELECT ST_Transform( - ST_SetValue( - ST_SetValue( + srid, + width > 0, + height > 0, + numbands, + round(scalex::numeric, 3) > 0, + round(scaley::numeric, 3) > 0, + count > 0, + min >= -10, + max <= 3.14159 +FROM ( + SELECT foo.rast, (st_summarystats(foo.rast)).*, (st_metadata(foo.rast)).* FROM ( + SELECT ST_Transform( ST_SetValue( - ST_AddBand( - ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1003310) - , 1, '64BF', 0, 0 + ST_SetValue( + ST_SetValue( + ST_AddBand( + ST_MakeEmptyRaster(10, 10, -500000, 600000, 1000, 1000, 0, 0, 1002163) + , 1, '64BF', 0, 0 + ) + , 1, 1, 1, -10 + ) + , 1, 5, 4, 0 ) - , 1, 1, 1, -10 + , 1, 5, 5, 3.14159 ) - , 1, 5, 4, 0 - ) - , 1, 5, 5, 3.14159 - ) - , 1003309, 'NearestNeighbor', 0.0) AS rast -) foo; + , 1003310, 'NearestNeighbor', 0.0 + ) AS rast + ) foo +) bar; BEGIN; DELETE FROM "spatial_ref_sys" WHERE srid = 1002163; DELETE FROM "spatial_ref_sys" WHERE srid = 1003309; diff --git a/raster/test/regress/rt_transform_expected b/raster/test/regress/rt_transform_expected index 73c0ef3bb..8914453d8 100644 --- a/raster/test/regress/rt_transform_expected +++ b/raster/test/regress/rt_transform_expected @@ -1,13 +1,13 @@ BEGIN COMMIT -1003310|12|12|1|995.262|-995.262|2|-3.429 -1003309|12|12|1|995.277|-995.277|2|-3.429 -1004269|12|9|1|0.011|-0.011|1|-10.000 -||||||| -1003310|12|12|1|995.262|-995.262|7|-1.427 -||||||| -1003310|12|12|1|995.262|-995.262|20|-0.515 -1003310|10|10|1|1000.006|-1000.006|2|-3.429 -1003309|10|10|1|999.994|-999.994|2|-3.429 +1003310|t|t|1|t|f|t|t|t +1003309|t|t|1|t|f|t|t|t +1004269|t|t|1|t|f|t|t|t +|||||||| +1003310|t|t|1|t|f|t|t|t +|||||||| +1003310|t|t|1|t|f|t|t|t +1003310|t|t|1|t|f|t|t|t +1003310|t|t|1|t|f|t|t|t BEGIN COMMIT -- 2.50.1