tourism=attraction - partially restore old label, stop rendering areas
it reverts some changes introduced in #941 - styling of tourism=attraction labels is changed to the old one, except depending on way_pixels and yielding to building label style
Merge branch 'tourism' of https://github.com/mkoniecz/openstreetmap-carto into mkoniecz-tourism

Conflicts:
	landcover.mss
Merge branch 'mkoniecz-tourism'