Use the Georef POJO instead of creating new columns in the Location table

Issue: GCP-5250

Reviewer: Jaira (post-commit)