Mapping Ware, Phase 4

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