replaced prototypes for CityMap
changed uid property for CityMap