From: Pierre Racine Date: Mon, 13 Feb 2012 15:43:16 +0000 (+0000) Subject: Fix regression broken by the limit imposed to SRID < 999999. Anyway the srid provided... X-Git-Tag: 2.0.0alpha5~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4590827ad170f8f725a59682fcf510b2d1e744b;p=postgis Fix regression broken by the limit imposed to SRID < 999999. Anyway the srid provided was not the right one. Changed from 4269 to 26919. git-svn-id: http://svn.osgeo.org/postgis/trunk@9169 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/raster/test/regress/create_rt_band_properties_test.sql b/raster/test/regress/create_rt_band_properties_test.sql index 3cd4f8a18..fd756685a 100644 --- a/raster/test/regress/create_rt_band_properties_test.sql +++ b/raster/test/regress/create_rt_band_properties_test.sql @@ -52,7 +52,7 @@ VALUES ( 1, '1x1, nbband:2 b1pixeltype:4BUI b1hasnodatavalue:true b1nodatavalue: || '0000000000000840' -- skewY (float64 3) || -'E6100000' -- SRID (int32 4326) +'27690000' -- SRID (int32 26919 - UTM 19N) || '0100' -- width (uint16 1) || diff --git a/raster/test/regress/create_rt_utility_test.sql b/raster/test/regress/create_rt_utility_test.sql index b37ee9813..3ad290925 100644 --- a/raster/test/regress/create_rt_utility_test.sql +++ b/raster/test/regress/create_rt_utility_test.sql @@ -30,7 +30,7 @@ CREATE TABLE rt_utility_test ( INSERT INTO rt_utility_test VALUES ( 1, '1217x1156, ip:782325.5,26744042.5 scale:5,-5 skew:0,0 srid:9102707 width:1217 height:1156', - 9102707, 1217, 1156, --- SRID, width, height + 26919, 1217, 1156, --- SRID, width, height 5, -5, 782325.5, 26744042.5, 0, 0, --- georeference ( '01' -- little endian (uint8 ndr) @@ -51,7 +51,7 @@ VALUES ( 1, '1217x1156, ip:782325.5,26744042.5 scale:5,-5 skew:0,0 srid:9102707 || '0000000000000000' -- skewY (float64 0) || -'73E58A00' -- SRID (int32 9102707) +'27690000' -- SRID (int32 26919 - UTM 19N) || 'C104' -- width (uint16 1217) || @@ -61,7 +61,7 @@ VALUES ( 1, '1217x1156, ip:782325.5,26744042.5 scale:5,-5 skew:0,0 srid:9102707 INSERT INTO rt_utility_test VALUES ( 2, '1217x1156, ip:782325.5,26744042.5 scale:5,-5 skew:3,3 srid:9102707 width:1217 height:1156', - 9102707, 1217, 1156, --- SRID, width, height + 26919, 1217, 1156, --- SRID, width, height 5, -5, 782325.5, 26744042.5, 3, 3, --- georeference ( '01' -- little endian (uint8 ndr) @@ -82,7 +82,7 @@ VALUES ( 2, '1217x1156, ip:782325.5,26744042.5 scale:5,-5 skew:3,3 srid:9102707 || '0000000000000840' -- skewY (float64 3) || -'73E58A00' -- SRID (int32 9102707) +'27690000' -- SRID (int32 26919 - UTM 19N) || 'C104' -- width (uint16 1217) || diff --git a/raster/test/regress/rt_spatial_relationship.sql b/raster/test/regress/rt_spatial_relationship.sql index b6f0705b7..4fc9276ce 100644 --- a/raster/test/regress/rt_spatial_relationship.sql +++ b/raster/test/regress/rt_spatial_relationship.sql @@ -48,7 +48,7 @@ VALUES ( 1, '1x1, nbband:2 b1pixeltype:4BUI b1hasnodatavalue:true b1nodatavalue: || '0000000000000840' -- skewY (float64 3) || -'AD100000' -- SRID (int32 4269) +'27690000' -- SRID (int32 26919 - UTM 19N) || '0200' -- width (uint16 1) || @@ -142,58 +142,58 @@ CREATE TABLE rt_spatial_relationship_test_geom ( -- Insert points for raster no 1 INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 1, 1, st_setsrid(st_makepoint(782325.5, 26744042.5), 4269)); +VALUES ( 1, 1, st_setsrid(st_makepoint(782325.5, 26744042.5), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 2, 1, st_setsrid(st_makepoint(782325.5 + 1, 26744042.5), 4269)); +VALUES ( 2, 1, st_setsrid(st_makepoint(782325.5 + 1, 26744042.5), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 3, 1, st_setsrid(st_makepoint(782325.5 + 10, 26744042.5 + 10), 4269)); +VALUES ( 3, 1, st_setsrid(st_makepoint(782325.5 + 10, 26744042.5 + 10), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 4, 1, st_setsrid(st_makepoint(782325.5 + 10, 26744042.5 - 2), 4269)); +VALUES ( 4, 1, st_setsrid(st_makepoint(782325.5 + 10, 26744042.5 - 2), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 5, 1, st_setsrid(st_makepoint(782325.5 + 5 + 3, 26744042.5 - 5 + 3), 4269)); +VALUES ( 5, 1, st_setsrid(st_makepoint(782325.5 + 5 + 3, 26744042.5 - 5 + 3), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 6, 1, st_setsrid(st_makepoint(782325.5 + 2*5 + 0.5*3, 26744042.5 + 2*3 - 0.5*5), 4269)); +VALUES ( 6, 1, st_setsrid(st_makepoint(782325.5 + 2*5 + 0.5*3, 26744042.5 + 2*3 - 0.5*5), 26919)); INSERT INTO rt_spatial_relationship_test_geom -VALUES ( 7, 1, st_setsrid(st_makepoint(782325.5 + 1, 26744042.5 - 3), 4269)); +VALUES ( 7, 1, st_setsrid(st_makepoint(782325.5 + 1, 26744042.5 - 3), 26919)); -- Insert lines for raster no 1 INSERT INTO rt_spatial_relationship_test_geom VALUES ( 11, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 1, 26744042.5 + 1), - st_makepoint(782325.5 + 11, 26744042.5 + 11)]), 4269)); + st_makepoint(782325.5 + 11, 26744042.5 + 11)]), 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 12, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 - 1, 26744042.5 - 2), - st_makepoint(782325.5 + 5, 26744042.5 + 4)]), 4269)); + st_makepoint(782325.5 + 5, 26744042.5 + 4)]), 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 13, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5, 26744042.5 - 10), - st_makepoint(782325.5 + 18, 26744042.5 - 2)]), 4269)); + st_makepoint(782325.5 + 18, 26744042.5 - 2)]), 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 14, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 13, 26744042.5 - 3), - st_makepoint(782325.5 + 18, 26744042.5 - 1)]), 4269)); + st_makepoint(782325.5 + 18, 26744042.5 - 1)]), 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 15, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 2*5 - 0.3*3, 26744042.5 + 2*3 + 0.3*5), st_makepoint(782325.5 + 2*5 + 0.5*3, 26744042.5 + 2*3 - 0.5*5) ]), - 4269)); + 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 16, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 2*5 + 1.5*3, 26744042.5 + 2*3 - 1.5*5), st_makepoint(782325.5 + 2*5 + 2.5*3, 26744042.5 + 2*3 - 2.5*5) ]), - 4269)); + 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 17, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 2*5 + 1.0*3, 26744042.5 + 2*3 - 1.0*5), st_makepoint(782325.5 + 2*5 + 1.5*3, 26744042.5 + 2*3 - 1.5*5) ]), - 4269)); + 26919)); INSERT INTO rt_spatial_relationship_test_geom VALUES ( 18, 1, st_setsrid(st_makeline(ARRAY[st_makepoint(782325.5 + 4, 26744042.5 - 8), - st_makepoint(782325.5 + 7, 26744042.5 + 6)]), 4269)); + st_makepoint(782325.5 + 7, 26744042.5 + 6)]), 26919)); -- Insert points for raster no 2