I can't stand all the right angles in here, by the way.
Basically, it would be categorizing all places by the way that the 11th edition categorized them, which seems like the best way to do it, and possibly the only tenable, self-consistent way to do it.