text: Which tag shoud the waterway have? River or Stream?
   
  From the WIki:
  Use waterway=stream for a naturally-forming waterway that is too narrow to be classed as waterway=river (the commonly accepted rule for OpenStreetMap is that a stream can be jumped across by an active, able-bodied person). A stream need not be permanently filled with water. 
  In case of varying size or intermittent waterways the distinction from larger rivers based on the above criterion should be made with respect to the high water level.