Merge in cc9c033e03b7a60700be22a364de7a24f5d31915
Switch x/y and i/j to follow col/row convention. Handle NODATA and add test for it
Switch x/y and i/j to follow col/row convention for ApproxViewshed