X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d874a5d61b332cefe944b77cfa38a1061425d3f..054f934f27e79ab0f7a25a89b6b719cc2cb0cb06:/app/controllers/browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index e3833a7d1..638cb7302 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,19 +1,20 @@
 class BrowseController < ApplicationController
-  layout 'site', :except => [ :start ]
+  layout 'map'
 
   before_filter :authorize_web  
   before_filter :set_locale 
   before_filter { |c| c.check_database_readable(true) }
   around_filter :web_timeout, :except => [:start]
 
-  def start 
+  def start
+    render :layout => false
   end
-  
+
   def relation
     @type = "relation"
     @relation = Relation.find(params[:id])
-    @next = Relation.visible.where("id > ?", @relation.id).order("id ASC").first
-    @prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first
+    @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
     render :action => "not_found", :status => :not_found
   end
@@ -27,19 +28,16 @@ class BrowseController < ApplicationController
   
   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
-
-    # Used for edit link, takes approx middle node of way
-    @midnode = @way.nodes[@way.nodes.length/2]
+    @way = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id])
+    @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
     @type = "way"
-    @way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}])
+    @way = Way.preload(:way_tags, :old_ways => { :changeset => :user }).find(params[:id])
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -47,8 +45,8 @@ class BrowseController < ApplicationController
   def node
     @type = "node"
     @node = Node.find(params[:id])
-    @next = Node.visible.where("id > ?", @node.id).order("id ASC").first
-    @prev = Node.visible.where("id < ?", @node.id).order("id DESC").first
+    @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
     render :action => "not_found", :status => :not_found
   end
@@ -69,14 +67,24 @@ class BrowseController < ApplicationController
     @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
       
     @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
+    @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
+      @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).order(:id => :asc).first
+      @prev_by_user = @changeset.user.changesets.where("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])
+    @title = "#{I18n.t('browse.note.title')} | #{@note.id}"
+    @next = Note.visible.where("id > ?", @note.id).order(:id => :asc).first
+    @prev = Note.visible.where("id < ?", @note.id).order(:id => :desc).first
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found
+  end
 end