Use of an enum for geometry type matching

Use of an enum for geometry type matching rather than integer.