diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5b27c52d141d3ce5053c3a7588fa34d0d82bfaf..c1d80ca378d1763017f524d9c01bde3f3476907e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,8 +181,6 @@ ubuntu-24-gdal-bindings: extends: .common-build image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:24.04 only: - changes: - - SuperBuild/CMake/External_gdal.cmake refs: - /^release-[0-9]+\.[0-9]+$/ script: diff --git a/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt b/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt new file mode 100644 index 0000000000000000000000000000000000000000..cdeceb83ef65e8a5dbbeff2c054656953bcba807 --- /dev/null +++ b/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt @@ -0,0 +1,35 @@ +VectorData (0x5f0da4bc59e0) + RTTI typeinfo: otb::VectorData<double, 2u, double> + Reference Count: 2 + Modified Time: 168 + Debug: Off + Object Name: + Observers: + none + Source: (0x5f0da4bc7870) + Source output name: Primary + Release Data: Off + Data Released: False + Global Release Data: Off + PipelineMTime: 18 + UpdateMTime: 169 + RealTimeStamp: 0 seconds + ++Root (Root) + +Document (ToulouseRoad-examples) + +Line () 6 points + -> Metadata: VectorData Keyword list: - Size: 1 + number (Integer64): 1 + + +Line () 4 points + -> Metadata: VectorData Keyword list: - Size: 1 + number (Integer64): 2 + + +Line () 9 points + -> Metadata: VectorData Keyword list: - Size: 1 + number (Integer64): 3 + + +Line () 4 points + -> Metadata: VectorData Keyword list: - Size: 1 + number (Integer64): 4 + diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt index 682cfcb63e56e77072b1e7525b14889f6efbbdb1..9f05bce3a230729bb733c6e01a7978939139a2f6 100644 --- a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt +++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt @@ -1,6 +1,23 @@ +VectorData (0x6352a94019f0) + RTTI typeinfo: otb::VectorData<double, 2u, double> + Reference Count: 2 + Modified Time: 280 + Debug: Off + Object Name: + Observers: + none + Source: (0x6352a9403880) + Source output name: Primary + Release Data: Off + Data Released: False + Global Release Data: Off + PipelineMTime: 18 + UpdateMTime: 281 + RealTimeStamp: 0 seconds + +Root (Root) -+Document (Paths) -+Line () 2 points + +Document (Paths) + +Line () 2 points -> Metadata: VectorData Keyword list: - Size: 5 Name (String): Tessellated description (String): If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain @@ -8,7 +25,7 @@ extrude (Integer): 0 visibility (Integer): 0 -+Line () 2 points + +Line () 2 points -> Metadata: VectorData Keyword list: - Size: 5 Name (String): Untessellated description (String): If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point @@ -16,7 +33,7 @@ extrude (Integer): 0 visibility (Integer): 0 -+Line () 11 points + +Line () 11 points -> Metadata: VectorData Keyword list: - Size: 6 Name (String): Absolute description (String): Transparent purple line @@ -25,7 +42,7 @@ extrude (Integer): 0 visibility (Integer): 0 -+Line () 11 points + +Line () 11 points -> Metadata: VectorData Keyword list: - Size: 6 Name (String): Absolute Extruded description (String): Transparent green wall with yellow outlines @@ -34,7 +51,7 @@ extrude (Integer): 1 visibility (Integer): 0 -+Line () 11 points + +Line () 11 points -> Metadata: VectorData Keyword list: - Size: 6 Name (String): Relative description (String): Black line (10 pixels wide), height tracks terrain @@ -43,7 +60,7 @@ extrude (Integer): 0 visibility (Integer): 0 -+Line () 11 points + +Line () 11 points -> Metadata: VectorData Keyword list: - Size: 6 Name (String): Relative Extruded description (String): Opaque blue walls with red outline, height tracks terrain diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt new file mode 100644 index 0000000000000000000000000000000000000000..49789d01634ee4baa2dd3cd9e351fe66cdbfe856 --- /dev/null +++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt @@ -0,0 +1,22 @@ +VectorData (0x63e21111b9f0) + RTTI typeinfo: otb::VectorData<double, 2u, double> + Reference Count: 2 + Modified Time: 94 + Debug: Off + Object Name: + Observers: + none + Source: (0x63e21111d880) + Source output name: Primary + Release Data: Off + Data Released: False + Global Release Data: Off + PipelineMTime: 18 + UpdateMTime: 95 + RealTimeStamp: 0 seconds + ++Root (Root) + +Document (KmlFile) + +Collection () + +Point () [-123.939, 49.1646] + +Polygon () 7 points, 0 interior rings diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.hxx b/Modules/Core/VectorDataBase/include/otbVectorData.hxx index 651b11406f25a26ae23c010f299f484b493886ba..b75586bf14e2f66ef29524f3bbf24580fd93a24b 100644 --- a/Modules/Core/VectorDataBase/include/otbVectorData.hxx +++ b/Modules/Core/VectorDataBase/include/otbVectorData.hxx @@ -135,8 +135,8 @@ void VectorData<TPrecision, VDimension, TValuePrecision>::PrintSelf(std::ostream boost::tie(ai, a_end) = boost::adjacent_vertices(*it, m_DataTree); for (; ai != a_end; ai++) { indentcounts++; + break; } - //os << "\n"; } } diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx index e74241686554bef62c3ec01c0ec7f4914d3dd4fb..a6ef4324452b90dcc5da175913297c6c16b24481 100644 --- a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx +++ b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx @@ -45,7 +45,6 @@ int otbVectorDataKeywordlist(int itkNotUsed(argc), char* argv[]) auto itPair = data->GetIteratorPair(); auto it = itPair.first; - data->Print(fout,indent); while (it != itPair.second) { if (data->Get(it)->GetMetaDataDictionary().HasKey(otb::MetaDataKey::VectorDataKeywordlistKey)) diff --git a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx index 100f1dc241f80c67adcaba6754e4468a0666207f..86b73f0b6e72bc63f0162e7afbb3de33e9f126cb 100644 --- a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx +++ b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx @@ -86,9 +86,6 @@ void ConcatenateVectorDataFilter<TVectorData>::GenerateData() auto outputPtr = this->GetOutput(); auto inputPtr = this->GetInput(0); - //outputPtr->SetRoot(inputPtr->GetRoot()); - - otbMsgDevMacro("InputPtr Childrenlist size : " << inputPtr->GetChildrenList(inputPtr->GetRoot()).size()); typename DataNodeType::Pointer outputDocument = inputPtr->GetChildrenList(inputPtr->GetRoot()).at(0); outputPtr->Add(outputDocument,outputPtr->GetRoot()); // Adding the layer to the data tree