diff --git a/Examples/Projections/test/CMakeLists.txt b/Examples/Projections/test/CMakeLists.txt index 06b3204e9b9aa326a036eff1640e4db81788a8e3..26098eb64c8d2f7624dbbaf35e6dbd04209f067a 100644 --- a/Examples/Projections/test/CMakeLists.txt +++ b/Examples/Projections/test/CMakeLists.txt @@ -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 +# ) diff --git a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h index ee7c8743bcc04f74b69d8779378166d8559ae3b4..6c4439962ec58a4eca66296dd6b4f9c7a3a8efea 100644 --- a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h +++ b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h @@ -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 diff --git a/Modules/IO/Carto/src/CMakeLists.txt b/Modules/IO/Carto/src/CMakeLists.txt index b170947be0e1ad47b10ed3e5979395b57514bb4b..8388260db728e97a61c89eead4ac739f1d079e37 100644 --- a/Modules/IO/Carto/src/CMakeLists.txt +++ b/Modules/IO/Carto/src/CMakeLists.txt @@ -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}