aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-12-25 10:11:01 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-12-25 10:11:01 +0100
commit46e28887e19e82488ff0659ff1f127c908fd4637 (patch)
tree8c640c66c1652ca7b5edc8064f72da913df89a16
parent41aa90d57e4cdcca2e6337d31be596c8beb1a945 (diff)
downloadPROJ-46e28887e19e82488ff0659ff1f127c908fd4637.tar.gz
PROJ-46e28887e19e82488ff0659ff1f127c908fd4637.zip
projinfo: no longer call createBoundCRSToWGS84IfPossible() for WKT1:GDAL
To align with GDAL 3.0.3 behaviour, no longer automatically try to create a boundCRS to WGS84 when exporting to WKT1:GDAL. The user has to explicitly specify --boundcrs-to-wgs84 if he wishes this behaviour.
-rw-r--r--docs/source/apps/projinfo.rst3
-rw-r--r--src/apps/projinfo.cpp13
2 files changed, 4 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/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);
}