aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-09-08 12:50:37 +0200
committerEven Rouault <even.rouault@spatialys.com>2021-09-08 17:05:45 +0200
commit85733181ee7c2777139f5d1db94f2beabb737e96 (patch)
tree2936c5f142c390bae34388925fbed74d0ad520a6 /include
parent5527b10ed140e20fac8e183317514fd59e4c8b99 (diff)
downloadPROJ-85733181ee7c2777139f5d1db94f2beabb737e96.tar.gz
PROJ-85733181ee7c2777139f5d1db94f2beabb737e96.zip
createOperations(): deal with spherical planetocentric geodetic CRS
This also fixes conversion between geocentric latlong and geodetic latlong with cs2cs. This was dealt with in PR 1093, but in the wrong direction (the geocentric latitude must be <= in absolute value to the geodetic one) The issue here was linked to the semantics of the +geoc specifier, which affects the semantics of the input coordinates in the forward direction (+geoc means that the input coordinate is is a geocentric latitude), which defeats the logic of doing A to B by using the inverse path of A and the forward path of B.
Diffstat (limited to 'include')
-rw-r--r--include/proj/crs.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp
index 7fde88c8..5a8e75ae 100644
--- a/include/proj/crs.hpp
+++ b/include/proj/crs.hpp
@@ -310,6 +310,9 @@ class PROJ_GCC_DLL GeodeticCRS : virtual public SingleCRS,
PROJ_INTERNAL void addGeocentricUnitConversionIntoPROJString(
io::PROJStringFormatter *formatter) const;
+ PROJ_INTERNAL void
+ addAngularUnitConvertAndAxisSwap(io::PROJStringFormatter *formatter) const;
+
PROJ_INTERNAL void _exportToWKT(io::WKTFormatter *formatter)
const override; // throw(io::FormattingException)
@@ -402,12 +405,10 @@ class PROJ_GCC_DLL GeographicCRS : public GeodeticCRS {
PROJ_PRIVATE :
//! @cond Doxygen_Suppress
- PROJ_INTERNAL void
- addAngularUnitConvertAndAxisSwap(
- io::PROJStringFormatter *formatter) const;
- PROJ_INTERNAL void _exportToPROJString(io::PROJStringFormatter *formatter)
- const override; // throw(FormattingException)
+ PROJ_INTERNAL void
+ _exportToPROJString(io::PROJStringFormatter *formatter)
+ const override; // throw(FormattingException)
PROJ_INTERNAL void _exportToJSON(io::JSONFormatter *formatter)
const override; // throw(FormattingException)