diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-25 19:45:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 19:45:39 +0200 |
| commit | 9e1e248cbb46f6f5dbc41f759ebbfc792738d010 (patch) | |
| tree | 70e9d565dea768cc40da4ed5b0a88054f34f4443 /src | |
| parent | 6976050e23683adf07c4688352d8d283a13e6b37 (diff) | |
| parent | f96f8ef4ffc0002219799cc5b0b2364c94a4ed49 (diff) | |
| download | PROJ-9e1e248cbb46f6f5dbc41f759ebbfc792738d010.tar.gz PROJ-9e1e248cbb46f6f5dbc41f759ebbfc792738d010.zip | |
Merge pull request #1692 from OSGeo/backport-1691-to-6.2
[Backport 6.2] importFromWkt(): fix axis orientation for non-standard ESRI WKT (fixes #1690)
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/io.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index a9607247..2a6d8a5e 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -3185,7 +3185,16 @@ ConversionNNPtr WKTParser::Private::buildProjectionFromESRI( } } - const auto *wkt2_mapping = getMapping(esriMapping->wkt2_name); + const char *projectionMethodWkt2Name = esriMapping->wkt2_name; + if (ci_equal(esriProjectionName, "Krovak")) { + const std::string projCRSName = + stripQuotes(projCRSNode->GP()->children()[0]); + if (projCRSName.find("_East_North") != std::string::npos) { + projectionMethodWkt2Name = EPSG_NAME_METHOD_KROVAK_NORTH_ORIENTED; + } + } + + const auto *wkt2_mapping = getMapping(projectionMethodWkt2Name); if (ci_equal(esriProjectionName, "Stereographic")) { try { if (std::fabs(io::asDouble( |