From 1ecf13d8461b2b0c597ba8b6492f6ffd973c61a0 Mon Sep 17 00:00:00 2001 From: Immanuel Scholz Date: Sat, 13 Jan 2007 04:03:46 +0000 Subject: [PATCH 1/1] - fixed map api call in version 0.4. --- app/controllers/api_controller.rb | 6 +++--- app/models/node.rb | 2 +- app/models/segment.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index d6b0b037a..f13802f7f 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -27,7 +27,7 @@ class ApiController < ApplicationController if node_ids.length > 0 node_ids_sql = "(#{node_ids.join(',')})" # get the referenced segments - segments = Segment.find_by_sql "select * from segments where node_a in #{node_ids_sql} or node_b in #{node_ids_sql}" + segments = Segment.find_by_sql "select * from current_segments where node_a in #{node_ids_sql} or node_b in #{node_ids_sql}" end # see if we have nay missing nodes segments_nodes = segments.collect {|segment| segment.node_a } @@ -47,10 +47,10 @@ class ApiController < ApplicationController segment_ids = segments.collect {|segment| segment.id } ways = Array.new if segment_ids.length > 0 - way_segments = WaySegment.find_by_segment_id(segment_ids) + way_segments = WaySegment.find_all_by_segment_id(segment_ids) way_ids = way_segments.collect {|way_segment| way_segment.id } - ways = Way.find(segment_ids) + ways = Way.find(way_ids) end nodes.each do |node| diff --git a/app/models/node.rb b/app/models/node.rb index 91f348f19..16e681f2c 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -101,7 +101,7 @@ class Node < ActiveRecord::Base key = parts[0].strip unless parts[0].nil? val = parts[1].strip unless parts[1].nil? if key != '' && val != '' - el2 = Node.new('tag') + el2 = XML::Node.new('tag') el2['k'] = key.to_s el2['v'] = val.to_s el << el2 diff --git a/app/models/segment.rb b/app/models/segment.rb index 774517e2c..a88bc9a5b 100644 --- a/app/models/segment.rb +++ b/app/models/segment.rb @@ -8,8 +8,8 @@ class Segment < ActiveRecord::Base has_many :old_segments, :foreign_key => :id belongs_to :user - has_one :from_node, :class => 'Node', :foreign_key => 'node_a' - has_one :to_node, :class => 'Node', :foreign_key => 'node_b' + has_one :from_node, :class_name => 'Node', :foreign_key => 'node_a' + has_one :to_node, :class_name => 'Node', :foreign_key => 'node_b' def self.from_xml(xml, create=false) p = XML::Parser.new @@ -104,7 +104,7 @@ class Segment < ActiveRecord::Base end def precondtions_ok? - return from_node and from_node.visible and to_node and to_node.visible + from_node and from_node.visible and to_node and to_node.visible end end -- 2.43.2