[mkgmap-dev] Commit: r1269: Fix working out the name that belongs to a city and also