diff options
| author | dalia2 <57895979+dalia2@users.noreply.github.com> | 2019-12-12 14:25:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 14:25:40 +0000 |
| commit | 1efec9523d21e7948db2d278635c8881409b9cf8 (patch) | |
| tree | 2ac7fde4db93e75c109d65f2c596275a02a3cc06 /src/iso19111/io.cpp | |
| parent | e9d6a0b2993c903c8932b68d2812dc02adb26014 (diff) | |
| parent | 5b4e60f4f9ec353f79fba01790a3b945c50cab8e (diff) | |
| download | PROJ-1efec9523d21e7948db2d278635c8881409b9cf8.tar.gz PROJ-1efec9523d21e7948db2d278635c8881409b9cf8.zip | |
Merge branch 'master' into update-grid-alternatives.sql-for-Icealnd
Diffstat (limited to 'src/iso19111/io.cpp')
| -rw-r--r-- | src/iso19111/io.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 0d98e2de..e0e6152a 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -5669,10 +5669,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, DatabaseContextNNPtr dbContextNNPtr(NN_NO_CHECK(dbContext)); const auto &authName = tokens[0]; const auto &code = tokens[1]; - static const std::string epsg_lowercase("epsg"); - auto factory = AuthorityFactory::create( - dbContextNNPtr, - authName == epsg_lowercase ? Identifier::EPSG : authName); + auto factory = AuthorityFactory::create(dbContextNNPtr, authName); try { return factory->createCoordinateReferenceSystem(code); } catch (...) { @@ -8582,7 +8579,11 @@ CRSNNPtr PROJStringParser::Private::buildProjectedCRS( break; } } - if (getNumericValue(getParamValue(step, "a")) == 6378137) { + if (getNumericValue(getParamValue(step, "a")) == 6378137 && + getAngularValue(getParamValue(step, "lon_0")) == 0.0 && + getAngularValue(getParamValue(step, "lat_0")) == 0.0 && + getAngularValue(getParamValue(step, "x_0")) == 0.0 && + getAngularValue(getParamValue(step, "y_0")) == 0.0) { bWebMercator = true; } } else if (hasParamValue(step, "lat_ts")) { |