Import from ESRI WKT: remove special case of renaming UPS_North / UPS_South which appears to be undesirable

Author: rouault

src/iso19111/io.cpp

@@ -4388,15 +4388,7 @@ WKTParser::Private::buildProjectedCRS(const WKTNodeNNPtr &node) {
 
     const std::string projCRSName = stripQuotes(nodeP->children()[0]);
     if (esriStyle_ && dbContext_) {
-        // It is likely that the ESRI definition of EPSG:32661 (UPS North) &
-        // EPSG:32761 (UPS South) uses the easting-northing order, instead
-        // of the EPSG northing-easting order
-        // so don't substitute names to avoid confusion.
-        if (projCRSName == "UPS_North") {
-            props.set(IdentifiedObject::NAME_KEY, "WGS 84 / UPS North (E,N)");
-        } else if (projCRSName == "UPS_South") {
-            props.set(IdentifiedObject::NAME_KEY, "WGS 84 / UPS South (E,N)");
-        } else if (cartesianCS) {
+        if (cartesianCS) {
             std::string outTableName;
             std::string authNameFromAlias;
             std::string codeFromAlias;

test/unit/test_io.cpp

@@ -7325,9 +7325,11 @@ TEST(wkt_parse, wkt1_esri_ups_north) {
     auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj);
     ASSERT_TRUE(crs != nullptr);
 
-    EXPECT_EQ(crs->nameStr(), "WGS 84 / UPS North (E,N)");
+    EXPECT_EQ(crs->nameStr(), "WGS 84 / UPS North (N,E)");
     EXPECT_EQ(crs->coordinateSystem()->axisList()[0]->direction(),
               AxisDirection::SOUTH);
+    // Yes, inconsistency between the name (coming from EPSG) and the fact
+    // that with ESRI CRS, we always output E, N axis order
     EXPECT_EQ(crs->coordinateSystem()->axisList()[0]->abbreviation(), "E");
     EXPECT_EQ(crs->coordinateSystem()->axisList()[1]->direction(),
               AxisDirection::SOUTH);
@@ -7355,9 +7357,11 @@ TEST(wkt_parse, wkt1_esri_ups_south) {
     auto crs = nn_dynamic_pointer_cast<ProjectedCRS>(obj);
     ASSERT_TRUE(crs != nullptr);
 
-    EXPECT_EQ(crs->nameStr(), "WGS 84 / UPS South (E,N)");
+    EXPECT_EQ(crs->nameStr(), "WGS 84 / UPS South (N,E)");
     EXPECT_EQ(crs->coordinateSystem()->axisList()[0]->direction(),
               AxisDirection::NORTH);
+    // Yes, inconsistency between the name (coming from EPSG) and the fact
+    // that with ESRI CRS, we always output E, N axis order
     EXPECT_EQ(crs->coordinateSystem()->axisList()[0]->abbreviation(), "E");
     EXPECT_EQ(crs->coordinateSystem()->axisList()[1]->direction(),
               AxisDirection::NORTH);