Merge 16891:17044 from trunk.

test/fixtures/gps_points.yml

@@ -9,3 +9,27 @@ first_trace_1:
   timestamp: "2008-10-01 10:10:10"
   tile: <%= QuadTile.tile_for_point(1, 1) %>
   
+trackable_trace_1:
+  trackid: 1
+  latitude: <%= (51.510 * SCALE).to_i %>
+  longitude: <%= (-0.140 * SCALE).to_i %>
+  gpx_id: 3
+  timestamp: "2009-07-30 17:46:00"
+  tile: <%= QuadTile.tile_for_point(51.510, -0.140) %>
+
+trackable_trace_2:
+  trackid: 2
+  latitude: <%= (51.511 * SCALE).to_i %>
+  longitude: <%= (-0.141 * SCALE).to_i %>
+  gpx_id: 3
+  timestamp: "2009-07-30 17:47:00"
+  tile: <%= QuadTile.tile_for_point(51.511, -0.141) %>
+
+identifiable_trace_1:
+  trackid: 1
+  latitude: <%= (51.512 * SCALE).to_i %>
+  longitude: <%= (0.142 * SCALE).to_i %>
+  gpx_id: 4
+  timestamp: "2009-07-30 17:46:00"
+  tile: <%= QuadTile.tile_for_point(51.512, 0.142) %>
+

test/fixtures/gpx_files.yml

@@ -7,7 +7,7 @@ public_trace_file:
   latitude: 1
   longitude: 1
   timestamp: "2008-10-29 10:10:10"
-  public: true
+  visibility: "public"
   description: This is a trace
   inserted: true
   
@@ -20,6 +20,32 @@ anon_trace_file:
   latitude: 51.3
   longitude: -0.56
   timestamp: "2009-05-06 13:34:34"
-  public: false
+  visibility: "private"
   description: This is an anonymous trace
   inserted: true
+
+trackable_trace_file:
+  id: 3
+  user_id: 2
+  visible: false
+  name: Trackable Trace.gpx
+  size: 123
+  latitude: 51.51
+  longitude: -0.14
+  timestamp: "2009-07-30 17:48:34"
+  visibility: "trackable"
+  description: This trace shows trksegs and timestamps, but no user details.
+  inserted: true
+
+identifiable_trace_file:
+  id: 4
+  user_id: 2
+  visible: false
+  name: Identifiable Trace.gpx
+  size: 123
+  latitude: 51.512
+  longitude: 0.142
+  timestamp: "2009-07-30 17:48:34"
+  visibility: "identifiable"
+  description: This trace shows trksegs, timestamps and user details.
+  inserted: true