There is an overlap between what CIMI was aiming to record and the existing TEI framework. TEI already has concepts for:
together with subelements which allow you to analyse each concept further (e.g. <settlement>, <region>, <country>, <bloc> and <geogName> for place names)