Wikipedia
JOSM
JOSM (Java OpenStreetMap Editor) is a free software desktop editing tool for OpenStreetMap geodata created in Java. It has a lot of advanced features, but also more complicated user interface than default online editor iD.