diff options
| author | Thomas Knudsen <busstoptaktik@users.noreply.github.com> | 2017-11-15 09:03:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 09:03:39 +0100 |
| commit | 7aeb1fb3aaf5a7c14ba2a0513d5eca13a9ddd9d0 (patch) | |
| tree | ed3f73269f5da4fa0b241323b5d70041f0c8389a /src/projects.h | |
| parent | 06b2f944d7844bb898ace8a7973f9182aa2234b1 (diff) | |
| download | PROJ-7aeb1fb3aaf5a7c14ba2a0513d5eca13a9ddd9d0.tar.gz PROJ-7aeb1fb3aaf5a7c14ba2a0513d5eca13a9ddd9d0.zip | |
Support numerical factors only (#664)
* Support numerical factors only
* Make sure h positive. Improve some comments
* Let pole overshoot check have effect even for geocentric latitudes
* Factor-typological constants, now all returning false, for backwards compatibility
Diffstat (limited to 'src/projects.h')
| -rw-r--r-- | src/projects.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/projects.h b/src/projects.h index 1d4fff50..32b74b08 100644 --- a/src/projects.h +++ b/src/projects.h @@ -257,9 +257,6 @@ struct PJconsts { PJ_COORD (*fwd4d)(PJ_COORD, PJ *); PJ_COORD (*inv4d)(PJ_COORD, PJ *); - - void (*spc)(LP, PJ *, struct FACTORS *); - void *(*destructor)(PJ *, int); @@ -460,14 +457,17 @@ struct FACTORS { double conv; /* convergence */ double s; /* areal scale factor */ double a, b; /* max-min scale error */ - int code; /* info as to analytics, see following */ + int code; /* always 0 */ +}; + +enum deprecated_constants_for_now_dropped_analytical_factors { + IS_ANAL_XL_YL = 01, /* derivatives of lon analytic */ + IS_ANAL_XP_YP = 02, /* derivatives of lat analytic */ + IS_ANAL_HK = 04, /* h and k analytic */ + IS_ANAL_CONV = 010 /* convergence analytic */ }; -#define IS_ANAL_XL_YL 01 /* derivatives of lon analytic */ -#define IS_ANAL_XP_YP 02 /* derivatives of lat analytic */ -#define IS_ANAL_HK 04 /* h and k analytic */ -#define IS_ANAL_CONV 010 /* convergence analytic */ /* datum_type values */ #define PJD_UNKNOWN 0 |