- fixed map api call in version 0.4.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index c27081650a692375575940c9ea90804ae1b40fcd..27c21c4815a78fea0da3c0846ac8d72559ba82b1 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,325 +1,105 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 class NodeController < ApplicationController
   require 'xml/libxml'

-  
+

   before_filter :authorize
   before_filter :authorize

+  after_filter :compress_output

 
   def create
 
   def create

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

     if request.put?
     if request.put?

-      doc = XML::Document.new(request.raw_post) #THIS IS BROKEN, libxml docus dont talk about creating a doc from a string
-      doc.find('//osm/node').each do |pt|
-        render :text => 'arghsd.rkugt;dsrt'
+      node = nil
+      begin
+        node = Node.from_xml(request.raw_post, true)
+      rescue
+        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse

         return
         return

-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        node_id = pt.attributes['id'].to_i
-
-        if lat > 90 or lat < -90 or lon > 180 or lon < -180  or node_id != 0
-          render :nothing => true, :status => 400 # BAD REQUEST
-          return
-        end
-
-        tags = []
-
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-        tags = '' if tags.nil?
-
-        now = Time.now
+      end

 
 

-        node = Node.new
-        node.latitude = lat
-        node.longitude = lon
-        node.visible = 1
-        node.tags = tags
-        node.timestamp = now
+      if node

         node.user_id = @user.id
         node.user_id = @user.id

-
-        #FIXME add a node to the old nodes table too
-
-        if node.save
+        node.visible = 1
+        if node.save_with_history

           render :text => node.id
         else
           render :nothing => true, :status => 500
         end
           render :text => node.id
         else
           render :nothing => true, :status => 500
         end

-      end
-    end
+        return

 
 

-        render :text => 'WRONG!           '
+      else
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse

         return
         return

+      end
+    end

 
 

+    render :nothing => true, :status => 500 # something went very wrong

   end
 
   def rest
   end
 
   def rest

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

     unless Node.exists?(params[:id])
     unless Node.exists?(params[:id])

-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404

       return
     end
 
     node = Node.find(params[:id])
 
       return
     end
 
     node = Node.find(params[:id])
 

-

     case request.method
     case request.method

-    when :get
-      doc = XML::Document.new

 
 

-      # this needs a new libxml:
-      # doc.encoding = "UTF-8"  
+    when :get
+      unless node
+        render :nothing => true, :status => 500
+        return
+      end

 
 

-      root = XML::Node.new 'osm'
-      root['version'] = '0.4'
-      root['generator'] = 'OpenStreetMap server'
-      doc.root = root
-      el1 = XML::Node.new 'node'
-      el1['id'] = node.id.to_s
-      el1['lat'] = node.latitude.to_s
-      el1['lon'] = node.longitude.to_s
-      split_tags(el1, node.tags)
-      el1['visible'] = node.visible.to_s
-      el1['timestamp'] = node.timestamp.xmlschema
-      root << el1
+      unless node.visible
+        render :nothing => true, :status => 410
+        return
+      end

 
 

-      render :text => doc.to_s
+      render :text => node.to_xml.to_s
+      return

 
 

-      #
-      # DELETE
-      #

     when :delete
     when :delete

-

       if node.visible
         node.visible = 0
       if node.visible
         node.visible = 0

-        node.save
+        node.save_with_history
+        render :nothing => true

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

-      #
-      # PUT
-      #

     when :put
     when :put

+      new_node = Node.from_xml(request.raw_post)

 
 

-      doc = XML::Document.new(request.raw_post)
-      doc.elements.each('osm/node') do |pt|
-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        node_id = pt.attributes['id'].to_i
-
-        if lat > 90 or lat < -90 or lon > 180 or lon < -180  or node_id != params[:id]
-          render :nothing => true, :status => 400 # BAD REQUEST
-          return
-        end
-
-        tags = []
-
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-        tags = '' if tags.nil?
-
-        now = Time.now
-
-        node.latitude = lat
-        node.longitude = lon
-        node.visible = 1
-        node.tags = tags
-        node.timestamp = now
-        node.user_id = @user.id
-
-        #FIXME add a node to the old nodes table too
-
-        if node.save
-          render :text => node.id
-        else
-          render :nothing => true, :status => 500
-        end
-      end
-    end
-  end
-
-
-  def dummy
-    if request.post?
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      doc = Document.new $stdin.read
-
-      doc.elements.each('osm/node') do |pt|
-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        xmlnodeid = pt.attributes['id'].to_i
-
-        tags = []
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
-
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-
-        tags = '' unless tags
-        if xmlnodeid == nodeid && userid != 0
-          if nodeid == 0
-            new_node_id = dao.create_node(lat, lon, userid, tags)
-            if new_node_id
-              puts new_node_id
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            node = dao.getnode(nodeid)
-            if node
-              #FIXME: need to check the node hasn't moved too much
-              if dao.update_node?(nodeid, userid, lat, lon, tags)
-                exit
-              else
-                exit HTTP_INTERNAL_SERVER_ERROR
-              end
-            else
-              exit HTTP_NOT_FOUND
-            end
-          end
-
-        else
-          exit BAD_REQUEST
-        end
-      end
-      exit HTTP_INTERNAL_SERVER_ERROR
-
-
-    end
-  end
-
-
-  def dummydummy
-
-    #
-    # POST ???
-    #
-
-    if request.post?
-      nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      doc = Document.new $stdin.read
-
-      doc.elements.each('osm/node') do |pt|
-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        xmlnodeid = pt.attributes['id'].to_i
-
-        tags = []
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
-
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
+      node.timestamp = Time.now
+      node.user_id = @user.id

 
 

-        tags = '' unless tags
-        if xmlnodeid == nodeid && userid != 0
-          if nodeid == 0
-            new_node_id = dao.create_node(lat, lon, userid, tags)
-            if new_node_id
-              puts new_node_id
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            node = dao.getnode(nodeid)
-            if node
-              #FIXME: need to check the node hasn't moved too much
-              if dao.update_node?(nodeid, userid, lat, lon, tags)
-                exit
-              else
-                exit HTTP_INTERNAL_SERVER_ERROR
-              end
-            else
-              exit HTTP_NOT_FOUND
-            end
-          end
+      node.latitude = new_node.latitude 
+      node.longitude = new_node.longitude
+      node.tags = new_node.tags

 
 

-        else
-          exit BAD_REQUEST
-        end
-      end
-      exit HTTP_INTERNAL_SERVER_ERROR
-
-    end
-
-    #
-    # GET ???
-    #
-
-    if request.get?
-      node = node.find(params[:id])
-      doc = document.new
-      doc.encoding = "utf-8"
-      root = node.new 'osm'
-      root['version'] = '0.4'
-      root['generator'] = 'openstreetmap server'
-      doc.root = root
-      el1 = node.new 'node'
-      el1['id'] = node.id.to_s
-      el1['lat'] = node.latitude.to_s
-      el1['lon'] = node.longitude.to_s
-      split_tags(el1, node.tags)
-      el1['visible'] = node.visible.to_s
-      el1['timestamp'] = node.timestamp
-      root << el1
-
-      render :text => doc.to_s, :template => false
-    end
-
-    #
-    # DELETE????
-    # 
-
-    if request.delete?
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      #cgi doesnt work with DELETE so extract manually:
-      nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i
-
-      if userid > 0 && nodeid != 0
-        node = dao.getnode(nodeid)
-        if node
-          if node.visible  
-            if dao.delete_node?(nodeid, userid)
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            exit HTTP_GONE
-          end
-        else
-          exit HTTP_NOT_FOUND
-        end
+      if node.id == new_node.id and node.save_with_history
+        render :nothing => true, :status => 200

       else
       else

-        exit BAD_REQUEST
-
+        render :nothing => true, :status => 500

       end
       end

-
-
+      return

     end
 
     end
 

-

   end
 
   end
 

-  private
-  def split_tags(el, tags)
-    tags.split(';').each do |tag|
-      parts = tag.split('=')
-      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['k'] = key.to_s
-        el2['v'] = val.to_s
-        el << el2
-      end
+  def nodes
+    response.headers["Content-Type"] = 'application/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
     end
   end

-

 end
 end