diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-06-03 15:11:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 15:11:09 +0200 |
| commit | 2a84dc816e2a3d5c6b963ae84178a463c3ac2154 (patch) | |
| tree | 269e30369e3ac241a2153d71780a4220d62ef9bd /src | |
| parent | dc1f82d8b5dadedc72b4d46e22c8f0bd14262d15 (diff) | |
| parent | 590449950057566d39e2997404422b00844343b6 (diff) | |
| download | PROJ-2a84dc816e2a3d5c6b963ae84178a463c3ac2154.tar.gz PROJ-2a84dc816e2a3d5c6b963ae84178a463c3ac2154.zip | |
Merge pull request #2256 from rouault/fix_normalizeForVisualization_for_EPSG_5482
normalizeForVisualization(): make it switch axis for EPSG:5482 (RSRGD2000 / RSPS2000)
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/crs.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index b0ec35b9..88420c8a 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -662,18 +662,26 @@ static bool mustAxisOrderBeSwitchedForVisualizationInternal( 90.0) < 1e-10; } - // Address EPSG:32761 "WGS 84 / UPS South (N,E)" if (&dir0 == &cs::AxisDirection::NORTH && &dir1 == &cs::AxisDirection::NORTH) { const auto &meridian0 = axisList[0]->meridian(); const auto &meridian1 = axisList[1]->meridian(); return meridian0 != nullptr && meridian1 != nullptr && - std::abs(meridian0->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 0.0) < 1e-10 && - std::abs(meridian1->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 90.0) < 1e-10; + (( + // Address EPSG:32761 "WGS 84 / UPS South (N,E)" + std::abs(meridian0->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 0.0) < 1e-10 && + std::abs(meridian1->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 90.0) < 1e-10) || + // Address EPSG:5482 "RSRGD2000 / RSPS2000" + (std::abs(meridian0->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 180) < 1e-10 && + std::abs(meridian1->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + -90.0) < 1e-10)); } return false; |