]> git.openstreetmap.org Git - rails.git/blobdiff - script/statistics
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add /api/0.6/users to fetch multiple users
[rails.git] / script / statistics
diff --git a/script/statistics b/script/statistics
index 2e60d630f885e79423388d0f99b6e12803c9b563..8b79523b728730b3b3b22b562c06556937686683 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
-require 'generator'
+require File.dirname(__FILE__) + "/../config/environment"
 
 start_time = Time.now
 
 
 start_time = Time.now
 
@@ -12,15 +11,15 @@ puts "<title>OpenStreetMap Statistics</title>"
 puts "<style>th { text-align: left }</style>"
 puts "</head>"
 puts "<body>"
 puts "<style>th { text-align: left }</style>"
 puts "</head>"
 puts "<body>"
-puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
+puts "<h2>OpenStreetMap stats report run at #{start_time}</h2>"
 
 begin
   ActiveRecord::Base.transaction do
 
 begin
   ActiveRecord::Base.transaction do
-    user_count = User.count(:conditions => "active = 1")
-    tracepoint_count = Tracepoint.count()
-    node_count = Node.count(:conditions => "visible = true")
-    way_count = Way.count(:conditions => "visible = true")
-    relation_count = Relation.count(:conditions => "visible = true")
+    user_count = User.where(:status => %w[active confirmed suspended]).count
+    tracepoint_count = Tracepoint.count
+    node_count = Node.where(:visible => true).count
+    way_count = Way.where(:visible => true).count
+    relation_count = Relation.where(:visible => true).count
 
     puts "<table>"
     puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
 
     puts "<table>"
     puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
@@ -34,8 +33,8 @@ begin
     puts "<table>"
     puts "<tr><th>User</th><th>Number of Points</th></tr>"
 
     puts "<table>"
     puts "<tr><th>User</th><th>Number of Points</th></tr>"
 
-    Trace.sum(:size, :conditions => { :inserted => true }, :group => :user_id, :order => "sum_size DESC", :limit => 50).each do |user, count|
-      display_name = User.find(user).display_name.gsub('@', ' at ').gsub('.', ' dot ')
+    Trace.where(:inserted => true).group(:user_id).order("sum_size DESC").limit(50).sum(:size).each do |user, count|
+      display_name = User.find(user).display_name.gsub("@", " at ").gsub(".", " dot ")
       puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
     end
 
       puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
     end
 
@@ -45,47 +44,35 @@ begin
     puts "<table>"
     puts "<tr><th>Data Type</th><th>Day</th><th>Week</th><th>Month</th></tr>"
 
     puts "<table>"
     puts "<tr><th>Data Type</th><th>Day</th><th>Week</th><th>Month</th></tr>"
 
-    day_count = Trace.count(:user_id, :distinct => true, 
-                            :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
-    week_count = Trace.count(:user_id, :distinct => true, 
-                             :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
-    month_count = Trace.count(:user_id, :distinct => true, 
-                              :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
+    day_count = Trace.where("timestamp > NOW() - '1 DAY'::INTERVAL").distinct.count(:user_id)
+    week_count = Trace.where("timestamp > NOW() - '7 DAYS'::INTERVAL").distinct.count(:user_id)
+    month_count = Trace.where("timestamp > NOW() - '28 DAYS'::INTERVAL").distinct.count(:user_id)
 
     puts "<tr><th>GPX Files</th><td>#{day_count}</td><td>#{week_count}</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, :joins => :changeset,
-                              :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
-    week_count = OldNode.count(:user_id, :distinct => true,  :joins => :changeset,
-                               :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
-    month_count = OldNode.count(:user_id, :distinct => true, :joins => :changeset,
-                                :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
+    day_count = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).distinct.count(:user_id)
+    week_count = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).distinct.count(:user_id)
+    month_count = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).distinct.count(:user_id)
 
     puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
     puts "</table>"
 
     puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
     puts "</table>"
-  
+
     puts "<h2>Top users editing over the past...</h2>"
     puts "<table>"
     puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
 
     puts "<h2>Top users editing over the past...</h2>"
     puts "<table>"
     puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
 
-    day_users = OldNode.count(:conditions => "timestamp > NOW() - '1 DAY'::INTERVAL",
-                              :joins => :changeset, :group => :user_id,
-                              :order => "count_all DESC")
-    week_users = OldNode.count(:conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL",
-                               :joins => :changeset, :group => :user_id,
-                               :order => "count_all DESC", :limit => 60)
-    month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL",
-                                :joins => :changeset, :group => :user_id,
-                                :order => "count_all DESC", :limit => 60)
-
-    SyncEnumerator.new(day_users, week_users, month_users).each do |row|
+    day_users = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).order("count_all DESC").group(:user_id).count
+    week_users = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count
+    month_users = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count
+
+    day_users.zip(week_users, month_users).each do |row|
       puts "<tr>"
       row.each do |column|
         if column.nil?
           puts "<td></td>"
         else
       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 ')
+          display_name = User.find(column[0]).display_name.gsub("@", " at ").gsub(".", " dot ")
           count = column[1]
           puts "<td>#{count} <a href=\"/user/#{display_name}\">#{display_name}</a></td>"
         end
           count = column[1]
           puts "<td>#{count} <a href=\"/user/#{display_name}\">#{display_name}</a></td>"
         end
@@ -95,11 +82,11 @@ begin
 
     puts "</table>"
   end
 
     puts "</table>"
   end
-rescue Exception => e
-  puts "<p><em>Exception: #{e.to_s}</em><br />#{e.backtrace.join('<br />')}</p>"
+rescue StandardError => e
+  puts "<p><em>Exception: #{e}</em><br />#{e.backtrace.join('<br />')}</p>"
 end
 
 end
 
-puts "<p>Report took #{(Time.new - start_time).to_s} seconds to run</p>"
+puts "<p>Report took #{(Time.new - start_time)} seconds to run</p>"
 puts "</body>"
 puts "</html>"
 
 puts "</body>"
 puts "</html>"
 
The OpenStreetMap web site