cover the other extreme in the map bounary sanitizeation. Ading some documentation, which is parsed when running rake doc:app. Fixing up a couple of tests.
This commit is contained in:
parent
dc2a959037
commit
b45dd63283
5 changed files with 61 additions and 24 deletions
|
@ -16,7 +16,8 @@ class ApiController < ApplicationController
|
|||
# Number of GPS trace/trackpoints returned per-page
|
||||
TRACEPOINTS_PER_PAGE = APP_CONFIG['tracepoints_per_page']
|
||||
|
||||
|
||||
# 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
|
||||
@@count+=1
|
||||
#retrieve the page number
|
||||
|
@ -84,6 +85,15 @@ class ApiController < ApplicationController
|
|||
render :text => doc.to_s, :content_type => "text/xml"
|
||||
end
|
||||
|
||||
# This is probably the most common call of all. It is used for getting the
|
||||
# OSM data for a specified bounding box, usually for editing. First the
|
||||
# bounding box (bbox) is checked to make sure that it is sane. All nodes
|
||||
# are searched, then all the ways that reference those nodes are found.
|
||||
# All Nodes that are referenced by those ways are fetched and added to the list
|
||||
# of nodes.
|
||||
# Then all the relations that reference the already found nodes and ways are
|
||||
# fetched. All the nodes and ways that are referenced by those ways are then
|
||||
# fetched. Finally all the xml is returned.
|
||||
def map
|
||||
GC.start
|
||||
@@count+=1
|
||||
|
@ -205,6 +215,8 @@ class ApiController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# Get a list of the tiles that have changed within a specified time
|
||||
# period
|
||||
def changes
|
||||
zoom = (params[:zoom] || '12').to_i
|
||||
|
||||
|
@ -250,6 +262,11 @@ class ApiController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# External apps that use the api are able to query the api to find out some
|
||||
# parameters of the API. It currently returns:
|
||||
# * minimum and maximum API versions that can be used.
|
||||
# * maximum area that can be requested in a bbox request in square degrees
|
||||
# * number of tracepoints that are returned in each tracepoints page
|
||||
def capabilities
|
||||
doc = OSM::API.new.get_xml_doc
|
||||
|
||||
|
|
|
@ -4,6 +4,9 @@ class MessageController < ApplicationController
|
|||
before_filter :authorize_web
|
||||
before_filter :require_user
|
||||
|
||||
# Allow the user to write a new message to another user. This action also
|
||||
# deals with the sending of that message to the other user when the user
|
||||
# clicks send.
|
||||
def new
|
||||
@title = 'send message'
|
||||
if params[:message]
|
||||
|
@ -22,6 +25,7 @@ class MessageController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# Allow the user to reply to another message.
|
||||
def reply
|
||||
message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
|
||||
@body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
|
||||
|
@ -32,6 +36,7 @@ class MessageController < ApplicationController
|
|||
render :nothing => true, :status => :not_found
|
||||
end
|
||||
|
||||
# Show a message
|
||||
def read
|
||||
@title = 'read message'
|
||||
@message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
|
||||
|
@ -41,6 +46,7 @@ class MessageController < ApplicationController
|
|||
render :nothing => true, :status => :not_found
|
||||
end
|
||||
|
||||
# Display the list of messages that have been sent to the user.
|
||||
def inbox
|
||||
@title = 'inbox'
|
||||
if @user and params[:display_name] == @user.display_name
|
||||
|
@ -49,6 +55,7 @@ class MessageController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# Display the list of messages that the user has sent to other users.
|
||||
def outbox
|
||||
@title = 'outbox'
|
||||
if @user and params[:display_name] == @user.display_name
|
||||
|
@ -57,6 +64,7 @@ class MessageController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# Set the message as being read or unread.
|
||||
def mark
|
||||
if params[:message_id]
|
||||
id = params[:message_id]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue