aboutsummaryrefslogtreecommitdiff
path: root/src/transformations/helmert.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-01-17 00:24:03 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-01-17 00:52:19 +0100
commit4724025e6c817761052fc0dc8810fd489a9e0104 (patch)
tree21117e52f95b8f36880efef8cd71c1fcec21242c /src/transformations/helmert.cpp
parent66fd99a8831955034cb25c8468ecfe1f9d3a7d62 (diff)
parentd76e6202d27c730b4dcbf16b8c1575c11b703485 (diff)
downloadPROJ-4724025e6c817761052fc0dc8810fd489a9e0104.tar.gz
PROJ-4724025e6c817761052fc0dc8810fd489a9e0104.zip
Merge branch 'master' into rfc4_merge_back_master
Diffstat (limited to 'src/transformations/helmert.cpp')
-rw-r--r--src/transformations/helmert.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp
index 7a3e64d0..2045dea2 100644
--- a/src/transformations/helmert.cpp
+++ b/src/transformations/helmert.cpp
@@ -665,18 +665,18 @@ PJ *TRANSFORMATION(helmert, 0) {
}
/* Let's help with debugging */
- if (proj_log_level(P->ctx, PJ_LOG_TELL) >= PJ_LOG_DEBUG) {
- proj_log_debug(P, "Helmert parameters:");
- proj_log_debug(P, "x= %8.5f y= %8.5f z= %8.5f", Q->xyz.x, Q->xyz.y, Q->xyz.z);
- proj_log_debug(P, "rx= %8.5f ry= %8.5f rz= %8.5f",
+ if (proj_log_level(P->ctx, PJ_LOG_TELL) >= PJ_LOG_TRACE) {
+ proj_log_trace(P, "Helmert parameters:");
+ proj_log_trace(P, "x= %8.5f y= %8.5f z= %8.5f", Q->xyz.x, Q->xyz.y, Q->xyz.z);
+ proj_log_trace(P, "rx= %8.5f ry= %8.5f rz= %8.5f",
Q->opk.o / ARCSEC_TO_RAD, Q->opk.p / ARCSEC_TO_RAD, Q->opk.k / ARCSEC_TO_RAD);
- proj_log_debug(P, "s= %8.5f exact=%d%s", Q->scale, Q->exact,
+ proj_log_trace(P, "s= %8.5f exact=%d%s", Q->scale, Q->exact,
Q->no_rotation ? "" :
Q->is_position_vector ? " convention=position_vector" :
" convention=coordinate_frame");
- proj_log_debug(P, "dx= %8.5f dy= %8.5f dz= %8.5f", Q->dxyz.x, Q->dxyz.y, Q->dxyz.z);
- proj_log_debug(P, "drx=%8.5f dry=%8.5f drz=%8.5f", Q->dopk.o, Q->dopk.p, Q->dopk.k);
- proj_log_debug(P, "ds= %8.5f t_epoch=%8.5f", Q->dscale, Q->t_epoch);
+ proj_log_trace(P, "dx= %8.5f dy= %8.5f dz= %8.5f", Q->dxyz.x, Q->dxyz.y, Q->dxyz.z);
+ proj_log_trace(P, "drx=%8.5f dry=%8.5f drz=%8.5f", Q->dopk.o, Q->dopk.p, Q->dopk.k);
+ proj_log_trace(P, "ds= %8.5f t_epoch=%8.5f", Q->dscale, Q->t_epoch);
}
if (Q->no_rotation) {
@@ -729,15 +729,15 @@ PJ *TRANSFORMATION(molobadekas, 0) {
/* Let's help with debugging */
- if (proj_log_level(P->ctx, PJ_LOG_TELL) >= PJ_LOG_DEBUG) {
- proj_log_debug(P, "Molodensky-Badekas parameters:");
- proj_log_debug(P, "x= %8.5f y= %8.5f z= %8.5f", Q->xyz_0.x, Q->xyz_0.y, Q->xyz_0.z);
- proj_log_debug(P, "rx= %8.5f ry= %8.5f rz= %8.5f",
+ if (proj_log_level(P->ctx, PJ_LOG_TELL) >= PJ_LOG_TRACE) {
+ proj_log_trace(P, "Molodensky-Badekas parameters:");
+ proj_log_trace(P, "x= %8.5f y= %8.5f z= %8.5f", Q->xyz_0.x, Q->xyz_0.y, Q->xyz_0.z);
+ proj_log_trace(P, "rx= %8.5f ry= %8.5f rz= %8.5f",
Q->opk.o / ARCSEC_TO_RAD, Q->opk.p / ARCSEC_TO_RAD, Q->opk.k / ARCSEC_TO_RAD);
- proj_log_debug(P, "s= %8.5f exact=%d%s", Q->scale, Q->exact,
+ proj_log_trace(P, "s= %8.5f exact=%d%s", Q->scale, Q->exact,
Q->is_position_vector ? " convention=position_vector" :
" convention=coordinate_frame");
- proj_log_debug(P, "px= %8.5f py= %8.5f pz= %8.5f", Q->refp.x, Q->refp.y, Q->refp.z);
+ proj_log_trace(P, "px= %8.5f py= %8.5f pz= %8.5f", Q->refp.x, Q->refp.y, Q->refp.z);
}
/* as an optimization, we incorporate the refp in the translation terms */