Embed brand, operator, ref in all point and line names.

git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2440 25d90789-57f7-4ee0-8453-03a3dfeeeb22