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

Added missing version to the pure rails AMF controller. More stringent tests on whichways.

Browse source
This commit is contained in:
Matt Amos 2008-12-10 14:31:07 +00:00
parent 3ed9ac21b5
commit aeaf2d2d20
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/amf_controller.rb
View file

@ -171,7 +171,7 @@ class AmfController < ApplicationController
# return is of the form:
# [error_code,
# [[way_id, way_version], ...],
# [[node_id, lat, lon, [tags, ...]], ...],
# [[node_id, lat, lon, [tags, ...], node_version], ...],
# [[rel_id, rel_version], ...]]
# where the ways are any visible ways which refer to any visible
# nodes in the bbox, nodes are any visible nodes in the bbox but not
@ -200,7 +200,7 @@ class AmfController < ApplicationController
# find the node ids in an area that aren't part of ways
nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }
points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags] }
points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }
# find the relations used by those nodes and ways
relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +