Refactor waterway bridges

* Rivers, streams, ditches and drains are now also rendered on bridges.
  This resolves #696.
* Canals on bridges now have a width consistent with canals not on bridges.