GEOMESA-136 PR changes - implement as dwithin query