-class WayController < ApplicationController\r
+class WayController < ApplicationController
require 'xml/libxml'
- before_filter :authorize
+ before_filter :authorize, :only => [:create, :update, :delete]
+ before_filter :require_allow_write_api, :only => [:create, :update, :delete]
+ before_filter :require_public_data, :only => [:create, :update, :delete]
+ before_filter :check_api_writable, :only => [:create, :update, :delete]
+ before_filter :check_api_readable, :except => [:create, :update, :delete]
after_filter :compress_output
-\r
+ around_filter :api_call_handle_error, :api_call_timeout
+
def create
- if request.put?
- way = Way.from_xml(request.raw_post, true)
-
- if way
- way.user_id = @user.id
- unless way.preconditions_ok? # are the segments (and their nodes) visible?
- render :nothing => true, :status => 412
- return
- end
+ assert_method :put
- if way.save_with_history
- render :text => way.id.to_s
- return
- else
- render :nothing => true, :status => 500
- return
- end
- return
- else
- render :nothing => true, :status => 400 # if we got here the doc didnt parse
- return
- end
+ way = Way.from_xml(request.raw_post, true)
+
+ if way
+ way.create_with_history @user
+ render :text => way.id.to_s, :content_type => "text/plain"
+ else
+ render :nothing => true, :status => :bad_request
end
-
- render :nothing => true, :status => 500 # something went very wrong
end
- def full\r
- unless Way.exists?(params[:id])
- render :nothing => true, :status => 404
- return
- end
-
+ def read
way = Way.find(params[:id])
-
- unless way.visible
- render :nothing => true, :status => 410
- return
+
+ response.headers['Last-Modified'] = way.timestamp.rfc822
+
+ if way.visible
+ render :text => way.to_xml.to_s, :content_type => "text/xml"
+ else
+ render :text => "", :status => :gone
end
-
- # In future, we might want to do all the data fetch in one step
- seg_ids = way.segs + [-1]
- segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
-
- node_ids = segments.collect {|segment| segment.node_a }
- node_ids += segments.collect {|segment| segment.node_b }
- node_ids += [-1]
- nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
-
- # Render
- doc = OSM::API.new.get_xml_doc
- nodes.each do |node|
- doc.root << node.to_xml_node()
- end
- segments.each do |segment|
- doc.root << segment.to_xml_node()
- end
- doc.root << way.to_xml_node()
-
- render :text => doc.to_s
end
- def rest\r
- unless Way.exists?(params[:id])
- render :nothing => true, :status => 404
- return
+ def update
+ way = Way.find(params[:id])
+ new_way = Way.from_xml(request.raw_post)
+
+ if new_way and new_way.id == way.id
+ way.update_from(new_way, @user)
+ render :text => way.version.to_s, :content_type => "text/plain"
+ else
+ render :nothing => true, :status => :bad_request
end
+ end
+ # This is the API call to delete a way
+ def delete
way = Way.find(params[:id])
- case request.method
-
- when :get\r
- unless way.visible
- render :nothing => true, :status => 410
- return
- end
- render :text => way.to_xml.to_s
+ new_way = Way.from_xml(request.raw_post)
+
+ if new_way and new_way.id == way.id
+ way.delete_with_history!(new_way, @user)
+ render :text => way.version.to_s, :content_type => "text/plain"
+ else
+ render :nothing => true, :status => :bad_request
+ end
+ end
- when :delete
- unless way.visible
- render :nothing => true, :status => 410
- return
- end
+ def full
+ way = Way.find(params[:id], :include => {:nodes => :node_tags})
+
+ if way.visible
+ changeset_cache = {}
+ user_display_name_cache = {}
- way.visible = false
- way.save_with_history
- render :nothing => true
- return
- when :put
- way = Way.from_xml(request.raw_post)
-
- if way
- way_in_db = Way.find(way.id)
- if way_in_db
- way_in_db.user_id = @user.id
- way_in_db.tags = way.tags
- way_in_db.segs = way.segs
- way_in_db.timestamp = way.timestamp
- way_in_db.visible = true
- if way_in_db.save_with_history
- render :text => way.id
- else
- render :nothing => true, :status => 500
- end
- return
- else
- render :nothing => true, :status => 404 # way doesn't exist yet
+ doc = OSM::API.new.get_xml_doc
+ way.nodes.uniq.each do |node|
+ if node.visible
+ doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
end
- else
- render :nothing => true, :status => 400 # if we got here the doc didnt parse
- return
end
+ doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
+
+ render :text => doc.to_s, :content_type => "text/xml"
+ else
+ render :text => "", :status => :gone
end
end
def ways
- response.headers["Content-Type"] = 'text/xml'
- ids = params['ways'].split(',').collect {|w| w.to_i }
+ begin
+ ids = params['ways'].split(',').collect { |w| w.to_i }
+ rescue
+ ids = []
+ end
+
if ids.length > 0
- waylist = Way.find(ids)
doc = OSM::API.new.get_xml_doc
- waylist.each do |way|
+
+ Way.find(ids).each do |way|
doc.root << way.to_xml_node
- end
- render :text => doc.to_s
+ end
+
+ render :text => doc.to_s, :content_type => "text/xml"
else
- render :nothing => true, :status => 400
+ render :nothing => true, :status => :bad_request
end
end
+ ##
+ # returns all the ways which are currently using the node given in the
+ # :id parameter. note that this used to return deleted ways as well, but
+ # this seemed not to be the expected behaviour, so it was removed.
+ def ways_for_node
+ wayids = WayNode.find(:all,
+ :conditions => ['node_id = ?', params[:id]]
+ ).collect { |ws| ws.id[0] }.uniq
+
+ doc = OSM::API.new.get_xml_doc
+
+ Way.find(wayids).each do |way|
+ doc.root << way.to_xml_node if way.visible
+ end
+
+ render :text => doc.to_s, :content_type => "text/xml"
+ end
end
projects / rails.git / blobdiff