JOSM offers a large set of features and useful tools for a wide range of editing styles: It will either read in GPX tracks from your hard disk, or download them from OSM. Aerial imagery can easily be downloaded as a background for tracing. JOSM also supports photo mapping and audio mapping. Once you have completed your edits, you can upload them to OSM.