Mapping Ware, Phase 4

https://api.openstreetmap.org/user/TomH/diary/417