                     popup = L.popup(closeButton: false).setContent "<div class='unit-name'>#{unit.get_text 'name'}</div>"
                     marker = L.marker([coords[1], coords[0]], icon: icon)
                         .bindPopup(popup)
-                        .addTo(@map)
+
+                    @all_markers.addLayer marker
 
                     marker.unit = unit
                     unit.marker = marker

                    marker.on 'mouseover', (event) ->
                        event.target.openPopup()

            bounds = L.latLngBounds (m.getLatLng() for m in markers)
            bounds = bounds.pad 0.05
            # FIXME: map.fitBounds() maybe?

            @map = options.map_view.map
            @current_markers = {}
            @details_marker = null # The marker currently visible on details view.
            @all_markers = L.layerGroup()

        render: ->
            return this

        clear_all_markers: ->
            @all_markers.clearLayers()

        remember_markers: (service_id, markers) ->
            @current_markers[service_id] = markers
        remove_service_points: (service_id) ->
