Rescale the map size and unit scales so that they occupy the movement tiles 1:1 like on a chessboard.
This should protect the player from any ambiguity within the location the units, and allows the combat resolver to be better implemented on a technical level.
We should carry this design decision forwards when considering and creating new maps/levels.