Salome HOME
Correction for hydro_test
[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_LandCoverMap.cxx
index ca87d407b85ea2fa8c8ac81c1c602a9a029f5447..972596d30a85e068bb423ce8e011136d41563f5f 100644 (file)
 #include <OSD_Timer.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 extern QString REF_DATA_PATH;
 const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table_06.txt";
+extern QString TMP_DIR;
 
 void test_HYDROData_LandCoverMap::test_add_2_objects()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -99,7 +100,7 @@ void test_HYDROData_LandCoverMap::test_add_2_objects()
 
 void test_HYDROData_LandCoverMap::test_split()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -134,7 +135,7 @@ void test_HYDROData_LandCoverMap::test_split()
 
 void test_HYDROData_LandCoverMap::test_incomplete_split()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -166,7 +167,7 @@ void test_HYDROData_LandCoverMap::test_incomplete_split()
 
 void test_HYDROData_LandCoverMap::test_merge()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -211,7 +212,7 @@ void test_HYDROData_LandCoverMap::test_merge()
 
 void test_HYDROData_LandCoverMap::test_merge_refs_691()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_PolylineXY) Polyline_4 =
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
@@ -250,7 +251,7 @@ void test_HYDROData_LandCoverMap::test_merge_refs_691()
 
   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() );
@@ -271,7 +272,7 @@ void test_HYDROData_LandCoverMap::test_merge_refs_691()
 
 void test_HYDROData_LandCoverMap::test_remove()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -418,6 +419,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     BRepCheck_Analyzer aBCA(aMergedFace);
     CPPUNIT_ASSERT(aBCA.IsValid());
   }
+
 }
 
 
@@ -434,7 +436,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
   CPPUNIT_ASSERT(!ff3.IsNull());
 
   //Test mergeFaces() func // circles // USD == true
-  { 
+  {
     TopTools_ListOfShape Faces;
     Faces.Append(ff1);
     Faces.Append(ff2);
@@ -533,7 +535,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
 
 void test_HYDROData_LandCoverMap::test_import_dbf()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -557,7 +559,7 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
     aMap->Add(aPolyline, "");
   TopoDS_Face aLC1 = Face2d( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
-  
+
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
   QList<int> Inds = QList<int>() << 1 << 2 << 3;
   aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds);
@@ -569,9 +571,11 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
   aDoc->Close();
 }
 
+#include <QTest>
+
 void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -593,21 +597,36 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) );
 
-  // build presentation object 
+  // build presentation object
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
   aPrs->SetTable( aTable );
   // show presentation in viewer
   TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByTypes" );
   // select one of faces (first)
-  TestViewer::select( 200, 300 );
-  CPPUNIT_ASSERT_IMAGES
+  TestViewer::select( 40, 20 );
+  QTest::qWait(1000);
+   TestViewer::select( 40, 60 );
+  QTest::qWait(1000);
+   TestViewer::select( 80, 60 );
+  QTest::qWait(1000);
+   TestViewer::select( 80, 100 );
+  QTest::qWait(1000);
+   TestViewer::select( 130, 40 );
+  QTest::qWait(1000);
+   TestViewer::select( 130, 60 );
+  QTest::qWait(1000);
+   TestViewer::select( 80, 20 );
+  QTest::qWait(1000);
+   TestViewer::select( 40, 80 );
+  QTest::qWait(1000);
 
+  CPPUNIT_ASSERT_IMAGES
   aDoc->Close();
 }
 
 void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -634,6 +653,7 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff()
   TestViewer::showColorScale( true );
   aPrs->SetColorScale( TestViewer::colorScale() );
   TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByCoeff" );
+
   CPPUNIT_ASSERT_IMAGES
 
   TestViewer::showColorScale( false );
@@ -642,7 +662,7 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff()
 
 void test_HYDROData_LandCoverMap::test_dump_python()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -672,7 +692,7 @@ void test_HYDROData_LandCoverMap::test_dump_python()
   QString aBaseName = "lc_dump.py";
   QString aBaseShp = "lc_dump.shp";
   QString aBaseDbf = "lc_dump.dbf";
-  QString aTmpPath = QDir::tempPath() + "/" + aBaseName;
+  QString aTmpPath = TMP_DIR + "/" + aBaseName;
   CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) );
 
   //TODO: CPPUNIT_ASSERT_SCRIPTS_EQUAL( aBaseName, true, false, 20 );
@@ -684,7 +704,7 @@ void test_HYDROData_LandCoverMap::test_dump_python()
 
 void test_HYDROData_LandCoverMap::test_transparent_prs()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -719,12 +739,13 @@ void test_HYDROData_LandCoverMap::test_transparent_prs()
   TestViewer::show( aPrs, AIS_Shaded, 0, true, "" );
 
   CPPUNIT_ASSERT_IMAGES
+
   aDoc->Close();
 }
 
 void test_HYDROData_LandCoverMap::test_add_triangles()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_PolylineXY) Polyline_1 =
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
@@ -795,7 +816,7 @@ void test_HYDROData_LandCoverMap::test_add_triangles()
 
 void test_HYDROData_LandCoverMap::test_assign_to_calc_case()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -810,24 +831,27 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case()
 
 void test_HYDROData_LandCoverMap::test_shp_import_cyp()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  //TestViewer::eraseAll(true);
+
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   QString aFileName = REF_DATA_PATH + "/cyprus_natural.shp";
   HYDROData_ShapeFile anImporter;
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
-  int Type = -1;
-  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
+
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces);
+  int Type = anImporter.GetShapeType();
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(268, PolygonFaces.Length());
-  
+
   Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
-  for ( int i = 1; i <= PolygonFaces.Length(); i++ )
+  for ( int i = 1; i <= 20; i++ )
   {
     TopoDS_Shape aShape = PolygonFaces(i);
-    if ( aShape.IsNull() ) 
+    if ( aShape.IsNull() )
       continue;
     aMapFace2ST.Add( TopoDS::Face( aShape ), "" );
   }
@@ -835,29 +859,31 @@ void test_HYDROData_LandCoverMap::test_shp_import_cyp()
   LCM->StoreLandCovers(aMapFace2ST);
   TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "cyprus_natural_all" );
   CPPUNIT_ASSERT_IMAGES
+
   aDoc->Close();
 }
 
 void test_HYDROData_LandCoverMap::test_shp_import_clc_dec()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   QString aFileName = REF_DATA_PATH + "/CLC_decoupe.shp";
   HYDROData_ShapeFile anImporter;
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
-  int Type = -1;
-  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces);
+    int Type = anImporter.GetShapeType();
+
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(625, PolygonFaces.Length());
-  
+
   Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
-  for ( int i = 150; i <= 350; i++ )
+  for ( int i = 150; i <= 160; i++ )
   {
     TopoDS_Shape aShape = PolygonFaces(i);
-    if ( aShape.IsNull() ) 
+    if ( aShape.IsNull() )
       continue;
     aMapFace2ST.Add( TopoDS::Face( aShape ), "" );
   }
@@ -865,29 +891,30 @@ void test_HYDROData_LandCoverMap::test_shp_import_clc_dec()
   LCM->StoreLandCovers(aMapFace2ST);
   TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "clc_dec_150_350" );
   CPPUNIT_ASSERT_IMAGES
+
   aDoc->Close();
 }
 
 void test_HYDROData_LandCoverMap::test_shp_import_nld_areas()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   QString aFileName = REF_DATA_PATH + "/NLD_water_areas_dcw.shp";
   HYDROData_ShapeFile anImporter;
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
-  int Type = -1;
-  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces);
+  int Type = anImporter.GetShapeType();
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(127, PolygonFaces.Length());
-  
+
   Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
   for ( int i = 1; i <= PolygonFaces.Length(); i++ )
   {
     TopoDS_Shape aShape = PolygonFaces(i);
-    if ( aShape.IsNull() ) 
+    if ( aShape.IsNull() )
       continue;
     aMapFace2ST.Add( TopoDS::Face( aShape ), "" );
   }
@@ -895,6 +922,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_nld_areas()
   LCM->StoreLandCovers(aMapFace2ST);
   TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "NLD_water_areas_dcw" );
   CPPUNIT_ASSERT_IMAGES
+
   aDoc->Close();
 }
 
@@ -903,18 +931,17 @@ 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 
+  //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);
+    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
     HYDROData_ShapeFile anImporter;
     QStringList PolygonList;
     TopTools_SequenceOfShape PolygonFaces;
-    int Type = -1;
 
     //import LCM from file (#2-4; #12-14 polygons)
-    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aFFileName, PolygonList, PolygonFaces, Type));
+    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aFFileName, PolygonList, PolygonFaces));
     Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
     HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
@@ -941,14 +968,12 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
     aDoc->Close();
   }
   {
-    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
     HYDROData_ShapeFile anImporter;
     QStringList PolygonList;
     TopTools_SequenceOfShape PolygonFaces;
-    int Type = -1;
-
     //import all
-    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aSFileName, PolygonList, PolygonFaces, Type));
+    CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aSFileName, PolygonList, PolygonFaces));
     Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
     HYDROData_MapOfFaceToStricklerType aMapFace2ST;
     CPPUNIT_ASSERT_EQUAL(PolygonFaces.Length(), 6);
@@ -968,11 +993,13 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back()
     aDoc->Close();
   }
   CPPUNIT_ASSERT_EQUAL(0, remove(aSFileName.toStdString().c_str()));
+  TestViewer::eraseAll(true, true);
+
 }
 
 void test_HYDROData_LandCoverMap::test_add_2_section_poly()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_PolylineXY) Polyline_12 =
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
@@ -1002,7 +1029,7 @@ void test_HYDROData_LandCoverMap::test_add_2_section_poly()
 
 void test_HYDROData_LandCoverMap::test_split_2()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_PolylineXY) Polyline_1 =
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
@@ -1075,7 +1102,7 @@ void test_HYDROData_LandCoverMap::test_split_2()
 
 void test_HYDROData_LandCoverMap::test_export_telemac()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -1084,21 +1111,29 @@ void test_HYDROData_LandCoverMap::test_export_telemac()
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
+  QStringList types = aTable->GetTypes();
+  //foreach( QString type, types )
+  //  std::cout << type.toStdString() << std::endl;
+
+  QString type7 = types[7];
+  QString type8 = types[8];
+  QString type9 = types[9];
+
   TopoDS_Face aLC1 = Face2d( 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")) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, type7 ) );
 
   TopoDS_Face aLC2 = Face2d( 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")) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, type8 ) );
 
   TopoDS_Face aLC3 = Face2d( 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")) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, type9 ) );
 
   QString aTmpFileName = "test.telemac";
-  QString aTmpPath = QDir::tempPath() + "/" + aTmpFileName;
+  QString aTmpPath = TMP_DIR + "/" + aTmpFileName;
   QString messStat;
   CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable, messStat ) );
   CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 );
@@ -1108,7 +1143,7 @@ void test_HYDROData_LandCoverMap::test_export_telemac()
 
 void test_HYDROData_LandCoverMap::test_copy()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
@@ -1150,32 +1185,32 @@ void test_HYDROData_LandCoverMap::test_copy()
 
 void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   QString aFileName = REF_DATA_PATH + "/CLC_decoupe.shp";
   HYDROData_ShapeFile anImporter;
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
-  int Type = -1;
-  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces);
+  int Type = anImporter.GetShapeType();
   CPPUNIT_ASSERT(aStat == 1);
   CPPUNIT_ASSERT_EQUAL(5, Type);
   CPPUNIT_ASSERT_EQUAL(625, PolygonFaces.Length());
-  
+
   Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   HYDROData_MapOfFaceToStricklerType aMapFace2ST;
 
 #ifdef NDEBUG
   int SI = 100;
-  int EI = 300;
+  int EI = 110;
 #else
-  int SI = 150;
-  int EI = 200;
+  int SI = 100;
+  int EI = 110;
 #endif
 
   for ( int i = SI; i <= EI; i++ )
   {
     TopoDS_Shape aShape = PolygonFaces(i);
-    if ( aShape.IsNull() ) 
+    if ( aShape.IsNull() )
       continue;
     aMapFace2ST.Add( TopoDS::Face( aShape ), "ST_" + QString::number(i) );
   }
@@ -1204,25 +1239,25 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
     }
   }
   OSD_Timer aTimer;
-  std::vector<std::set <QString> > TRes;  
+  std::vector<std::set <QString> > TRes;
   aTimer.Start();
   LCM->ClassifyPoints(pnts, TRes);
   aTimer.Stop();
 #ifdef NDEBUG
-  CPPUNIT_ASSERT( aTimer.ElapsedTime() < 1.4);
+  std::cout << "Time: " << aTimer.ElapsedTime() << std::endl;
+  CPPUNIT_ASSERT( aTimer.ElapsedTime() < 6.0);
   aTimer.Show();
 #endif
 }
 
 void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   QString aFileName = REF_DATA_PATH + "/CLC_decoupe.shp";
   HYDROData_ShapeFile anImporter;
   QStringList PolygonList;
   TopTools_SequenceOfShape PolygonFaces;
-  int Type = -1;
-  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type);
+  int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces);
   CPPUNIT_ASSERT(aStat == 1);
   Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   HYDROData_MapOfFaceToStricklerType aMapFace2ST;
@@ -1233,7 +1268,7 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
   aMapFace2ST.Add( TopoDS::Face( PolygonFaces(187) ), "Vignobles" );
   aMapFace2ST.Add( TopoDS::Face( PolygonFaces(190) ), "Oliveraies" );
   aMapFace2ST.Add( TopoDS::Face( PolygonFaces(196) ), "Estuaires" );
-  
+
   LCM->StoreLandCovers(aMapFace2ST);
 
   TopoDS_Shape Sh = LCM->GetShape();
@@ -1248,7 +1283,7 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
   pnts.push_back(gp_XY(470350, 6384700));
   pnts.push_back(gp_XY(469279.642874048, 6385132.45048612 ));
 
-  std::vector<std::set <QString> > TRes;  
+  std::vector<std::set <QString> > TRes;
   LCM->ClassifyPoints(pnts, TRes);
 
   CPPUNIT_ASSERT (TRes[0].empty());
@@ -1278,3 +1313,72 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
 
 }
 
+void test_HYDROData_LandCoverMap::test_lcm_classification()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+
+  Handle(HYDROData_StricklerTable) aTable =
+    Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
+  CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
+
+  Handle(HYDROData_PolylineXY) ContourP = Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
+  ContourP->SetName( "Contour" );
+  ContourP->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true );
+  ContourP->AddPoint( 0, gp_XY( 89.57, 81.63 ) );
+  ContourP->AddPoint( 0, gp_XY( 479.59, 81.63 ) );
+  ContourP->AddPoint( 0, gp_XY( 472.79, 671.20 ) );
+  ContourP->AddPoint( 0, gp_XY( 69.16, 696.15 ) );
+  ContourP->Update();
+
+  Handle(HYDROData_PolylineXY) Poly_Sens_TrigoP =
+    Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
+  Poly_Sens_TrigoP->SetName( "Poly_Sens_Trigo" );
+  Poly_Sens_TrigoP->SetZLevel( 3 );
+  Poly_Sens_TrigoP->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, 1 );
+  Poly_Sens_TrigoP->AddPoint( 0, gp_XY( 130.46, 223.57 ) );
+  Poly_Sens_TrigoP->AddPoint( 0, gp_XY( 252.16, 239.58 ) );
+  Poly_Sens_TrigoP->AddPoint( 0, gp_XY( 240.95, 498.99 ) );
+  Poly_Sens_TrigoP->AddPoint( 0, gp_XY( 119.26, 510.20 ) );
+  Poly_Sens_TrigoP->AddPoint( 0, gp_XY( 141.67, 378.89 ) );
+  Poly_Sens_TrigoP->Update();
+
+  Handle(HYDROData_PolylineXY) Polyline_Sens_HoraireP =
+    Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
+  Polyline_Sens_HoraireP->SetName( "Polyline_Sens_Horaire" );
+  Polyline_Sens_HoraireP->SetZLevel( 4 );
+  Polyline_Sens_HoraireP->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, 1 );
+  Polyline_Sens_HoraireP->AddPoint( 0, gp_XY( 313.01, 470.16 ) );
+  Polyline_Sens_HoraireP->AddPoint( 0, gp_XY( 313.01, 627.09 ) );
+  Polyline_Sens_HoraireP->AddPoint( 0, gp_XY( 426.70, 633.49 ) );
+  Polyline_Sens_HoraireP->AddPoint( 0, gp_XY( 442.71, 398.11 ) );
+  Polyline_Sens_HoraireP->Update();
+
+
+  Handle(HYDROData_LandCoverMap) Land_cover_map_1 =
+    Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
+  Land_cover_map_1->SetName( "Land cover map_1" );
+  Land_cover_map_1->SetZLevel( 2 );
+  CPPUNIT_ASSERT_EQUAL( true, Land_cover_map_1->Add( ContourP, "Vignobles" ) );
+  CPPUNIT_ASSERT_EQUAL( true, Land_cover_map_1->Add( Poly_Sens_TrigoP, "Oliveraies" ) );
+  CPPUNIT_ASSERT_EQUAL( true, Land_cover_map_1->Add( Polyline_Sens_HoraireP, "Estuaires" ) );
+
+  Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( Land_cover_map_1 );
+  TopoDS_Shape aSh = Land_cover_map_1->GetShape();
+  TestViewer::show( aPrs, AIS_Shaded, 0, true, "Land_cover_map_1" );
+
+  std::vector<gp_XY> pnts;
+  pnts.push_back(gp_XY(90, 90));
+  pnts.push_back(gp_XY(300, 90));
+  pnts.push_back(gp_XY(200, 350));
+  pnts.push_back(gp_XY(400, 500));
+  std::vector<double> theCoeffs;
+  Land_cover_map_1->ClassifyPoints(pnts, aTable, theCoeffs, -1, true );
+  CPPUNIT_ASSERT_EQUAL((int)theCoeffs.size(), 4);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(theCoeffs[0], 24, 0.0001);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(theCoeffs[1], 24, 0.0001);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(theCoeffs[2], 26, 0.0001);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(theCoeffs[3], 98, 0.0001);
+
+  aDoc->Close();
+}
+