X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2d3ca85751e4bf582f953369c6a25b5bbe88116e..18f5f1d499178bfbeaceb450a4a8e0a2863b3d96:/test/models/old_node_test.rb

diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index 3fa4bac3b..12d344730 100644
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -3,47 +3,77 @@ require "test_helper"
 class OldNodeTest < ActiveSupport::TestCase
   def test_node_too_far_north
     node = build(:old_node, :latitude => 90.01 * OldNode::SCALE)
-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_north_limit
     node = build(:old_node, :latitude => 90 * OldNode::SCALE)
-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_too_far_south
     node = build(:old_node, :latitude => -90.01 * OldNode::SCALE)
-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_south_limit
     node = build(:old_node, :latitude => -90 * OldNode::SCALE)
-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_too_far_west
     node = build(:old_node, :longitude => -180.01 * OldNode::SCALE)
-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_west_limit
     node = build(:old_node, :longitude => -180 * OldNode::SCALE)
-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_too_far_east
     node = build(:old_node, :longitude => 180.01 * OldNode::SCALE)
-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_node_east_limit
     node = build(:old_node, :longitude => 180 * OldNode::SCALE)
-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")
   end
 
   def test_totally_wrong
     node = build(:old_node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)
-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")
+  end
+
+  def test_lat_lon
+    node = build(:old_node, :latitude => 12.345 * OldNode::SCALE, :longitude => 34.567 * OldNode::SCALE)
+
+    assert_in_delta 12.345, node.lat, 0.0000001
+    assert_in_delta 34.567, node.lon, 0.0000001
+
+    node.lat = 54.321
+    node.lon = 76.543
+
+    assert_in_delta 54.321 * OldNode::SCALE, node.latitude, 0.000001
+    assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001
+  end
+
+  # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+  def test_lat_lon_xml_format
+    old_node = build(:old_node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE)
+
+    assert_match(/lat="0.0000400"/, old_node.to_xml.to_s)
+    assert_match(/lon="0.0000800"/, old_node.to_xml.to_s)
   end
 
   def test_node_tags