Skip to content

Merged from main repo #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkrasting merged 16 commits into from
May 19, 2020
Merged

Merged from main repo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c405904
grids: add support for projected grids for GenericShiftGridSet
rouault Apr 27, 2020
fe3ffe8
createOperations(): be stricter when considering if an operation is a…
rouault May 15, 2020
e3bbef8
createOperations(): when converting CompoundCRS<-->Geographic3DCrs, d…
rouault May 16, 2020
e3e2468
createOperations(): improve operation name when inverting a 'axis ord…
rouault May 16, 2020
960285f
test: improve formatting of expected result
rouault May 16, 2020
f57475a
Allow importing WKT1 COMPD_CS with a VERT_DATUM[Ellipsoid,2002], and …
rouault May 16, 2020
6a3371e
Adjustments to deal with non-conformant WKT1 LAS COMPD_CS[] (refs #2171)
rouault May 16, 2020
2d6b5c0
Merge pull request #2227 from rouault/fix_2225
rouault May 16, 2020
be6b6d7
pj_bilinear_interpolation_three_samples(): add comments
rouault May 12, 2020
4054c3b
gie: fix loss of precision when parsing big values such as in project…
rouault May 4, 2020
697b93d
Add a +proj=defmodel transformation for multi-component time-based de…
rouault May 4, 2020
95e8777
geodetictiffgrids.rst: update with deformation model
rouault May 4, 2020
b349fa7
Merge pull request #2229 from rouault/fix_2228
rouault May 17, 2020
0403980
Merge pull request #2206 from rouault/deformation_model_for_merge
rouault May 17, 2020
9c50122
Address warnings raised by recent cppcheck
rouault May 17, 2020
2e54703
Implemented IGH Oceanic View (#2226)
jkrasting May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ DATAPATH = $(top_srcdir)/data
pkgdata_DATA = proj.ini GL27 nad.lst nad27 nad83 world other.extra \
CH \
ITRF2000 ITRF2008 ITRF2014 proj.db \
projjson.schema.json
projjson.schema.json \
deformation_model.schema.json

SQL_ORDERED_LIST = sql/begin.sql \
sql/proj_db_table_defs.sql \
Expand Down Expand Up @@ -43,6 +44,7 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \
CH \
ITRF2000 ITRF2008 ITRF2014 \
projjson.schema.json \
deformation_model.schema.json \
CMakeLists.txt \
tests/test_nodata.gtx \
tests/test_vgrid_bigendian_bigtiff.tif \
Expand Down Expand Up @@ -89,6 +91,7 @@ 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/test_3d_grid_projected.tif \
tests/BETA2007.gsb \
tests/MD \
tests/alaska \
Expand All @@ -97,6 +100,22 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \
tests/ntv1_can.dat \
tests/ntv2_0_downsampled.gsb \
tests/ntf_r93.gsb \
tests/simple_model_degree_3d_grid.tif \
tests/simple_model_degree_horizontal.json \
tests/simple_model_degree_3d.json \
tests/simple_model_metre_3d_grid.tif \
tests/simple_model_metre_horizontal.json \
tests/simple_model_metre_3d.json \
tests/simple_model_metre_3d_geocentric.json \
tests/simple_model_metre_vertical_grid.tif \
tests/simple_model_metre_vertical.json \
tests/simple_model_polar.json \
tests/simple_model_polar.tif \
tests/simple_model_wrap_east.json \
tests/simple_model_wrap_east.tif \
tests/simple_model_wrap_west.json \
tests/simple_model_wrap_west.tif \
tests/simple_model_projected.json \
generate_all_sql_in.cmake sql_filelist.cmake \
$(SQL_ORDERED_LIST)

Expand Down
Loading