aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-12-25 17:50:48 +0100
committerGitHub <noreply@github.com>2019-12-25 17:50:48 +0100
commite4f952c40ea04593a6935dab5e40598c675818ff (patch)
treef896e0b88b8b6179f75b2fa7e553489f9963bdfc
parent1003bf3abd3ac032706179fe3613af47a94ba98e (diff)
parentd11804fb791bc22d75d9858d7c3db2e02f739f98 (diff)
downloadPROJ-e4f952c40ea04593a6935dab5e40598c675818ff.tar.gz
PROJ-e4f952c40ea04593a6935dab5e40598c675818ff.zip
Merge pull request #1810 from rouault/projinfo_wkt1_gdal_no_longer_boundcrs
projinfo: no longer call createBoundCRSToWGS84IfPossible() for WKT1:GDAL
-rw-r--r--docs/source/apps/projinfo.rst3
-rw-r--r--docs/source/usage/differences.rst9
-rw-r--r--src/apps/projinfo.cpp13
3 files changed, 13 insertions, 12 deletions
diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst
index 6236056d..2715f687 100644
--- a/docs/source/apps/projinfo.rst
+++ b/docs/source/apps/projinfo.rst
@@ -77,6 +77,9 @@ The following control parameters can appear in any order:
.. note:: WKT2_2019 was previously called WKT2_2018.
+ .. note:: Before PROJ 6.3.0, WKT1:GDAL was implicitly calling --boundcrs-to-wgs84.
+ This is no longer the case.
+
.. option:: -k crs|operation|ellipsoid
When used to query a single object with a AUTHORITY:CODE, determines the (k)ind of the object
diff --git a/docs/source/usage/differences.rst b/docs/source/usage/differences.rst
index 4d05543a..b1c3d1a9 100644
--- a/docs/source/usage/differences.rst
+++ b/docs/source/usage/differences.rst
@@ -114,3 +114,12 @@ exclusive with :option:`+t_epoch`. :option:`+dt` is used when deformation
for a set amount of time is needed and :option:`+t_epoch` is used (in
conjunction with the observation time of the input coordinate) when
deformation from a specific epoch to the observation time is needed.
+
+Version 6.3.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+projinfo
+--------
+
+Before PROJ 6.3.0, WKT1:GDAL was implicitly calling --boundcrs-to-wgs84, to
+add a TOWGS84[] node in some cases. This is no longer the case.
diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index fd9b2f46..c1139564 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -423,24 +423,13 @@ static void outputObject(
std::cout << "WKT1:GDAL string:" << std::endl;
}
- auto crs = nn_dynamic_pointer_cast<CRS>(obj);
- std::shared_ptr<IWKTExportable> objToExport;
- if (crs) {
- objToExport = nn_dynamic_pointer_cast<IWKTExportable>(
- crs->createBoundCRSToWGS84IfPossible(
- dbContext, allowUseIntermediateCRS));
- }
- if (!objToExport) {
- objToExport = wktExportable;
- }
-
auto formatter =
WKTFormatter::create(WKTFormatter::Convention::WKT1_GDAL);
if (outputOpt.singleLine) {
formatter->setMultiLine(false);
}
formatter->setStrict(outputOpt.strict);
- auto wkt = objToExport->exportToWKT(formatter.get());
+ auto wkt = wktExportable->exportToWKT(formatter.get());
if (outputOpt.c_ify) {
wkt = c_ify_string(wkt);
}