update city.cc to latest version

closes #22