opentrail modifications to allow whole of England/Wales mapfiles; hikar tweaks