Geomap: legend enhancements

Should avoid leaving in commented out code.