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

Unify lat/lon formatting for json output

Browse source
This commit is contained in:
mmd-osm 2020-01-02 14:37:27 +01:00
parent 45a1d298a9
commit b54333fa6d
5 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/geo_record.rb
View file

@ -12,6 +12,10 @@ module GeoRecord
def to_s def to_s
format("%.7f", self) format("%.7f", self)
end end
def as_json(_)
format("%.7f", self).to_f
end
end end
# This scaling factor is used to convert between the float lat/lon that is # This scaling factor is used to convert between the float lat/lon that is

8
app/views/api/map/_bounds.json.jbuilder
View file

@ -1,6 +1,6 @@
json.bounds do json.bounds do
json.minlat format("%.7f", @bounds.min_lat) json.minlat GeoRecord::Coord.new(@bounds.min_lat)
json.minlon format("%.7f", @bounds.min_lon) json.minlon GeoRecord::Coord.new(@bounds.min_lon)
json.maxlat format("%.7f", @bounds.max_lat) json.maxlat GeoRecord::Coord.new(@bounds.max_lat)
json.maxlon format("%.7f", @bounds.max_lon) json.maxlon GeoRecord::Coord.new(@bounds.max_lon)
end end

4
app/views/api/nodes/_node.json.jbuilder
View file

@ -1,8 +1,8 @@
json.type "node" json.type "node"
json.id node.id json.id node.id
if node.visible if node.visible
json.lat format("%.7f", node.lat.to_f) json.lat GeoRecord::Coord.new(node.lat)
json.lon format("%.7f", node.lon.to_f) json.lon GeoRecord::Coord.new(node.lon)
end end
json.timestamp node.timestamp.xmlschema json.timestamp node.timestamp.xmlschema
json.version node.version json.version node.version

4
app/views/api/old_nodes/_old_node.json.jbuilder
View file

@ -1,8 +1,8 @@
json.type "node" json.type "node"
json.id old_node.node_id json.id old_node.node_id
if old_node.visible if old_node.visible
json.lat format("%.7f", old_node.lat.to_f) json.lat GeoRecord::Coord.new(old_node.lat)
json.lon format("%.7f", old_node.lon.to_f) json.lon GeoRecord::Coord.new(old_node.lon)
end end
json.timestamp old_node.timestamp.xmlschema json.timestamp old_node.timestamp.xmlschema
json.version old_node.version json.version old_node.version

12
test/controllers/api/map_controller_test.rb
View file

@ -92,15 +92,15 @@ module Api
assert_equal Settings.api_version, js["version"] assert_equal Settings.api_version, js["version"]
assert_equal Settings.generator, js["generator"] assert_equal Settings.generator, js["generator"]
assert_equal "#{format('%.7f', minlon)}", js["bounds"]["minlon"] assert_equal GeoRecord::Coord.new(minlon), js["bounds"]["minlon"]
assert_equal "#{format('%.7f', minlat)}", js["bounds"]["minlat"] assert_equal GeoRecord::Coord.new(minlat), js["bounds"]["minlat"]
assert_equal "#{format('%.7f', maxlon)}", js["bounds"]["maxlon"] assert_equal GeoRecord::Coord.new(maxlon), js["bounds"]["maxlon"]
assert_equal "#{format('%.7f', maxlat)}", js["bounds"]["maxlat"] assert_equal GeoRecord::Coord.new(maxlat), js["bounds"]["maxlat"]
result_nodes = js["elements"].select { |a| a["type"] == "node" } result_nodes = js["elements"].select { |a| a["type"] == "node" }
.select { |a| a["id"] == node.id } .select { |a| a["id"] == node.id }
.select { |a| a["lat"] == "#{format('%.7f', node.lat)}" } .select { |a| a["lat"] == GeoRecord::Coord.new(node.lat) }
.select { |a| a["lon"] == "#{format('%.7f', node.lon)}" } .select { |a| a["lon"] == GeoRecord::Coord.new(node.lon) }
.select { |a| a["version"] == node.version } .select { |a| a["version"] == node.version }
.select { |a| a["changeset"] == node.changeset_id } .select { |a| a["changeset"] == node.changeset_id }
.select { |a| a["timestamp"] == node.timestamp.xmlschema } .select { |a| a["timestamp"] == node.timestamp.xmlschema }