Make the same city detection consider more information

This fixes nearby cities being considered the same due to just considering
their coordinates. This showed for example in form of weird mis-groupings
in Itinerary.