From 1f01ecb90a751c8099a50e066616639f63522134 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 6 Dec 2019 21:08:59 +0100 Subject: Add support for horizontal and vertical grids in GeoTIFF --- data/Makefile.am | 38 ++++++++++++++++++++- data/tests/test_hgrid.tif | Bin 0 -> 506 bytes data/tests/test_hgrid_degree.tif | Bin 0 -> 680 bytes .../tests/test_hgrid_extra_ifd_with_other_info.tif | Bin 0 -> 1708 bytes data/tests/test_hgrid_lon_shift_first.tif | Bin 0 -> 764 bytes data/tests/test_hgrid_positive_west.tif | Bin 0 -> 764 bytes data/tests/test_hgrid_radian.tif | Bin 0 -> 680 bytes data/tests/test_hgrid_separate.tif | Bin 0 -> 514 bytes data/tests/test_hgrid_strip.tif | Bin 0 -> 514 bytes data/tests/test_hgrid_tiled.tif | Bin 0 -> 4920 bytes data/tests/test_hgrid_tiled_separate.tif | Bin 0 -> 2256 bytes data/tests/test_hgrid_with_overview.tif | Bin 0 -> 864 bytes data/tests/test_hgrid_with_subgrid.tif | Bin 0 -> 6943 bytes .../tests/test_hgrid_with_subgrid_no_grid_name.tif | Bin 0 -> 6943 bytes data/tests/test_vgrid_bigendian.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_bigendian_bigtiff.tif | Bin 0 -> 568 bytes data/tests/test_vgrid_bigtiff.tif | Bin 0 -> 568 bytes data/tests/test_vgrid_bottomup_with_matrix.tif | Bin 0 -> 474 bytes data/tests/test_vgrid_bottomup_with_scale.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_deflate.tif | Bin 0 -> 430 bytes .../test_vgrid_deflate_floatingpointpredictor.tif | Bin 0 -> 422 bytes data/tests/test_vgrid_float64.tif | Bin 0 -> 494 bytes data/tests/test_vgrid_in_second_channel.tif | Bin 0 -> 632 bytes data/tests/test_vgrid_int16.tif | Bin 0 -> 398 bytes data/tests/test_vgrid_int32.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_invalid_channel_type.tif | Bin 0 -> 560 bytes data/tests/test_vgrid_nodata.tif | Bin 0 -> 464 bytes data/tests/test_vgrid_pixelisarea.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_pixelispoint.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_uint16.tif | Bin 0 -> 398 bytes data/tests/test_vgrid_uint16_with_scale_offset.tif | Bin 0 -> 556 bytes data/tests/test_vgrid_uint32.tif | Bin 0 -> 430 bytes data/tests/test_vgrid_unsupported_byte.tif | Bin 0 -> 382 bytes data/tests/test_vgrid_with_overview.tif | Bin 0 -> 707 bytes data/tests/test_vgrid_with_subgrid.tif | Bin 0 -> 756 bytes 35 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 data/tests/test_hgrid.tif create mode 100644 data/tests/test_hgrid_degree.tif create mode 100644 data/tests/test_hgrid_extra_ifd_with_other_info.tif create mode 100644 data/tests/test_hgrid_lon_shift_first.tif create mode 100644 data/tests/test_hgrid_positive_west.tif create mode 100644 data/tests/test_hgrid_radian.tif create mode 100644 data/tests/test_hgrid_separate.tif create mode 100644 data/tests/test_hgrid_strip.tif create mode 100644 data/tests/test_hgrid_tiled.tif create mode 100644 data/tests/test_hgrid_tiled_separate.tif create mode 100644 data/tests/test_hgrid_with_overview.tif create mode 100644 data/tests/test_hgrid_with_subgrid.tif create mode 100644 data/tests/test_hgrid_with_subgrid_no_grid_name.tif create mode 100644 data/tests/test_vgrid_bigendian.tif create mode 100644 data/tests/test_vgrid_bigendian_bigtiff.tif create mode 100644 data/tests/test_vgrid_bigtiff.tif create mode 100644 data/tests/test_vgrid_bottomup_with_matrix.tif create mode 100644 data/tests/test_vgrid_bottomup_with_scale.tif create mode 100644 data/tests/test_vgrid_deflate.tif create mode 100644 data/tests/test_vgrid_deflate_floatingpointpredictor.tif create mode 100644 data/tests/test_vgrid_float64.tif create mode 100644 data/tests/test_vgrid_in_second_channel.tif create mode 100644 data/tests/test_vgrid_int16.tif create mode 100644 data/tests/test_vgrid_int32.tif create mode 100644 data/tests/test_vgrid_invalid_channel_type.tif create mode 100644 data/tests/test_vgrid_nodata.tif create mode 100644 data/tests/test_vgrid_pixelisarea.tif create mode 100644 data/tests/test_vgrid_pixelispoint.tif create mode 100644 data/tests/test_vgrid_uint16.tif create mode 100644 data/tests/test_vgrid_uint16_with_scale_offset.tif create mode 100644 data/tests/test_vgrid_uint32.tif create mode 100644 data/tests/test_vgrid_unsupported_byte.tif create mode 100644 data/tests/test_vgrid_with_overview.tif create mode 100644 data/tests/test_vgrid_with_subgrid.tif (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index e7c38d7c..9a7c0c28 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -43,7 +43,43 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ CH \ ITRF2000 ITRF2008 ITRF2014 \ projjson.schema.json \ - CMakeLists.txt tests/test_nodata.gtx null \ + CMakeLists.txt \ + tests/test_nodata.gtx \ + tests/test_vgrid_bigendian_bigtiff.tif \ + tests/test_vgrid_bigendian.tif \ + tests/test_vgrid_bigtiff.tif \ + tests/test_vgrid_bottomup_with_matrix.tif \ + tests/test_vgrid_bottomup_with_scale.tif \ + tests/test_vgrid_deflate_floatingpointpredictor.tif \ + tests/test_vgrid_deflate.tif \ + tests/test_vgrid_float64.tif \ + tests/test_vgrid_in_second_channel.tif \ + tests/test_vgrid_int16.tif \ + tests/test_vgrid_int32.tif \ + tests/test_vgrid_uint32.tif \ + tests/test_vgrid_invalid_channel_type.tif \ + tests/test_vgrid_nodata.tif \ + tests/test_vgrid_pixelisarea.tif \ + tests/test_vgrid_pixelispoint.tif \ + tests/test_vgrid_uint16.tif \ + tests/test_vgrid_uint16_with_scale_offset.tif \ + tests/test_vgrid_unsupported_byte.tif \ + tests/test_vgrid_with_overview.tif \ + tests/test_vgrid_with_subgrid.tif \ + tests/test_hgrid.tif \ + tests/test_hgrid_separate.tif \ + tests/test_hgrid_tiled.tif \ + tests/test_hgrid_tiled_separate.tif \ + tests/test_hgrid_strip.tif \ + tests/test_hgrid_positive_west.tif \ + tests/test_hgrid_lon_shift_first.tif \ + tests/test_hgrid_radian.tif \ + tests/test_hgrid_degree.tif \ + tests/test_hgrid_with_overview.tif \ + tests/test_hgrid_extra_ifd_with_other_info.tif \ + tests/test_hgrid_with_subgrid.tif \ + tests/test_hgrid_with_subgrid_no_grid_name.tif \ + null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) diff --git a/data/tests/test_hgrid.tif b/data/tests/test_hgrid.tif new file mode 100644 index 00000000..94718c21 Binary files /dev/null and b/data/tests/test_hgrid.tif differ diff --git a/data/tests/test_hgrid_degree.tif b/data/tests/test_hgrid_degree.tif new file mode 100644 index 00000000..d06782ec Binary files /dev/null and b/data/tests/test_hgrid_degree.tif differ diff --git a/data/tests/test_hgrid_extra_ifd_with_other_info.tif b/data/tests/test_hgrid_extra_ifd_with_other_info.tif new file mode 100644 index 00000000..b7e67af7 Binary files /dev/null and b/data/tests/test_hgrid_extra_ifd_with_other_info.tif differ diff --git a/data/tests/test_hgrid_lon_shift_first.tif b/data/tests/test_hgrid_lon_shift_first.tif new file mode 100644 index 00000000..395f0743 Binary files /dev/null and b/data/tests/test_hgrid_lon_shift_first.tif differ diff --git a/data/tests/test_hgrid_positive_west.tif b/data/tests/test_hgrid_positive_west.tif new file mode 100644 index 00000000..4ebc17cc Binary files /dev/null and b/data/tests/test_hgrid_positive_west.tif differ diff --git a/data/tests/test_hgrid_radian.tif b/data/tests/test_hgrid_radian.tif new file mode 100644 index 00000000..30219ccd Binary files /dev/null and b/data/tests/test_hgrid_radian.tif differ diff --git a/data/tests/test_hgrid_separate.tif b/data/tests/test_hgrid_separate.tif new file mode 100644 index 00000000..ef2ca575 Binary files /dev/null and b/data/tests/test_hgrid_separate.tif differ diff --git a/data/tests/test_hgrid_strip.tif b/data/tests/test_hgrid_strip.tif new file mode 100644 index 00000000..e38fc609 Binary files /dev/null and b/data/tests/test_hgrid_strip.tif differ diff --git a/data/tests/test_hgrid_tiled.tif b/data/tests/test_hgrid_tiled.tif new file mode 100644 index 00000000..b0d5dd8b Binary files /dev/null and b/data/tests/test_hgrid_tiled.tif differ diff --git a/data/tests/test_hgrid_tiled_separate.tif b/data/tests/test_hgrid_tiled_separate.tif new file mode 100644 index 00000000..d7e0934f Binary files /dev/null and b/data/tests/test_hgrid_tiled_separate.tif differ diff --git a/data/tests/test_hgrid_with_overview.tif b/data/tests/test_hgrid_with_overview.tif new file mode 100644 index 00000000..d7453b49 Binary files /dev/null and b/data/tests/test_hgrid_with_overview.tif differ diff --git a/data/tests/test_hgrid_with_subgrid.tif b/data/tests/test_hgrid_with_subgrid.tif new file mode 100644 index 00000000..2acc4581 Binary files /dev/null and b/data/tests/test_hgrid_with_subgrid.tif differ diff --git a/data/tests/test_hgrid_with_subgrid_no_grid_name.tif b/data/tests/test_hgrid_with_subgrid_no_grid_name.tif new file mode 100644 index 00000000..974699b5 Binary files /dev/null and b/data/tests/test_hgrid_with_subgrid_no_grid_name.tif differ diff --git a/data/tests/test_vgrid_bigendian.tif b/data/tests/test_vgrid_bigendian.tif new file mode 100644 index 00000000..5cf4a039 Binary files /dev/null and b/data/tests/test_vgrid_bigendian.tif differ diff --git a/data/tests/test_vgrid_bigendian_bigtiff.tif b/data/tests/test_vgrid_bigendian_bigtiff.tif new file mode 100644 index 00000000..a586b85f Binary files /dev/null and b/data/tests/test_vgrid_bigendian_bigtiff.tif differ diff --git a/data/tests/test_vgrid_bigtiff.tif b/data/tests/test_vgrid_bigtiff.tif new file mode 100644 index 00000000..2a01893a Binary files /dev/null and b/data/tests/test_vgrid_bigtiff.tif differ diff --git a/data/tests/test_vgrid_bottomup_with_matrix.tif b/data/tests/test_vgrid_bottomup_with_matrix.tif new file mode 100644 index 00000000..90f637dc Binary files /dev/null and b/data/tests/test_vgrid_bottomup_with_matrix.tif differ diff --git a/data/tests/test_vgrid_bottomup_with_scale.tif b/data/tests/test_vgrid_bottomup_with_scale.tif new file mode 100644 index 00000000..636b7dc7 Binary files /dev/null and b/data/tests/test_vgrid_bottomup_with_scale.tif differ diff --git a/data/tests/test_vgrid_deflate.tif b/data/tests/test_vgrid_deflate.tif new file mode 100644 index 00000000..ee3b5f0a Binary files /dev/null and b/data/tests/test_vgrid_deflate.tif differ diff --git a/data/tests/test_vgrid_deflate_floatingpointpredictor.tif b/data/tests/test_vgrid_deflate_floatingpointpredictor.tif new file mode 100644 index 00000000..5fd7b9fa Binary files /dev/null and b/data/tests/test_vgrid_deflate_floatingpointpredictor.tif differ diff --git a/data/tests/test_vgrid_float64.tif b/data/tests/test_vgrid_float64.tif new file mode 100644 index 00000000..16b3e790 Binary files /dev/null and b/data/tests/test_vgrid_float64.tif differ diff --git a/data/tests/test_vgrid_in_second_channel.tif b/data/tests/test_vgrid_in_second_channel.tif new file mode 100644 index 00000000..d377f8b7 Binary files /dev/null and b/data/tests/test_vgrid_in_second_channel.tif differ diff --git a/data/tests/test_vgrid_int16.tif b/data/tests/test_vgrid_int16.tif new file mode 100644 index 00000000..1c69b5d6 Binary files /dev/null and b/data/tests/test_vgrid_int16.tif differ diff --git a/data/tests/test_vgrid_int32.tif b/data/tests/test_vgrid_int32.tif new file mode 100644 index 00000000..1b6dfd7b Binary files /dev/null and b/data/tests/test_vgrid_int32.tif differ diff --git a/data/tests/test_vgrid_invalid_channel_type.tif b/data/tests/test_vgrid_invalid_channel_type.tif new file mode 100644 index 00000000..ec9e641f Binary files /dev/null and b/data/tests/test_vgrid_invalid_channel_type.tif differ diff --git a/data/tests/test_vgrid_nodata.tif b/data/tests/test_vgrid_nodata.tif new file mode 100644 index 00000000..65ec5343 Binary files /dev/null and b/data/tests/test_vgrid_nodata.tif differ diff --git a/data/tests/test_vgrid_pixelisarea.tif b/data/tests/test_vgrid_pixelisarea.tif new file mode 100644 index 00000000..a5409f66 Binary files /dev/null and b/data/tests/test_vgrid_pixelisarea.tif differ diff --git a/data/tests/test_vgrid_pixelispoint.tif b/data/tests/test_vgrid_pixelispoint.tif new file mode 100644 index 00000000..cfeb598f Binary files /dev/null and b/data/tests/test_vgrid_pixelispoint.tif differ diff --git a/data/tests/test_vgrid_uint16.tif b/data/tests/test_vgrid_uint16.tif new file mode 100644 index 00000000..a03d9a73 Binary files /dev/null and b/data/tests/test_vgrid_uint16.tif differ diff --git a/data/tests/test_vgrid_uint16_with_scale_offset.tif b/data/tests/test_vgrid_uint16_with_scale_offset.tif new file mode 100644 index 00000000..b08fa4a3 Binary files /dev/null and b/data/tests/test_vgrid_uint16_with_scale_offset.tif differ diff --git a/data/tests/test_vgrid_uint32.tif b/data/tests/test_vgrid_uint32.tif new file mode 100644 index 00000000..cae7e9e7 Binary files /dev/null and b/data/tests/test_vgrid_uint32.tif differ diff --git a/data/tests/test_vgrid_unsupported_byte.tif b/data/tests/test_vgrid_unsupported_byte.tif new file mode 100644 index 00000000..ccf03fc8 Binary files /dev/null and b/data/tests/test_vgrid_unsupported_byte.tif differ diff --git a/data/tests/test_vgrid_with_overview.tif b/data/tests/test_vgrid_with_overview.tif new file mode 100644 index 00000000..aa15aa1d Binary files /dev/null and b/data/tests/test_vgrid_with_overview.tif differ diff --git a/data/tests/test_vgrid_with_subgrid.tif b/data/tests/test_vgrid_with_subgrid.tif new file mode 100644 index 00000000..5c7584c4 Binary files /dev/null and b/data/tests/test_vgrid_with_subgrid.tif differ -- cgit v1.2.3 From 8063c0b992af82154b3d9b637c78aa769a482f8a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 11 Dec 2019 20:34:15 +0100 Subject: test/gie/geotiff_grids.gie: use of subset of gr3df97a.tif for systematic testing --- data/Makefile.am | 1 + data/tests/subset_of_gr3df97a.tif | Bin 0 -> 3215 bytes 2 files changed, 1 insertion(+) create mode 100644 data/tests/subset_of_gr3df97a.tif (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 9a7c0c28..2a8eb285 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -79,6 +79,7 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ tests/test_hgrid_extra_ifd_with_other_info.tif \ tests/test_hgrid_with_subgrid.tif \ tests/test_hgrid_with_subgrid_no_grid_name.tif \ + tests/subset_of_gr3df97a.tif \ null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) diff --git a/data/tests/subset_of_gr3df97a.tif b/data/tests/subset_of_gr3df97a.tif new file mode 100644 index 00000000..a98783f3 Binary files /dev/null and b/data/tests/subset_of_gr3df97a.tif differ -- cgit v1.2.3 From c165952bcf0135bc26b6cfea3ae387c51ba59fb0 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 12 Dec 2019 19:27:57 +0100 Subject: grids.cpp: use 'parent_grid_name' as stated in RFC4 --- data/tests/test_hgrid_with_subgrid.tif | Bin 6943 -> 6943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/tests/test_hgrid_with_subgrid.tif b/data/tests/test_hgrid_with_subgrid.tif index 2acc4581..46a8f2f4 100644 Binary files a/data/tests/test_hgrid_with_subgrid.tif and b/data/tests/test_hgrid_with_subgrid.tif differ -- cgit v1.2.3 From d3bdbb841719780560438129b4911a86a7a4be58 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 21 Dec 2019 00:38:50 +0100 Subject: Add testing of network functionality --- data/Makefile.am | 1 + data/tests/egm96_15_uncompressed_truncated.tif | Bin 0 -> 956 bytes 2 files changed, 1 insertion(+) create mode 100644 data/tests/egm96_15_uncompressed_truncated.tif (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 2a8eb285..59ab4e83 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -80,6 +80,7 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ tests/test_hgrid_with_subgrid.tif \ tests/test_hgrid_with_subgrid_no_grid_name.tif \ tests/subset_of_gr3df97a.tif \ + tests/egm96_15_uncompressed_truncated.tif \ null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) diff --git a/data/tests/egm96_15_uncompressed_truncated.tif b/data/tests/egm96_15_uncompressed_truncated.tif new file mode 100644 index 00000000..bd34a7e2 Binary files /dev/null and b/data/tests/egm96_15_uncompressed_truncated.tif differ -- cgit v1.2.3 From 9d0bd793b552e248a10f9ff8b6c62d942fe437a1 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 23 Dec 2019 15:58:47 +0100 Subject: Network: remove dedicated get_file_size() callback to use get_header_value(), and test --- data/Makefile.am | 1 + data/tests/test_vgrid_single_strip_truncated.tif | Bin 0 -> 550 bytes 2 files changed, 1 insertion(+) create mode 100644 data/tests/test_vgrid_single_strip_truncated.tif (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 59ab4e83..3778a2be 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -81,6 +81,7 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ tests/test_hgrid_with_subgrid_no_grid_name.tif \ tests/subset_of_gr3df97a.tif \ tests/egm96_15_uncompressed_truncated.tif \ + tests/test_vgrid_single_strip_truncated.tif \ null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) diff --git a/data/tests/test_vgrid_single_strip_truncated.tif b/data/tests/test_vgrid_single_strip_truncated.tif new file mode 100644 index 00000000..9a0030f6 Binary files /dev/null and b/data/tests/test_vgrid_single_strip_truncated.tif differ -- cgit v1.2.3 From 2093aca0720949303410280912b61efd791d2f01 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 25 Dec 2019 20:13:03 +0100 Subject: Network: make CDN endpoint configurable either in proj.ini, PROJ_NETWORK_ENDPOINT or proj_context_set_url_endpoint() --- data/Makefile.am | 4 ++-- data/proj.ini | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 data/proj.ini (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 3778a2be..09fa1989 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ DATAPATH = $(top_srcdir)/data -pkgdata_DATA = GL27 nad.lst nad27 nad83 world other.extra \ +pkgdata_DATA = proj.ini GL27 nad.lst nad27 nad83 world other.extra \ CH null \ ITRF2000 ITRF2008 ITRF2014 proj.db \ projjson.schema.json @@ -38,7 +38,7 @@ SQL_ORDERED_LIST = sql/begin.sql \ sql/customizations.sql \ sql/commit.sql -EXTRA_DIST = GL27 nad.lst nad27 nad83 \ +EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \ world other.extra \ CH \ ITRF2000 ITRF2008 ITRF2014 \ diff --git a/data/proj.ini b/data/proj.ini new file mode 100644 index 00000000..f42bc940 --- /dev/null +++ b/data/proj.ini @@ -0,0 +1,10 @@ +[general] +; Lines starting by ; are commented lines. +; + +; Network capabilities disabled by default. +; Can be overriden with the PROJ_NETWORK=ON environment variable. +; network = on + +; Can be overriden with the PROJ_NETWORK_ENDPOINT environment variable. +cdn_endpoint = https://cdn.proj.org -- cgit v1.2.3