X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bb8acc842464bdc00987a54bc0c405223dd1a50d..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index e679442c1..ebdd2cd80 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,94 +1,91 @@ class BrowseController < ApplicationController - before_filter :authorize_web - layout 'site' + layout :map_layout - def relation_view - 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) - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - end + before_action :authorize_web + before_action :set_locale + before_action -> { check_database_readable(true) } + before_action :require_oauth + around_action :web_timeout + authorize_resource :class => false + + def relation + @type = "relation" + @feature = Relation.preload(:relation_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :relation_members => :member).find(params[:id]) + render "feature" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found end - + 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 - render :nothing => true, :status => :not_found - end + @type = "relation" + @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, :changeset => [:changeset_tags, :user], :old_members => :member]).find(params[:id]) + render "history" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found end - - def way_view - 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) - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - end + + def way + @type = "way" + @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :nodes => [:node_tags, :ways => :way_tags]).find(params[:id]) + render "feature" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found 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 - render :nothing => true, :status => :not_found - end + + def way_history + @type = "way" + @feature = Way.preload(:way_tags, :old_ways => [:old_tags, :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] }]).find(params[:id]) + render "history" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found + end + + def node + @type = "node" + @feature = Node.preload(:node_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :ways => :way_tags).find(params[:id]) + render "feature" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found end - def node_view - 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) - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + def node_history + @type = "node" + @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, :changeset => [:changeset_tags, :user]]).find(params[:id]) + render "history" + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found + end + + def changeset + @type = "changeset" + @changeset = Changeset.find(params[:id]) + @comments = if current_user&.moderator? + @changeset.comments.unscope(:where => :visible).includes(:author) + else + @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.active? && @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 + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found 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 | ' + (@name) - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + + def note + @type = "note" + + if current_user&.moderator? + @note = Note.find(params[:id]) + @note_comments = @note.comments.unscope(:where => :visible) + else + @note = Note.visible.find(params[:id]) + @note_comments = @note.comments end + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found end end