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

Use full list of osm xml root attributes in builder templates

Browse source
This commit is contained in:
Andy Allan 2019-01-09 14:15:39 +01:00
parent fac3f0ef24
commit 686fee43bf
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/api/permissions.builder
View file

@ -1,6 +1,6 @@
# create list of permissions
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION.to_s, "generator" => "OpenStreetMap Server") do
xml.osm(OSM::API.new.xml_root_attributes) do
xml.permissions do
@permissions.each do |permission|
xml.permission :name => permission

2
app/views/notes/index.xml.builder
View file

@ -1,5 +1,5 @@
xml.instruct!
xml.osm(:version => API_VERSION, :generator => GENERATOR) do |osm|
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << (render(:partial => "note", :collection => @notes) || "")
end

2
app/views/notes/show.xml.builder
View file

@ -1,5 +1,5 @@
xml.instruct!
xml.osm(:version => API_VERSION, :generator => GENERATOR) do |osm|
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << render(:partial => "note", :object => @note)
end

2
app/views/users/api_read.builder
View file

@ -1,4 +1,4 @@
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION, "generator" => GENERATOR) do |osm|
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << render(:partial => "api_user", :object => @user)
end

2
app/views/users/api_users.builder
View file

@ -1,4 +1,4 @@
xml.instruct! :xml, :version => "1.0"
xml.osm("version" => API_VERSION, "generator" => GENERATOR) do |osm|
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
osm << render(:partial => "api_user", :collection => @users)
end

16
lib/osm.rb
View file

@ -494,14 +494,20 @@ module OSM
doc = XML::Document.new
doc.encoding = XML::Encoding::UTF_8
root = XML::Node.new "osm"
root["version"] = API_VERSION.to_s
root["generator"] = GENERATOR
root["copyright"] = COPYRIGHT_OWNER
root["attribution"] = ATTRIBUTION_URL
root["license"] = LICENSE_URL
xml_root_attributes.each do |k, v|
root[k] = v
end
doc.root = root
doc
end
def xml_root_attributes
{ "version" => API_VERSION.to_s,
"generator" => GENERATOR,
"copyright" => COPYRIGHT_OWNER,
"attribution" => ATTRIBUTION_URL,
"license" => LICENSE_URL }
end
end
def self.ip_to_country(ip_address)