ShapeAnnotation ShapeType uses shape enum name instead of ordinal. References #2525