GEOMESA-169 fixing density iterator, restoring expansion of density map

This now includes the final fixes for density maps.
Ditto above