Merge remote-tracking branch 'upstream/pull/4576'

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index dcc4cd3f31504291ef19f90b975903ad3c493c18..f69acc158e7ab5ae350ff4e69da442c8c9d29e08 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,34 +1,37 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  before_filter :authorize_web  
-  layout 'site'
-  def way_view 
-    begin
-      way = Way.find(params[:id])
-     
-      @way = way
-      @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
+  layout :map_layout
+
+  before_action :authorize_web
+  before_action :set_locale
+  before_action -> { check_database_readable(:need_api => true) }
+  before_action :require_oauth
+  before_action :update_totp, :only => [:query]
+  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
   end

-  def node_view 
-    begin
-      node = Node.find(params[:id])
-     
-      @node = node
-      @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
-    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
   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 query; end

 end
 end