two queries using geometry

changed heat map to perform two separate queries and to query based on
the esri geometry attribute rather than x and y features