Add map base types and MapAnnotation, see #11341
Add GenericSource using the Map type, see #11344
Adding plural markers to map