Changed City model to hold a geometry of the city