Spr mapper

Updated the SPR mapper and tests. Could be some problems at low speeds and high powers (going up hills). Added an over-ride to get round this but might need some tweaking.