- fixed map api call in version 0.4.

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index d6b0b037a78cbd6e875b4c35bdcff8c09f75935d..f13802f7f425fbb947b1f2b1aef7265d93356ab0 100644 (file)
--- 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
     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 }
     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
     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 }
 
       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|
     end
 
     nodes.each do |node|

diff --git a/app/models/node.rb b/app/models/node.rb
index 91f348f19c70ca73b70f10f2764f032fca7bd25c..16e681f2ce80e464f8b9b4bdf8c243811f093543 100644 (file)
--- 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 != ''
       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
         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 774517e2cbc650b4157df2cc6b13f653bd601a48..a88bc9a5b62f47e6277366a37e89adfdf3379956 100644 (file)
--- 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_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
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new


@@ -104,7 +104,7 @@ class Segment < ActiveRecord::Base
   end
 
   def precondtions_ok?
   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
   end
 
 end