There is an OSM map of some city, in which several buildings are missing (see the OSM map and the Yandex map of the same place below - there are lots of spaces, which look empty in the OSM map, but have buildings in the Yandex map).
I want to add missing buildings to the OSM map using a tool, which
- displays the OSM objects over a satellite map (such that I can see what objects are present on the satellite map, but not in the OSM map),
- allows to add new objects (ways) to the OSM map by clicking points on the satellite map and connecting them to a polygon and
- allows to save my changes (coordinates of newly added buildings) locally in a file.
What tool are there, which support these functions?