Move the tracepoint coordinate format test to the controller test

This allows us to remove the model method

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 000f257b4eba0f683db3c0af4c974fe80aa9015d..b3c37430d8624a0c61d419e1b8e2ae9bec23e3d6 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -31,12 +31,4 @@ class Tracepoint < ApplicationRecord
   validates :timestamp, :presence => true
 
   belongs_to :trace, :foreign_key => "gpx_id"
   validates :timestamp, :presence => true
 
   belongs_to :trace, :foreign_key => "gpx_id"

-
-  def to_xml_node(print_timestamp: false)
-    el1 = XML::Node.new "trkpt"
-    el1["lat"] = lat.to_s
-    el1["lon"] = lon.to_s
-    el1 << (XML::Node.new("time") << timestamp.xmlschema) if print_timestamp
-    el1
-  end

 end
 end

diff --git a/test/controllers/api/tracepoints_controller_test.rb b/test/controllers/api/tracepoints_controller_test.rb
index a904e8127693f37e7ccb48900a3e8b0259311074..7d561522c12c7fc1fd225e9ae65461cc7c814d43 100644 (file)
--- a/test/controllers/api/tracepoints_controller_test.rb
+++ b/test/controllers/api/tracepoints_controller_test.rb
@@ -148,5 +148,14 @@ module Api
         assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
       end
     end
         assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
       end
     end

+
+    # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+    def test_lat_lon_xml_format
+      create(:tracepoint, :latitude => (0.00004 * GeoRecord::SCALE).to_i, :longitude => (0.00008 * GeoRecord::SCALE).to_i)
+
+      get trackpoints_path(:bbox => "0,0,0.1,0.1")
+      assert_match(/lat="0.0000400"/, response.body)
+      assert_match(/lon="0.0000800"/, response.body)
+    end

   end
 end
   end
 end

diff --git a/test/models/tracepoint_test.rb b/test/models/tracepoint_test.rb
index a672b7c62b9de9e0374afc4f93470e730c154e75..2ffbef09fae8f7c5d7de527c2fcb889dc3615e63 100644 (file)
--- a/test/models/tracepoint_test.rb
+++ b/test/models/tracepoint_test.rb
@@ -7,12 +7,4 @@ class TracepointTest < ActiveSupport::TestCase
     tracepoint.timestamp = nil
     assert_not tracepoint.valid?
   end
     tracepoint.timestamp = nil
     assert_not tracepoint.valid?
   end

-
-  # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
-  def test_lat_lon_xml_format
-    tracepoint = build(:tracepoint, :latitude => 0.00004 * GeoRecord::SCALE, :longitude => 0.00008 * GeoRecord::SCALE)
-
-    assert_match(/lat="0.0000400"/, tracepoint.to_xml_node.to_s)
-    assert_match(/lon="0.0000800"/, tracepoint.to_xml_node.to_s)
-  end

 end
 end