diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-28 22:12:32 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-03-29 11:59:35 +0100 |
| commit | 47dd4dbc40cbba140f4ceb775ea5d5d628fba961 (patch) | |
| tree | 32dee876f6e6523167238fbf96d1b7bf13203d37 /src | |
| parent | 3d670b859026218045cf972e4b38af9e3e9a3c6f (diff) | |
| download | PROJ-47dd4dbc40cbba140f4ceb775ea5d5d628fba961.tar.gz PROJ-47dd4dbc40cbba140f4ceb775ea5d5d628fba961.zip | |
Adopt use of the noop conversion in ISO19111 code
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/c_api.cpp | 3 | ||||
| -rw-r--r-- | src/iso19111/io.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index f7dcd354..f6138e9b 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -134,8 +134,7 @@ static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { auto formatter = PROJStringFormatter::create( PROJStringFormatter::Convention::PROJ_5, dbContext); auto projString = coordop->exportToPROJString(formatter.get()); - auto pj = pj_create_internal( - ctx, projString.empty() ? "+proj=affine" : projString.c_str()); + auto pj = pj_create_internal(ctx, projString.c_str()); if (pj) { pj->iso_obj = objIn; return pj; diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 578234b4..a933dcad 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -5342,6 +5342,11 @@ const std::string &PROJStringFormatter::toString() const { } } } + + if (d->result_.empty()) { + d->appendToResult("+proj=noop"); + } + return d->result_; } |