- 'test/controllers/api/relations_controller_test.rb'
- 'test/controllers/api/ways_controller_test.rb'
- 'test/lib/bounding_box_test.rb'
+ - 'app/views/api/map/_bounds.json.jbuilder'
+ - 'app/views/api/nodes/_node.json.jbuilder'
+ - 'app/views/api/old_nodes/_old_node.json.jbuilder'
# Offense count: 539
# Cop supports --auto-correct.
before_action :check_api_readable
around_action :api_call_handle_error, :api_call_timeout
+ before_action :default_format_xml
+
+ # Set format to xml unless client requires a specific format
+ def default_format_xml
+ request.format = "xml" unless params[:format]
+ 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
response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
end
before_action :check_api_readable, :except => [:create, :update, :delete]
around_action :api_call_handle_error, :api_call_timeout
+ before_action :default_format_xml
+
+ # Set format to xml unless client requires a specific format
+ def default_format_xml
+ request.format = "xml" unless params[:format]
+ end
+
# Create a node from XML.
def create
assert_method :put
if @node.visible
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
@nodes = Node.find(ids)
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
end
before_action :lookup_old_element, :except => [:history]
before_action :lookup_old_element_versions, :only => [:history]
+ before_action :default_format_xml
+
+ # Set format to xml unless client requires a specific format
+ def default_format_xml
+ request.format = "xml" unless params[:format]
+ end
+
def history
# the .where() method used in the lookup_old_element_versions
# call won't throw an error if no records are found, so we have
end
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
def version
response.last_modified = @old_element.timestamp
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
before_action :check_api_readable, :except => [:create, :update, :delete]
around_action :api_call_handle_error, :api_call_timeout
+ before_action :default_format_xml
+
+ # Set format to xml unless client requires a specific format
+ def default_format_xml
+ request.format = "xml" unless params[:format]
+ end
+
def create
assert_method :put
response.last_modified = @relation.timestamp
if @relation.visible
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
@relations << relation
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
@relations = Relation.find(ids)
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
def relations_for_way
end
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
end
before_action :check_api_readable, :except => [:create, :update, :delete]
around_action :api_call_handle_error, :api_call_timeout
+ before_action :default_format_xml
+
+ # Set format to xml unless client requires a specific format
+ def default_format_xml
+ request.format = "xml" unless params[:format]
+ end
+
def create
assert_method :put
if @way.visible
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
end
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
else
head :gone
end
@ways = Way.find(ids)
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
##
@ways = Way.where(:id => wayids, :visible => true)
# Render the result
- render :formats => [:xml]
+ respond_to do |format|
+ format.xml
+ format.json
+ end
end
end
end
--- /dev/null
+json.bounds do
+ json.minlat format("%.7f", @bounds.min_lat)
+ json.minlon format("%.7f", @bounds.min_lon)
+ json.maxlat format("%.7f", @bounds.max_lat)
+ json.maxlon format("%.7f", @bounds.max_lon)
+end
--- /dev/null
+json.version Settings.api_version
+json.generator Settings.generator
+json.copyright Settings.copyright_owner
+json.attribution Settings.attribution_url
+json.license Settings.license_url
--- /dev/null
+json.partial! "root_attributes"
+
+json.partial! "bounds"
+
+all = @nodes + @ways + @relations
+
+json.elements(all) do |obj|
+ json.partial! obj
+end
--- /dev/null
+json.type "node"
+json.id node.id
+if node.visible
+ json.lat format("%.7f", node.lat.to_f)
+ json.lon format("%.7f", node.lon.to_f)
+end
+json.timestamp node.timestamp.xmlschema
+json.version node.version
+json.changeset node.changeset_id
+json.user node.changeset.user.display_name
+json.uid node.changeset.user_id
+
+json.visible node.visible unless node.visible
+
+json.tags node.tags unless node.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@nodes) do |node|
+ json.partial! node
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@node]) do |node|
+ json.partial! node
+end
--- /dev/null
+json.type "node"
+json.id old_node.node_id
+if old_node.visible
+ json.lat format("%.7f", old_node.lat.to_f)
+ json.lon format("%.7f", old_node.lon.to_f)
+end
+json.timestamp old_node.timestamp.xmlschema
+json.version old_node.version
+json.changeset old_node.changeset_id
+json.user old_node.changeset.user.display_name
+json.uid old_node.changeset.user_id
+
+json.visible old_node.visible unless old_node.visible
+
+json.tags old_node.tags unless old_node.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@elems) do |old_node|
+ json.partial! old_node
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@old_element]) do |old_node|
+ json.partial! old_node
+end
--- /dev/null
+json.type "relation"
+json.id old_relation.relation_id
+json.timestamp old_relation.timestamp.xmlschema
+json.version old_relation.version
+json.changeset old_relation.changeset_id
+json.user old_relation.changeset.user.display_name
+json.uid old_relation.changeset.user_id
+
+json.visible old_relation.visible unless old_relation.visible
+
+unless old_relation.relation_members.empty?
+ json.members(old_relation.relation_members) do |m|
+ json.type m.member_type.downcase
+ json.ref m.member_id
+ json.role m.member_role
+ end
+end
+
+json.tags old_relation.tags unless old_relation.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@elems) do |old_relation|
+ json.partial! old_relation
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@old_element]) do |old_relation|
+ json.partial! old_relation
+end
--- /dev/null
+json.type "way"
+json.id old_way.way_id
+json.timestamp old_way.timestamp.xmlschema
+json.version old_way.version
+json.changeset old_way.changeset_id
+json.user old_way.changeset.user.display_name
+json.uid old_way.changeset.user_id
+
+json.visible old_way.visible unless old_way.visible
+
+json.nodes old_way.nds unless old_way.nds.empty?
+
+json.tags old_way.tags unless old_way.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@elems) do |old_way|
+ json.partial! old_way
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@old_element]) do |old_way|
+ json.partial! old_way
+end
--- /dev/null
+json.type "relation"
+json.id relation.id
+json.timestamp relation.timestamp.xmlschema
+json.version relation.version
+json.changeset relation.changeset_id
+json.user relation.changeset.user.display_name
+json.uid relation.changeset.user_id
+
+json.visible relation.visible unless relation.visible
+
+unless relation.relation_members.empty?
+ json.members(relation.relation_members) do |m|
+ json.type m.member_type.downcase
+ json.ref m.member_id
+ json.role m.member_role
+ end
+end
+
+json.tags relation.tags unless relation.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+all = @nodes + @ways + @relations
+
+json.elements(all) do |obj|
+ json.partial! obj
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@relations) do |relation|
+ json.partial! relation
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@relations) do |relation|
+ json.partial! relation
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@relations) do |relation|
+ json.partial! relation
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@relations) do |relation|
+ json.partial! relation
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@relation]) do |relation|
+ json.partial! relation
+end
--- /dev/null
+json.type "way"
+json.id way.id
+json.timestamp way.timestamp.xmlschema
+json.version way.version
+json.changeset way.changeset_id
+json.user way.changeset.user.display_name
+json.uid way.changeset.user_id
+
+json.visible way.visible unless way.visible
+
+json.nodes way.nodes.ids unless way.nodes.ids.empty?
+
+json.tags way.tags unless way.tags.empty?
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+all = @nodes + [@way]
+
+json.elements(all) do |obj|
+ json.partial! obj
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@ways) do |way|
+ json.partial! way
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements([@way]) do |way|
+ json.partial! way
+end
--- /dev/null
+json.partial! "api/map/root_attributes"
+
+json.elements(@ways) do |way|
+ json.partial! way
+end
{ :path => "/api/0.6/map", :method => :get },
{ :controller => "api/map", :action => "index" }
)
+ assert_routing(
+ { :path => "/api/0.6/map.json", :method => :get },
+ { :controller => "api/map", :action => "index", :format => "json" }
+ )
end
# -------------------------------------
end
end
+ def test_map_json
+ node = create(:node, :lat => 7, :lon => 7)
+ tag = create(:node_tag, :node => node)
+ way1 = create(:way_node, :node => node).way
+ way2 = create(:way_node, :node => node).way
+ relation = create(:relation_member, :member => node).relation
+
+ # Need to split the min/max lat/lon out into their own variables here
+ # so that we can test they are returned later.
+ minlon = node.lon - 0.1
+ minlat = node.lat - 0.1
+ maxlon = node.lon + 0.1
+ maxlat = node.lat + 0.1
+ bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
+ get :index, :params => { :bbox => bbox, :format => "json" }
+ if $VERBOSE
+ print @request.to_yaml
+ print @response.body
+ end
+ assert_response :success, "Expected success with the map call"
+ js = ActiveSupport::JSON.decode(@response.body)
+ assert_not_nil js
+
+ assert_equal Settings.api_version, js["version"]
+ assert_equal Settings.generator, js["generator"]
+ assert_equal "#{format('%.7f', minlon)}", js["bounds"]["minlon"]
+ assert_equal "#{format('%.7f', minlat)}", js["bounds"]["minlat"]
+ assert_equal "#{format('%.7f', maxlon)}", js["bounds"]["maxlon"]
+ assert_equal "#{format('%.7f', maxlat)}", js["bounds"]["maxlat"]
+
+ result_nodes = js["elements"].select { |a| a["type"] == "node" }
+ .select { |a| a["id"] == node.id }
+ .select { |a| a["lat"] == "#{format('%.7f', node.lat)}" }
+ .select { |a| a["lon"] == "#{format('%.7f', node.lon)}" }
+ .select { |a| a["version"] == node.version }
+ .select { |a| a["changeset"] == node.changeset_id }
+ .select { |a| a["timestamp"] == node.timestamp.xmlschema }
+ assert_equal result_nodes.count, 1
+ result_node = result_nodes.first
+
+ assert_equal result_node["tags"], tag.k => tag.v
+ assert_equal 2, (js["elements"].count { |a| a["type"] == "way" })
+ assert_equal 1, (js["elements"].count { |a| a["type"] == "way" && a["id"] == way1.id })
+ assert_equal 1, (js["elements"].count { |a| a["type"] == "way" && a["id"] == way2.id })
+ assert_equal 1, (js["elements"].count { |a| a["type"] == "relation" })
+ assert_equal 1, (js["elements"].count { |a| a["type"] == "relation" && a["id"] == relation.id })
+ end
+
# This differs from the above test in that we are making the bbox exactly
# the same as the node we are looking at
def test_map_inclusive
projects / rails.git / commitdiff