Allow the map centre and marker position to be set independently.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index a5f20acea658e49f2e26f32ac9f186722f6272b8..3f3f882ae6cb5971c8c951da5e214f0d9a6f943b 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,162 +1,113 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize
+  before_filter :authorize, :only => [:create, :update, :delete]
+  after_filter :compress_output

 
   def create
     if request.put?
 
   def create
     if request.put?

-      p = XML::Parser.new
-      p.string = request.raw_post
-      doc = p.parse
-
-      doc.find('//osm/node').each do |pt|
-        lat = pt['lat'].to_f
-        lon = pt['lon'].to_f
-        node_id = pt['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.find('tag').each do |tag|
-          tags << [tag['k'],tag['v']]
-        end
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-        tags = '' if tags.nil?
-
-        now = Time.now
+      node = Node.from_xml(request.raw_post, true)

 
 

-        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

+        node.visible = true

 
 

-        #FIXME add a node to the old nodes table too
-
-        if node.save
-          render :text => node.id
+        if node.save_with_history
+          render :text => node.id.to_s, :content_type => "text/plain"

         else
         else

-          render :nothing => true, :status => 500
+          render :nothing => true, :status => :internal_server_error

         end
         end

-
-        return
+      else
+        render :nothing => true, :status => :bad_request

       end
       end

+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-
-    render :nothing => true, :status => 400 # if we got here the doc didnt parse

   end
 
   end
 

-  def rest
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
-      return
-    end
-
-    node = Node.find(params[:id])
-
-
-    case request.method
-    when :get
-      doc = XML::Document.new
-
-      doc.encoding = "UTF-8"  
-      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
-
-      render :text => doc.to_s
-
-    when :delete
-      #
-      # DELETE
-      #
+  def read
+    begin
+      node = Node.find(params[:id])

 
       if node.visible
 
       if node.visible

-        node.visible = 0
-        node.save
-        render :nothing => true
-      else
-        render :nothing => true, :status => 410
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+       else
+        render :nothing => true, :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error
+    end
+  end

 
 

-    when :put
-      #
-      # PUT
-      #
-
-      p = XML::Parser.new
-      p.string = request.raw_post
-      doc = p.parse
-
-      doc.find('//osm/node').each do |pt|
-        lat = pt['lat'].to_f
-        lon = pt['lon'].to_f
-        node_id = pt['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
-          return
-        end
-
-        tags = []
-
-        pt.find('tag').each do |tag|
-          tags << [tag['k'],tag['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
+  def update
+    begin
+      node = Node.find(params[:id])

 
 

-        if node.save
-          render :text => node.id
+      if node.visible
+        new_node = Node.from_xml(request.raw_post)
+
+        if new_node and new_node.id == node.id
+          node.user_id = @user.id
+          node.latitude = new_node.latitude 
+          node.longitude = new_node.longitude
+          node.tags = new_node.tags
+
+          if node.save_with_history
+            render :nothing => true
+          else
+            render :nothing => true, :status => :internal_server_error
+          end

         else
         else

-          render :nothing => true, :status => 500
+          render :nothing => true, :status => :bad_request

         end
         end

+      else
+        render :nothing => true, :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error

     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
+  def delete
+    begin
+      node = Node.find(params[:id])
+
+      if node.visible
+        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
+          render :nothing => true, :status => :precondition_failed
+        else
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history
+          render :nothing => true
+        end
+      else
+        render :nothing => true, :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue
+      render :nothing => true, :status => :internal_server_error

     end
   end
 
     end
   end
 

+  def nodes
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
+
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc
+
+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 

 
 

+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
+  end

 end
 end