diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-05-17 22:07:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 22:07:31 +0200 |
| commit | 0403980832dbaadad73e51da76ac0e71d37eec85 (patch) | |
| tree | 33459f7caba4fe3092857d1b4dd9a60c529ddf91 /src/grids.hpp | |
| parent | b349fa73847740950b2c5f5e6e1f5769ab594b44 (diff) | |
| parent | 95e877761865f073f4df7f52d9e97b899db92efd (diff) | |
| download | PROJ-0403980832dbaadad73e51da76ac0e71d37eec85.tar.gz PROJ-0403980832dbaadad73e51da76ac0e71d37eec85.zip | |
Merge pull request #2206 from rouault/deformation_model_for_merge
Add a +proj=defmodel transformation for multi-component time-based deformation models
Diffstat (limited to 'src/grids.hpp')
| -rw-r--r-- | src/grids.hpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/grids.hpp b/src/grids.hpp index 0fd1b7b0..d060fc95 100644 --- a/src/grids.hpp +++ b/src/grids.hpp @@ -37,12 +37,14 @@ NS_PROJ_START struct ExtentAndRes { - double westLon; // in radian - double southLat; // in radian - double eastLon; // in radian - double northLat; // in radian - double resLon; // in radian - double resLat; // in radian + bool isGeographic; // whether extent and resolutions are in a geographic or + // projected CRS + double west; // in radian for geographic, in CRS units otherwise + double south; // in radian for geographic, in CRS units otherwise + double east; // in radian for geographic, in CRS units otherwise + double north; // in radian for geographic, in CRS units otherwise + double resX; // in radian for geographic, in CRS units otherwise + double resY; // in radian for geographic, in CRS units otherwise bool fullWorldLongitude() const; bool contains(const ExtentAndRes &other) const; @@ -188,7 +190,7 @@ class PROJ_GCC_DLL GenericShiftGrid : public Grid { PROJ_FOR_TEST ~GenericShiftGrid() override; - PROJ_FOR_TEST const GenericShiftGrid *gridAt(double lon, double lat) const; + PROJ_FOR_TEST const GenericShiftGrid *gridAt(double x, double y) const; PROJ_FOR_TEST virtual std::string unit(int sample) const = 0; @@ -228,7 +230,7 @@ class PROJ_GCC_DLL GenericShiftGridSet { grids() const { return m_grids; } - PROJ_FOR_TEST const GenericShiftGrid *gridAt(double lon, double lat) const; + PROJ_FOR_TEST const GenericShiftGrid *gridAt(double x, double y) const; PROJ_FOR_TEST virtual void reassign_context(PJ_CONTEXT *ctx); PROJ_FOR_TEST virtual bool reopen(PJ_CONTEXT *ctx); @@ -253,11 +255,9 @@ PJ_LP pj_hgrid_apply(PJ_CONTEXT *ctx, const ListOfHGrids &grids, PJ_LP lp, const GenericShiftGrid *pj_find_generic_grid(const ListOfGenericGrids &grids, const PJ_LP &input, GenericShiftGridSet *&gridSetOut); -bool pj_bilinear_interpolation_three_samples(const GenericShiftGrid *grid, - const PJ_LP &lp, int idx1, - int idx2, int idx3, double &v1, - double &v2, double &v3, - bool &must_retry); +bool pj_bilinear_interpolation_three_samples( + PJ_CONTEXT *ctx, const GenericShiftGrid *grid, const PJ_LP &lp, int idx1, + int idx2, int idx3, double &v1, double &v2, double &v3, bool &must_retry); NS_PROJ_END |