Merged the groundwater approval code and refactored to keep all of the info needed to render tooltips, legend data and groundwater visit circles in selectors/discrete-data.js