Commit 76f3b0f6 authored by Antoine Regimbeau's avatar Antoine Regimbeau

REFAC: remove prTeCoordinateToNameExampleTest and reinstate PlaceNameToLonLat

parent 5479fcca
......@@ -118,11 +118,13 @@ otb_add_test(NAME prTePlaceNameToLonLatExampleTest COMMAND ${OTB_TEST_DRIVER}
Execute $<TARGET_FILE:PlaceNameToLonLatExample>
Toulouse
)
otb_add_test(NAME prTeCoordinateToNameExampleTest COMMAND ${OTB_TEST_DRIVER}
--compare-ascii ${NOTOL}
${BASELINE}/CoordinateToNameExample.txt
${TEMP}/CoordinateToNameExample.txt
Execute $<TARGET_FILE:CoordinateToNameExample>
103.78 1.29
${TEMP}/CoordinateToNameExample.txt
)
# The following test is disabled (GitLab #1669 !244)
# otb_add_test(NAME prTeCoordinateToNameExampleTest COMMAND ${OTB_TEST_DRIVER}
# --compare-ascii ${NOTOL}
# ${BASELINE}/CoordinateToNameExample.txt
# ${TEMP}/CoordinateToNameExample.txt
# Execute $<TARGET_FILE:CoordinateToNameExample>
# 103.78 1.29
# ${TEMP}/CoordinateToNameExample.txt
# )
......@@ -17,8 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if OTB_USE_DEPRECATED
#ifndef otbPlaceNameToLonLat_h
#define otbPlaceNameToLonLat_h
......@@ -30,7 +28,6 @@ namespace otb
{
/**
* \deprecated
* \class PlaceNameToLonLat
* \brief Retrieve Longitude and Latitude coordinates from a place name
*
......@@ -38,7 +35,7 @@ namespace otb
* \ingroup OTBCarto
*/
class OTBCarto_DEPRECATED_EXPORT PlaceNameToLonLat : public itk::Object
class OTBCarto_EXPORT PlaceNameToLonLat : public itk::Object
{
public:
/** Standard class typedefs. */
......@@ -86,4 +83,3 @@ private:
} // namespace otb
#endif
#endif // deprecated
......@@ -22,13 +22,9 @@ set(OTBCarto_SRC
otbCoordinateToName.cxx
otbOSMDataToVectorDataGenerator.cxx
otbWorldFile.cxx
otbPlaceNameToLonLat.cxx
)
#Deprecated module
if ( OTB_USE_DEPRECATED )
set(OTBCarto_SRC ${OTBCarto_SRC} otbPlaceNameToLonLat.cxx)
endif()
add_library(OTBCarto ${OTBCarto_SRC})
target_link_libraries(OTBCarto
${OTBVectorDataBase_LIBRARIES}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment