Mapping Ware, Phase 2

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