geocoder controller - handles geocoding

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index fcff0fc4528678c2d760b0500ee1359738beb6ca..8daac7cc2c543487a4015bbdd7c478d9ec3fee8e 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,9 +1,9 @@
-class WayController < ApplicationController
+class WayController < ApplicationController\r

   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output
   require 'xml/libxml'
 
   before_filter :authorize
   after_filter :compress_output

-
+\r

   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)
   def create
     if request.put?
       way = Way.from_xml(request.raw_post, true)


@@ -16,7 +16,7 @@ class WayController < ApplicationController
         end
 
         if way.save_with_history
         end
 
         if way.save_with_history

-          render :text => way.id
+          render :text => way.id.to_s

           return
         else
           render :nothing => true, :status => 500
           return
         else
           render :nothing => true, :status => 500


@@ -32,7 +32,7 @@ class WayController < ApplicationController
     render :nothing => true, :status => 500 # something went very wrong
   end
 
     render :nothing => true, :status => 500 # something went very wrong
   end
 

-  def rest
+  def rest\r

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


@@ -41,7 +41,7 @@ class WayController < ApplicationController
     way = Way.find(params[:id])
     case request.method
 
     way = Way.find(params[:id])
     case request.method
 

-    when :get
+    when :get\r

       unless way.visible
         render :nothing => true, :status => 410
         return
       unless way.visible
         render :nothing => true, :status => 410
         return


@@ -90,7 +90,7 @@ class WayController < ApplicationController
     ids = params['ways'].split(',').collect {|w| w.to_i }
     if ids.length > 0
       waylist = Way.find(ids)
     ids = params['ways'].split(',').collect {|w| w.to_i }
     if ids.length > 0
       waylist = Way.find(ids)

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

       waylist.each do |way|
         doc.root << way.to_xml_node
       end 
       waylist.each do |way|
         doc.root << way.to_xml_node
       end