X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/16a641ac2a663ea926566a5cca2575ee295e8555..9b2248e8fb89a74c582393bb77d1d5e4d86d8e87:/script/statistics?ds=sidebyside diff --git a/script/statistics b/script/statistics index a703b3a0d..7105d475d 100755 --- a/script/statistics +++ b/script/statistics @@ -15,18 +15,18 @@ 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") - 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 "" puts "" puts "" puts "" - puts "" + puts "" puts "

Number of users	#{user_count}
Number of uploaded GPS points	#{tracepoint_count}
Number of nodes	#{node_count}
Number of ways	#{way_count}
Number of ways with tags	#{tagged_way_count}
Number of relations	#{relation_count}

" puts "

Top 50 users for uploads of GPS data

" @@ -35,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 "" @@ -53,11 +53,14 @@ begin puts "GPX Files#{day_count}#{week_count}#{month_count}" - day_count = OldNode.count(:user_id, :distinct => true, + day_count = OldNode.count(:user_id, :distinct => true, + :include => :changeset, :conditions => "timestamp > NOW() - INTERVAL 1 DAY") week_count = OldNode.count(:user_id, :distinct => true, + :include => :changeset, :conditions => "timestamp > NOW() - INTERVAL 7 DAY") month_count = OldNode.count(:user_id, :distinct => true, + :include => :changeset, :conditions => "timestamp > NOW() - INTERVAL 28 DAY") puts "Nodes#{day_count}#{week_count}#{month_count}" @@ -69,11 +72,14 @@ begin puts "DayWeekMonth" day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY", - :group => :user_id, :order => "count_all DESC") + :include => :changeset, :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) + :include => :changeset, :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) + :include => :changeset, :group => :user_id, + :order => "count_all DESC", :limit => 60) SyncEnumerator.new(day_users, week_users, month_users).each do |row| puts "" @@ -83,7 +89,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 ""