Fix most auto-correctable rubocop issues

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 33a0c3e26ac04e7297355414a29916effb4f2871..10eac78e5db335d2d2fe43a3f6514821c20de4d5 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -2,8 +2,8 @@ module Nominatim
   extend ActionView::Helpers::NumberHelper
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || http_accept_language.user_preferred_languages.join(',')
+    zoom ||= 14
+    language ||= http_accept_language.user_preferred_languages.join(',')
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
       url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
@@ -16,7 +16,7 @@ module Nominatim
         response = nil
       end
 
-      if response and result = response.get_text("reversegeocode/result")
+      if response && result = response.get_text("reversegeocode/result")
         result.to_s
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"