Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/mac/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- ccache
- autoconf
- automake
- m4
- jsonschema
- ruamel.yaml
- pytest
Expand Down
12 changes: 11 additions & 1 deletion src/iso19111/operation/coordinateoperationfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6221,6 +6221,7 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToGeog(
std::map<std::string, PairOfTransforms>
cacheHorizToInterpAndInterpToTarget;

bool hasVerticalTransformWithInterpGeogCRS = false;
for (const auto &verticalTransform : verticalTransforms) {
#ifdef TRACE_CREATE_OPERATIONS
ENTER_BLOCK("Considering vertical transform " +
Expand Down Expand Up @@ -6414,11 +6415,20 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToGeog(
verticalTransform, interpToTarget,
interpolationGeogCRS, true);
res.emplace_back(op);
hasVerticalTransformWithInterpGeogCRS = true;
} catch (const std::exception &) {
}
}
}
} else {
}
}

for (const auto &verticalTransform : verticalTransforms) {
crs::GeographicCRSPtr interpolationGeogCRS =
getInterpolationGeogCRS(verticalTransform, dbContext);
if (!interpolationGeogCRS &&
(!hasVerticalTransformWithInterpGeogCRS ||
verticalTransform->hasBallparkTransformation())) {
// This case is probably only correct if
// verticalTransform and horizTransform are independent
// and in particular that verticalTransform does not
Expand Down
6 changes: 5 additions & 1 deletion test/cli/test_projinfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1939,4 +1939,8 @@ tests:
out: |
Candidate operations found: 1
unknown id, Ballpark geographic offset from NAD83(CSRS) to NAD83(CSRS)v2, unknown accuracy, Canada - onshore and offshore - Alberta; British Columbia; Manitoba; New Brunswick; Newfoundland and Labrador; Northwest Territories; Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; Saskatchewan; Yukon., has ballpark transformation

- comment: Test that EPSG:4979 to EPSG:10645 does not include a non-sensical 'Inverse of Inverse of BES2020 Saba to Saba height (1) + Inverse of Saba to WGS 84 (1) + Saba Transverse Mercator 2020'
args: -s EPSG:4979 -t EPSG:10645 --hide-ballpark --summary
out: |
Candidate operations found: 1
unknown id, Inverse of Saba to WGS 84 (1) + Saba to Saba height (1) + Saba Transverse Mercator 2020, 1.2 m, Bonaire, Sint Eustatius and Saba (BES Islands or Caribbean Netherlands) - Saba - onshore.
14 changes: 12 additions & 2 deletions travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ ctest --output-on-failure
make install
# find /tmp/proj_shared_install_from_dist
$TRAVIS_BUILD_DIR/test/postinstall/test_cmake.sh /tmp/proj_shared_install_from_dist shared
$TRAVIS_BUILD_DIR/test/postinstall/test_autotools.sh /tmp/proj_shared_install_from_dist shared
if [ "$BUILD_NAME" != "osx" ]; then
# Fail on osx Conda with "autom4te: error: need GNU m4 1.4 or later: /Users/runner/miniforge3/conda-bld/autoconf_1746873780934/_build_env/bin/m4"
$TRAVIS_BUILD_DIR/test/postinstall/test_autotools.sh /tmp/proj_shared_install_from_dist
else
echo "Skipping test_autotools.sh test for $BUILD_NAME"
fi

# Test install and uninstall targets with DESTDIR
make install DESTDIR=/tmp/destdir
Expand Down Expand Up @@ -115,7 +120,12 @@ ctest --output-on-failure
make install
# find /tmp/proj_static_install_from_dist
$TRAVIS_BUILD_DIR/test/postinstall/test_cmake.sh /tmp/proj_static_install_from_dist static PROJ_CONFIG
$TRAVIS_BUILD_DIR/test/postinstall/test_autotools.sh /tmp/proj_static_install_from_dist static
if [ "$BUILD_NAME" != "osx" ]; then
# Fail on osx Conda with "autom4te: error: need GNU m4 1.4 or later: /Users/runner/miniforge3/conda-bld/autoconf_1746873780934/_build_env/bin/m4"
$TRAVIS_BUILD_DIR/test/postinstall/test_autotools.sh /tmp/proj_static_install_from_dist static
else
echo "Skipping test_autotools.sh test for $BUILD_NAME"
fi

# Re-run by unsetting CMAKE_INSTALL_INCLUDEDIR/CMAKE_INSTALL_LIBDIR/CMAKE_INSTALL_BINDIR
# so that later test which involve renaming/moving the installation prefix work.
Expand Down