Uplifting map system to use database coordinates instead of hardcoded values

I've done a comparison of what was in the