Use full page width when editing with iD

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 356af9879e029d5cf80083b47699fc8333fb93f5..b2212645c2761d764e03287a23b8dc6f79af0ec1 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -5,22 +5,45 @@ class SiteController < ApplicationController
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]

+  before_filter :require_oauth, :only => [:index]
+
+  def index
+    anchor = []
+
+    if params[:lat] && params[:lon]
+      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
+    end
+
+    if params[:layers]
+      anchor << "layers=#{params.delete(:layers)}"
+    elsif params.delete(:notes) == 'yes'
+      anchor << "layers=N"
+    end
+
+    if anchor.present?
+      redirect_to params.merge(:anchor => anchor.join('&'))
+      return
+    end
+
+    unless STATUS == :database_readonly or STATUS == :database_offline
+      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+    end
+  end

 
   def permalink
     lon, lat, zoom = ShortLink::decode(params[:code])
 
   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
     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
     end

-    new_params[:zoom] = zoom
+

     new_params[:controller] = 'site'
     new_params[:action] = 'index'
     new_params[:controller] = 'site'
     new_params[:action] = 'index'

+    new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
+

     redirect_to new_params
   end
 
     redirect_to new_params
   end
 


@@ -33,48 +56,23 @@ class SiteController < ApplicationController
 
     if editor == "remote"
       render :action => :index
 
     if editor == "remote"
       render :action => :index

-    else
-      # Decide on a lat lon to initialise potlatch with. Various ways of doing this
-      if params['lon'] and params['lat']
-        @lon = params['lon'].to_f
-        @lat = params['lat'].to_f
-        @zoom = params['zoom'].to_i
-
-      elsif params['mlon'] and params['mlat']
-        @lon = params['mlon'].to_f
-        @lat = params['mlat'].to_f
-        @zoom = params['zoom'].to_i
-
-      elsif params['bbox']
-        bbox = BoundingBox.from_bbox_params(params)
-
-        @lon = bbox.centre_lon
-        @lat = bbox.centre_lat
-        @zoom = 16
-      elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
-        bbox = BoundingBox.from_lon_lat_params(params)
-
-        @lon = bbox.centre_lon
-        @lat = bbox.centre_lat
-        @zoom = 16
-
-      elsif params['gpx']
-        @lon = Trace.find(params['gpx']).longitude
-        @lat = Trace.find(params['gpx']).latitude
-
-      elsif cookies.key?("_osm_location")
-        @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
-
-      elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
-        @lon = @user.home_lon
-        @lat = @user.home_lat
-
-      else
-        #catch all.  Do nothing.  lat=nil, lon=nil
-        #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
-      end
-
-      @zoom = '17' if @zoom.nil?
+      return
+    end
+
+    @extra_body_class = "site-edit-#{editor}"
+
+    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
 
     end
   end
 


@@ -85,4 +83,8 @@ class SiteController < ApplicationController
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end

+
+  def id
+    render "id", :layout => false
+  end

 end
 end