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

This now includes the final fixes for density maps.
Probably not... it was something I looked at in the beginning. But I figure it's safer this way.