Adjustment and Extension of the Hansen and Rattray Estuarine Classification Diagram