comboKey now contains correct data

Fixed a bug causing ComboKey to not contain the correct data.  This
meant that existing records were not detected, causing records to not be
deleted / updated
Fixed a bug in deleting records

If stop code was recognised, but location wasn't, record should be
deleted and re-inserted (because stop had moved).  However, wrong value
passed to delete function
Dialog Closed now detected and map updated

When the dialog is closed, it is detected, and the map updates to
reflect any changes