diff options
| author | Nyall Dawson <nyall.dawson@gmail.com> | 2020-02-26 09:37:13 +1000 |
|---|---|---|
| committer | Nyall Dawson <nyall.dawson@gmail.com> | 2020-03-04 19:01:56 +1000 |
| commit | d49ce528bbdc3e71e971db2ca5f0acd4ee649208 (patch) | |
| tree | b61440385f213d980065588a8cb8c296e995a51a /src | |
| parent | 72f5bb21ae35999b4994766e47b81900e8826c33 (diff) | |
| download | PROJ-d49ce528bbdc3e71e971db2ca5f0acd4ee649208.tar.gz PROJ-d49ce528bbdc3e71e971db2ca5f0acd4ee649208.zip | |
Add capability to force a fixed value for a non-specified CRS component
while mapping ESRI projections, and map the Behrman projection to
cae with lat_ts=30, lon_0=0
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/io.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 5b122707..861aadbf 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -3185,7 +3185,8 @@ ConversionNNPtr WKTParser::Private::buildProjectionFromESRI( if (iter != mapParamNameToValue.end()) { if (param->wkt2_name == nullptr) { try { - if (param->fixed_value == io::asDouble(iter->second)) { + if (io::asDouble(param->fixed_value) == + io::asDouble(iter->second)) { matchCount++; } } catch (const std::exception &) { @@ -3193,6 +3194,8 @@ ConversionNNPtr WKTParser::Private::buildProjectionFromESRI( } else { matchCount++; } + } else if (param->is_fixed_value) { + mapParamNameToValue[param->esri_name] = param->fixed_value; } } if (matchCount > bestMatchCount) { |