X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/160429e62d88810ec49ccc9c504edee675dca080..cb6d528ecb9abe916e11c607038290435e6b35d9:/script/statistics?ds=sidebyside
diff --git a/script/statistics b/script/statistics
index 4ceb92cfc..9b27bf08f 100755
--- a/script/statistics
+++ b/script/statistics
@@ -1,9 +1,8 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/environment'
-require 'generator'
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
-start_time = Time.now
+start_time = Time.now.utc
puts "<html>"
puts "<head>"
@@ -12,15 +11,16 @@ puts "<title>OpenStreetMap Statistics</title>"
puts "<style>th { text-align: left }</style>"
puts "</head>"
puts "<body>"
-puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
+puts "<h1>OpenStreetMap stats</h1>"
+puts "<h2>Report run at #{start_time}</h2>"
begin
ActiveRecord::Base.transaction do
- user_count = User.count(:conditions => { :status => ["active", "confirmed", "suspended"] })
- 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>"
@@ -30,64 +30,52 @@ begin
puts "<tr><td>Number of relations</td><td>#{relation_count}</td></tr>"
puts "</table>"
- puts "<h2>Top 50 users for uploads of GPS data</h2>"
+ puts '<h2 id="top-traces">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, :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 ')
- puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
+ 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=\"https://www.openstreetmap.org/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
end
puts "</table>"
- puts "<h2>Number of users editing over the past...</h2>"
+ puts '<h2 id="number-of-editors">Number of users editing over the past...</h2>'
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>"
- 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 "<h2>Top users editing over the past...</h2>"
+
+ puts '<h2 id="top-editors">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
- 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>"
+ puts "<td>#{count} <a href=\"https://www.openstreetmap.org/user/#{display_name}\">#{display_name}</a></td>"
end
end
puts "</tr>"
@@ -95,11 +83,11 @@ begin
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
-puts "<p>Report took #{(Time.new - start_time).to_s} seconds to run</p>"
+puts "<p>Report took #{Time.now.utc - start_time} seconds to run</p>"
puts "</body>"
puts "</html>"