diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-10 19:04:32 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-11 11:56:57 +0100 |
| commit | 7d46771382e394586477b0edd7833a89369bb248 (patch) | |
| tree | a9f3f7f782c64995fa9f0c2fb569a405a8358a23 | |
| parent | 91e360027bad225b7914b1fe7bdecfa73124a39c (diff) | |
| download | PROJ-7d46771382e394586477b0edd7833a89369bb248.tar.gz PROJ-7d46771382e394586477b0edd7833a89369bb248.zip | |
CompoundCRS::identify(): avoid exception when horiz/vertical part is a BoundCRS
The exception only affects C++ users. It was caught by the C layer.
| -rw-r--r-- | src/iso19111/factory.cpp | 8 | ||||
| -rw-r--r-- | test/unit/test_crs.cpp | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 0bd44308..4989e634 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -5751,7 +5751,9 @@ static std::string buildSqlLookForAuthNameCode( std::set<std::string> authorities; for (const auto &crs : list) { - const auto &ids = crs.first->identifiers(); + auto boundCRS = dynamic_cast<crs::BoundCRS *>(crs.first.get()); + const auto &ids = boundCRS ? boundCRS->baseCRS()->identifiers() + : crs.first->identifiers(); if (!ids.empty()) { authorities.insert(*(ids[0]->codeSpace())); } @@ -5770,7 +5772,9 @@ static std::string buildSqlLookForAuthNameCode( params.emplace_back(auth_name); bool firstGeodCRSForAuth = true; for (const auto &crs : list) { - const auto &ids = crs.first->identifiers(); + auto boundCRS = dynamic_cast<crs::BoundCRS *>(crs.first.get()); + const auto &ids = boundCRS ? boundCRS->baseCRS()->identifiers() + : crs.first->identifiers(); if (!ids.empty() && *(ids[0]->codeSpace()) == auth_name) { if (!firstGeodCRSForAuth) { sql += ','; diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index 88a7813a..82eb4562 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -3493,6 +3493,17 @@ TEST(crs, compoundCRS_identify_db) { EXPECT_EQ(res.front().first->getEPSGCode(), 8769); EXPECT_EQ(res.front().second, 70); } + { + auto obj = PROJStringParser().createFromPROJString( + "+proj=tmerc +lat_0=0 +lon_0=72.05 +k=1 +x_0=3500000 " + "+y_0=-5811057.63 +ellps=krass " + "+towgs84=23.57,-140.95,-79.8,0,-0.35,-0.79,-0.22 " + "+geoidgrids=egm08_25.gtx +units=m +no_defs +type=crs"); + auto crs = nn_dynamic_pointer_cast<CompoundCRS>(obj); + ASSERT_TRUE(crs != nullptr); + // Just check we don't get an exception + crs->identify(factory); + } } // --------------------------------------------------------------------------- |