Geomap: Switched most events to the JEP model
Merge pull request #4706 from pjackson28/jepevents

Geomap: Switched most events to the JEP model