Fix more rubocop style issues

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 2e4af03d878e79aae231212c2b1508916627e822..a529b393eb954d29386e936388f0115a97adae63 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,131 +1,83 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  layout 'site'
+  layout :map_layout

 
 

-  before_filter :authorize_web  
-  before_filter { |c| c.check_database_availability(true) }
+  before_filter :authorize_web
+  before_filter :set_locale
+  before_filter :except => [:query] { |c| c.check_database_readable(true) }
+  before_filter :require_oauth
+  around_filter :web_timeout

 
 

-  def start 
+  def relation
+    @type = "relation"
+    @feature = Relation.find(params[:id])
+    render "feature"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
   end

-  
-  def index
-    @changesets = Changeset.find(:all, :order => "closed_at DESC", :limit=> 20)
-  end
-  
-  def relation 
-    begin
-      @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 }] ) 
-    rescue ActiveRecord::RecordNotFound
-      @type = "relation"
-      render :action => "not_found", :status => :not_found
-    end
-  end
-  
+

   def relation_history
   def relation_history

-    begin
-      @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
-      @type = "relation"
-      render :action => "not_found", :status => :not_found
-    end
+    @type = "relation"
+    @feature = Relation.find(params[:id])
+    render "history"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
   end

-  
-  def way 
-    begin
-      @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
-      @type = "way"
-      render :action => "not_found", :status => :not_found
-    end
+
+  def way
+    @type = "way"
+    @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id])
+    render "feature"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
   end

-  
-  def way_history 
-    begin
-      @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
-      @type = "way"
-      render :action => "not_found", :status => :not_found
-    end
+
+  def way_history
+    @type = "way"
+    @feature = Way.preload(:way_tags, :old_ways => { :changeset => :user }).find(params[:id])
+    render "history"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
 
   end
 

-  def node 
-    begin
-      @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 }] ) 
-    rescue ActiveRecord::RecordNotFound
-      @type = "node"
-      render :action => "not_found", :status => :not_found
-    end
+  def node
+    @type = "node"
+    @feature = Node.find(params[:id])
+    render "feature"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
   end

-  
-  def node_history 
-    begin
-      @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
-      @type = "way"
-      render :action => "not_found", :status => :not_found
-    end
+
+  def node_history
+    @type = "node"
+    @feature = Node.find(params[:id])
+    render "history"
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
   end

-  
+

   def changeset
   def changeset

-    begin
-      @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}"
-      @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 }] ) 
-    rescue ActiveRecord::RecordNotFound
-      @type = "changeset"
-      render :action => "not_found", :status => :not_found
+    @type = "changeset"
+    @changeset = Changeset.find(params[:id])
+    if @user && @user.moderator?
+      @comments = @changeset.comments.unscope(:where => :visible).includes(:author)
+    else
+      @comments = @changeset.comments.includes(:author)
+    end
+    @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")
+    if @changeset.user.data_public?
+      @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first
+      @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first

     end
     end

+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found
+  end
+
+  def note
+    @type = "note"
+    @note = Note.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
 end
   end
 end