Support getting a way, and all the segments and nodes it depends on, via /way/:id...

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 3cebdcf5319bc6ff6c002ce4b769809f1934a703..8091aa67af06e67489a1c55f9394faaf168769ea 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -68,7 +68,7 @@ class ApiController < ApplicationController
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 

-    doc = OSM::API.get_xml_doc
+    doc = OSM::API.new.get_xml_doc

 
     # get ways
     # find which ways are needed
 
     # get ways
     # find which ways are needed

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 875a29583293dd49dcffab7c40756334d57642cc..acc8a5d0cdb3ea38d3b9aee550b915ea6f50fa45 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -32,6 +32,41 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
     render :nothing => true, :status => 500 # something went very wrong
   end
 

+  def full\r
+    unless Way.exists?(params[:id])
+      render :nothing => true, :status => 404
+      return
+    end
+
+    way = Way.find(params[:id])
+
+    unless way.visible
+        render :nothing => true, :status => 410
+        return
+    end
+
+       # In future, we might want to do all the data fetch in one step
+       seg_ids = way.segs + [-1]
+       segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
+
+       node_ids = segments.collect {|segment| segment.node_a }
+       node_ids += segments.collect {|segment| segment.node_b }
+       node_ids += [-1]
+       nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+       
+       # Render
+       doc = OSM::API.new.get_xml_doc
+       nodes.each do |node|
+               doc.root << node.to_xml_node()
+       end
+       segments.each do |segment|
+               doc.root << segment.to_xml_node()
+       end
+       doc.root << way.to_xml_node()
+
+    render :text => doc.to_s
+  end
+

   def rest\r
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404
   def rest\r
     unless Way.exists?(params[:id])
       render :nothing => true, :status => 404

diff --git a/config/routes.rb b/config/routes.rb
index 5b2a6babf2d3dcdb8f5ab36aeff4b39bb7788ac9..36cc5df0af06ee39f99347ee2df5d6c6a759fb88 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,6 +13,7 @@ ActionController::Routing::Routes.draw do |map|
   
   map.connect "api/#{API_VERSION}/way/create", :controller => 'way', :action => 'create'
   map.connect "api/#{API_VERSION}/way/:id/history", :controller => 'old_way', :action => 'history', :id => nil
   
   map.connect "api/#{API_VERSION}/way/create", :controller => 'way', :action => 'create'
   map.connect "api/#{API_VERSION}/way/:id/history", :controller => 'old_way', :action => 'history', :id => nil

+  map.connect "api/#{API_VERSION}/way/:id/full", :controller => 'way', :action => 'full', :id => nil

   map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'rest', :id => nil
   map.connect "api/#{API_VERSION}/ways", :controller => 'way', :action => 'ways', :id => nil
 
   map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'rest', :id => nil
   map.connect "api/#{API_VERSION}/ways", :controller => 'way', :action => 'ways', :id => nil