Merge -r 20198:20540 from trunc into openstreetbugs branch

[rails.git] / app / controllers / browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 6ace0817b01353a7f1f4a270354b9075c05e5e27..cb866eb3f9e41089dd0e1b1c2f50af479c3efbc0 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -2,114 +2,104 @@ class BrowseController < ApplicationController
   layout 'site'
 
   before_filter :authorize_web  
   layout 'site'
 
   before_filter :authorize_web  

+  before_filter :set_locale 

   before_filter { |c| c.check_database_readable(true) }
   before_filter { |c| c.check_database_readable(true) }

+  around_filter :timeout, :except => [:start]

 
   def start 
   end
   
 
   def start 
   end
   

-  
-  
-  def relation 
+  def relation
+    @type = "relation"

     @relation = Relation.find(params[:id])
     @relation = Relation.find(params[:id])

-   
-    @name = @relation.tags['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @relation.id.to_s
-    end
-       
-    @title = 'Relation | ' + (@name)
-    @next = Relation.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @relation.id }] ) 
-    @prev = Relation.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @relation.id }] ) 
+    @next = Relation.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @relation.id }] )
+    @prev = Relation.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @relation.id }] )

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "relation"

     render :action => "not_found", :status => :not_found
   end
   
   def relation_history
     render :action => "not_found", :status => :not_found
   end
   
   def relation_history

+    @type = "relation"

     @relation = Relation.find(params[:id])
     @relation = Relation.find(params[:id])

-     
-    @name = @relation.tags['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @relation.id.to_s
-    end
-       
-    @title = 'Relation History | ' + (@name)

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "relation"

     render :action => "not_found", :status => :not_found
   end
   
     render :action => "not_found", :status => :not_found
   end
   

-  def way 
-    @way = Way.find(params[:id])
-     
-    @name = @way.tags['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @way.id.to_s
-    end
-       
-    @title = 'Way | ' + (@name)
-    @next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] ) 
-    @prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] ) 
-  rescue ActiveRecord::RecordNotFound
+  def way

     @type = "way"
     @type = "way"

+    @way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
+    @next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] )
+    @prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] )
+
+    # Used for edit link, takes approx middle node of way
+    @midnode = @way.nodes[@way.nodes.length/2]
+  rescue ActiveRecord::RecordNotFound

     render :action => "not_found", :status => :not_found
   end
   
     render :action => "not_found", :status => :not_found
   end
   

-  def way_history 
-    @way = Way.find(params[:id])
-     
-    @name = @way.tags['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @way.id.to_s
-    end
-       
-    @title = 'Way History | ' + (@name)
-  rescue ActiveRecord::RecordNotFound
+  def way_history

     @type = "way"
     @type = "way"

+    @way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}])
+  rescue ActiveRecord::RecordNotFound

     render :action => "not_found", :status => :not_found
   end
 
     render :action => "not_found", :status => :not_found
   end
 

-  def node 
+  def node
+    @type = "node"

     @node = Node.find(params[:id])
     @node = Node.find(params[:id])

-     
-    @name = @node.tags_as_hash['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @node.id.to_s
-    end
-       
-    @title = 'Node | ' + (@name)
-    @next = Node.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] ) 
-    @prev = Node.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @node.id }] ) 
+    @next = Node.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] )
+    @prev = Node.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @node.id }] )

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "node"

     render :action => "not_found", :status => :not_found
   end
   
     render :action => "not_found", :status => :not_found
   end
   

-  def node_history 
+  def node_history
+    @type = "node"

     @node = Node.find(params[:id])
     @node = Node.find(params[:id])

-     
-    @name = @node.tags_as_hash['name'].to_s 
-    if @name.length == 0:
-      @name = "#" + @node.id.to_s
-    end
-       
-    @title = 'Node History | ' + (@name)

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "way"

     render :action => "not_found", :status => :not_found
   end
   
   def changeset
     render :action => "not_found", :status => :not_found
   end
   
   def changeset

+    @type = "changeset"
+

     @changeset = Changeset.find(params[:id])
     @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page')
     @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page')
     @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
       
     @changeset = Changeset.find(params[:id])
     @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page')
     @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page')
     @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
       

-    @title = "Changeset | #{@changeset.id}"
+    @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"

     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 

-    @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) 
+    @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )
+
+    @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
+    @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "changeset"

     render :action => "not_found", :status => :not_found
   end
     render :action => "not_found", :status => :not_found
   end

+
+  def bug
+    @type = "bug"
+    @bug = MapBug.find(params[:id])
+    @next = MapBug.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @bug.id }] )
+    @prev = MapBug.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @bug.id }] )
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found
+  end
+
+private
+
+  def timeout
+    SystemTimer.timeout_after(30) do
+      yield
+    end
+  rescue ActionView::TemplateError => ex
+    if ex.original_exception.is_a?(Timeout::Error)
+      render :action => "timeout", :status => :request_timeout
+    else
+      raise
+    end
+  rescue Timeout::Error
+    render :action => "timeout", :status => :request_timeout
+  end

 end
 end