From 23e52aacd4f37601779c0a6f91d7c7442fb5d976 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Thu, 6 Dec 2012 18:00:10 +0100
Subject: [PATCH] TEST: Fixing all DEMHandler tests
---
.../OssimAdapters/otbDEMHandler.cxx | 4 ++--
Testing/Code/UtilitiesAdapters/CMakeLists.txt | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
index 80e38c396a..13e7fdf189 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
@@ -58,6 +58,8 @@ DEMHandler
m_DefaultHeightAboveEllipsoid(0)
{
m_ElevManager->setDefaultHeightAboveEllipsoid(m_DefaultHeightAboveEllipsoid);
+ // Force geoid fallback
+ m_ElevManager->setUseGeoidIfNullFlag(true);
}
void
@@ -105,8 +107,6 @@ DEMHandler
ossimGeoidManager::instance()->addGeoid(geoidPtr);
geoidPtr.release();
- // Force geoid fallback
- m_ElevManager->setUseGeoidIfNullFlag(true);
// The previous flag will be ignored if
// defaultHeightAboveEllipsoid is not NaN
m_ElevManager->setDefaultHeightAboveEllipsoid(ossim::nan());
diff --git a/Testing/Code/UtilitiesAdapters/CMakeLists.txt b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
index 7443424d93..cbc2f92aaf 100644
--- a/Testing/Code/UtilitiesAdapters/CMakeLists.txt
+++ b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
@@ -161,7 +161,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_Geoid
8.434583
44.647083
1
- -5.7464
+ 0
0.001
)
@@ -188,7 +188,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_NoGeoid
8.434583
44.647083
1
- 40
+ 0
0.001
)
@@ -215,7 +215,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_Geoid_NoData
8.687917
44.237917
1
- -5.7464
+ 0
0.001
)
@@ -241,7 +241,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_NoGeoid_NoData
8.687917
44.237917
1
- 40
+ 0
0.001
)
@@ -267,7 +267,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_NoGeoid_NoData
8.687917
44.237917
1
- 40
+ 0
0.001
)
@@ -294,7 +294,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_Geoid_NoSRTMCoverage
10. # Point not covered
10. # Point not covered
1
- -1.569
+ 0
0.001
)
@@ -320,7 +320,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_NoGeoid_NoSRTMCoverage
10. # Point not covered
10. # Point not covered
1
- 20
+ 0
0.001
)
--
GitLab