Make things work with multipart keys.
This commit is contained in:
parent
bdf1b8823a
commit
bee38e63a3
4 changed files with 8 additions and 12 deletions
|
@ -161,7 +161,7 @@ class ApiController < ApplicationController
|
||||||
ways = Array.new
|
ways = Array.new
|
||||||
if node_ids.length > 0
|
if node_ids.length > 0
|
||||||
way_nodes = WayNode.find_all_by_node_id(node_ids)
|
way_nodes = WayNode.find_all_by_node_id(node_ids)
|
||||||
way_ids = way_nodes.collect {|way_node| way_node.id }
|
way_ids = way_nodes.collect {|way_node| way_node.id[0] }
|
||||||
ways = Way.find(way_ids)
|
ways = Way.find(way_ids)
|
||||||
|
|
||||||
list_of_way_nodes = ways.collect { |way|
|
list_of_way_nodes = ways.collect { |way|
|
||||||
|
|
|
@ -38,15 +38,13 @@ class OldWay < ActiveRecord::Base
|
||||||
tag.save!
|
tag.save!
|
||||||
end
|
end
|
||||||
|
|
||||||
i = 1
|
sequence = 1
|
||||||
self.nds.each do |n|
|
self.nds.each do |n|
|
||||||
nd = OldWayNode.new
|
nd = OldWayNode.new
|
||||||
nd.id = self.id
|
nd.id = [self.id, self.version, sequence]
|
||||||
nd.node_id = n
|
nd.node_id = n
|
||||||
nd.sequence_id = i
|
|
||||||
nd.version = self.version
|
|
||||||
nd.save!
|
nd.save!
|
||||||
i += 1
|
sequence += 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
class OldWayNode < ActiveRecord::Base
|
class OldWayNode < ActiveRecord::Base
|
||||||
belongs_to :user
|
|
||||||
|
|
||||||
set_table_name 'way_nodes'
|
set_table_name 'way_nodes'
|
||||||
|
|
||||||
|
set_primary_keys :id, :version, :sequence_id
|
||||||
end
|
end
|
||||||
|
|
|
@ -177,14 +177,13 @@ class Way < ActiveRecord::Base
|
||||||
|
|
||||||
WayNode.delete_all(['id = ?', self.id])
|
WayNode.delete_all(['id = ?', self.id])
|
||||||
|
|
||||||
i = 1
|
sequence = 1
|
||||||
nds.each do |n|
|
nds.each do |n|
|
||||||
nd = WayNode.new
|
nd = WayNode.new
|
||||||
nd.id = self.id
|
nd.id = [self.id, sequence]
|
||||||
nd.node_id = n
|
nd.node_id = n
|
||||||
nd.sequence_id = i
|
|
||||||
nd.save!
|
nd.save!
|
||||||
i += 1
|
sequence += 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue