Restore rendering of bridges
Remove duplicate and inconsistent condition from water_lines_casing

This resolves #939