X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/afa5d420d385e73fa9106d1b5cc14c619050ffa1..aaaeb211dea4711fd6bff4d79c1339e82a43ebcd:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 74dbc41f5..fa8ec5a1e 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -11,9 +11,7 @@ class SiteController < ApplicationController before_action :update_totp, :only => [:index] def index - unless STATUS == :database_readonly || STATUS == :database_offline - session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) - end + session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline end def permalink @@ -147,9 +145,7 @@ class SiteController < ApplicationController def redirect_map_params anchor = [] - if params[:lat] && params[:lon] - anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" - end + anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon] if params[:layers] anchor << "layers=#{params.delete(:layers)}" @@ -157,8 +153,6 @@ class SiteController < ApplicationController anchor << "layers=N" end - if anchor.present? - redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) - end + redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present? end end