Commit 0b19048c authored by Bborie Park's avatar Bborie Park

Renamed variants of ST_World2RasterCoord() and ST_Raster2WorldCoord() to

ST_WorldToRasterCoord() and ST_RasterToWorldCoord() as names are
inconsistent with other PostGIS function names. Ticket #2104

git-svn-id: http://svn.osgeo.org/postgis/trunk@10740 b70326c6-7e19-0410-871a-916f4a2858ee
parent 5699c380
......@@ -19,6 +19,11 @@ PostGIS 2.1.0
Use ST_MapAlgebra instead
- 1 and 2 raster variants of ST_MapAlgebraExpr.
Use expression variants of ST_MapAlgebra instead
- #2104, ST_World2RasterCoord, ST_World2RasterCoordX and
ST_World2RasterCoordY renamed to ST_WorldToRasterCoord,
ST_WorldToRasterCoordX and ST_WorldToRasterCoordY. ST_Raster2WorldCoord,
ST_Raster2WorldCoordX and ST_Raster2WorldCoordY renamed to
ST_RasterToWorldCoord, ST_RasterToWorldCoordX and ST_RasterToWorldCoordY
* New Features *
......
This diff is collapsed.
This diff is collapsed.
......@@ -356,8 +356,8 @@ DROP FUNCTION IF EXISTS st_intersects(raster, integer, raster, integer);
DROP FUNCTION IF EXISTS st_intersects(raster, raster);
-- functions have changed dramatically
DROP FUNCTION IF EXISTS st_intersection(rast raster, band integer, geom geometry);
DROP FUNCTION IF EXISTS st_intersection(rast raster, geom geometry);
DROP FUNCTION IF EXISTS st_intersection(raster, integer, geometry);
DROP FUNCTION IF EXISTS st_intersection(raster, geometry);
-- function was renamed
DROP FUNCTION IF EXISTS st_minpossibleval(text);
......@@ -450,3 +450,20 @@ DROP FUNCTION IF EXISTS st_tile(raster, integer, integer, integer);
-- function signatures changed
DROP FUNCTION IF EXISTS st_setvalue(raster, integer, geometry, double precision);
DROP FUNCTION IF EXISTS st_setvalue(raster, geometry, double precision);
-- function name change
DROP FUNCTION IF EXISTS st_world2rastercoord(raster, double precision, double precision);
DROP FUNCTION IF EXISTS st_world2rastercoord(raster, geometry);
DROP FUNCTION IF EXISTS _st_world2rastercoord(raster, double precision, double precision);
DROP FUNCTION IF EXISTS st_world2rastercoordx(raster, float8, float8);
DROP FUNCTION IF EXISTS st_world2rastercoordx(raster, float8);
DROP FUNCTION IF EXISTS st_world2rastercoordx(raster, geometry);
DROP FUNCTION IF EXISTS st_world2rastercoordy(raster, float8, float8);
DROP FUNCTION IF EXISTS st_world2rastercoordy(raster, float8);
DROP FUNCTION IF EXISTS st_world2rastercoordy(raster, geometry);
DROP FUNCTION IF EXISTS st_raster2worldcoord( raster, integer, integer);
DROP FUNCTION IF EXISTS _st_raster2worldcoord(raster, integer, integer);
DROP FUNCTION IF EXISTS st_raster2worldcoordx(raster, int, int);
DROP FUNCTION IF EXISTS st_raster2worldcoordx(raster, int);
DROP FUNCTION IF EXISTS st_raster2worldcoordy(raster, int, int);
DROP FUNCTION IF EXISTS st_raster2worldcoordy(raster, int);
......@@ -57,8 +57,8 @@ TEST_PROPS = \
rt_isempty \
rt_hasnoband \
rt_metadata \
rt_raster2worldcoord \
rt_world2rastercoord
rt_rastertoworldcoord \
rt_worldtorastercoord
TEST_BANDPROPS = \
rt_band_properties \
......
......@@ -34,8 +34,8 @@ DROP FUNCTION make_test_raster();
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsCentroids(rast) AS pix FROM raster_pixelascentroids) foo
......@@ -44,8 +44,8 @@ ORDER BY 1, 2, 3, 4, 6;
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsCentroids(rast, NULL) AS pix FROM raster_pixelascentroids) foo
......@@ -54,8 +54,8 @@ ORDER BY 1, 2, 3, 4, 6;
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsCentroids(rast, 1, FALSE) AS pix FROM raster_pixelascentroids) foo
......
......@@ -34,8 +34,8 @@ DROP FUNCTION make_test_raster();
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsPoints(rast) AS pix FROM raster_pixelaspoints) foo
......@@ -44,8 +44,8 @@ ORDER BY 1, 2, 3, 4, 6;
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsPoints(rast, NULL) AS pix FROM raster_pixelaspoints) foo
......@@ -54,8 +54,8 @@ ORDER BY 1, 2, 3, 4, 6;
SELECT
(pix).x,
(pix).y,
ST_Raster2WorldCoordX(rast, (pix).x, (pix).y),
ST_Raster2WorldCoordY(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordX(rast, (pix).x, (pix).y),
ST_RasterToWorldCoordY(rast, (pix).x, (pix).y),
(pix).val,
ST_AsText((pix).geom)
FROM (SELECT rast, ST_PixelAsPoints(rast, 1, FALSE) AS pix FROM raster_pixelaspoints) foo
......
......@@ -47,107 +47,107 @@ DROP FUNCTION make_test_raster(integer, integer, integer, double precision, doub
SELECT
rid,
(ST_Raster2WorldCoord(rast, 1, 1)).*
(ST_RasterToWorldCoord(rast, 1, 1)).*
FROM raster_raster2world;
SELECT
rid,
(ST_Raster2WorldCoord(rast, 1, 2)).*
(ST_RasterToWorldCoord(rast, 1, 2)).*
FROM raster_raster2world;
SELECT
rid,
(ST_Raster2WorldCoord(rast, 2, 2)).*
(ST_RasterToWorldCoord(rast, 2, 2)).*
FROM raster_raster2world;
SELECT
rid,
(ST_Raster2WorldCoord(rast, 0, 0)).*
(ST_RasterToWorldCoord(rast, 0, 0)).*
FROM raster_raster2world;
SELECT
rid,
(ST_Raster2WorldCoord(rast, -1, 0)).*
(ST_RasterToWorldCoord(rast, -1, 0)).*
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 1, 1)
ST_RasterToWorldCoordX(rast, 1, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 1, 2)
ST_RasterToWorldCoordX(rast, 1, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 2, 2)
ST_RasterToWorldCoordX(rast, 2, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 0, 0)
ST_RasterToWorldCoordX(rast, 0, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, -1, 0)
ST_RasterToWorldCoordX(rast, -1, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 1)
ST_RasterToWorldCoordX(rast, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 1)
ST_RasterToWorldCoordX(rast, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 2)
ST_RasterToWorldCoordX(rast, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, 0)
ST_RasterToWorldCoordX(rast, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordX(rast, -1)
ST_RasterToWorldCoordX(rast, -1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 1, 1)
ST_RasterToWorldCoordY(rast, 1, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 1, 2)
ST_RasterToWorldCoordY(rast, 1, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 2, 2)
ST_RasterToWorldCoordY(rast, 2, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 0, 0)
ST_RasterToWorldCoordY(rast, 0, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, -1, 0)
ST_RasterToWorldCoordY(rast, -1, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 1)
ST_RasterToWorldCoordY(rast, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 1)
ST_RasterToWorldCoordY(rast, 1)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 2)
ST_RasterToWorldCoordY(rast, 2)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, 0)
ST_RasterToWorldCoordY(rast, 0)
FROM raster_raster2world;
SELECT
rid,
ST_Raster2WorldCoordY(rast, -1)
ST_RasterToWorldCoordY(rast, -1)
FROM raster_raster2world;
DROP TABLE raster_raster2world;
This diff is collapsed.
......@@ -47,138 +47,138 @@ DROP FUNCTION make_test_raster(integer, integer, integer, double precision, doub
SELECT
rid,
(ST_World2RasterCoord(rast, -2, -2)).*
(ST_WorldToRasterCoord(rast, -2, -2)).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, 0, 0)).*
(ST_WorldToRasterCoord(rast, 0, 0)).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, 1, -1)).*
(ST_WorldToRasterCoord(rast, 1, -1)).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, 1, 1)).*
(ST_WorldToRasterCoord(rast, 1, 1)).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, 2, 2)).*
(ST_WorldToRasterCoord(rast, 2, 2)).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, ST_MakePoint(-2, -2))).*
(ST_WorldToRasterCoord(rast, ST_MakePoint(-2, -2))).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, ST_MakePoint(0, 0))).*
(ST_WorldToRasterCoord(rast, ST_MakePoint(0, 0))).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, ST_MakePoint(1, -1))).*
(ST_WorldToRasterCoord(rast, ST_MakePoint(1, -1))).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, ST_MakePoint(1, 1))).*
(ST_WorldToRasterCoord(rast, ST_MakePoint(1, 1))).*
FROM raster_world2raster;
SELECT
rid,
(ST_World2RasterCoord(rast, ST_MakePoint(2, 2))).*
(ST_WorldToRasterCoord(rast, ST_MakePoint(2, 2))).*
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, -2, -2)
ST_WorldToRasterCoordX(rast, -2, -2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 0, 0)
ST_WorldToRasterCoordX(rast, 0, 0)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 1, -1)
ST_WorldToRasterCoordX(rast, 1, -1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 1, 1)
ST_WorldToRasterCoordX(rast, 1, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 2, 2)
ST_WorldToRasterCoordX(rast, 2, 2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, ST_MakePoint(-2, -2))
ST_WorldToRasterCoordX(rast, ST_MakePoint(-2, -2))
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, -2)
ST_WorldToRasterCoordX(rast, -2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 0)
ST_WorldToRasterCoordX(rast, 0)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 1)
ST_WorldToRasterCoordX(rast, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 1)
ST_WorldToRasterCoordX(rast, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, 2)
ST_WorldToRasterCoordX(rast, 2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, -2, -2)
ST_WorldToRasterCoordY(rast, -2, -2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 0, 0)
ST_WorldToRasterCoordY(rast, 0, 0)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 1, -1)
ST_WorldToRasterCoordY(rast, 1, -1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 1, 1)
ST_WorldToRasterCoordY(rast, 1, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 2, 2)
ST_WorldToRasterCoordY(rast, 2, 2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordX(rast, ST_MakePoint(-2, -2))
ST_WorldToRasterCoordX(rast, ST_MakePoint(-2, -2))
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, -2)
ST_WorldToRasterCoordY(rast, -2)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 0)
ST_WorldToRasterCoordY(rast, 0)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 1)
ST_WorldToRasterCoordY(rast, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 1)
ST_WorldToRasterCoordY(rast, 1)
FROM raster_world2raster;
SELECT
rid,
ST_World2RasterCoordY(rast, 2)
ST_WorldToRasterCoordY(rast, 2)
FROM raster_world2raster;
DROP TABLE raster_world2raster;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment