X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8edf08405db64afcd1207a9f1d33039ea1e23cfb..4afacf34109cc2f4938b331fd83a5eeb8435b2a1:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 3c7d3ff82..1478c5773 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,21 +1,33 @@
 class SiteController < ApplicationController
+  layout 'site', :except => [:key, :permalink]
+
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 
-
-  def search
-    @tags = WayTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
+  def export
+    render :action => 'index'
   end
 
-  def goto_way
-    way = Way.find(params[:id])
-
-    begin
-      node = way.way_segments.first.segment.from_node
-      redirect_to :controller => 'site', :action => 'index', :lat => node.latitude, :lon => node.longitude, :zoom => 6
-    rescue
-      redirect_to :back
+  def permalink
+    lon, lat, zoom = ShortLink::decode(params[:code])
+    new_params = params.clone
+    new_params.delete :code
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    else
+      new_params[:lat] = lat
+      new_params[:lon] = lon
     end
+    new_params[:zoom] = zoom
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    redirect_to new_params
   end
 
+  def key
+    expires_in 7.days, :public => true
+  end
 end