diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-03-04 14:35:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 14:35:18 +0100 |
| commit | c1fbdd88b3898279abc6a834254df15070fca39b (patch) | |
| tree | cc4b3e0738913763c0a4ab58ded6d507f8c4a51f /src | |
| parent | 72f5bb21ae35999b4994766e47b81900e8826c33 (diff) | |
| parent | cb64ce26221811bc19c362e0950dc2b057e5b757 (diff) | |
| download | PROJ-c1fbdd88b3898279abc6a834254df15070fca39b.tar.gz PROJ-c1fbdd88b3898279abc6a834254df15070fca39b.zip | |
Merge pull request #1986 from nyalldawson/behrman
Map the Behrman projection to cae when converting ESRI CRSes
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) { |