Salome HOME
debug of DTM object
[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_LandCoverMap.cxx
index 60b21ae904dc1e0b9449df83a50d0dabd325aac8..895a52b601a3cc7bd619854a5a3cd6ab4c55ab03 100644 (file)
@@ -35,6 +35,7 @@
 #include <TopTools_ListOfShape.hxx>
 #include <AIS_DisplayMode.hxx>
 #include <Aspect_ColorScale.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
 #include <QString>
 #include <QColor>
 #include <QMap>
 #include <BRep_Builder.hxx>
 #include <BRepCheck_Analyzer.hxx>
 
-const QString REF_DATA_PATH = qgetenv( "HYDRO_REFERENCE_DATA" );
-const QString DEF_STR_PATH = qgetenv( "HYDRO_SRC_DIR" ) + "/src/HYDROGUI/resources/def_strickler_table.txt";
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
+const QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
 
 void test_HYDROData_LandCoverMap::test_add_2_objects()
 {
@@ -56,18 +60,34 @@ void test_HYDROData_LandCoverMap::test_add_2_objects()
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
   TopoDS_Face aLC1 = Face( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
+  //DEBTRACE("--- ajout test1 " << aLC1);
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
 
   TopoDS_Face aLC2 = Face( QList<double>() << 30 << 20 << 60 << 10 << 70 << 35 << 40 << 40 );
+  //DEBTRACE("--- ajout test2 " << aLC2);
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) );
 
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  //DEBTRACE(anIt.Face() << " " << anIt.StricklerType());
+  CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
+  anIt.Next();
+  //DEBTRACE(anIt.Face() << " " << anIt.StricklerType());
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  CPPUNIT_ASSERT_EQUAL( QString( "test2" ), anIt.StricklerType() );
+  anIt.Next();
+  CPPUNIT_ASSERT_EQUAL( false, anIt.More() );
+
+  //DEBTRACE("--- show")
   TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Add_2_Objects" );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  anIt.Init(*aMap);
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  //DEBTRACE(anIt.Face() << " " << anIt.StricklerType());
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
+  //DEBTRACE(anIt.Face() << " " << anIt.StricklerType());
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test2" ), anIt.StricklerType() );
   anIt.Next();
@@ -99,7 +119,7 @@ void test_HYDROData_LandCoverMap::test_split()
   TestViewer::show( aWire, 0, true, Qt::blue );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
@@ -128,13 +148,13 @@ void test_HYDROData_LandCoverMap::test_incomplete_split()
   TopoDS_Wire aWire = Wire( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10, false );
   aPolyline->SetShape( aWire );
 
-  CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
+  CPPUNIT_ASSERT_EQUAL( false, aMap->Split( aPolyline ) );
 
   TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Split_2" );
   TestViewer::show( aWire, 0, true, Qt::green );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
@@ -188,6 +208,66 @@ void test_HYDROData_LandCoverMap::test_merge()
   aDoc->Close();
 }
 
+void test_HYDROData_LandCoverMap::test_merge_refs_691()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_PolylineXY) Polyline_4 =
+    Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
+  Polyline_4->SetName( "test_Polyline_4" );
+  Polyline_4->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true );
+  Polyline_4->AddPoint( 0, gp_XY( -242.741935, -16.129032 ) );
+  Polyline_4->AddPoint( 0, gp_XY( -339.516129, -95.161290 ) );
+  Polyline_4->AddPoint( 0, gp_XY( -204.032258, -167.740000 ) );
+  Polyline_4->AddPoint( 0, gp_XY( -86.290000, -158.060000 ) );
+  Polyline_4->AddPoint( 0, gp_XY( -83.064516, -37.096774 ) );
+  Polyline_4->AddPoint( 0, gp_XY( -116.935484, 17.741935 ) );
+  Polyline_4->AddSection( "Section_2", HYDROData_PolylineXY::SECTION_POLYLINE, true );
+  Polyline_4->AddPoint( 1, gp_XY( -239.516129, -295.161290 ) );
+  Polyline_4->AddPoint( 1, gp_XY( -204.030000, -167.740000 ) );
+  Polyline_4->AddPoint( 1, gp_XY( -86.290000, -158.060000 ) );
+  Polyline_4->AddPoint( 1, gp_XY( -2.419355, -288.709677 ) );
+  Polyline_4->AddPoint( 1, gp_XY( -165.322581, -351.612903 ) );
+  Polyline_4->Update();
+
+  Handle(HYDROData_LandCoverMap) aMap =
+    Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
+
+  CPPUNIT_ASSERT_EQUAL( true, aMap->Add( Polyline_4, "test" ) );
+
+  TopTools_ListOfShape aList;
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  CPPUNIT_ASSERT_EQUAL( QString( "test" ), anIt.StricklerType() );
+  aList.Append( anIt.Face() );
+  anIt.Next();
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  CPPUNIT_ASSERT_EQUAL( QString( "test" ), anIt.StricklerType() );
+  aList.Append( anIt.Face() );
+  anIt.Next();
+  CPPUNIT_ASSERT_EQUAL( false, anIt.More() );
+
+  BRepCheck_Analyzer aCheck1( aMap->GetShape() );
+  CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck1.IsValid() );
+  
+  CPPUNIT_ASSERT_EQUAL( true, aMap->Merge( aList, "test" ) );
+
+  BRepCheck_Analyzer aCheck2( aMap->GetShape() );
+  CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck2.IsValid() );
+
+  // we try construct the triangulation to check that it is correct
+  BRepMesh_IncrementalMesh anIncMesh( aMap->GetShape(), 0.01 );
+  CPPUNIT_ASSERT_EQUAL( true, (bool)anIncMesh.IsDone() );
+  BRepCheck_Analyzer aCheck3( aMap->GetShape() );
+  CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck3.IsValid() );
+
+  Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
+  TestViewer::show( aPrs, AIS_Shaded, 0, true, "LandCoverMap_Merge_2" );
+  CPPUNIT_ASSERT_IMAGES
+
+  aDoc->Close();
+}
+
 void test_HYDROData_LandCoverMap::test_remove()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
@@ -248,6 +328,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -256,7 +338,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_12" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -266,7 +350,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_13" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -278,6 +364,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_14" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   //
 
@@ -290,6 +378,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -298,7 +388,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_22" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -308,7 +400,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_23" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -320,6 +414,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_24" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
 }
 
@@ -345,6 +441,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -353,7 +451,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_12" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -363,7 +463,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_13" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -373,7 +475,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_14" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   //
 
@@ -386,6 +490,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -394,7 +500,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_22" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -404,7 +512,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_23" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -414,7 +524,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_24" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
 }
 
@@ -448,8 +560,7 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
   QList<int> Inds = QList<int>() << 1 << 2 << 3;
   aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds);
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() );
   anIt.Next();
   CPPUNIT_ASSERT_EQUAL( QString( "road" ), anIt.StricklerType() );
@@ -469,17 +580,17 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
   TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "Zones de champs cultivé à végétation basse" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) );
 
   TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "Zones de champs cultivé à végétation haute" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) );
 
   TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "Zones de champs, prairies, sans cultures" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) );
 
   // build presentation object 
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
@@ -505,21 +616,22 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff()
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
   TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "Zones de champs cultivé à végétation basse" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) );
 
   TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "Zones de champs cultivé à végétation haute" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) );
 
   TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
-  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "Zones de champs, prairies, sans cultures" ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) );
 
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
   aPrs->SetTable( aTable );
-  aPrs->SetColorScale( TestViewer::showColorScale( true ) );
+  TestViewer::showColorScale( true );
+  aPrs->SetColorScale( TestViewer::colorScale() );
   TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByCoeff" );
   CPPUNIT_ASSERT_IMAGES
 
@@ -531,6 +643,11 @@ void test_HYDROData_LandCoverMap::test_dump_python()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
+  Handle(HYDROData_StricklerTable) aTable =
+    Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
+  CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
+  aTable->SetName( "DefStr" );
+
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   aMap->SetName( "test_LCM" );
@@ -551,10 +668,15 @@ void test_HYDROData_LandCoverMap::test_dump_python()
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) );
 
-  QString aTmpPath = QDir::tempPath() + "/lc_dump.py";
+  QString aBaseName = "lc_dump.py";
+  QString aBaseShp = "lc_dump.shp";
+  QString aBaseDbf = "lc_dump.dbf";
+  QString aTmpPath = QDir::tempPath() + "/" + aBaseName;
   CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) );
 
-  //TODO: compare files
+  //TODO: CPPUNIT_ASSERT_SCRIPTS_EQUAL( aBaseName, true, false, 20 );
+  //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseShp );
+  //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseDbf );
 
   aDoc->Close();
 }
@@ -582,15 +704,17 @@ void test_HYDROData_LandCoverMap::test_transparent_prs()
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
-  aMap->LocalPartition( Face( QList<double>() << 1 << 1 << 10 << 10 << 10 << 20 ), "Zones de champs cultivé à végétation haute" );
-  aMap->LocalPartition( Face( QList<double>() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), "Zones de champs cultivé à végétation haute" );
+  aMap->LocalPartition( Face( QList<double>() << 1 << 1 << 10 << 10 << 10 << 20 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
+  aMap->LocalPartition( Face( QList<double>() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
   aMap->SetName( "test_LCM" );
 
   TestViewer::show( aZone->GetTopShape(), AIS_Shaded, true, "LandCoverMap_TransparentPrs" );
 
+  aMap->SetTransparency( 0.5 );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, aMap->GetTransparency(), 1E-6 );
+
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
   aPrs->SetTable( aTable );
-  aPrs->SetTransparency( 0.5 );
   TestViewer::show( aPrs, AIS_Shaded, 0, true, "" );
 
   CPPUNIT_ASSERT_IMAGES
@@ -656,6 +780,7 @@ void test_HYDROData_LandCoverMap::test_add_triangles()
   CPPUNIT_ASSERT_EQUAL( true, aMap->Add( Polyline_4, "" ) );
 
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
+  TopoDS_Shape aSh = aMap->GetShape();
   TestViewer::show( aPrs, AIS_Shaded, 0, true, "LandCover_Triangles" );
   CPPUNIT_ASSERT_IMAGES
 
@@ -690,7 +815,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_cyp()
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
   int Type = -1;
-  int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(268, PolygonFaces.Length());
@@ -720,7 +845,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_clc_dec()
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
   int Type = -1;
-  int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(625, PolygonFaces.Length());
@@ -750,7 +875,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_nld_areas()
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
   int Type = -1;
-  int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(127, PolygonFaces.Length());
@@ -776,8 +901,11 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
 {
   QString aFFileName = REF_DATA_PATH + "/CLC06-cut_1.shp";
   QString aSFileName = REF_DATA_PATH + "/CLC06-cut_1_res.shp";
+
   //This test verify only some geom data (shp+shx) without any dbf reading/writing 
   {
+    //DEBTRACE("aFFileName: " << aFFileName.toStdString());
+    //DEBTRACE("aSFileName: " << aSFileName.toStdString());
     Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
     HYDROData_ShapeFile anImporter;
     QStringList PolygonList;
@@ -785,7 +913,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
     int Type = -1;
 
     //import LCM from file (#2-4; #12-14 polygons)
-    CPPUNIT_ASSERT( anImporter.ImportPolygons(aFFileName, PolygonList, PolygonFaces, Type));
+    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aFFileName, PolygonList, PolygonFaces, Type));
     Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
     HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
@@ -806,7 +934,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
     //export lcm
     HYDROData_ShapeFile anExporter;
     QStringList aNonExpList;
-    anExporter.Export(aSFileName, LCM, aNonExpList);
+    anExporter.Export(aDoc, aSFileName, LCM, aNonExpList);
     CPPUNIT_ASSERT (aNonExpList.empty());
 
     aDoc->Close();
@@ -819,7 +947,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
     int Type = -1;
 
     //import all
-    CPPUNIT_ASSERT( anImporter.ImportPolygons(aSFileName, PolygonList, PolygonFaces, Type));
+    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aSFileName, PolygonList, PolygonFaces, Type));
     Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
     HYDROData_MapOfFaceToStricklerType aMapFace2ST;
     CPPUNIT_ASSERT_EQUAL(PolygonFaces.Length(), 6);
@@ -943,3 +1071,77 @@ void test_HYDROData_LandCoverMap::test_split_2()
 
   aDoc->Close();
 }
+
+void test_HYDROData_LandCoverMap::test_export_telemac()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_StricklerTable) aTable =
+    Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
+  CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
+
+  Handle(HYDROData_LandCoverMap) aMap =
+    Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
+
+  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêt et végétation arbustive en mutation")) );
+
+  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+                                              44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
+                                             128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
+                                              31 << 114 );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Forêts de conifères")) );
+
+  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+                                            127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Forêts de feuillus")) );
+
+  QString aTmpFileName = "test.telemac";
+  QString aTmpPath = QDir::tempPath() + "/" + aTmpFileName;
+  CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable ) );
+  CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 );
+
+  aDoc->Close();
+}
+
+void test_HYDROData_LandCoverMap::test_copy()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_LandCoverMap) aMap =
+    Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
+  aMap->SetName( "map_1" );
+
+  TopoDS_Face aLC1 = Face( QList<double>() << 10 << 10 << 30 << 10 << 20 << 20 );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêts de conifères")) );
+
+  TopoDS_Face aLC2 = Face( QList<double>() << 110 << 10 << 130 << 10 << 120 << 20 );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Forêts de feuillus")) );
+
+  Handle(HYDROData_LandCoverMap) aMap2 =
+    Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
+  aMap->CopyTo( aMap2, true );
+
+  CPPUNIT_ASSERT_EQUAL( QString( "map_2" ), aMap2->GetName() );
+  HYDROData_LandCoverMap::Explorer anIt( aMap2 );
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  CPPUNIT_ASSERT_EQUAL( QString::fromUtf8("Forêts de feuillus"), anIt.StricklerType() );
+  CPPUNIT_ASSERT( anIt.Face().TShape()!=aLC1.TShape() );
+  anIt.Next();
+  CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
+  CPPUNIT_ASSERT_EQUAL( QString::fromUtf8("Forêts de conifères"), anIt.StricklerType() );
+  CPPUNIT_ASSERT( anIt.Face().TShape()!=aLC2.TShape() );
+  anIt.Next();
+  CPPUNIT_ASSERT_EQUAL( false, anIt.More() );
+
+  TopoDS_Shape aShape1 = aMap->GetShape();
+  TopoDS_Shape aShape2 = aMap2->GetShape();
+  gp_Trsf aTr;
+  aTr.SetTranslation( gp_Vec( 0, 50, 0 ) );
+  aShape2.Move( TopLoc_Location( aTr ) );
+  TestViewer::show( aShape1, AIS_Shaded, /*0,*/ true, "LCM_copied" );
+  TestViewer::show( aShape2, AIS_Shaded, /*0,*/ true, "" );
+  CPPUNIT_ASSERT_IMAGES
+
+  aDoc->Close();
+}