X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..b154cefbf0a18d512c3768bf7de1505acab77341:/test/lib/short_link_test.rb diff --git a/test/lib/short_link_test.rb b/test/lib/short_link_test.rb index 1c8d3ce2c..a32e1ac20 100644 --- a/test/lib/short_link_test.rb +++ b/test/lib/short_link_test.rb @@ -7,7 +7,7 @@ class ShortLinkTest < ActiveSupport::TestCase def test_encode_decode cases = [] 1000.times do - cases << [180.0 * rand - 90.0, 360.0 * rand - 180.0, (18 * rand).to_i] + cases << [(180.0 * rand) - 90.0, (360.0 * rand) - 180.0, (18 * rand).to_i] end cases.each do |lat, lon, zoom| @@ -18,9 +18,9 @@ class ShortLinkTest < ActiveSupport::TestCase # one pixel (i.e: zoom + 8). the sqrt(5) is because each position # has an extra bit of accuracy in the lat coordinate, due to the # smaller range. - distance = Math.sqrt((lat - lat2)**2 + (lon - lon2)**2) + distance = Math.sqrt(((lat - lat2)**2) + ((lon - lon2)**2)) max_distance = 360.0 / (1 << (zoom + 8)) * 0.5 * Math.sqrt(5) - assert max_distance > distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})." + assert_operator max_distance, :>, distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})." end end