Merge amenity-symbols into amenity-points

This resolves #210