pushState based navigation between map-based layouts

app/controllers/application_controller.rb

@@ -422,6 +422,10 @@ class ApplicationController < ActionController::Base
     request.body.rewind
   end
 
+  def map_layout
+    request.xhr? ? false : 'map'
+  end
+
   def preferred_editor
     editor = if params[:editor]
       params[:editor]

app/controllers/browse_controller.rb

@@ -1,5 +1,5 @@
 class BrowseController < ApplicationController
-  layout 'map'
+  layout :map_layout
 
   before_filter :authorize_web  
   before_filter :set_locale 

app/controllers/changeset_controller.rb

@@ -321,7 +321,7 @@ class ChangesetController < ApplicationController
 
       @edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
 
-      render :action => :list, :layout => 'map'
+      render :action => :list, :layout => map_layout
     end
   end
 

app/controllers/site_controller.rb

@@ -1,6 +1,6 @@
 class SiteController < ApplicationController
   layout 'site'
-  layout 'map', :only => [:index, :export]
+  layout :map_layout, :only => [:index, :export]
 
   before_filter :authorize_web
   before_filter :set_locale