Merge 16070:16110 from trunk.

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 767220c7905ed0be8bae70bf324a07f6c1c77be7..2a826770d4144b2eafa680ebdd0f189f56de0b79 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,16 +1,15 @@
 class SiteController < ApplicationController
+  layout 'site',:except => [:key]
+
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 
-  def goto_way
-    way = Way.find(params[:id])
-
-    begin
-      node = way.way_nodes.first.node
-      redirect_to :controller => 'site', :action => 'index', :lat => node.latitude, :lon => node.longitude, :zoom => 6
-    rescue
-      redirect_to :back
-    end
+  def export
+    render :action => 'index'
   end
 
+  def key
+    expires_in 7.days, :public => true
+  end
 end