diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-12 19:27:57 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-12 19:27:57 +0100 |
| commit | c165952bcf0135bc26b6cfea3ae387c51ba59fb0 (patch) | |
| tree | 6833b243111fbca4a4da56ae6400477c9ebaa445 | |
| parent | 8063c0b992af82154b3d9b637c78aa769a482f8a (diff) | |
| download | PROJ-c165952bcf0135bc26b6cfea3ae387c51ba59fb0.tar.gz PROJ-c165952bcf0135bc26b6cfea3ae387c51ba59fb0.zip | |
grids.cpp: use 'parent_grid_name' as stated in RFC4
| -rw-r--r-- | data/tests/test_hgrid_with_subgrid.tif | bin | 6943 -> 6943 bytes | |||
| -rw-r--r-- | src/grids.cpp | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/tests/test_hgrid_with_subgrid.tif b/data/tests/test_hgrid_with_subgrid.tif Binary files differindex 2acc4581..46a8f2f4 100644 --- a/data/tests/test_hgrid_with_subgrid.tif +++ b/data/tests/test_hgrid_with_subgrid.tif diff --git a/src/grids.cpp b/src/grids.cpp index eca0033a..ca3ddfcc 100644 --- a/src/grids.cpp +++ b/src/grids.cpp @@ -1054,7 +1054,7 @@ insertIntoHierarchy(PJ_CONTEXT *ctx, std::unique_ptr<GridType> &&grid, std::map<std::string, GridType *> &mapGrids) { const auto &extent = grid->extentAndRes(); - // If we have one or both of grid_name and parent_name, try to use + // If we have one or both of grid_name and parent_grid_name, try to use // the names to recreate the hiearchy if (!gridName.empty()) { if (mapGrids.find(gridName) != mapGrids.end()) { @@ -1250,7 +1250,7 @@ GTiffVGridShiftSet::open(PJ_CONTEXT *ctx, PAFile fp, } const std::string gridName = grid->metadataItem("grid_name"); - const std::string parentName = grid->metadataItem("parent_name"); + const std::string parentName = grid->metadataItem("parent_grid_name"); auto vgrid = internal::make_unique<GTiffVGrid>(std::move(grid), idxSample); @@ -2068,7 +2068,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, PAFile fp, } const std::string gridName = grid->metadataItem("grid_name"); - const std::string parentName = grid->metadataItem("parent_name"); + const std::string parentName = grid->metadataItem("parent_grid_name"); auto hgrid = internal::make_unique<GTiffHGrid>( std::move(grid), idxLatShift, idxLonShift, convFactorToRadian, @@ -2364,7 +2364,7 @@ GTiffGenericGridShiftSet::open(PJ_CONTEXT *ctx, PAFile fp, } const std::string gridName = grid->metadataItem("grid_name"); - const std::string parentName = grid->metadataItem("parent_name"); + const std::string parentName = grid->metadataItem("parent_grid_name"); auto hgrid = internal::make_unique<GTiffGenericGrid>(std::move(grid)); |