diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-06-06 22:38:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 22:38:44 +0200 |
| commit | f8438ec596cce6f4b3e0c19092df9eaf22e93cd3 (patch) | |
| tree | a42df7bcb2f5682283d82e0ebd013326ba1fb237 | |
| parent | 6aab9a71395ca05ccf109ae979611eeff265cfaf (diff) | |
| parent | dc038ddd4c037599a5944baf9ab379fa2563cc5e (diff) | |
| download | PROJ-f8438ec596cce6f4b3e0c19092df9eaf22e93cd3.tar.gz PROJ-f8438ec596cce6f4b3e0c19092df9eaf22e93cd3.zip | |
Merge pull request #1509 from rouault/wkt1_direction_case_insensitive
WKT1 importer: do case insensitive comparison for axis direction
| -rw-r--r-- | src/iso19111/io.cpp | 2 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index ae298a3a..caf9852b 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -2311,7 +2311,7 @@ WKTParser::Private::buildAxis(const WKTNodeNNPtr &node, direction = &AxisDirection::GEOCENTRIC_Z; } else if (dirString == AxisDirectionWKT1::OTHER.toString()) { direction = &AxisDirection::UNSPECIFIED; - } else if (!direction && AxisDirectionWKT1::valueOf(dirString) != nullptr) { + } else if (!direction && AxisDirectionWKT1::valueOf(toupper(dirString)) != nullptr) { direction = AxisDirection::valueOf(tolower(dirString)); } diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 62054f16..f0f462c2 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -1018,7 +1018,7 @@ TEST(wkt_parse, wkt1_projected) { " PARAMETER[\"false_northing\",0],\n" " UNIT[\"metre\",1,\n" " AUTHORITY[\"EPSG\",\"9001\"]],\n" - " AXIS[\"(E)\",EAST],\n" + " AXIS[\"(E)\",East],\n" // should normally be uppercase " AXIS[\"(N)\",NORTH],\n" " AUTHORITY[\"EPSG\",\"32631\"]]"; auto obj = WKTParser() |