         el: '#map-viz'
         itemView: MarkerItemView
 
+        # Find a column that can be plotted on the map.
+        # TODO: Support lat/lngs as separate columns.
         _detect_headers: ( fields ) ->
             @map_headers = []
             @selected_header = null
 
-            for field in fields
-                if field.type in [ 'geopoint' ]
-                    @map_headers.push( field )
-
-                    if not @selected_header?
-                        @selected_header = field
-
-                else if field.label.length == 3
-                    if field.label.search( 'lat' ) != -1
-                        console.log(field)
-                        @map_headers.push( field )
-                    else if field.label.search( 'lng' ) != -1
-                        console.log(field)
-                        @map_headers.push( field )
-
-            # This means there were no geopoints... attempt to find an lat/lng
-            # combo between two columns
-            # TODO: Support separate lat/lngs somehow. Perhaps introduce a merging utility?
-            # if not @selected_header?
-            #     @selected_header = {}
-            #     for field in @map_headers
-            #         if field.label.search( 'lat' ) != -1
-            #             @selected_header.lat = field
-            #         else if field.label.search( 'lng' ) != -1
-            #             @selected_header.lng = field
+            for field in fields when field.type is 'geopoint'
+                @selected_header or= field
 
         _geopoint: ( datum ) =>
             # Ensure there is a column with geopoint data

                    continue

                marker = L.marker( [geopoint.lat, geopoint.lng], {icon: mapIcon} )
                #marker.data = datum.get( 'data' )
                #marker.timestamp = new Date( datum.get( 'timestamp' ) )

                # if last_marker?
                #     day = 1000 * 60 * 60 * 24
                #     if marker.timestamp.getTime() - last_marker.timestamp.getTime() < day
                #         pline = [ marker.getLatLng(), last_marker.getLatLng() ]
                #         @connections.addLayer( L.polyline( pline ) )

                #     last_marker = marker
                # else
                #     last_marker = marker

                html = ''
                for key, value of datum.get( 'data' )#marker.data


    return DataMapView
)
