Salome HOME
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
[modules/hydro.git] / src / HYDROData / HYDROData_CalculationCase.cxx
index 4e218713b73e9787fbf7540ad8294598182bb878..b0241aa91ba15b556d27f14eb7c47e5e85870665 100644 (file)
@@ -1,3 +1,20 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_CalculationCase.h"
 
@@ -8,6 +25,8 @@
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 #include "HYDROData_PolylineXY.h"
+#include "HYDROData_StricklerTable.h"
+#include "HYDROData_LandCover.h"
 #include "HYDROData_SplittedShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
@@ -41,6 +60,7 @@
 #endif 
 #define CALCULATION_REGIONS_PREF GetName() + "_Reg"
 #define CALCULATION_ZONES_PREF GetName() + "_Zone"
+#define CALCULATION_LANDCOVER_ZONES_PREF GetName() + "_LandCoverZone"
 #define CALCULATION_GROUPS_PREF GetName() + "_"
 //#define DEB_CLASS2D 1
 #ifdef DEB_CLASS2D
 
 #define EXPORT_NAME "HYDRO_" + GetName()
 
-#include <SALOME_NamingService.hxx>
-#include <SALOME_LifeCycleCORBA.hxx>
-
-
-
-
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
 
@@ -73,33 +86,14 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   QString anOldCaseName = GetName();
   if ( anOldCaseName != theName )
   {
-    HYDROData_SequenceOfObjects aRegions = GetRegions();
-
-    HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if ( aRegion.IsNull() )
-        continue;
-
-      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegion );
-
-      HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
-      HYDROData_SequenceOfObjects::Iterator anIter( aZones );
-      for ( ; anIter.More(); anIter.Next() )
-      {
-        Handle(HYDROData_Zone) aRegZone =
-          Handle(HYDROData_Zone)::DownCast( anIter.Value() );
-        if ( aRegZone.IsNull() )
-          continue;
-
-        HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegZone );
-      }
-    }
+    // Update names of regions and its zones
+    UpdateRegionsNames( GetRegions( false ), anOldCaseName, theName );
+    // Update names of land cover regions and its zones
+    UpdateRegionsNames( GetRegions( true ), anOldCaseName, theName );
 
     HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
 
+    HYDROData_SequenceOfObjects::Iterator anIter;
     anIter.Init( aGroups );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -122,10 +116,14 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
 
   QString aCalculName = GetObjPyName();
 
-  AssignmentMode aMode = GetAssignmentMode();
+  AssignmentMode aMode = GetAssignmentMode();  
   QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
   aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr );
 
+  AssignmentMode aModeLC = GetAssignmentLandCoverMode();
+  QString aModeLCStr = aModeLC==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
+  aResList << QString( "%0.SetAssignmentLandCoverMode( %1 )" ).arg( aCalculName ).arg( aModeLCStr );
+
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
   for ( ; anIter.More(); anIter.Next() )
@@ -164,6 +162,8 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
 
   if( aMode==AUTOMATIC )
     DumpRulesToPython( aCalculName, aResList );
+  if( aModeLC==AUTOMATIC )
+    DumpLandCoverRulesToPython( aCalculName, aResList );
 
   aResList << QString( "" );
   aResList << "# Start the algorithm of the partition and assignment";
@@ -171,20 +171,16 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
 
   if( aMode==MANUAL )
   {
-    // Now we restore the regions and zones order
-    HYDROData_SequenceOfObjects aRegions = GetRegions();
-    anIter.Init( aRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if ( aRegion.IsNull() )
-        continue;
+    // Now we restore the
+    // - regions and zones order
+    DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( false ) );   
+  }
 
-      theTreatedObjects.insert( aRegion->GetName(), aRegion );
-      QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
-      aResList << aRegDump;
-    }
+  if( aModeLC==MANUAL )
+  {
+    // Now we restore the
+    // - land cover regions and zones order
+    DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( true ) );
   }
 
   // Export calculation case
@@ -256,9 +252,14 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
   if ( !aBoundaryPolyline.IsNull() )
     aResSeq.Append( aBoundaryPolyline );
 
-  HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions();
+  // Regions
+  HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions( false );
   aResSeq.Append( aSeqOfRegions );
 
+  // Land cover regions
+  HYDROData_SequenceOfObjects aSeqOfLandCoverRegions = GetRegions( true );
+  aResSeq.Append( aSeqOfLandCoverRegions );
+
   return aResSeq;
 }
 
@@ -268,62 +269,90 @@ void HYDROData_CalculationCase::Update()
   SetWarning();
 
   // At first we remove previously created objects
-  RemoveRegions();
+  RemoveRegions( false );
+  RemoveRegions( true );
   RemoveSplittedGroups();
 
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
     return;
 
+  // Split to zones
+  HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
+
   Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
-  if ( aGeomObjects.IsEmpty() )
-    return;
-
-  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
-
-  HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
-    HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
-  if ( aSplitObjects.isEmpty() )
-    return;
+  if ( !aGeomObjects.IsEmpty() ) {
+    HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+
+    HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
+      HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+    if ( !aSplitObjects.isEmpty() ) {
+      HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
+      while( anIter.hasNext() ) {
+        const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+        if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+          aZonesList.append( aSplitData );
+        else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+          anEdgesList.append( aSplitData );
+      }
+    }
+  }
 
-  HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
+  // Split to land cover zones
+  HYDROData_SplitToZonesTool::SplitDataList aLandCoverZonesList;
+
+  HYDROData_SequenceOfObjects aLandCovers = GetLandCovers();
+  if ( !aLandCovers.IsEmpty() ) {
+    HYDROData_SplitToZonesTool::SplitDataList aSplitLandCoverObjects =
+      HYDROData_SplitToZonesTool::Split( aLandCovers );
+    if ( !aSplitLandCoverObjects.isEmpty() ) {
+      HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitLandCoverObjects );
+      while( anIter.hasNext() ) {
+        const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+        if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+          aLandCoverZonesList.append( aSplitData );
+      }
+    }
+  }
 
-  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
-  while( anIter.hasNext() )
+  switch( GetAssignmentMode() )
   {
-    const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-    if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
-      aZonesList.append( aSplitData );
-    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
-      anEdgesList.append( aSplitData );
+  case MANUAL:
+    CreateRegionsDef( aDocument, aZonesList, false );    
+    break;
+  case AUTOMATIC:
+    CreateRegionsAuto( aDocument, aZonesList, false );    
+    break;
   }
 
-  switch( GetAssignmentMode() )
+  switch( GetAssignmentLandCoverMode() )
   {
   case MANUAL:
-    CreateRegionsDef( aDocument, aZonesList );
+    CreateRegionsDef( aDocument, aLandCoverZonesList, true );
     break;
   case AUTOMATIC:
-    CreateRegionsAuto( aDocument, aZonesList );
+    CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
     break;
   }
+
   CreateEdgeGroupsDef( aDocument, anEdgesList );
 }
 
 void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
-                                                  const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+                                                  const HYDROData_SplitToZonesTool::SplitDataList& theZones,
+                                                  const bool theLandCover )
 {
   // Create result regions for case, by default one zone for one region
   QString aRegsPref = CALCULATION_REGIONS_PREF;
-  QString aZonesPref = CALCULATION_ZONES_PREF;
+  QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
 
   HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
     // Create new region
-    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref );
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref, theLandCover );
 
     // Add the zone for region
     Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
@@ -331,23 +360,24 @@ void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen
 }
 
 void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
-                                                   const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+                                                   const HYDROData_SplitToZonesTool::SplitDataList& theZones,
+                                                   const bool theLandCover )
 {
   QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
   QMap<QString, QString> aRegionNameToObjNameMap;
-  QString aZonesPref = CALCULATION_ZONES_PREF;
-  HYDROData_PriorityQueue aPr( this );
+  QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
+  HYDROData_PriorityQueue aPr( this, theLandCover ? DataTag_CustomLandCoverRules : DataTag_CustomRules );
 
   // 1. First we create a default region for each object included into the calculation case
-  HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
-  for( int i=aGeomObjects.Lower(), n=aGeomObjects.Upper(); i<=n; i++ )
+  HYDROData_SequenceOfObjects anObjects = theLandCover ? GetLandCovers() : GetGeometryObjects();
+  for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ )
   {
-    Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( aGeomObjects.Value( i ) );
+    Handle(HYDROData_Entity) anObj = anObjects.Value( i );
     if( anObj.IsNull() )
       continue;
     QString anObjName = anObj->GetName();
     QString aRegName = anObjName + "_reg";
-    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false );
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, theLandCover, false );
     aRegionsMap.insert( anObjName, aRegion );
     aRegionNameToObjNameMap.insert( aRegName, anObjName );
   }
@@ -358,8 +388,8 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-    HYDROData_Zone::MergeAltitudesType aMergeType;
-    Handle(HYDROData_Object) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
+    HYDROData_Zone::MergeType aMergeType;
+    Handle(HYDROData_Entity) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
     if( aRegObj.IsNull() )
       continue;
     Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()];
@@ -372,6 +402,14 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
       qDebug( "Error in algorithm: unresolved conflicts" );
     }
 
+    Handle(HYDROData_Entity) aMergeEntity = aRegObj;
+    if ( !theLandCover ) {
+      Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
+      if ( !aMergeObject.IsNull() ) {
+        aMergeEntity = aMergeObject->GetAltitudeObject();
+      }
+    }
+
     switch( aMergeType )
     {
     case HYDROData_Zone::Merge_ZMIN:
@@ -380,8 +418,8 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
       break;
     case HYDROData_Zone::Merge_Object:
       aRegionZone->SetMergeType( aMergeType );
-      aRegionZone->RemoveMergeAltitude();
-      aRegionZone->SetMergeAltitude( aRegObj->GetAltitudeObject() );
+      aRegionZone->RemoveMergeObject();
+      aRegionZone->SetMergeObject( aMergeEntity );
       break;
     }
   }
@@ -550,10 +588,74 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline()
   SetToUpdate( !aPrevPolyline.IsNull() || IsMustBeUpdated() );
 }
 
-Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
+void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_StricklerTable)& theStricklerTable )
+{
+  Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable();
+
+  SetReferenceObject( theStricklerTable, DataTag_StricklerTable );
+
+  // Indicate model of the need to update land covers partition
+  SetToUpdate( !IsEqual( aPrevStricklerTable, theStricklerTable ) || IsMustBeUpdated() );
+}
+
+Handle(HYDROData_StricklerTable) HYDROData_CalculationCase::GetStricklerTable() const
+{
+  return Handle(HYDROData_StricklerTable)::DownCast( 
+           GetReferenceObject( DataTag_StricklerTable ) );
+}
+
+void HYDROData_CalculationCase::RemoveStricklerTable()
+{
+  Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable();
+
+  ClearReferenceObjects( DataTag_StricklerTable );
+
+  // Indicate model of the need to update land covers partition
+  SetToUpdate( !aPrevStricklerTable.IsNull() || IsMustBeUpdated() );
+}
+
+bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+{
+  if ( HasReference( theLandCover, DataTag_LandCover ) )
+    return false; // Land cover is already in reference list
+
+  AddReferenceObject( theLandCover, DataTag_LandCover );
+  
+  // Indicate model of the need to update land covers partition
+  SetToUpdate( true );
+
+  return true;
+}
+
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const
+{
+  return GetReferenceObjects( DataTag_LandCover );
+}
+
+void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+{
+  if ( theLandCover.IsNull() )
+    return;
+
+  RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover );
+
+  // Indicate model of the need to update land cover partition
+  SetToUpdate( true );
+}
+
+void HYDROData_CalculationCase::RemoveLandCovers()
+{
+  ClearReferenceObjects( DataTag_LandCover );
+
+  // Indicate model of the need to update land cover partition
+  SetToUpdate( true );
+}
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone,
+                                                                  const bool theLandCover )
 {
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
+  Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover );
   if ( aNewRegion.IsNull() )
     return aNewRegion;
 
@@ -562,14 +664,18 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H
   return aNewRegion;
 }
 
-bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion )
+bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion,
+                                           const bool theLandCover )
 {
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
 
   if ( theRegion.IsNull() )
     return false;
   
-  if ( HasReference( theRegion, DataTag_Region ) )
+  HYDROData_CalculationCase::DataTag aDataTag = 
+    theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+
+  if ( HasReference( theRegion, aDataTag ) )
     return false; // Object is already in reference list
 
   // Move the region from other calculation
@@ -577,24 +683,24 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
     Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() );
   if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab )
   {
-    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
+    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover );
     theRegion->CopyTo( aNewRegion );
 
-    aFatherCalc->RemoveRegion( theRegion );
+    aFatherCalc->RemoveRegion( theRegion, theLandCover );
 
     theRegion->SetLabel( aNewRegion->Label() );
   }
   else
   {
-    AddReferenceObject( theRegion, DataTag_Region );
+    AddReferenceObject( theRegion, aDataTag );
   }
 
   return true;
 }
 
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions() const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions( const bool theLandCover ) const
 {
-  return GetReferenceObjects( DataTag_Region );
+  return GetReferenceObjects( theLandCover ? DataTag_LandCoverRegion : DataTag_Region );
 }
 
 void HYDROData_CalculationCase::UpdateRegionsOrder()
@@ -603,7 +709,9 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
   if ( aDocument.IsNull() )
     return;
 
-  HYDROData_SequenceOfObjects aRegions = GetRegions();
+  HYDROData_SequenceOfObjects aRegions = GetRegions( false );
+  HYDROData_SequenceOfObjects aRegionsLC = GetRegions( true );
+  aRegions.Append( aRegionsLC );
 
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More(); anIter.Next() )
@@ -631,12 +739,15 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
   }
 }
 
-void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion )
+void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion,
+                                              const bool theLandCover )
 {
   if ( theRegion.IsNull() )
     return;
 
-  RemoveReferenceObject( theRegion->Label(), DataTag_Region );
+  HYDROData_CalculationCase::DataTag aDataTag = 
+    theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+  RemoveReferenceObject( theRegion->Label(), aDataTag );
 
   // Remove region from data model
   Handle(HYDROData_CalculationCase) aFatherCalc = 
@@ -645,9 +756,9 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
     theRegion->Remove();
 }
 
-void HYDROData_CalculationCase::RemoveRegions()
+void HYDROData_CalculationCase::RemoveRegions( const bool theLandCover )
 {
-  myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes();
+  myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).ForgetAllAttributes();
 }
 
 HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const
@@ -662,7 +773,7 @@ void HYDROData_CalculationCase::RemoveSplittedGroups()
 
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
 {
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
   return GetAltitudeForPoint( thePoint, aZone );
 }
 
@@ -671,7 +782,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
 {
   double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
 
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
   if ( !aZone.IsNull() )
   {
     Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
@@ -689,7 +800,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   if ( theZone.IsNull() )
     return aResAltitude;
 
-  HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+  HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
   if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
@@ -702,7 +813,8 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
   if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
   {
-    Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+    Handle(HYDROData_IAltitudeObject) aMergeAltitude = 
+      Handle(HYDROData_IAltitudeObject)::DownCast( theZone->GetMergeObject() );
     if ( !aMergeAltitude.IsNull() )
     {
       if ( aZoneInterpolator != NULL )
@@ -716,7 +828,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   }
   else
   {
-    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -802,22 +914,56 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
   return aResSeq;
 }
 
-Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
+double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const
+{
+    double aCoeff = 0;
+    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+    if ( !aDocument.IsNull() )
+        aCoeff = aDocument->GetDefaultStricklerCoefficient();
+
+    Handle(HYDROData_LandCover) aLandCover;
+    Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, Standard_True );
+    if ( !aZone.IsNull() )
+    {
+        HYDROData_SequenceOfObjects anObjList = aZone->GetObjects();
+        if ( anObjList.Length() == 1 )
+            aLandCover = Handle(HYDROData_LandCover)::DownCast( anObjList.First() );
+        else
+            aLandCover = Handle(HYDROData_LandCover)::DownCast( aZone->GetMergeObject() );
+    }
+
+    if ( !aLandCover.IsNull() )
+    {
+        QString aType = aLandCover->GetStricklerType();
+        Handle(HYDROData_StricklerTable) aTable = GetStricklerTable();
+        if ( !aTable.IsNull() )
+        {
+            if ( aTable->GetTypes().contains( aType ) )
+                aCoeff = aTable->Get( aType, aCoeff );
+        }
+    }
+
+    return aCoeff;
+}
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint,
+                                                                        const bool theLandCover ) const
 {
   Handle(HYDROData_Region) aResRegion;
 
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, theLandCover );
   if ( !aZone.IsNull() )
     aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
 
   return aResRegion;
 }
 
-Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
+Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint,
+                                                                    const bool theLandCover ) const
 {
   Handle(HYDROData_Zone) aResZone;
 
-  HYDROData_SequenceOfObjects aRegions = GetRegions();
+  HYDROData_SequenceOfObjects aRegions = GetRegions( theLandCover );
 
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More() && aResZone.IsNull(); anIter.Next() )
@@ -878,14 +1024,15 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc,
                                                                   const QString& thePrefixOrName,
+                                                                  const bool theLandCover,
                                                                   bool isPrefix )
 {
-  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).NewChild();
   int aTag = aNewLab.Tag();
 
   Handle(HYDROData_Region) aNewRegion =
     Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
-  AddRegion( aNewRegion );
+  AddRegion( aNewRegion, theLandCover );
 
   QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
   aNewRegion->SetName( aRegionName );
@@ -912,14 +1059,15 @@ QString HYDROData_CalculationCase::Export( int theStudyId ) const
   GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
   SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
   
-  QString aGeomObjEntry;
-  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry );
+  QString aGeomObjEntry, anErrorMsg;
+  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
   return isOK ? aGeomObjEntry : QString();
 }
 
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
                                         SALOMEDS::Study_ptr theStudy,
-                                        QString& theGeomObjEntry ) const
+                                        QString& theGeomObjEntry,
+                                        QString& theErrorMsg ) const
 {
   HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
 
@@ -944,21 +1092,35 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   }
   
   // Get faces
+  bool isAllNotSubmersible = true;
   TopTools_ListOfShape aFaces;
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
+  HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false );
   HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
   for ( ; aRegionIter.More(); aRegionIter.Next() )
   {
     Handle(HYDROData_Region) aRegion =
       Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() )
+    if( aRegion.IsNull() || !aRegion->IsSubmersible() )
       continue;
+    
+    if ( isAllNotSubmersible )
+      isAllNotSubmersible = false;
 
     TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
     aFaces.Append( aRegionShape );
   }
 
-  return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );
+  bool aRes = false;
+
+  if ( aCaseRegions.IsEmpty() ) {
+    theErrorMsg = QString("the list of regions is empty.");
+  } else if ( isAllNotSubmersible ) {
+    theErrorMsg = QString("there are no submersible regions.");
+  } else {
+    aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
+  }
+
+  return aRes;
 }
 
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var                            theGeomEngine,
@@ -1019,7 +1181,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
   // Publish the sewed shape
   QString aName = EXPORT_NAME;
   GEOM::GEOM_Object_ptr aMainShape = 
-    publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
+    HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
 
   if ( aMainShape->_is_nil() )  
     return false;
@@ -1116,55 +1278,10 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
   return true;
 }
 
-GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM( 
-  GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
-  const TopoDS_Shape& theShape, const QString& theName,
-  QString& theGeomObjEntry ) const
+void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag,
+                                            const bool theIsSetToUpdate )
 {
-  theGeomObjEntry = "";
-  GEOM::GEOM_Object_var aGeomObj;
-
-  if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
-       theShape.IsNull() ) {
-    return aGeomObj._retn();
-  }
-
-  std::ostringstream aStreamShape;
-  // Write TopoDS_Shape in ASCII format to the stream
-  BRepTools::Write( theShape, aStreamShape );
-  // Returns the number of bytes that have been stored in the stream's buffer.
-  int aSize = aStreamShape.str().size();
-  // Allocate octect buffer of required size
-  CORBA::Octet* anOctetBuf = SALOMEDS::TMPFile::allocbuf( aSize );
-  // Copy ostrstream content to the octect buffer
-  memcpy( anOctetBuf, aStreamShape.str().c_str(), aSize );
-  // Create TMPFile
-  SALOMEDS::TMPFile_var aSeqFile = new SALOMEDS::TMPFile( aSize, aSize, anOctetBuf, 1 );
-
-  // Restore shape from the stream and get the GEOM object
-  GEOM::GEOM_IInsertOperations_var anInsOp = theGeomEngine->GetIInsertOperations( theStudy->StudyId() );
-  aGeomObj = anInsOp->RestoreShape( aSeqFile );
-  
-  // Puplish the GEOM object
-  if ( !aGeomObj->_is_nil() ) {
-    QString aName = HYDROData_GeomTool::GetFreeName( theStudy, theName );
-
-    SALOMEDS::SObject_var aResultSO = 
-      theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), 
-                                     aGeomObj, qPrintable( aName ) );
-    if ( aResultSO->_is_nil() ) {
-      aGeomObj = GEOM::GEOM_Object::_nil();
-    }
-    else
-      theGeomObjEntry = aResultSO->GetID();
-  }
-
-  return aGeomObj._retn();
-}
-
-void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate )
-{
-  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
   HYDROData_PriorityQueue::ClearRules( aRulesLab );
 
   // Indicate model of the need to update splitting
@@ -1173,12 +1290,13 @@ void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate )
   }
 }
 
-void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Object)&    theObject1,
+void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)&    theObject1,
                                          HYDROData_PriorityType             thePriority,
-                                         const Handle(HYDROData_Object)&    theObject2,
-                                         HYDROData_Zone::MergeAltitudesType theMergeType )
+                                         const Handle(HYDROData_Entity)&    theObject2,
+                                         HYDROData_Zone::MergeType          theMergeType,
+                                         HYDROData_CalculationCase::DataTag theDataTag )
 {
-  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
   HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
 
   // Indicate model of the need to update splitting
@@ -1191,6 +1309,12 @@ QString HYDROData_CalculationCase::DumpRules() const
   return HYDROData_PriorityQueue::DumpRules( aRulesLab );
 }
 
+QString HYDROData_CalculationCase::DumpLandCoverRules() const
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules );
+  return HYDROData_PriorityQueue::DumpRules( aRulesLab );
+}
+
 void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode )
 {
   TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode );
@@ -1217,6 +1341,13 @@ void HYDROData_CalculationCase::DumpRulesToPython( const QString& theCalcCaseNam
   HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
 }
 
+void HYDROData_CalculationCase::DumpLandCoverRulesToPython( const QString& theCalcCaseName,
+                                                            QStringList& theScript ) const
+{
+  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules );
+  HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
+}
+
 HYDROData_Warning HYDROData_CalculationCase::GetLastWarning() const
 {
   return myLastWarning;
@@ -1228,13 +1359,80 @@ void HYDROData_CalculationCase::SetWarning( HYDROData_WarningType theType, const
   myLastWarning.Data = theData;
 }
 
+void HYDROData_CalculationCase::UpdateRegionsNames( const HYDROData_SequenceOfObjects& theRegions,
+                                                    const QString& theOldCaseName,
+                                                    const QString& theName )
+{
+  HYDROData_SequenceOfObjects::Iterator anIter( theRegions );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    if ( aRegion.IsNull() )
+      continue;
+
+    HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegion );
+
+    HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
+    HYDROData_SequenceOfObjects::Iterator anIter( aZones );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_Zone) aRegZone =
+        Handle(HYDROData_Zone)::DownCast( anIter.Value() );
+      if ( aRegZone.IsNull() )
+        continue;
+
+      HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegZone );
+    }
+  }
+}
+
+void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
+                                                     MapOfTreatedObjects& theTreatedObjects,
+                                                     const HYDROData_SequenceOfObjects& theRegions ) const
+{
+  HYDROData_SequenceOfObjects::Iterator anIter;
+  anIter.Init( theRegions );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    if ( aRegion.IsNull() )
+      continue;
+
+    theTreatedObjects.insert( aRegion->GetName(), aRegion );
+    QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
+    theResList << aRegDump;
+  }
+}
+
 bool HYDROData_CalculationCase::GetRule( int theIndex, 
-                                         Handle(HYDROData_Object)&           theObject1,
+                                         Handle(HYDROData_Entity)&           theObject1,
                                          HYDROData_PriorityType&             thePriority,
-                                         Handle(HYDROData_Object)&           theObject2,
-                                         HYDROData_Zone::MergeAltitudesType& theMergeType ) const
+                                         Handle(HYDROData_Entity)&           theObject2,
+                                         HYDROData_Zone::MergeType&          theMergeType,
+                                         HYDROData_CalculationCase::DataTag& theDataTag) const
 {
-  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+  TDF_Label aRulesLab = myLab.FindChild( theDataTag );
   return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
     theObject1, thePriority, theObject2, theMergeType );
 }
+
+void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode )
+{
+  TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode );
+  TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+
+  // Indicate model of the need to update land covers partition
+  SetToUpdate( true );
+}
+
+HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const
+{
+  Handle(TDataStd_Integer) aModeAttr;
+  bool isOK = myLab.FindChild( DataTag_AssignmentLandCoverMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr );
+  if( isOK )
+    return ( AssignmentMode ) aModeAttr->Get();
+  else
+    return MANUAL;
+}