Mapping Ware, Phase 3

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