From: Steve Coast <steve@asklater.com>
Date: Sat, 7 Apr 2007 16:56:45 +0000 (+0000)
Subject: fix import bug, make points commify
X-Git-Tag: live~8564
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9f8952b6ef681a544b9f817483ac21edda0961c7?hp=4434bac3b484006d579b9229a5f69b182644eae7;ds=sidebyside

fix import bug, make points commify
---

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml
index 3bc2abada..be3cbef00 100644
--- a/app/views/trace/view.rhtml
+++ b/app/views/trace/view.rhtml
@@ -5,8 +5,8 @@
 <table border="0">
   <tr><td>filename:</td><td><%= @trace.name %></td></tr> <!-- TODO link to download -->
   <tr><td>uploaded at:</td><td><%= @trace.timestamp %></td></tr>
-  <tr><td>points:</td><td><%= @trace.size %></td></tr>
-  <tr><td>start coordinate:</td><td><%= @trace.latitude %>, <%= @trace.longitude %></td></tr> <!-- TODO link to map -->
+  <tr><td>points:</td><td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
+  <tr><td>start coordinate:</td><td><%= @trace.latitude %>, <%= @trace.longitude %></td></tr> <!-- FIXME link to map -->
   <tr><td>owner:</td><td><%= link_to @trace.user.display_name, {:controller => 'trace', :action => 'view', :display_name => @trace.user.display_name, :id => nil} %></td></tr>
   <tr><td>description:</td><td><%= @trace.description %></td></tr>
   <tr><td>tags:</td><td>
diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index b0e6a1782..42e642b8b 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -61,7 +61,7 @@ while($running) do
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])
 
           trace.latitude = f_lat
-          trace.longitude = f_lat
+          trace.longitude = f_lon
           trace.large_picture = gpx.get_picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
           trace.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
           trace.size = gpx.actual_points