Take waterway=lock into account for navigable waters

(But need to cross a navigable line)