Remove export controller from branches where it isn't needed yet.

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index c3640609a695ec755c762182679c6a12149c14db..3b6491cf0b3ceda5ed90ee7e1da5e49579c6af21 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -77,7 +77,6 @@ class WayController < ApplicationController
 
       # if we get here, all is fine, otherwise something will catch below.  
       render :nothing => true
 
       # if we get here, all is fine, otherwise something will catch below.  
       render :nothing => true

-      return

     rescue OSM::APIAlreadyDeletedError
       render :text => "", :status => :gone
     rescue OSM::APIPreconditionFailedError
     rescue OSM::APIAlreadyDeletedError
       render :text => "", :status => :gone
     rescue OSM::APIPreconditionFailedError


@@ -132,7 +131,7 @@ class WayController < ApplicationController
   end
 
   def ways_for_node
   end
 
   def ways_for_node

-    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
+    wayids = WayNode.find(:all, :conditions => ['node_id = ?', params[:id]]).collect { |ws| ws.id[0] }.uniq

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