X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21c21ccd9cf879529aa7dfc51945554461399963..63970defb0bb4e06fda7ba39cf7e82396072ead1:/script/statistics

diff --git a/script/statistics b/script/statistics
index cd0069f63..e76028114 100755
--- a/script/statistics
+++ b/script/statistics
@@ -17,26 +17,23 @@ puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
 begin
   user_count = User.count(:conditions => "active = true")
   tracepoint_count = Tracepoint.count()
-  node_count = Node.count() # :conditions => "visible = true")
-  segment_count = Segment.count() # :conditions => "visible = true")
-  way_count = Way.count() # :conditions => "visible = true")
-  tagged_way_count = Way.count(:conditions => "current_ways.visible = true AND current_way_tags.k <> 'created_by'",
-                               :joins => "INNER JOIN current_way_tags ON current_way_tags.id = current_ways.id")
+  node_count = Node.count(:conditions => "visible = true")
+  way_count = Way.count(:conditions => "visible = true")
+  relation_count = Relation.count(:conditions => "visible = true")
 
   puts "<table>"
   puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
   puts "<tr><td>Number of uploaded GPS points</td><td>#{tracepoint_count}</td></tr>"
   puts "<tr><td>Number of nodes</td><td>#{node_count}</td></tr>"
-  puts "<tr><td>Number of segments</td><td>#{segment_count}</td></tr>"
   puts "<tr><td>Number of ways</td><td>#{way_count}</td></tr>"
-  puts "<tr><td>Number of ways with tags</td><td>#{tagged_way_count}</td></tr>"
+  puts "<tr><td>Number of relations</td><td>#{relation_count}</td></tr>"
   puts "</table>"
 
-  puts "<h2>Top 10 users for uploads of GPS data</h2>"
+  puts "<h2>Top 50 users for uploads of GPS data</h2>"
   puts "<table>"
   puts "<tr><th>User</th><th>Number of Points</th></tr>"
 
-  Trace.sum(:size, :group => :user_id, :order => "sum_size DESC", :limit => 10).each do |user, count|
+  Trace.sum(:size, :group => :user_id, :order => "sum_size DESC", :limit => 50).each do |user, count|
     display_name = User.find(user).display_name.gsub('@', ' at ').gsub('.', ' dot ')
     puts "<tr><td>#{display_name}</td><td>#{count}</td></tr>"
   end
@@ -54,9 +51,7 @@ begin
   month_count = Trace.count(:user_id, :distinct => true, 
                             :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
 
-  puts "<tr><th>GPX Files</th><td>Day</td><td>#{day_count}</td></tr>"
-  puts "<tr><th>GPX Files</th><td>Week</td><td>#{week_count}</td></tr>"
-  puts "<tr><th>GPX Files</th><td>Month</td><td>#{month_count}</td></tr>"
+  puts "<tr><th>GPX Files</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
   day_count = OldNode.count(:user_id, :distinct => true, 
                             :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
@@ -65,9 +60,7 @@ begin
   month_count = OldNode.count(:user_id, :distinct => true, 
                               :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
 
-  puts "<tr><th>Nodes</th><td>Day</td><td>#{day_count}</td></tr>"
-  puts "<tr><th>Nodes</th><td>Week</td><td>#{week_count}</td></tr>"
-  puts "<tr><th>Nodes</th><td>Month</td><td>#{month_count}</td></tr>"
+  puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
   puts "</table>"
   
@@ -76,18 +69,24 @@ begin
   puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
 
   day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY",
-                            :group => :user_id, :order => "count_all DESC", :limit => 60)
+                            :group => :user_id, :order => "count_all DESC")
   week_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 7 DAY",
                              :group => :user_id, :order => "count_all DESC", :limit => 60)
   month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY",
                               :group => :user_id, :order => "count_all DESC", :limit => 60)
 
-  day_users = day_users.keys.map { |u| User.find(u).display_name.gsub('@', ' at ').gsub('.', ' dot ') }
-  week_users = week_users.keys.map { |u| User.find(u).display_name.gsub('@', ' at ').gsub('.', ' dot ') }
-  month_users = month_users.keys.map { |u| User.find(u).display_name.gsub('@', ' at ').gsub('.', ' dot ') }
-
-  SyncEnumerator.new(day_users, week_users, month_users).each do |day,week,month|
-    puts "<tr><td>#{day}</td><td>#{week}</td><td>#{month}</td></tr>"
+  SyncEnumerator.new(day_users, week_users, month_users).each do |row|
+    puts "<tr>"
+    row.each do |column|
+      if column.nil?
+        puts "<td></td>"
+      else
+        display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
+        count = column[1]
+        puts "<td>#{count} #{display_name}</td>"
+      end
+    end
+    puts "</tr>"
   end
 
   puts "</table>"