                 @highlight_selected_unit unit
 
             @listenTo p13n, 'position', @handle_user_position
+            @listenTo @selected_position, 'change:value', =>
+                if @selected_position.isSet()
+                    @handle_user_position @selected_position.get('value'), center=true
 
         get_max_auto_zoom: ->
             if p13n.get('map_background_layer') == 'guidemap'

            lat_lng = L.latLng [pos.coordinates[1], pos.coordinates[0]]
            accuracy = pos.accuracy
            radius = 4
            @listenTo @selected_position, 'change:value', =>
                if @selected_position.has 'value'
                    @handle_user_position @selected_position.get('value'), center=true
            if not @user_position_markers?
                opts =
                    weight: 0

    if get_ie_version() and get_ie_version() < 9
        ICON_SIZE *= .8
    MARKER_POINT_VARIANT = false
    SHOW_ALL_MARKERS_ZOOMLEVEL = 14

    class MapView extends Backbone.Marionette.View
        tagName: 'div'
