X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..654d22ed2e30f406d036cb57273678c4406f3535:/app/controllers/browse_controller.rb?ds=inline diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 6ace0817b..5526aacca 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,115 +1,88 @@ class BrowseController < ApplicationController - layout 'site' + layout 'site', :except => [ :start ] before_filter :authorize_web + before_filter :set_locale before_filter { |c| c.check_database_readable(true) } + around_filter :web_timeout, :except => [:start] def start end - - - def relation + def relation + @type = "relation" @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.visible.where("id > ?", @relation.id).order("id ASC").first + @prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first rescue ActiveRecord::RecordNotFound - @type = "relation" render :action => "not_found", :status => :not_found end def relation_history + @type = "relation" @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 - 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" + @way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members]) + @next = Way.visible.where("id > ?", @way.id).order("id ASC").first + @prev = Way.visible.where("id < ?", @way.id).order("id DESC").first + rescue ActiveRecord::RecordNotFound 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" + @way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}]) + rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - def node + def node + @type = "node" @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.visible.where("id > ?", @node.id).order("id ASC").first + @prev = Node.visible.where("id < ?", @node.id).order("id DESC").first rescue ActiveRecord::RecordNotFound - @type = "node" render :action => "not_found", :status => :not_found end - def node_history + def node_history + @type = "node" @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 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') - @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 }] ) + @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}" + @next = Changeset.where("id > ?", @changeset.id).order("id ASC").first + @prev = Changeset.where("id < ?", @changeset.id).order("id DESC").first + + if @changeset.user.data_public? + @next_by_user = Changeset.where("user_id = ? AND id > ?", @changeset.user_id, @changeset.id).order("id ASC").first + @prev_by_user = Changeset.where("user_id = ? AND id < ?", @changeset.user_id, @changeset.id).order("id DESC").first + end + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found + end + + def note + @type = "note" + @note = Note.find(params[:id]) + @next = Note.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @note.id }] ) + @prev = Note.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @note.id }] ) rescue ActiveRecord::RecordNotFound - @type = "changeset" render :action => "not_found", :status => :not_found end end