beating the bounds redux

https://www.openstreetmap.org/user/morwen/diary/223