cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Additional api tests for the changes. Also making sure that you cannot request a change of 0 length, so that you can detect erronious input.

Browse source
This commit is contained in:
Shaun McDonald 2008-11-03 18:05:19 +00:00
parent 635daf1773
commit e932a69bd7
2 changed files with 83 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/api_controller.rb
View file

@ -131,7 +131,7 @@ class ApiController < ApplicationController
return
end
if node_ids.length == 0
render :text => "<osm version='#{API_VERSION}'></osm>", :content_type => "text/xml"
render :text => "<osm version='#{API_VERSION}' generator='#{GENERATOR}'></osm>", :content_type => "text/xml"
return
end
@ -230,7 +230,7 @@ class ApiController < ApplicationController
end
if zoom >= 1 and zoom <= 16 and
endtime >= starttime and endtime - starttime <= 24.hours
endtime > starttime and endtime - starttime <= 24.hours
mask = (1 << zoom) - 1
tiles = Node.count(:conditions => ["timestamp BETWEEN ? AND ?", starttime, endtime],
@ -258,7 +258,7 @@ class ApiController < ApplicationController
render :text => doc.to_s, :content_type => "text/xml"
else
render :text => "Requested zoom is invalid", :status => :bad_request
render :text => "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", :status => :bad_request
end
end