Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

Conflicts:
	src/HYDROData/HYDROData_LandCoverMap.cxx

diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
index be2f26ad9dd46a9ba3dc2af0c69c4465f6044578,677cd6770779aa9b870041fe980f4ce262af063d..3cc968d5f179fef2cfce8ac62f39ff34b5434aab
--- 1/src/HYDROData/HYDROData_LandCoverMap.cxx
--- 2/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@@ -735,9 -726,26 +735,8 @@@ TopoDS_Shape HYDROData_LandCoverMap::Me
      }
    }
  
 -  if (!EmptySh)
 -    aSeqSh.Append (ShellR);
 -  
 -  TopoDS_Compound cmp; 
 -  BB.MakeCompound( cmp ); 
 -  
 -  TopoDS_Shape aResult;
 -
 -  if (aSeqSh.Length() == 1)
 -    aResult = aSeqSh.First();
 -  else
 -  {
 -    for (int i = 1; i <= aSeqSh.Size(); i++)
 -      BB.Add(cmp, aSeqSh(i));
 -    aResult = cmp;
 -  }
 -
    return aResult;
  }
--
  /**
    Change Strickler type for the list of faces to the given one
    @param theFaces the faces to change type