Integer city maps now specified by enum, to simplify the namespace