Ditch image-annotation-geometry-types

... and add this info to each individual annotation. The aggregated values suppüosed to go into the image-annotation-geometry-types field can eb computed afterwards by an external tool.