Proper application of nodata switch for all cases in rio-shapes

Plus tests to get to 100% coverage.
:+1: