One who specializes in geology.
One who collects rocks and minerals, especially gemstones, as a hobby.