When loading a map, enforce a know data format. Refs #557 and #547.

* Simplified some code logic.
* Any additional data defined on the map, overrides the profile data.