Refactor waterway bridges

* Rivers, streams, ditches and drains are now also rendered on bridges.
  This resolves https://trac.openstreetmap.org/ticket/3005.
* Canals on bridges now have a width consistent with canals not on bridges.
Merge pull request #814 from math1985/waterway-bridges

Refactor waterway bridges