mapping: consider moving to within layer

[davidhodge931]

This enables it to work even when there is another argument of the same name

[davidhodge931]

Pros: can add x, y, col, fill etc in mapping Cons:

• y doesn't get reversed
• col doesn't get reversed -they would not inherit