X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bf13d9c43dfe2996ddfe0bd15916623e63be1a1..2861236f602b3686deb62add6de0565ba8108fee:/script/statistics?ds=sidebyside
diff --git a/script/statistics b/script/statistics
index 1b47fccae..b076bef30 100755
--- a/script/statistics
+++ b/script/statistics
@@ -15,12 +15,11 @@ puts "
"
puts "OpenStreetMap stats report run at #{start_time.to_s}
"
begin
- user_count = User.count(:conditions => "active = true")
+ 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")
- rel_count = Relation.count(:conditions => "visible = true")
- tagged_way_count = Way.count(:conditions => "visible = true AND EXISTS (SELECT * FROM current_way_tags WHERE id = current_ways.id AND k <> 'created_by')")
+ relation_count = Relation.count(:conditions => "visible = true")
puts ""
puts "Number of users | #{user_count} |
"
@@ -28,7 +27,6 @@ begin
puts "Number of nodes | #{node_count} |
"
puts "Number of ways | #{way_count} |
"
puts "Number of relations | #{relation_count} |
"
- puts "Number of ways with tags | #{tagged_way_count} |
"
puts "
"
puts "Top 50 users for uploads of GPS data
"
@@ -37,7 +35,7 @@ begin
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 "#{display_name} | #{count} |
"
+ puts "#{display_name} | #{count} |
"
end
puts ""
@@ -47,20 +45,20 @@ begin
puts "Data Type | Day | Week | Month |
"
day_count = Trace.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
+ :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
week_count = Trace.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
+ :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
month_count = Trace.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+ :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
puts "GPX Files | #{day_count} | #{week_count} | #{month_count} |
"
- day_count = OldNode.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
- week_count = OldNode.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
- month_count = OldNode.count(:user_id, :distinct => true,
- :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+ 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")
puts "Nodes | #{day_count} | #{week_count} | #{month_count} |
"
@@ -70,12 +68,15 @@ begin
puts ""
puts "Day | Week | Month |
"
- day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY",
- :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 = 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|
puts ""
@@ -85,7 +86,7 @@ begin
else
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 "
"