[postgis-tickets] r17841 - Turn rt_gdalwarp tests back on, removing grid shifts to account
Paul Ramsey
pramsey at cleverelephant.ca
Mon Sep 30 02:18:36 PDT 2019
Author: pramsey
Date: 2019-09-30 14:18:35 -0700 (Mon, 30 Sep 2019)
New Revision: 17841
Modified:
trunk/raster/test/regress/rt_gdalwarp.sql
trunk/raster/test/regress/rt_gdalwarp_expected
Log:
Turn rt_gdalwarp tests back on, removing grid shifts to account
for changes in Proj installed grids
Modified: trunk/raster/test/regress/rt_gdalwarp.sql
===================================================================
--- trunk/raster/test/regress/rt_gdalwarp.sql 2019-09-30 20:54:38 UTC (rev 17840)
+++ trunk/raster/test/regress/rt_gdalwarp.sql 2019-09-30 21:18:35 UTC (rev 17841)
@@ -36,14 +36,12 @@
DROP FUNCTION make_test_raster();
DELETE FROM "spatial_ref_sys" WHERE srid = 992163;
-DELETE FROM "spatial_ref_sys" WHERE srid = 993309;
DELETE FROM "spatial_ref_sys" WHERE srid = 993310;
DELETE FROM "spatial_ref_sys" WHERE srid = 994269;
DELETE FROM "spatial_ref_sys" WHERE srid = 984269;
DELETE FROM "spatial_ref_sys" WHERE srid = 974269;
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (992163,'EPSG',2163,'PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6370997,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",45],PARAMETER["longitude_of_center",-100],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1],AUTHORITY["EPSG","2163"]]','+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0 +a=6370997 +b=6370997 +units=m +no_defs ');
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (993309,'EPSG',3309,'PROJCS["NAD27 / California Albers",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3309"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +datum=NAD27 +units=m +no_defs');
+INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (992163,'EPSG',2163,'PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6370997,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",45],PARAMETER["longitude_of_center",-100],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1],AUTHORITY["EPSG","2163"]]','+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ');
INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (993310,'EPSG',3310,'PROJCS["NAD83 / California Albers",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"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3310"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ');
INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (994269,'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 ');
@@ -50,8 +48,6 @@
INSERT INTO "spatial_ref_sys" ("srid","auth_name","srtext","proj4text") VALUES (984269,'EPSG','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 ');
INSERT INTO "spatial_ref_sys" ("srid","srtext") VALUES (974269,'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"]]');
--- Take out some testing of srid 993309 since it fails on Proj.5 with GDAL 2.2.4, GDAL 2.3.0
--- See #4104. Put back after we start testing proj.5 and issue is fixed in proj.
-- _st_gdalwarp
INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
0.0, (SELECT _st_gdalwarp(
@@ -63,13 +59,13 @@
'NearestNeighbour', 0.125,
993310
) FROM raster_gdalwarp_src)
-), /**(
+), (
0.2, (SELECT _st_gdalwarp(
rast,
'NearestNeighbour', 0.125,
- 993309
+ 993310
) FROM raster_gdalwarp_src)
-),**/ (
+), (
0.3, (SELECT _st_gdalwarp(
rast,
'NearestNeighbour', 0.125,
@@ -183,7 +179,7 @@
0.17, (SELECT _st_gdalwarp(
rast,
'NearestNeighbor', 0.125,
- 993309,
+ 993310,
50., 50.,
-290, 7
) FROM raster_gdalwarp_src)
@@ -205,16 +201,16 @@
NULL, NULL,
3, 3
) FROM raster_gdalwarp_src)
-),/** (
+), (
0.20, (SELECT _st_gdalwarp(
rast,
'Bilinear', 0.125,
- 993309,
+ 993310,
NULL, NULL,
NULL, NULL,
1, 3
) FROM raster_gdalwarp_src)
-),**/ (
+), (
0.21, (SELECT _st_gdalwarp(
rast,
'Cubic', 0,
@@ -446,12 +442,12 @@
rast,
993310
) FROM raster_gdalwarp_src)
-),/** (
+), (
2.2, (SELECT ST_Transform(
rast,
- 993309
+ 993310
) FROM raster_gdalwarp_src)
-),**/ (
+), (
2.3, (SELECT ST_Transform(
rast,
994269
@@ -491,12 +487,12 @@
rast,
993310, 'NearestNeighbor', 0.125, 500, 500
) FROM raster_gdalwarp_src)
-),/** (
+), (
2.11, (SELECT ST_Transform(
rast,
- 993309, 'Cubic', 0., 100, 100
+ 993310, 'Cubic', 0., 100, 100
) FROM raster_gdalwarp_src)
-),**/ (
+), (
2.12, (SELECT ST_Transform(
rast,
993310, 'CubicSpline', 0., 2000, 2000
@@ -802,8 +798,8 @@
FROM baz;
DELETE FROM "spatial_ref_sys" WHERE srid = 992163;
-DELETE FROM "spatial_ref_sys" WHERE srid = 993309;
DELETE FROM "spatial_ref_sys" WHERE srid = 993310;
+DELETE FROM "spatial_ref_sys" WHERE srid = 993310;
DELETE FROM "spatial_ref_sys" WHERE srid = 994269;
DELETE FROM "spatial_ref_sys" WHERE srid = 984269;
DELETE FROM "spatial_ref_sys" WHERE srid = 974269;
Modified: trunk/raster/test/regress/rt_gdalwarp_expected
===================================================================
--- trunk/raster/test/regress/rt_gdalwarp_expected 2019-09-30 20:54:38 UTC (rev 17840)
+++ trunk/raster/test/regress/rt_gdalwarp_expected 2019-09-30 21:18:35 UTC (rev 17841)
@@ -16,9 +16,11 @@
0.14|992163|201|201|1|50.000|50.000|0.000|0.000|-500040.000|589957.000|t|t|t
0.15|992163|84|84|1|121.000|121.000|0.000|0.000|-500093.000|589875.000|t|t|t
0.16|993310|243|243|1|50.000|50.000|0.000|0.000|950710.000|1397157.000|t|t|t
-0.17|993309|243|243|1|50.000|50.000|0.000|0.000|950760.000|1396957.000|t|t|t
+0.17|993310|243|243|1|50.000|50.000|0.000|0.000|950710.000|1397157.000|t|t|t
0.18|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500030.000|600000.000|t|t|t
0.19|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950691.792|1409281.783|t|t|t
+0.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+0.20|993310|12|12|1|1009.894|-1009.894|1.000|3.000|950711.990|1409281.783|t|t|t
0.21|993310|24|24|1|500.000|500.000|3.000|3.000|950657.188|1397356.783|t|t|t
0.22|993310|26|26|1|500.000|500.000|0.000|6.000|950452.000|1396632.000|t|t|t
0.23|984269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
@@ -61,10 +63,12 @@
1.9|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
2.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
2.10|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+2.11|993310|121|121|1|100.000|100.000|0.000|0.000|950732.188|1397181.783|t|t|t
2.12|993310|6|6|1|2000.000|2000.000|0.000|0.000|950732.188|1397281.783|t|t|t
2.13|993310|8|8|1|1500.000|1500.000|0.000|0.000|950732.188|1397281.783|t|t|t
2.14|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
2.15|993310|16|16|1|750.000|750.000|0.000|0.000|950732.188|1397281.783|t|t|t
+2.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
2.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
2.4|||||||||||||
2.5|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
More information about the postgis-tickets
mailing list