diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-29 18:06:58 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-29 18:06:58 +0100 |
| commit | ec2faad6d656a03466ff44a813c6017abfed347f (patch) | |
| tree | 1a9fc5391754e9731fce2346a7cfd6cea665b866 | |
| parent | cebb314e144c3fdd8f913e4c0b0477b33818a95d (diff) | |
| download | PROJ-ec2faad6d656a03466ff44a813c6017abfed347f.tar.gz PROJ-ec2faad6d656a03466ff44a813c6017abfed347f.zip | |
Remove 'null' grid file as it is now a special hardcoded case in grid code
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | data/null | bin | 232 -> 0 bytes | |||
| -rw-r--r-- | test/unit/gie_self_tests.cpp | 5 |
4 files changed, 6 insertions, 9 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index cf20fea4..53848a67 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -7,7 +7,6 @@ set(CONFIG_FILES ) set(PROJ_DICTIONARY - null world other.extra nad27 @@ -68,7 +67,6 @@ endif() # Note: this is done at configure/cmake time, not build time. # So if you install new grids in the source data/ subdirectory, run cmake again set(DATA_FOR_TESTS - null GL27 nad27 nad83 diff --git a/data/Makefile.am b/data/Makefile.am index ede26453..b48e87a4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ DATAPATH = $(top_srcdir)/data pkgdata_DATA = proj.ini GL27 nad.lst nad27 nad83 world other.extra \ - CH null \ + CH \ ITRF2000 ITRF2008 ITRF2014 proj.db \ projjson.schema.json @@ -87,14 +87,13 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \ tests/nkgrf03vel_realigned_z_extract.gtx \ tests/test_hgrid_with_two_level_of_subgrids_no_grid_name.tif \ tests/us_noaa_geoid06_ak_subset_at_antimeridian.tif \ - null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy \ - $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii $(DATAPATH)/null \ + $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii \ $(DATAPATH)/prvi $(DATAPATH)/stgeorge $(DATAPATH)/stlrnc $(DATAPATH)/stpaul \ $(DATAPATH)/FL $(DATAPATH)/MD $(DATAPATH)/TN $(DATAPATH)/WI $(DATAPATH)/WO; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ @@ -150,8 +149,7 @@ check-local: fi; \ rm -rf for_tests; \ mkdir for_tests; \ - for x in $(DATAPATH)/null \ - $(DATAPATH)/GL27 \ + for x in $(DATAPATH)/GL27 \ $(DATAPATH)/nad27 \ $(DATAPATH)/nad83 \ $(DATAPATH)/ntv1_can.dat \ diff --git a/data/null b/data/null Binary files differdeleted file mode 100644 index 8418408b..00000000 --- a/data/null +++ /dev/null diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp index bcf31139..720c13ca 100644 --- a/test/unit/gie_self_tests.cpp +++ b/test/unit/gie_self_tests.cpp @@ -384,9 +384,10 @@ TEST(gie, info_functions) { proj_destroy(P); /* proj_grid_info() */ - grid_info = proj_grid_info("null"); + grid_info = proj_grid_info("tests/test_hgrid.tif"); ASSERT_NE(std::string(grid_info.filename), ""); - ASSERT_EQ(std::string(grid_info.gridname), "null"); + ASSERT_EQ(std::string(grid_info.gridname), "tests/test_hgrid.tif"); + ASSERT_EQ(std::string(grid_info.format), "gtiff"); grid_info = proj_grid_info("nonexistinggrid"); ASSERT_EQ(std::string(grid_info.filename), ""); |