Avoid showing table header when there are no results

[rails.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 989cdee5cd20cc4a5b86d910cfedd9d54eda79ca..52c4b6d67a0256abbe97a9e1efffbee173123cec 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,14 +2,14 @@
 #
 # Table name: current_nodes
 #
 #
 # Table name: current_nodes
 #

-#  id           :integer          not null, primary key
+#  id           :bigint(8)        not null, primary key

 #  latitude     :integer          not null
 #  longitude    :integer          not null
 #  latitude     :integer          not null
 #  longitude    :integer          not null

-#  changeset_id :integer          not null
+#  changeset_id :bigint(8)        not null

 #  visible      :boolean          not null
 #  timestamp    :datetime         not null
 #  visible      :boolean          not null
 #  timestamp    :datetime         not null

-#  tile         :integer          not null
-#  version      :integer          not null
+#  tile         :bigint(8)        not null
+#  version      :bigint(8)        not null

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -21,7 +21,7 @@
 #  current_nodes_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
 #  current_nodes_changeset_id_fkey  (changeset_id => changesets.id)
 #
 

-class Node < ActiveRecord::Base
+class Node < ApplicationRecord

   require "xml/libxml"
 
   include GeoRecord
   require "xml/libxml"
 
   include GeoRecord


@@ -47,15 +47,15 @@ class Node < ActiveRecord::Base
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates :id, :uniqueness => true, :presence => { :on => :update },

-                 :numericality => { :on => :update, :integer_only => true }
+                 :numericality => { :on => :update, :only_integer => true }

   validates :version, :presence => true,
   validates :version, :presence => true,

-                      :numericality => { :integer_only => true }
+                      :numericality => { :only_integer => true }

   validates :changeset_id, :presence => true,
   validates :changeset_id, :presence => true,

-                           :numericality => { :integer_only => true }
+                           :numericality => { :only_integer => true }

   validates :latitude, :presence => true,
   validates :latitude, :presence => true,

-                       :numericality => { :integer_only => true }
+                       :numericality => { :only_integer => true }

   validates :longitude, :presence => true,
   validates :longitude, :presence => true,

-                        :numericality => { :integer_only => true }
+                        :numericality => { :only_integer => true }

   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]


@@ -74,13 +74,15 @@ class Node < ActiveRecord::Base
   def self.from_xml(xml, create = false)
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
   def self.from_xml(xml, create = false)
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse

+    pt = doc.find_first("//osm/node")

 
 

-    doc.find("//osm/node").each do |pt|
-      return Node.from_xml_node(pt, create)
+    if pt
+      Node.from_xml_node(pt, create)
+    else
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")

     end
     end

-    raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
-  rescue LibXML::XML::Error, ArgumentError => ex
-    raise OSM::APIBadXMLError.new("node", xml, ex.message)
+  rescue LibXML::XML::Error, ArgumentError => e
+    raise OSM::APIBadXMLError.new("node", xml, e.message)

   end
 
   def self.from_xml_node(pt, create = false)
   end
 
   def self.from_xml_node(pt, create = false)


@@ -200,28 +202,6 @@ class Node < ActiveRecord::Base
     save_with_history!
   end
 
     save_with_history!
   end
 

-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node
-    doc
-  end
-
-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new "node"
-    el["id"] = id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    if visible?
-      el["lat"] = lat.to_s
-      el["lon"] = lon.to_s
-    end
-
-    add_tags_to_xml_node(el, node_tags)
-
-    el
-  end
-

   def tags_as_hash
     tags
   end
   def tags_as_hash
     tags
   end