Mapping Ware, Phase 2

https://www.openstreetmap.org/user/TomH/diary/347