From 3bf1f41d27a5903c25dca2d54d844c53760e6133 Mon Sep 17 00:00:00 2001
From: adv <adv@opencascade.com>
Date: Thu, 31 Oct 2013 08:39:32 +0000
Subject: [PATCH] Undefined merge bathymetries type added for zones.

---
 src/HYDROData/HYDROData_Zone.cxx | 2 +-
 src/HYDROData/HYDROData_Zone.h   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 2000af76..2e8e58dd 100644
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -87,7 +87,7 @@ void HYDROData_Zone::SetMergeType( const MergeBathymetriesType& theType )
 
 HYDROData_Zone::MergeBathymetriesType HYDROData_Zone::GetMergeType() const
 {
-  MergeBathymetriesType aMergeType = Merge_ZMIN;
+  MergeBathymetriesType aMergeType = Merge_UNKNOWN;
   
   Handle(TDataStd_Integer) anInt;
   if ( myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
diff --git a/src/HYDROData/HYDROData_Zone.h b/src/HYDROData/HYDROData_Zone.h
index eddee171..a0c4279c 100644
--- a/src/HYDROData/HYDROData_Zone.h
+++ b/src/HYDROData/HYDROData_Zone.h
@@ -22,9 +22,10 @@ public:
   // Enumeration of mergin types for conflict bathymetries
   enum MergeBathymetriesType
   {
-    Merge_ZMIN,   // The minimum values
-    Merge_ZMAX,   // The maximum values
-    Merge_Object  // Only one bathymetry will be taken into account
+    Merge_UNKNOWN, // Undefined
+    Merge_ZMIN,    // The minimum values
+    Merge_ZMAX,    // The maximum values
+    Merge_Object   // Only one bathymetry will be taken into account
   };
 
 protected:
@@ -67,7 +68,7 @@ public:
 
   /**
    * Sets the merging type for conflict bathymetries.
-   * By default it is set to Merge_ZMIN.
+   * By default it is set to Merge_UNKNOWN.
    */
   HYDRODATA_EXPORT virtual void SetMergeType( const MergeBathymetriesType& theType );
 
-- 
2.39.2