Added the city list to the data files, in preparation for drawing city labels.
Looks like I made some optimizations a while ago and never committed them.
Some more to-do items.