Geomap: fix legend issues (2669, 2671)
Merge branch 'legend-issue' of https://github.com/jolevesq/wet-boew into jolevesq-legend-issue
Geomap: Fixed remaining issue in PR #2682.
Geomap: Fixed remaining legend-related WAVE errors in PR #2682.