X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c94e059d2d2a5ae9e27222934f72e349dd5636d4..4300c7b142cb00d4f51e097d53332d3e8ed3caa6:/script/statistics?ds=sidebyside
diff --git a/script/statistics b/script/statistics
index c201f6c57..9b27bf08f 100755
--- a/script/statistics
+++ b/script/statistics
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/environment'
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
-start_time = Time.now
+start_time = Time.now.utc
puts ""
puts ""
@@ -11,15 +11,16 @@ puts "OpenStreetMap Statistics"
puts ""
puts ""
puts ""
-puts "OpenStreetMap stats report run at #{start_time.to_s}
"
+puts "OpenStreetMap stats
"
+puts "Report run at #{start_time}
"
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 ""
puts "| Number of users | #{user_count} |
"
@@ -29,54 +30,42 @@ begin
puts "| Number of relations | #{relation_count} |
"
puts "
"
- puts "Top 50 users for uploads of GPS data
"
+ puts 'Top 50 users for uploads of GPS data
'
puts ""
puts "| User | Number of Points |
|---|
"
- 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 "| #{display_name} | #{count} |
"
+ 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 "| #{display_name} | #{count} |
"
end
puts "
"
- puts "Number of users editing over the past...
"
+ puts 'Number of users editing over the past...
'
puts ""
puts "| Data Type | Day | Week | Month |
|---|
"
- 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 "| GPX Files | #{day_count} | #{week_count} | #{month_count} |
|---|
"
- 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 "| Nodes | #{day_count} | #{week_count} | #{month_count} |
|---|
"
puts "
"
-
- puts "Top users editing over the past...
"
+
+ puts 'Top users editing over the past...
'
puts ""
puts "| Day | Week | Month |
|---|
"
- 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)
+ 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 ""
@@ -84,9 +73,9 @@ begin
if column.nil?
puts " | "
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 "#{count} #{display_name} | "
+ puts "#{count} #{display_name} | "
end
end
puts "
"
@@ -94,11 +83,11 @@ begin
puts "
"
end
-rescue Exception => e
- puts "Exception: #{e.to_s}
#{e.backtrace.join('
')}
"
+rescue StandardError => e
+ puts "Exception: #{e}
#{e.backtrace.join('
')}
"
end
-puts "Report took #{(Time.new - start_time).to_s} seconds to run
"
+puts "Report took #{Time.now.utc - start_time} seconds to run
"
puts ""
puts ""