more geocoder stuff

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index c5b4f279b54ee16bf80b34ba336c090643b68837..cc29c09e52422f90c167fb89734a5067de384bc1 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,8 +2,10 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   require 'xml/libxml'
 
   before_filter :authorize

+  after_filter :compress_output

 
 

-  def create
+  def create\r
+    response.headers["Content-Type"] = 'text/xml'

     if request.put?
       node = nil
       begin
     if request.put?
       node = nil
       begin


@@ -15,8 +17,9 @@ class NodeController < ApplicationController
 
       if node
         node.user_id = @user.id
 
       if node
         node.user_id = @user.id

+        node.visible = 1

         if node.save_with_history
         if node.save_with_history

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

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


@@ -32,6 +35,7 @@ class NodeController < ApplicationController
   end
 
   def rest
   end
 
   def rest

+    response.headers["Content-Type"] = 'text/xml'

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


@@ -84,32 +88,18 @@ class NodeController < ApplicationController
 
   end
 
 
   end
 

-  def history
-    node = Node.find(params[:id])
-
-    unless node
-      render :nothing => true, :staus => 404
-      return
+  def nodes
+    response.headers["Content-Type"] = 'text/xml'
+    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    if ids.length > 0
+      nodelist = Node.find(ids)
+      doc = get_xml_doc
+      nodelist.each do |node|
+        doc.root << node.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400

     end
     end

-
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-
-    node.old_nodes.each do |old_node|
-      el1 = XML::Node.new 'node'
-      el1['id'] = old_node.id.to_s
-      el1['lat'] = old_node.latitude.to_s
-      el1['lon'] = old_node.longitude.to_s
-      Node.split_tags(el1, old_node.tags)
-      el1['visible'] = old_node.visible.to_s
-      el1['timestamp'] = old_node.timestamp.xmlschema
-      root << el1
-    end
-
-    render :text => doc.to_s

   end
 end
   end
 end