X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0509fc8d12fd763e98bc0c8e3a0d2b0ee6a11f9a..c8d4e4eee3835e9b92fe7cb62c22a07fa2f95f5d:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 015da9e22..c16daf37f 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -5,8 +5,15 @@ class SiteController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
+  before_filter :require_oauth, :only => [:index]
 
   def index
+    if params[:lat] && params[:lon]
+      params[:anchor] = "#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
+      redirect_to params
+      return
+    end
+
     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
     end
@@ -14,19 +21,18 @@ class SiteController < ApplicationController
 
   def permalink
     lon, lat, zoom = ShortLink::decode(params[:code])
-    new_params = params.clone
-    new_params.delete :code
+    new_params = params.except(:code, :lon, :lat, :zoom)
+
     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'
+    new_params[:anchor] = "#{zoom}/#{lat}/#{lon}"
+
     redirect_to new_params
   end
 
@@ -39,6 +45,21 @@ class SiteController < ApplicationController
 
     if editor == "remote"
       render :action => :index
+      return
+    end
+
+    if params[:node]
+      bbox = Node.find(params[:node]).bbox.to_unscaled
+      @lat = bbox.centre_lat
+      @lon = bbox.centre_lon
+    elsif params[:way]
+      bbox = Way.find(params[:way]).bbox.to_unscaled
+      @lat = bbox.centre_lat
+      @lon = bbox.centre_lon
+    elsif params[:gpx]
+      trace = Trace.visible_to(@user).find(params[:gpx])
+      @lat = trace.latitude
+      @lon = trace.longitude
     end
   end
 
@@ -49,4 +70,8 @@ class SiteController < ApplicationController
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
+
+  def id
+    render "id", :layout => false
+  end
 end