the FieldUnit enum was being converted in some dodgy ways and
in some places the MapUnit enum values were being used.

Change-Id: Ic9aacb84058d1c14c3a4a79ef6676082df9a7270