Fixed bug in returning results from model
Updated for changes to GridMapLayoutOptimiser
Reduced scope of geoPoints
Tidied up code for readability