From 45c819b69fb401c21c5571ddc2a602a8e72385d6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 20 Oct 2020 21:14:30 +0200 Subject: Improve identification of compound CRS from ESRI WKT1, and for compound CRS whose result is not in the DB but whose horiz and vertical parts are known --- test/unit/test_crs.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'test') diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index ec30580a..c2031081 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -4058,6 +4058,42 @@ TEST(crs, compoundCRS_identify_db) { // Just check we don't get an exception crs->identify(factory); } + // Identify from ESRI WKT + { + auto sourceCRS = factory->createCompoundCRS("7405"); + auto wkt = sourceCRS->exportToWKT( + WKTFormatter::create(WKTFormatter::Convention::WKT1_ESRI, dbContext) + .get()); + auto obj = + WKTParser().attachDatabaseContext(dbContext).createFromWKT(wkt); + auto crs = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(crs != nullptr); + auto res = crs->identify(factory); + ASSERT_EQ(res.size(), 1U); + EXPECT_EQ(res.front().first->getEPSGCode(), 7405); + EXPECT_EQ(res.front().second, 100); + } + // Identify a CompoundCRS whose horizontal and vertical parts are known + // but not the composition. + { + auto obj = createFromUserInput("EPSG:4326+3855", dbContext); + auto sourceCRS = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(sourceCRS != nullptr); + auto wkt = sourceCRS->exportToWKT( + WKTFormatter::create(WKTFormatter::Convention::WKT1_ESRI, dbContext) + .get()); + auto obj2 = + WKTParser().attachDatabaseContext(dbContext).createFromWKT(wkt); + auto crs = nn_dynamic_pointer_cast(obj2); + ASSERT_TRUE(crs != nullptr); + auto res = crs->identify(factory); + ASSERT_EQ(res.size(), 1U); + EXPECT_EQ(res.front().first->getEPSGCode(), 0); + EXPECT_EQ(res.front().second, 100); + const auto &components = res.front().first->componentReferenceSystems(); + EXPECT_EQ(components[0]->getEPSGCode(), 4326); + EXPECT_EQ(components[1]->getEPSGCode(), 3855); + } } // --------------------------------------------------------------------------- -- cgit v1.2.3 From 31f272708eaba9274b4b3c02240e9e7012c6b2b8 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 20 Oct 2020 21:51:45 +0200 Subject: VerticalCRS: morph CRS and datum name using ESRI aliases on import from / export to WKT1:ESRI --- test/unit/test_crs.cpp | 19 ++++++++++++++++++- test/unit/test_io.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index c2031081..a0fee905 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -3593,7 +3593,7 @@ TEST(crs, verticalCRS_as_WKT1_GDAL) { TEST(crs, verticalCRS_as_WKT1_ESRI) { auto crs = createVerticalCRS(); - auto expected = "VERTCS[\"ODN height\",VDATUM[\"Ordnance Datum Newlyn\"]," + auto expected = "VERTCS[\"ODN_height\",VDATUM[\"Ordnance_Datum_Newlyn\"]," "PARAMETER[\"Vertical_Shift\",0.0]," "PARAMETER[\"Direction\",1.0]," "UNIT[\"Meter\",1.0]]"; @@ -3603,6 +3603,23 @@ TEST(crs, verticalCRS_as_WKT1_ESRI) { WKTFormatter::create(WKTFormatter::Convention::WKT1_ESRI).get()), expected); } + +// --------------------------------------------------------------------------- + +TEST(crs, verticalCRS_as_WKT1_ESRI_context) { + auto crs = createVerticalCRS(); + auto expected = "VERTCS[\"Newlyn\",VDATUM[\"Ordnance_Datum_Newlyn\"]," + "PARAMETER[\"Vertical_Shift\",0.0]," + "PARAMETER[\"Direction\",1.0]," + "UNIT[\"Meter\",1.0]]"; + + EXPECT_EQ(crs->exportToWKT( + WKTFormatter::create(WKTFormatter::Convention::WKT1_ESRI, + DatabaseContext::create()) + .get()), + expected); +} + // --------------------------------------------------------------------------- TEST(crs, verticalCRS_down_as_WKT1_ESRI) { diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 1be0f2aa..055b1e1d 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -2106,6 +2106,31 @@ TEST(wkt_parse, VERTCS_WKT1_ESRI) { // --------------------------------------------------------------------------- +TEST(wkt_parse, VERTCS_WKT1_ESRI_context) { + auto wkt = "VERTCS[\"EGM2008_Geoid\",VDATUM[\"EGM2008_Geoid\"]," + "PARAMETER[\"Vertical_Shift\",0.0]," + "PARAMETER[\"Direction\",1.0],UNIT[\"Meter\",1.0]]"; + + auto obj = WKTParser() + .attachDatabaseContext(DatabaseContext::create()) + .createFromWKT(wkt); + auto crs = nn_dynamic_pointer_cast(obj); + ASSERT_TRUE(crs != nullptr); + EXPECT_EQ(crs->nameStr(), "EGM2008 height"); + + auto datum = crs->datum(); + EXPECT_EQ(datum->nameStr(), "EGM2008 geoid"); + + auto cs = crs->coordinateSystem(); + ASSERT_EQ(cs->axisList().size(), 1U); + EXPECT_EQ(cs->axisList()[0]->direction(), AxisDirection::UP); + + EXPECT_EQ(WKTParser().guessDialect(wkt), + WKTParser::WKTGuessedDialect::WKT1_ESRI); +} + +// --------------------------------------------------------------------------- + TEST(wkt_parse, VERTCS_WKT1_ESRI_down) { auto wkt = "VERTCS[\"Caspian\",VDATUM[\"Caspian_Sea\"]," "PARAMETER[\"Vertical_Shift\",0.0]," -- cgit v1.2.3