Fix rubocop style issues

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e76ee97f6342c8a90c7e4184ebc2328b35d82025..01cdcf23f9fd207f2277f0713d02e237b64af08f 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -10,34 +10,34 @@ class SiteController < ApplicationController
   before_filter :require_oauth, :only => [:index]
 
   def index
-    unless STATUS == :database_readonly or STATUS == :database_offline
-      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+    unless STATUS == :database_readonly || STATUS == :database_offline
+      session[:location] ||= OSM.ip_location(request.env['REMOTE_ADDR'])
     end
   end
 
   def permalink
-    lon, lat, zoom = ShortLink::decode(params[:code])
+    lon, lat, zoom = ShortLink.decode(params[:code])
     new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
 
-    if new_params.has_key? :m
+    if new_params.key? :m
       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 
-    if params.has_key? :node
+    if params.key? :node
       new_params[:controller] = 'browse'
       new_params[:action] = 'node'
       new_params[:id] = params[:node]
-    elsif params.has_key? :way
+    elsif params.key? :way
       new_params[:controller] = 'browse'
       new_params[:action] = 'way'
       new_params[:id] = params[:way]
-    elsif params.has_key? :relation
+    elsif params.key? :relation
       new_params[:controller] = 'browse'
       new_params[:action] = 'relation'
       new_params[:id] = params[:relation]
-    elsif params.has_key? :changeset
+    elsif params.key? :changeset
       new_params[:controller] = 'browse'
       new_params[:action] = 'changeset'
       new_params[:id] = params[:changeset]
@@ -47,10 +47,7 @@ class SiteController < ApplicationController
     end
 
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
-
-    if params.has_key? :layers
-      new_params[:anchor] += "&layers=#{params[:layers]}"
-    end
+    new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
 
     redirect_to Hash[new_params]
   end