refactoring amenity-points

some obvious changes that are subset of #710 and cleanup after #695 

minor changes in rendering (generic shop names are no longer rendered as larger than normal shop labels, bar and cinema now inherit properties (for example bar names are now wrapping).