Added shape types enum to ShapeAnnotation interface. References #2525