Resolve conflict

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 35fc86c520576dd9b502a03463f7c136a842df48..2c442c190585d590647a7705aaff4a1319869278 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,12 +1,11 @@
 class ApiController < ApplicationController
 
 class ApiController < ApplicationController
 

+  skip_before_filter :verify_authenticity_token

   before_filter :check_api_readable, :except => [:capabilities]
   before_filter :check_api_readable, :except => [:capabilities]

+  before_filter :setup_user_auth, :only => [:permissions]

   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 

-  # Help methods for checking boundary sanity and area size
-  include MapBoundary
-

   # Get an XML response containing a list of tracepoints that have been uploaded
   # within the specified bounding box, and in the specified page.
   def trackpoints
   # Get an XML response containing a list of tracepoints that have been uploaded
   # within the specified bounding box, and in the specified page.
   def trackpoints


@@ -21,25 +20,19 @@ class ApiController < ApplicationController
     offset = page * TRACEPOINTS_PER_PAGE
 
     # Figure out the bbox
     offset = page * TRACEPOINTS_PER_PAGE
 
     # Figure out the bbox

-    bbox = params['bbox']
-    unless bbox and bbox.count(',') == 3
-      report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
-      return
-    end
-
-    bbox = bbox.split(',')
-    min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox)

     # check boundary is sane and area within defined
     # see /config/application.yml
     begin
     # check boundary is sane and area within defined
     # see /config/application.yml
     begin

-      check_boundaries(min_lon, min_lat, max_lon, max_lat)
+      bbox = BoundingBox.from_bbox_params(params)
+      bbox.check_boundaries
+      bbox.check_size

     rescue Exception => err
       report_error(err.message)
       return
     end
 
     # get all the points
     rescue Exception => err
       report_error(err.message)
       return
     end
 
     # get all the points

-    points = Tracepoint.bbox(min_lat, min_lon, max_lat, max_lon).offset(offset).limit(TRACEPOINTS_PER_PAGE).order("gpx_id DESC, trackid ASC, timestamp ASC")
+    points = Tracepoint.bbox(bbox).offset(offset).limit(TRACEPOINTS_PER_PAGE).order("gpx_id DESC, trackid ASC, timestamp ASC")

 
     doc = XML::Document.new
     doc.encoding = XML::Encoding::UTF_8
 
     doc = XML::Document.new
     doc.encoding = XML::Encoding::UTF_8


@@ -76,7 +69,7 @@ class ApiController < ApplicationController
           if gpx_file.identifiable?
             track << (XML::Node.new("name") << gpx_file.name)
             track << (XML::Node.new("desc") << gpx_file.description)
           if gpx_file.identifiable?
             track << (XML::Node.new("name") << gpx_file.name)
             track << (XML::Node.new("desc") << gpx_file.description)

-            track << (XML::Node.new("url") << url_for(:controller => 'trace', :action => 'view', :id => gpx_file.id))
+            track << (XML::Node.new("url") << url_for(:controller => 'trace', :action => 'view', :display_name => gpx_file.user.display_name, :id => gpx_file.id))

           end
         else
           # use the anonymous track segment if the user hasn't allowed
           end
         else
           # use the anonymous track segment if the user hasn't allowed


@@ -123,32 +116,18 @@ class ApiController < ApplicationController
   # fetched. Finally all the xml is returned.
   def map
     # Figure out the bbox
   # fetched. Finally all the xml is returned.
   def map
     # Figure out the bbox

-    bbox = params['bbox']
-
-    unless bbox and bbox.count(',') == 3
-      # alternatively: report_error(TEXT['boundary_parameter_required']
-      report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
-      return
-    end
-
-    bbox = bbox.split(',')
-
-    min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox)
-

     # check boundary is sane and area within defined
     # see /config/application.yml
     begin
     # check boundary is sane and area within defined
     # see /config/application.yml
     begin

-      check_boundaries(min_lon, min_lat, max_lon, max_lat)
+      bbox = BoundingBox.from_bbox_params(params)
+      bbox.check_boundaries
+      bbox.check_size

     rescue Exception => err
       report_error(err.message)
       return
     end
 
     rescue Exception => err
       report_error(err.message)
       return
     end
 

-    # FIXME um why is this area using a different order for the lat/lon from above???
-    @nodes = Node.bbox(min_lat, min_lon, max_lat, max_lon).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES+1)
-    # get all the nodes, by tag not yet working, waiting for change from NickB
-    # need to be @nodes (instance var) so tests in /spec can be performed
-    #@nodes = Node.search(bbox, params[:tag])
+    @nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES+1)

 
     node_ids = @nodes.collect(&:id)
     if node_ids.length > MAX_NUMBER_OF_NODES
 
     node_ids = @nodes.collect(&:id)
     if node_ids.length > MAX_NUMBER_OF_NODES


@@ -163,20 +142,15 @@ class ApiController < ApplicationController
     doc = OSM::API.new.get_xml_doc
 
     # add bounds
     doc = OSM::API.new.get_xml_doc
 
     # add bounds

-    bounds = XML::Node.new 'bounds'
-    bounds['minlat'] = min_lat.to_s
-    bounds['minlon'] = min_lon.to_s
-    bounds['maxlat'] = max_lat.to_s
-    bounds['maxlon'] = max_lon.to_s
-    doc.root << bounds
+    doc.root << bbox.add_bounds_to(XML::Node.new 'bounds')

 
     # get ways
     # find which ways are needed
     ways = Array.new
     if node_ids.length > 0
 
     # get ways
     # find which ways are needed
     ways = Array.new
     if node_ids.length > 0

-      way_nodes = WayNode.find_all_by_node_id(node_ids)
+      way_nodes = WayNode.where(:node_id => node_ids)

       way_ids = way_nodes.collect { |way_node| way_node.id[0] }
       way_ids = way_nodes.collect { |way_node| way_node.id[0] }

-      ways = Way.find(way_ids, :include => [:way_nodes, :way_tags])
+      ways = Way.preload(:way_nodes, :way_tags).find(way_ids)

 
       list_of_way_nodes = ways.collect { |way|
         way.way_nodes.collect { |way_node| way_node.node_id }
 
       list_of_way_nodes = ways.collect { |way|
         way.way_nodes.collect { |way_node| way_node.node_id }


@@ -308,9 +282,30 @@ class ApiController < ApplicationController
     timeout = XML::Node.new 'timeout'
     timeout['seconds'] = API_TIMEOUT.to_s
     api << timeout
     timeout = XML::Node.new 'timeout'
     timeout['seconds'] = API_TIMEOUT.to_s
     api << timeout

-    
+    status = XML::Node.new 'status'
+    status['database'] = database_status.to_s
+    status['api'] = api_status.to_s
+    status['gpx'] = gpx_status.to_s
+    api << status
+

     doc.root << api
 
     render :text => doc.to_s, :content_type => "text/xml"
   end
     doc.root << api
 
     render :text => doc.to_s, :content_type => "text/xml"
   end

+
+  # External apps that use the api are able to query which permissions
+  # they have. This currently returns a list of permissions granted to the current user:
+  # * if authenticated via OAuth, this list will contain all permissions granted by the user to the access_token.
+  # * if authenticated via basic auth all permissions are granted, so the list will contain all permissions.
+  # * unauthenticated users have no permissions, so the list will be empty.
+  def permissions
+    @permissions = case
+                   when current_token.present?
+                     ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
+                   when @user
+                     ClientApplication.all_permissions
+                   else
+                     []
+                   end
+  end

 end
 end