dy on waterway labels
text wrap on peak labels
Allow labels to be close to airport icon (fix #58)