aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--configure.ac2
-rw-r--r--docs/source/conf.py6
-rw-r--r--docs/source/download.rst29
-rw-r--r--docs/source/news.rst78
-rw-r--r--src/iso19111/c_api.cpp21
-rw-r--r--src/iso19111/coordinateoperation.cpp70
-rw-r--r--src/proj.h4
-rw-r--r--src/proj_api.h2
-rw-r--r--src/release.cpp2
-rw-r--r--test/cli/testprojinfo_out.dist15
-rw-r--r--test/unit/test_operation.cpp8
-rwxr-xr-xtravis/after_success.sh2
13 files changed, 205 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8213c19a..a75aa578 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ message(STATUS "Configuring PROJ:")
#PROJ version information
################################################################################
include(ProjVersion)
-proj_version(MAJOR 7 MINOR 2 PATCH 0)
+proj_version(MAJOR 8 MINOR 0 PATCH 0)
set(PROJ_API_VERSION "19")
set(PROJ_BUILD_VERSION "21.0.2")
diff --git a/configure.ac b/configure.ac
index 17f19900..33f8cc0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([PROJ], [7.2.0],
+AC_INIT([PROJ], [8.0.0],
[https://github.com/OSGeo/PROJ/issues], proj, [https://proj.org])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 31b81d3f..fbf4358a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -69,8 +69,8 @@ copyright = u'1983-{0}'.format(now.year)
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
-version = '7.2.0'
-data_version = '1.2'
+version = '8.0.0'
+data_version = '1.3'
# use same |release| as |version|
release = version
@@ -194,7 +194,7 @@ html_context = {
'github_user': 'OSGeo',
'github_repo': 'PROJ',
# TODO: edit when switching active branch
- 'github_version': '/7.1/docs/source/',
+ 'github_version': '/7.2/docs/source/',
'css_files': [
'_static/theme_overrides.css', # override wide tables in RTD theme
],
diff --git a/docs/source/download.rst b/docs/source/download.rst
index 12d9d913..f33733fb 100644
--- a/docs/source/download.rst
+++ b/docs/source/download.rst
@@ -13,17 +13,8 @@ distribution of the source code and various resource file archives. See
Current Release
--------------------------------------------------------------------------------
-* **2020-09-01** `proj-7.1.1.tar.gz`_ (`md5`_)
-* **2020-07-01** `proj-7.1.0.tar.gz`_
-* **2020-05-01** `proj-6.3.2.tar.gz`_
-* **2020-09-01** `proj-data-1.2.tar.gz`_
-* **2020-05-01** `proj-data-1.1.tar.gz`_
-* **2020-03-01** `proj-data-1.0.tar.gz`_
-* **2018-09-15** `proj-datumgrid-1.8.zip`_
-* **2020-03-01** `proj-datumgrid-europe-1.6.zip`_
-* **2020-03-01** `proj-datumgrid-north-america-1.4.zip`_
-* **2020-03-01** `proj-datumgrid-oceania-1.2.zip`_
-* **2019-03-01** `proj-datumgrid-world-1.0.zip`_
+* **2020-11-01** `proj-7.2.0.tar.gz`_ (`md5`_)
+* **2020-11-01** `proj-data-1.3.tar.gz`_
* **PDF Manual** `proj.pdf`_
.. note::
@@ -37,6 +28,9 @@ Current Release
Past Releases
--------------------------------------------------------------------------------
+* **2020-09-01** `proj-7.1.1.tar.gz`_
+* **2020-07-01** `proj-7.1.0.tar.gz`_
+* **2020-05-01** `proj-6.3.2.tar.gz`_
* **2020-05-01** `proj-7.0.1.tar.gz`_
* **2020-03-01** `proj-7.0.0.tar.gz`_
* **2020-02-11** `proj-6.3.1.tar.gz`_
@@ -54,8 +48,15 @@ Past Releases
* **2015-09-13** `proj-4.9.2.tar.gz`_
* **2015-03-04** `proj-4.9.1.tar.gz`_
+* **2020-09-01** `proj-data-1.2.tar.gz`_
+* **2020-05-01** `proj-data-1.1.tar.gz`_
* **2020-03-01** `proj-data-1.0.tar.gz`_
+* **2018-09-15** `proj-datumgrid-1.8.zip`_
+* **2020-03-01** `proj-datumgrid-europe-1.6.zip`_
+* **2020-03-01** `proj-datumgrid-north-america-1.4.zip`_
+* **2020-03-01** `proj-datumgrid-oceania-1.2.zip`_
+* **2019-03-01** `proj-datumgrid-world-1.0.zip`_
* **2018-03-01** `proj-datumgrid-1.7.zip`_
* **2016-09-11** `proj-datumgrid-1.6.zip`_
* **2019-09-01** `proj-datumgrid-europe-1.5.zip`_
@@ -71,8 +72,9 @@ Past Releases
* **2018-03-01** `proj-datumgrid-oceania-1.1.zip`_
* **2018-03-01** `proj-datumgrid-oceania-1.0.zip`_
+.. _`proj-7.2.0.tar.gz`: https://download.osgeo.org/proj/proj-7.2.0.tar.gz
+.. _`md5`: https://download.osgeo.org/proj/proj-7.2.0.tar.gz.md5
.. _`proj-7.1.1.tar.gz`: https://download.osgeo.org/proj/proj-7.1.1.tar.gz
-.. _`md5`: https://download.osgeo.org/proj/proj-7.1.1.tar.gz.md5
.. _`proj-7.1.0.tar.gz`: https://download.osgeo.org/proj/proj-7.1.0.tar.gz
.. _`proj-7.0.1.tar.gz`: https://download.osgeo.org/proj/proj-7.0.1.tar.gz
.. _`proj-7.0.0.tar.gz`: https://download.osgeo.org/proj/proj-7.0.0.tar.gz
@@ -91,9 +93,12 @@ Past Releases
.. _`proj-4.9.1.tar.gz`: https://download.osgeo.org/proj/proj-4.9.1.tar.gz
.. _`proj-4.9.2.tar.gz`: https://download.osgeo.org/proj/proj-4.9.2.tar.gz
.. _`proj-4.9.3.tar.gz`: https://download.osgeo.org/proj/proj-4.9.3.tar.gz
+
+.. _`proj-data-1.3.tar.gz`: https://download.osgeo.org/proj/proj-data-1.3.tar.gz
.. _`proj-data-1.2.tar.gz`: https://download.osgeo.org/proj/proj-data-1.2.tar.gz
.. _`proj-data-1.1.tar.gz`: https://download.osgeo.org/proj/proj-data-1.1.tar.gz
.. _`proj-data-1.0.tar.gz`: https://download.osgeo.org/proj/proj-data-1.0.tar.gz
+
.. _`proj-datumgrid-1.6.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.6.zip
.. _`proj-datumgrid-1.7.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.7.zip
.. _`proj-datumgrid-1.8.zip`: https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
diff --git a/docs/source/news.rst b/docs/source/news.rst
index 21e3f748..4275dd11 100644
--- a/docs/source/news.rst
+++ b/docs/source/news.rst
@@ -3,6 +3,84 @@
News
###############################################################################
+7.2.0 Release Notes
+++++++++++++++++++++++++++++++++++++++++
+*November 1st 2020*
+
+Updates
+-------
+
++ **Command line tools**
+
+ * Add multi-line PROJ string export capability, and use it by default in
+ :program:`projinfo` (unless ``--single-line`` is specified) (`#2381 <https://github.com/OSGeo/issues/2381>`_)
+
++ **Coordinate operations**
+
+ * :ref:`col_urban` projection, implementing a EPSG projection method
+ used by a number of projected CRS in Colombia (`#2395 <https://github.com/OSGeo/issues/2395>`_)
+
+ * :ref:`tinshift` for triangulation-based transformations (`#2344 <https://github.com/OSGeo/issues/2344>`_)
+
+ * Added ellipsoidal formulation of :ref:`ortho` (`#2361 <https://github.com/OSGeo/issues/2361>`_)
+
+
++ **Database**
+
+ * Update to EPSG 10.003 and make code base robust to dealing with
+ WKT CRS with DatumEnsemble (`#2370 <https://github.com/OSGeo/issues/2370>`_)
+
+ * Added Finland tinshift operations (`#2392 <https://github.com/OSGeo/issues/2392>`_)
+
+ * Added transformation from JGD2011 Geographic 3D to JGD2011
+ height using GSIGEO2011 (`#2393 <https://github.com/OSGeo/issues/2393>`_)
+
+ * Improve CompoundCRS identification and name morphing in VerticalCRS
+ with ESRI WKT1 (`#2386 <https://github.com/OSGeo/issues/2386>`_)
+
+ * Added OGC:CRS27 and OGC:CRS83 CRS entries for NAD27 and NAD83
+ in longitude, latitude order (`#2350 <https://github.com/OSGeo/issues/2350>`_)
+
++ **API**
+
+ * Added temporal, engineering, and parametric datum :c:type:`PJ_TYPE` enumerations (`#2274 <https://github.com/OSGeo/issues/2274>`_)
+
+ * Various improvements to context handling (#2329, #2331)
+
+ * :c:func:`proj_create_vertical_crs_ex()`: add a ``ACCURACY`` option to provide
+ an explicit accuracy, or derive it from the grid name if it is
+ known (`#2342 <https://github.com/OSGeo/issues/2342>`_)
+
+ * :c:func:`proj_crs_create_bound_crs_to_WGS84()`: make it work on
+ verticalCRS/compoundCRS such as EPSG:4326+5773 and
+ EPSG:4326+3855 (`#2365 <https://github.com/OSGeo/issues/2365>`_)
+
+ * :cpp:func:`promoteTo3D()`: add a remark with the original CRS identifier (`#2369 <https://github.com/OSGeo/issues/2369>`_)
+
+ * Added :c:func:`proj_context_clone` (`#2383 <https://github.com/OSGeo/issues/2383>`_)
+
+
+Bug fixes
+---------
+
+* Avoid core dumps when copying contexts in certain scenarios (`#2324 <https://github.com/OSGeo/issues/2324>`_)
+
+* :c:func:`proj_trans()`: reset errno before attemptying a retry with a new
+ coordinate operation (`#2353 <https://github.com/OSGeo/issues/2353>`_)
+
+* PROJJSON schema corrected to allow prime meridians values with
+ explicitly stating a unit (degrees assumed) (`#2354 <https://github.com/OSGeo/issues/2354>`_)
+
+* Adjust :cpp:func:`createBoundCRSToWGS84IfPossible()` and operation filtering
+ (for POSGAR 2007 to WGS84 issues) (`#2357 <https://github.com/OSGeo/issues/2357>`_)
+
+* :cpp:func:`createOperations()`: several fixes affecting NAD83 -> NAD83(2011) (`#2364 <https://github.com/OSGeo/issues/2364>`_)
+
+* WKT2:2019 import/export: handle DATUM (at top level object) with PRIMEM
+
+* WKT1_ESRI: fix import and export of CompoundCRS (`#2389 <https://github.com/OSGeo/issues/2389>`_)
+
+
7.1.1 Release Notes
++++++++++++++++++++++++++++++++++++++++
*September 1st 2020*
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index f463dc2a..90a414c6 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -4440,8 +4440,9 @@ PJ *proj_create_cartesian_2D_cs(PJ_CONTEXT *ctx, PJ_CARTESIAN_CS_2D_TYPE type,
*
* @param ctx PROJ context, or NULL for default context
* @param type Coordinate system type.
- * @param unit_name Unit name.
- * @param unit_conv_factor Unit conversion factor to SI.
+ * @param unit_name Name of the angular units. Or NULL for Degree
+ * @param unit_conv_factor Conversion factor from the angular unit to radian.
+ * Or 0 for Degree if unit_name == NULL. Otherwise should be not NULL
*
* @return Object that must be unreferenced with
* proj_destroy(), or NULL in case of error.
@@ -4480,13 +4481,17 @@ PJ *proj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx,
*
* @param ctx PROJ context, or NULL for default context
* @param type Coordinate system type.
- * @param horizontal_angular_unit_name Horizontal angular unit name.
- * @param horizontal_angular_unit_conv_factor Horizontal angular unit conversion
- * factor to SI.
- * @param vertical_linear_unit_name Vertical linear unit name.
+ * @param horizontal_angular_unit_name Name of the angular units. Or NULL for
+ * Degree.
+ * @param horizontal_angular_unit_conv_factor Conversion factor from the angular
+ * unit to radian. Or 0 for Degree if horizontal_angular_unit_name == NULL.
+ * Otherwise should be not NULL
+ * @param vertical_linear_unit_name Vertical linear unit name. Or NULL for
+ * Metre.
* @param vertical_linear_unit_conv_factor Vertical linear unit conversion
- * factor to SI.
- *
+ * factor to metre. Or 0 for Metre if vertical_linear_unit_name == NULL.
+ * Otherwise should be not NULL
+
* @return Object that must be unreferenced with
* proj_destroy(), or NULL in case of error.
* @since 6.3
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index be15b3e0..e9d73f52 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -8836,11 +8836,16 @@ createSimilarPropertiesTransformation(TransformationNNPtr obj) {
// The domain(s) are unchanged
addDomains(map, obj.get());
- std::string forwardName = obj->nameStr();
+ const std::string &forwardName = obj->nameStr();
if (!forwardName.empty()) {
map.set(common::IdentifiedObject::NAME_KEY, forwardName);
}
+ const std::string &remarks = obj->remarks();
+ if (!remarks.empty()) {
+ map.set(common::IdentifiedObject::REMARKS_KEY, remarks);
+ }
+
addModifiedIdentifier(map, obj.get(), false, true);
return map;
@@ -12615,6 +12620,55 @@ createGeodToGeodPROJBased(const crs::CRSNNPtr &geodSrc,
// ---------------------------------------------------------------------------
+static std::string
+getRemarks(const std::vector<operation::CoordinateOperationNNPtr> &ops) {
+ std::string remarks;
+ for (const auto &op : ops) {
+ const auto &opRemarks = op->remarks();
+ if (!opRemarks.empty()) {
+ if (!remarks.empty()) {
+ remarks += '\n';
+ }
+
+ std::string opName(op->nameStr());
+ if (starts_with(opName, INVERSE_OF)) {
+ opName = opName.substr(INVERSE_OF.size());
+ }
+
+ remarks += "For ";
+ remarks += opName;
+
+ const auto &ids = op->identifiers();
+ if (!ids.empty()) {
+ std::string authority(*ids.front()->codeSpace());
+ if (starts_with(authority, "INVERSE(") &&
+ authority.back() == ')') {
+ authority = authority.substr(strlen("INVERSE("),
+ authority.size() - 1 -
+ strlen("INVERSE("));
+ }
+ if (starts_with(authority, "DERIVED_FROM(") &&
+ authority.back() == ')') {
+ authority = authority.substr(strlen("DERIVED_FROM("),
+ authority.size() - 1 -
+ strlen("DERIVED_FROM("));
+ }
+
+ remarks += " (";
+ remarks += authority;
+ remarks += ':';
+ remarks += ids.front()->code();
+ remarks += ')';
+ }
+ remarks += ": ";
+ remarks += opRemarks;
+ }
+ }
+ return remarks;
+}
+
+// ---------------------------------------------------------------------------
+
static CoordinateOperationNNPtr createHorizVerticalPROJBased(
const crs::CRSNNPtr &sourceCRS, const crs::CRSNNPtr &targetCRS,
const operation::CoordinateOperationNNPtr &horizTransform,
@@ -12640,6 +12694,10 @@ static CoordinateOperationNNPtr createHorizVerticalPROJBased(
properties.set(common::ObjectUsage::DOMAIN_OF_VALIDITY_KEY,
NN_NO_CHECK(extent));
}
+ const auto &remarks = verticalTransform->remarks();
+ if (!remarks.empty()) {
+ properties.set(common::IdentifiedObject::REMARKS_KEY, remarks);
+ }
return createPROJBased(
properties, exportable, sourceCRS, targetCRS, nullptr,
verticalTransform->coordinateOperationAccuracies(),
@@ -12664,6 +12722,11 @@ static CoordinateOperationNNPtr createHorizVerticalPROJBased(
NN_NO_CHECK(extent));
}
+ const auto remarks = getRemarks(ops);
+ if (!remarks.empty()) {
+ properties.set(common::IdentifiedObject::REMARKS_KEY, remarks);
+ }
+
std::vector<metadata::PositionalAccuracyNNPtr> accuracies;
const double accuracy = getAccuracy(ops);
if (accuracy >= 0.0) {
@@ -12724,6 +12787,11 @@ static CoordinateOperationNNPtr createHorizVerticalHorizPROJBased(
NN_NO_CHECK(extent));
}
+ const auto remarks = getRemarks(ops);
+ if (!remarks.empty()) {
+ properties.set(common::IdentifiedObject::REMARKS_KEY, remarks);
+ }
+
std::vector<metadata::PositionalAccuracyNNPtr> accuracies;
const double accuracy = getAccuracy(ops);
if (accuracy >= 0.0) {
diff --git a/src/proj.h b/src/proj.h
index c98fcc1f..e77a5984 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -170,8 +170,8 @@ extern "C" {
#endif
/* The version numbers should be updated with every release! **/
-#define PROJ_VERSION_MAJOR 7
-#define PROJ_VERSION_MINOR 2
+#define PROJ_VERSION_MAJOR 8
+#define PROJ_VERSION_MINOR 0
#define PROJ_VERSION_PATCH 0
extern char const PROJ_DLL pj_release[]; /* global release id string */
diff --git a/src/proj_api.h b/src/proj_api.h
index a1b6393c..a26088ca 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -38,7 +38,7 @@
#endif
#ifndef PJ_VERSION
-#define PJ_VERSION 720
+#define PJ_VERSION 800
#endif
#ifdef PROJ_RENAME_SYMBOLS
diff --git a/src/release.cpp b/src/release.cpp
index 06b2cfcd..c8b9c178 100644
--- a/src/release.cpp
+++ b/src/release.cpp
@@ -11,7 +11,7 @@ char const pj_release[] =
STR(PROJ_VERSION_MAJOR)"."
STR(PROJ_VERSION_MINOR)"."
STR(PROJ_VERSION_PATCH)", "
- "November 1st, 2020";
+ "March 1st, 2021";
const char *pj_get_release() {
return pj_release;
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index 245bb258..7da5add7 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -317,7 +317,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
SCOPE["Historic record only - now superseded - see remarks."],
AREA["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."],
BBOX[40.04,-141.01,86.46,-47.74]],
- ID["DERIVED_FROM(EPSG)",1312]]
+ ID["DERIVED_FROM(EPSG)",1312],
+ REMARK["Uses NTv1 method. Replaced in Quebec by code 1462 and elsewhere in 1997 by NTv2 (transformation code 1313). Input expects longitudes to be positive west; EPSG GeogCRS NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]]
-------------------------------------
Operation No. 2:
@@ -371,7 +372,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
SCOPE["Transformation of coordinates at 1m to 2m level of accuracy."],
AREA["Canada - onshore - Alberta; British Columbia; Manitoba; New Brunswick; Newfoundland and Labrador; Northwest Territories; Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; Saskatchewan; Yukon; offshore east coast."],
BBOX[40.04,-141.01,83.17,-47.74]],
- ID["DERIVED_FROM(EPSG)",1313]]
+ ID["DERIVED_FROM(EPSG)",1313],
+ REMARK["Uses NTv2 data files. Replaces NTv1 (transformation code 1312) except in Quebec. Input expects longitudes to be positive west; EPSG GeogCRS NAD27 (code 4267) and (code 4269) have longitudes positive east. May be used as tfm to WGS 84 - see code 1693."]]
-------------------------------------
Operation No. 3:
@@ -425,7 +427,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
SCOPE["Transformation of coordinates at 0.2m level of accuracy."],
AREA["United States (USA) - CONUS including EEZ -onshore and offshore - Alabama; Arizona; Arkansas; California; Colorado; Connecticut; Delaware; Florida; Georgia; Idaho; Illinois; Indiana; Iowa; Kansas; Kentucky; Louisiana; Maine; Maryland; Massachusetts; Michigan; Minnesota; Mississippi; Missouri; Montana; Nebraska; Nevada; New Hampshire; New Jersey; New Mexico; New York; North Carolina; North Dakota; Ohio; Oklahoma; Oregon; Pennsylvania; Rhode Island; South Carolina; South Dakota; Tennessee; Texas; Utah; Vermont; Virginia; Washington; West Virginia; Wisconsin; Wyoming. US Gulf of Mexico (GoM) OCS."],
BBOX[23.81,-129.17,49.38,-65.69]],
- ID["DERIVED_FROM(EPSG)",1241]]
+ ID["DERIVED_FROM(EPSG)",1241],
+ REMARK["Uses NADCON method which expects longitudes positive west; EPSG GeogCRS NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]]
-------------------------------------
Operation No. 4:
@@ -479,7 +482,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
SCOPE["Geodesy."],
AREA["United States (USA) - Alaska including EEZ."],
BBOX[47.88,167.65,74.71,-129.99]],
- ID["DERIVED_FROM(EPSG)",1243]]
+ ID["DERIVED_FROM(EPSG)",1243],
+ REMARK["Uses NADCON method which expects longitudes positive west; EPSG GeogCRS NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east. May be used as transformation to WGS 84 - see NAD27 to WGS 84 (85) (code 15864)."]]
-------------------------------------
Operation No. 5:
@@ -533,7 +537,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
SCOPE["Transformation of coordinates at 1m to 2m level of accuracy."],
AREA["Canada - Quebec."],
BBOX[44.99,-79.85,62.62,-57.1]],
- ID["DERIVED_FROM(EPSG)",1573]]
+ ID["DERIVED_FROM(EPSG)",1573],
+ REMARK["Also distributed with file name QUE27-83.gsb. Replaces NAD27 to NAD83 (5) (code 1462). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]]
-------------------------------------
Operation No. 6:
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index ce4b866b..1181b6d8 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -8734,6 +8734,14 @@ TEST(operation, compoundCRS_to_geogCRS_3D_context) {
"+multiplier=1 "
"+step +proj=unitconvert +xy_in=rad +xy_out=deg "
"+step +proj=axisswap +order=2,1");
+ EXPECT_EQ(list[0]->remarks(),
+ "For NAD83(NSRS2007) to NAVD88 height (1) (EPSG:9173): Uses "
+ "Geoid09 hybrid model. Replaced by 2012 model (CT code 6326)."
+ "\n"
+ "For NAD83(NSRS2007) to WGS 84 (1) (EPSG:15931): "
+ "Approximation at the +/- 1m level assuming that "
+ "NAD83(NSRS2007) is equivalent to WGS 84 within the accuracy "
+ "of the transformation.");
}
// NAD83 + NAVD88 height --> WGS 84
diff --git a/travis/after_success.sh b/travis/after_success.sh
index c3b28b97..095bafbd 100755
--- a/travis/after_success.sh
+++ b/travis/after_success.sh
@@ -12,7 +12,7 @@ fi
echo "$TRAVIS_SECURE_ENV_VARS"
./travis/build_docs.sh
# Only build and publish docs when changes are made on most recent maintenance branch
-if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "7.1"; then
+if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "7.2"; then
echo "publish website";
./travis/add_deploy_key.sh;
./travis/deploy_website.sh $TRAVIS_BUILD_DIR/docs/build /tmp;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 21:26:56 +0000