diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-18 07:10:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 07:10:42 +0100 |
| commit | 8584dcd50777355b460b38418cae0db05dcf91bc (patch) | |
| tree | b7335182c91737ceda8518a638ac5a79bd2bc5b2 /src/iso19111/crs.cpp | |
| parent | 3fc48e6146e020b86a0ef87749cc645f9b4fa113 (diff) | |
| parent | 25f8ad123dc5fb7de0ac2fb10b55ae9efd2723a3 (diff) | |
| download | PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.tar.gz PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.zip | |
Merge pull request #1223 from rouault/unify_proj_create
Unify proj_create(), proj_create_from_user_input() and proj_create_from_proj_string() (fixes #1214)
Diffstat (limited to 'src/iso19111/crs.cpp')
| -rw-r--r-- | src/iso19111/crs.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index 7bf40e0c..74b94a1f 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -1176,7 +1176,8 @@ void GeodeticCRS::_exportToPROJString( { const auto &extensionProj4 = CRS::getPrivate()->extensionProj4_; if (!extensionProj4.empty()) { - formatter->ingestPROJString(extensionProj4); + formatter->ingestPROJString( + replaceAll(extensionProj4, " +type=crs", "")); formatter->addNoDefs(false); return; } @@ -1907,7 +1908,8 @@ void GeographicCRS::_exportToPROJString( { const auto &extensionProj4 = CRS::getPrivate()->extensionProj4_; if (!extensionProj4.empty()) { - formatter->ingestPROJString(extensionProj4); + formatter->ingestPROJString( + replaceAll(extensionProj4, " +type=crs", "")); formatter->addNoDefs(false); return; } @@ -2719,7 +2721,8 @@ void ProjectedCRS::_exportToPROJString( { const auto &extensionProj4 = CRS::getPrivate()->extensionProj4_; if (!extensionProj4.empty()) { - formatter->ingestPROJString(extensionProj4); + formatter->ingestPROJString( + replaceAll(extensionProj4, " +type=crs", "")); formatter->addNoDefs(false); return; } |