diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-19 22:39:17 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-02-19 22:39:17 +0100 |
| commit | 43d811d20598abde95a8d177123e9f26fe5229ab (patch) | |
| tree | c66684d7975798109a072b52bce5e7c5f9bd5182 /src/pj_datums.c | |
| parent | a9e08ad008b1ff16d6139aab5e813058c922eef8 (diff) | |
| parent | efa636e0d9e0cef5a5fff1b7ed76d0368d20121b (diff) | |
| download | PROJ-43d811d20598abde95a8d177123e9f26fe5229ab.tar.gz PROJ-43d811d20598abde95a8d177123e9f26fe5229ab.zip | |
Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0
Diffstat (limited to 'src/pj_datums.c')
| -rw-r--r-- | src/pj_datums.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/pj_datums.c b/src/pj_datums.c index c9655cd6..f084f9cc 100644 --- a/src/pj_datums.c +++ b/src/pj_datums.c @@ -25,17 +25,18 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#define PJ_DATUMS__ +#include "proj.h" +#define PJ_DATUMS__ #include <projects.h> -/* +/* * The ellipse code must match one from pj_ellps.c. The datum id should - * be kept to 12 characters or less if possible. Use the official OGC - * datum name for the comments if available. + * be kept to 12 characters or less if possible. Use the official OGC + * datum name for the comments if available. */ -C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { +C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { /* id definition ellipse comments */ /* -- ---------- ------- -------- */ {"WGS84", "towgs84=0,0,0", "WGS84", ""}, @@ -46,7 +47,8 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { {"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat", "clrk66", "North_American_Datum_1927"}, -{"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7", +{"potsdam", /*"towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7",*/ + "nadgrids=@BETA2007.gsb", "bessel", "Potsdam Rauenberg 1950 DHDN"}, {"carthage","towgs84=-263.0,6.0,431.0", "clrk80ign", @@ -65,12 +67,11 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { }; struct PJ_DATUMS *pj_get_datums_ref() - { - return pj_datums; + return (struct PJ_DATUMS *)pj_datums; } -C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { +C_NAMESPACE_VAR const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { /* id definition */ /* -- ---------- */ {"greenwich", "0dE"}, @@ -86,12 +87,16 @@ C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { {"stockholm", "18d3'29.8\"E"}, {"athens", "23d42'58.815\"E"}, {"oslo", "10d43'22.5\"E"}, + {"copenhagen","12d34'40.35\"E"}, {NULL, NULL} }; struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref() +{ + return (struct PJ_PRIME_MERIDIANS *)pj_prime_meridians; +} +const PJ_PRIME_MERIDIANS *proj_list_prime_meridians(void) { return pj_prime_meridians; } - |