Add popup capabilities to Geomap

At the same time it looks like the issue 2237 is resolve.