X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5f8ab9e9244550b20b8d3bd97b3567df7020d06d..2b8bde9055f0cfdf7d261382cd40980d72bae188:/app/controllers/browse_controller.rb?ds=sidebyside diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index f3a04519c..60f580963 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -17,14 +17,15 @@ class BrowseController < ApplicationController @name = @relation.tags['name'].to_s if @name.length == 0: - @name = "#" + @relation.id.to_s + @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 - render :nothing => true, :status => :not_found + @type = "relation" + render :action => "not_found", :status => :not_found end end @@ -34,12 +35,13 @@ class BrowseController < ApplicationController @name = @relation.tags['name'].to_s if @name.length == 0: - @name = "#" + @relation.id.to_s + @name = "#" + @relation.id.to_s end @title = 'Relation History | ' + (@name) rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + @type = "relation" + render :action => "not_found", :status => :not_found end end @@ -49,14 +51,15 @@ class BrowseController < ApplicationController @name = @way.tags['name'].to_s if @name.length == 0: - @name = "#" + @way.id.to_s + @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 - render :nothing => true, :status => :not_found + @type = "way" + render :action => "not_found", :status => :not_found end end @@ -66,12 +69,13 @@ class BrowseController < ApplicationController @name = @way.tags['name'].to_s if @name.length == 0: - @name = "#" + @way.id.to_s + @name = "#" + @way.id.to_s end @title = 'Way History | ' + (@name) rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + @type = "way" + render :action => "not_found", :status => :not_found end end @@ -81,14 +85,15 @@ class BrowseController < ApplicationController @name = @node.tags_as_hash['name'].to_s if @name.length == 0: - @name = "#" + @node.id.to_s + @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 - render :nothing => true, :status => :not_found + @type = "node" + render :action => "not_found", :status => :not_found end end @@ -98,12 +103,29 @@ class BrowseController < ApplicationController @name = @node.tags_as_hash['name'].to_s if @name.length == 0: - @name = "#" + @node.id.to_s + @name = "#" + @node.id.to_s end @title = 'Node History | ' + (@name) rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + @type = "way" + render :action => "not_found", :status => :not_found + end + end + + 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 end end end