Uploader changes for the new data format.
Basic map interface (no clusters yet).
Merge initial map changes.