I only interpret the given tags from version 1. I add also a building from the aerial image You can add the addr:housenumber and addr:street (as minimum of an address). In the United States, the keys are also useful 
* addr:state, 
* addr:postcode (value zip code),
* addr:city 