             for field in fields when field.type is 'geopoint'
                 @selected_header or= field
 
-        _geopoint: ( datum ) =>
+        # Add a geopoint to all of the map layers.
+        _add_to_layers: (datum, geopoint) ->
+
+          # Set up a pop-up so that when the marker is clicked, the fields for
+          # that data point are showed.
+          fields =
+            for key, value of datum.get( 'data' )
+              "<div><strong>#{key}:</strong> #{value}</div>"
+          marker = L.marker( [geopoint.lat, geopoint.lng], {icon: mapIcon} )
+          marker.bindPopup( fields.join('') )
+
+          @markers.addLayer( marker )
+          @clusters.addLayer( marker )
+          @heatmap.addDataPoint( {'lon': geopoint.lng, 'lat': geopoint.lat, 'value': 1 } )
+
+        _geopoint: ( datum ) ->
             # Ensure there is a column with geopoint data
             return null if not @selected_header?.name?
 

            return { lat: lat, lng: lng }

        render: ->
            last_marker = undefined

            for datum in @collection.models
                geopoint = @_geopoint( datum )

                if not geopoint?
                    continue

                marker = L.marker( [geopoint.lat, geopoint.lng], {icon: mapIcon} )

                html = ''
                for key, value of datum.get( 'data' )#marker.data
                    html += "<div><strong>#{key}:</strong> #{value}</div>"
                marker.bindPopup( html )

                @markers.addLayer( marker )
                @clusters.addLayer( marker )

                if datum.get( 'data' ).value?
                    heatmap_value = datum.get( 'data' ).value

        _resize_map: () =>
            $( '#map' ).css( { 'height': ( @$el.parent().height() - 20 ) + 'px' } )

            @map.on( 'moveend', @refresh_viewport )

            # Clear all our markers when we get another set of markers.
            @collection.on( 'reset', =>
                @markers.clearLayers()
                @clusters.clearLayers() )
            @
