An extensible editor for OpenStreetMap
JOSM is the "Java OpenStreetMap Editor". It is a feature-rich editor for the experienced OSM mapper. It requires some configuration efforts. But if you intend to become a great OSM mapper, it's worth the time you need to get used to it.