Second attempt to address mapping

https://www.openstreetmap.org/user/maning/diary/18139