v2 - based on r1402.

-----------

Hi Felix,

Please try the attached patch. I've tested it inasmuch that it doesn't
blow up but whether it actually does the right thing when you have a
routable and non-routable way from the same set of points, I don't know.

Cheers,

Mark