Fix new rubocop warnings

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 5f3b4dbb65875dab909f1dc5c482d20bcb5f1d35..f23448bffc08584391f162074d723c1e38d1c987 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -34,13 +34,13 @@ class GeocoderController < ApplicationController
       # We've got two nondescript numbers for a query, which can mean both "lat, lon" or "lon, lat".
       @results = []
 
       # We've got two nondescript numbers for a query, which can mean both "lat, lon" or "lon, lat".
       @results = []
 

-      if lat >= -90 && lat <= 90 && lon >= -180 && lon <= 180
+      if lat.between?(-90, 90) && lon.between?(-180, 180)

         @results.push(:lat => params[:lat], :lon => params[:lon],
                       :zoom => params[:zoom],
                       :name => "#{params[:lat]}, #{params[:lon]}")
       end
 
         @results.push(:lat => params[:lat], :lon => params[:lon],
                       :zoom => params[:zoom],
                       :name => "#{params[:lat]}, #{params[:lon]}")
       end
 

-      if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180
+      if lon.between?(-90, 90) && lat.between?(-180, 180)

         @results.push(:lat => params[:lon], :lon => params[:lat],
                       :zoom => params[:zoom],
                       :name => "#{params[:lon]}, #{params[:lat]}")
         @results.push(:lat => params[:lon], :lon => params[:lat],
                       :zoom => params[:zoom],
                       :name => "#{params[:lon]}, #{params[:lat]}")


@@ -54,10 +54,10 @@ class GeocoderController < ApplicationController
       end
     else
       # Coordinates in a query have come with markers for latitude and longitude.
       end
     else
       # Coordinates in a query have come with markers for latitude and longitude.

-      if lat < -90 || lat > 90
+      if !lat.between?(-90, 90)

         @error = "Latitude #{lat} out of range"
         render :action => "error"
         @error = "Latitude #{lat} out of range"
         render :action => "error"

-      elsif lon < -180 || lon > 180
+      elsif !lon.between?(-180, 180)

         @error = "Longitude #{lon} out of range"
         render :action => "error"
       else
         @error = "Longitude #{lon} out of range"
         render :action => "error"
       else

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index b54b0e9f85a8b316ea296f1a42fae66720548784..97f0530a81f0a958f8dda767c7dfb50a96535100 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -278,7 +278,7 @@ module ActionController
 
       # Returns true if this paginator contains the page of index +number+.
       def contains_page?(number)
 
       # Returns true if this paginator contains the page of index +number+.
       def contains_page?(number)

-        number >= 1 && number <= page_count
+        number.between?(1, page_count)

       end
 
       # Returns a new Page representing the page with the given index
       end
 
       # Returns a new Page representing the page with the given index