aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-02-26 20:36:33 +0100
committerKristian Evers <kristianevers@gmail.com>2020-02-27 13:19:13 +0100
commita9bc6e5fb000f618c9df6276f4ef79063ce4cdfc (patch)
treefc9f7df9d9d237f42c49137e863a501717f8718e /data
parent8d665f20a743b136cb43943ff255ddadf1ead92d (diff)
downloadPROJ-a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc.tar.gz
PROJ-a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc.zip
Make tests independent of proj-datumgrid
Fixes #1984 - Copy BETA2007.gsb, MD, alaska, conus, ntf_r93.gsb, ntv1_can.dat grids from proj-datumgrid to data/tests. - Replace a couple uses of nzgd2kgrid0005.gsb in tests by ntf_r93.gsb - Add downsampled/subsetted versions of egm96_15.gtx as tests/egm96_15_downsampled.gtx and ntv2_0.gsb as tests/ntv2_0_downsampled.gsb This results in a few changes in expected results - Simpify travis/install.sh due to less configurations to test This results in a hopefully acceptable increase of the proj-X.Y.Z.tar.gz from 2.9 to 5.3 MB
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt32
-rw-r--r--data/Makefile.am41
-rw-r--r--data/tests/BETA2007.gsbbin0 -> 83696 bytes
-rw-r--r--data/tests/MDbin0 -> 3560 bytes
-rw-r--r--data/tests/alaskabin0 -> 1053928 bytes
-rw-r--r--data/tests/conusbin0 -> 264424 bytes
-rw-r--r--data/tests/egm96_15_downsampled.gtxbin0 -> 259240 bytes
-rw-r--r--data/tests/ntf_r93.gsbbin0 -> 277424 bytes
-rw-r--r--data/tests/ntv1_can.datbin0 -> 1113184 bytes
-rw-r--r--data/tests/ntv2_0_downsampled.gsbbin0 -> 245824 bytes
10 files changed, 49 insertions, 24 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 53848a67..fa2e35d5 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -70,30 +70,34 @@ set(DATA_FOR_TESTS
GL27
nad27
nad83
- ntv1_can.dat
- MD
- ntf_r93.gsb
- egm96_15.gtx
- ntv2_0.gsb
- conus
- alaska
- nzgd2kgrid0005.gsb
- ITRF2000
- BETA2007.gsb)
-file(GLOB DATA_TESTS tests/*)
+ ITRF2000)
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/for_tests)
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/for_tests/tests)
+
foreach(FILE ${DATA_FOR_TESTS} ${CONFIG_FILES})
- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
- endif()
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
endforeach()
+
+file(GLOB DATA_TESTS tests/*)
foreach(FILE ${DATA_TESTS})
get_filename_component(FILENAME ${FILE} NAME)
configure_file(${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/tests/${FILENAME} COPYONLY)
endforeach()
+set(DATA_FOR_TESTS_FROM_TESTS_SUBDIR
+ alaska
+ BETA2007.gsb
+ conus
+ MD
+ ntf_r93.gsb
+ ntv1_can.dat)
+foreach(FILE ${DATA_FOR_TESTS_FROM_TESTS_SUBDIR})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/${FILE} ${CMAKE_CURRENT_BINARY_DIR}/for_tests/${FILE} COPYONLY)
+endforeach()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/egm96_15_downsampled.gtx ${CMAKE_CURRENT_BINARY_DIR}/for_tests/egm96_15.gtx COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/ntv2_0_downsampled.gsb ${CMAKE_CURRENT_BINARY_DIR}/for_tests/ntv2_0.gsb COPYONLY)
+
#
#install
#
diff --git a/data/Makefile.am b/data/Makefile.am
index e284c6e0..8dbfed1b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -89,6 +89,14 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \
tests/us_noaa_geoid06_ak_subset_at_antimeridian.tif \
tests/test_hgrid_little_endian.gsb \
tests/test_hgrid_big_endian.gsb \
+ tests/BETA2007.gsb \
+ tests/MD \
+ tests/alaska \
+ tests/conus \
+ tests/egm96_15_downsampled.gtx \
+ tests/ntv1_can.dat \
+ tests/ntv2_0_downsampled.gsb \
+ tests/ntf_r93.gsb \
generate_all_sql_in.cmake sql_filelist.cmake \
$(SQL_ORDERED_LIST)
@@ -143,6 +151,19 @@ proj.db: $(DATAPATH)/sql/*.sql
# For out-of-tree builds, link all file of the source data dir to the generated data
# Also link select resource files in a for_tests subdirectory so that we are not
# influenced by the presence of other grids
+
+# egm96_15_downsampled.gtx created with
+# gdal_translate proj-datumgrid/egm96_15.gtx egm96_15_downsampled.gtx -of GTX -outsize 25% 25% -r average
+
+# ntv2_0_downsampled.gsb created with:
+# gdal_translate NTv2:0:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10%
+# gdal_translate NTv2:1:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:2:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:3:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes
+# gdal_translate NTv2:99:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+# gdal_translate NTv2:44:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+# gdal_translate NTv2:4:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes
+
check-local:
@if [ ! -f GL27 ]; then \
for x in $(DATAPATH)/*; do \
@@ -154,24 +175,24 @@ check-local:
for x in $(DATAPATH)/GL27 \
$(DATAPATH)/nad27 \
$(DATAPATH)/nad83 \
- $(DATAPATH)/ntv1_can.dat \
- $(DATAPATH)/MD \
- $(DATAPATH)/ntf_r93.gsb \
- $(DATAPATH)/egm96_15.gtx \
- $(DATAPATH)/ntv2_0.gsb \
- $(DATAPATH)/conus \
- $(DATAPATH)/alaska \
- $(DATAPATH)/nzgd2kgrid0005.gsb \
+ $(DATAPATH)/tests/ntv1_can.dat \
+ $(DATAPATH)/tests/MD \
+ $(DATAPATH)/tests/ntf_r93.gsb \
+ $(DATAPATH)/tests/conus \
+ $(DATAPATH)/tests/alaska \
$(DATAPATH)/ITRF2000 \
- $(DATAPATH)/BETA2007.gsb; \
+ $(DATAPATH)/tests/BETA2007.gsb; \
do \
if test -f "$$x" ; then \
ln -sf "../$$x" for_tests; \
else \
- echo "WARNING: grid $$x missing: some tests will be skipped"; \
+ echo "ERROR: grid $$x missing: some tests will be skipped"; \
+ exit 1; \
fi \
done; \
ln -sf ../$(DATAPATH)/tests for_tests; \
+ ln -sf ../$(DATAPATH)/tests/ntv2_0_downsampled.gsb for_tests/ntv2_0.gsb; \
+ ln -sf ../$(DATAPATH)/tests/egm96_15_downsampled.gtx for_tests/egm96_15.gtx; \
ln -sf ../$(DATAPATH)/proj.ini for_tests; \
ln -sf ../proj.db for_tests
diff --git a/data/tests/BETA2007.gsb b/data/tests/BETA2007.gsb
new file mode 100644
index 00000000..69cd3346
--- /dev/null
+++ b/data/tests/BETA2007.gsb
Binary files differ
diff --git a/data/tests/MD b/data/tests/MD
new file mode 100644
index 00000000..c8500e97
--- /dev/null
+++ b/data/tests/MD
Binary files differ
diff --git a/data/tests/alaska b/data/tests/alaska
new file mode 100644
index 00000000..bb6be2ff
--- /dev/null
+++ b/data/tests/alaska
Binary files differ
diff --git a/data/tests/conus b/data/tests/conus
new file mode 100644
index 00000000..44b4900f
--- /dev/null
+++ b/data/tests/conus
Binary files differ
diff --git a/data/tests/egm96_15_downsampled.gtx b/data/tests/egm96_15_downsampled.gtx
new file mode 100644
index 00000000..ea53ab10
--- /dev/null
+++ b/data/tests/egm96_15_downsampled.gtx
Binary files differ
diff --git a/data/tests/ntf_r93.gsb b/data/tests/ntf_r93.gsb
new file mode 100644
index 00000000..07e34fcb
--- /dev/null
+++ b/data/tests/ntf_r93.gsb
Binary files differ
diff --git a/data/tests/ntv1_can.dat b/data/tests/ntv1_can.dat
new file mode 100644
index 00000000..8acad077
--- /dev/null
+++ b/data/tests/ntv1_can.dat
Binary files differ
diff --git a/data/tests/ntv2_0_downsampled.gsb b/data/tests/ntv2_0_downsampled.gsb
new file mode 100644
index 00000000..06b81110
--- /dev/null
+++ b/data/tests/ntv2_0_downsampled.gsb
Binary files differ