Commit 63777ce1 authored by Antoine Regimbeau's avatar Antoine Regimbeau

Merge branch 'deprecate_onlinedata' into 'develop'

Deprecated TileMap and prTeCoordinateToNameExampleTest

Closes #1690

See merge request !244
parents 9517ce03 674e8fc8
......@@ -70,12 +70,13 @@ target_link_libraries(RGBImageReadWrite ${OTB_LIBRARIES})
add_executable(StreamingImageReadWrite StreamingImageReadWrite.cxx)
target_link_libraries(StreamingImageReadWrite ${OTB_LIBRARIES})
add_executable(TileMapImageIOExample TileMapImageIOExample.cxx)
target_link_libraries(TileMapImageIOExample ${OTB_LIBRARIES})
add_executable(VectorDataIOExample VectorDataIOExample.cxx)
target_link_libraries(VectorDataIOExample ${OTB_LIBRARIES})
if(OTB_USE_DEPRECATED)
add_executable(TileMapImageIOExample TileMapImageIOExample.cxx)
target_link_libraries(TileMapImageIOExample ${OTB_LIBRARIES})
endif()
if(BUILD_TESTING)
add_subdirectory(test)
......
......@@ -101,7 +101,8 @@ otb_add_test(NAME ioTeImageToKmzAndMapFileProductExample COMMAND ${OTB_TEST_DRIV
set_property(TEST ioTeImageToKmzAndMapFileProductExample PROPERTY RESOURCE_LOCK web_access)
endif()
otb_add_test(NAME ioTeTileMapImageIOExampleTest COMMAND ${OTB_TEST_DRIVER}
if(OTB_USE_DEPRECATED)
otb_add_test(NAME ioTeTileMapImageIOExampleTest COMMAND ${OTB_TEST_DRIVER}
--compare-image 10.0
${BASELINE}/openStreetMap.png
${TEMP}/openStreetMap.png
......@@ -112,4 +113,5 @@ otb_add_test(NAME ioTeTileMapImageIOExampleTest COMMAND ${OTB_TEST_DRIVER}
1.4835345
43.55968261
12
)
)
endif()
......@@ -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,7 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef otbPlaceNameToLonLat_h
#define otbPlaceNameToLonLat_h
......
......@@ -21,8 +21,8 @@
set(OTBCarto_SRC
otbCoordinateToName.cxx
otbOSMDataToVectorDataGenerator.cxx
otbPlaceNameToLonLat.cxx
otbWorldFile.cxx
otbPlaceNameToLonLat.cxx
)
add_library(OTBCarto ${OTBCarto_SRC})
......@@ -37,7 +37,6 @@ target_link_libraries(OTBCarto
${OTBCurlAdapters_LIBRARIES}
${OTBVectorDataIO_LIBRARIES}
${OTBImageManipulation_LIBRARIES}
)
otb_module_target(OTBCarto)
......@@ -44,14 +44,14 @@ enum TileMapAddressingStyle {GM = 0, OSM = 1, NEARMAP = 2, LOCAL = 3};
}
/** \class TileMapImageIO
*
* \deprecated
* \brief ImageIO object for reading and writing TileMap images
*
*
*
* \ingroup OTBIOTileMap
*/
class OTBIOTileMap_EXPORT TileMapImageIO : public otb::ImageIOBase
class OTBIOTileMap_DEPRECATED_EXPORT TileMapImageIO : public otb::ImageIOBase
{
public:
......
......@@ -28,11 +28,12 @@
namespace otb
{
/** \class TileMapImageIOFactory
* \deprecated
* \brief Creation of a TileMapImageIO object using object factory.
*
* \ingroup OTBIOTileMap
*/
class OTBIOTileMap_EXPORT TileMapImageIOFactory : public itk::ObjectFactoryBase
class OTBIOTileMap_DEPRECATED_EXPORT TileMapImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
......
......@@ -34,13 +34,14 @@ namespace otb
{
/** \class TileMapImageIOHelper
* \deprecated
* \brief This class IO TileMapImage
*
*
* \ingroup OTBIOTileMap
*/
class OTBIOTileMap_EXPORT TileMapImageIOHelper: public itk::Object
class OTBIOTileMap_DEPRECATED_EXPORT TileMapImageIOHelper: public itk::Object
{
public:
/** Standard class typedefs. */
......
......@@ -38,6 +38,8 @@ ENABLE_SHARED
OTBTransform
OTBImageManipulation
DEPRECATED
DESCRIPTION
"${DOCUMENTATION}"
)
......@@ -33,13 +33,15 @@ otb_module(OTBImageIO
OTBIOMSTAR
OTBIOONERA
OTBIORAD
OTBIOTileMap
OTBITK
OTBImageBase
OTBOSSIMAdapters
OTBObjectList
OTBStreaming
OPTIONAL_DEPENDS
OTBIOTileMap #This module is deprecated
TEST_DEPENDS
OTBStatistics
OTBTestKernel
......
......@@ -34,10 +34,11 @@ target_link_libraries(OTBImageIO
${OTBIOGDAL_LIBRARIES}
${OTBStreaming_LIBRARIES}
${OTBBoost_LIBRARIES}
${OTBIOTileMap_LIBRARIES}
${OTBCommon_LIBRARIES}
${OTBExtendedFilename_LIBRARIES}
${OTBOSSIMAdapters_LIBRARIES}
#Deprecated modules
${OTBIOTileMap_LIBRARIES}
)
......
......@@ -33,7 +33,9 @@
#include "otbBSQImageIOFactory.h"
#include "otbRADImageIOFactory.h"
#if OTB_USE_DEPRECATED
#include "otbTileMapImageIOFactory.h"
#endif
namespace otb
{
......@@ -95,11 +97,12 @@ ImageIOFactory::RegisterBuiltInFactories()
itk::ObjectFactoryBase::RegisterFactory(RADImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(BSQImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(LUMImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(GDALImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(ONERAImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(MSTARImageIOFactory::New());
#if OTB_USE_DEPRECATED
itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
#endif
firstTime = false;
}
}
......
......@@ -59,7 +59,6 @@ otbImageFileReaderRADFloat.cxx
otbVectorImageFileReaderWriterTest.cxx
otbIntImageIOTest.cxx
otbImageFileReaderONERA.cxx
otbImageFileReaderServerName.cxx
otbPNGIndexedNbBandsTest.cxx
otbImageFileReaderTest.cxx
otbVectorImageFileWriterTestWithoutInput.cxx
......@@ -78,6 +77,10 @@ otbMultiImageFileWriterTest.cxx
otbWriteGeomFile.cxx
)
if(OTB_USE_DEPRECATED)
set(OTBImageIOTests ${OTBImageIOTests} otbImageFileReaderServerName.cxx)
endif()
add_executable(otbImageIOTestDriver ${OTBImageIOTests})
target_link_libraries(otbImageIOTestDriver ${OTBImageIO-Test_LIBRARIES})
otb_module_target_label(otbImageIOTestDriver)
......@@ -519,10 +522,12 @@ otb_add_test(NAME ioTvONERAImageFileWriterComplex COMMAND otbImageIOTestDriver
LARGEINPUT{ONERA/spa3_0215_rad.ent}
${TEMP}/ioImageFileReaderONERAComplexWrite.ent )
otb_add_test(NAME ioTvImageFileReaderServerNameOTBTest COMMAND otbImageIOTestDriver
otbImageFileReaderServerName
${OTB_DATA_ROOT}/Examples/osmfile.otb)
set_property(TEST ioTvImageFileReaderServerNameOTBTest PROPERTY RESOURCE_LOCK web_access)
if(OTB_USE_DEPRECATED)
otb_add_test(NAME ioTvImageFileReaderServerNameOTBTest COMMAND otbImageIOTestDriver
otbImageFileReaderServerName
${OTB_DATA_ROOT}/Examples/osmfile.otb)
set_property(TEST ioTvImageFileReaderServerNameOTBTest PROPERTY RESOURCE_LOCK web_access)
endif()
#dashboard_hell
# otb_add_test(NAME ioTvImageFileReaderServerNameHTTPTest COMMAND otbImageIOTestDriver
......
......@@ -85,7 +85,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorImageFileReaderWriterTest);
REGISTER_TEST(otbIntImageIOTest);
REGISTER_TEST(otbImageFileReaderONERATest);
REGISTER_TEST(otbImageFileReaderServerName);
REGISTER_TEST(otbPNGIndexedNbBandsTest);
REGISTER_TEST(otbImageFileReaderTest);
REGISTER_TEST(otbVectorImageFileWriterScalarTestWithoutInputShort);
......@@ -153,4 +152,7 @@ void RegisterTests()
REGISTER_TEST(otbImageFileWriterOptBandTest);
REGISTER_TEST(otbMultiImageFileWriterTest);
REGISTER_TEST(otbWriteGeomFile);
#if OTB_USE_DEPRECATED
REGISTER_TEST(otbImageFileReaderServerName);
#endif
}
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