X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/87918595da1e1fad2ddd7aa62f9fc537dff657ff..6d0100b91dda3e36d3eeeab0e3a4894e1dae9fd2:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index 212998ccc..6573b9805 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: current_ways
+#
+#  id           :integer          not null, primary key
+#  changeset_id :integer          not null
+#  timestamp    :datetime         not null
+#  visible      :boolean          not null
+#  version      :integer          not null
+#
+# Indexes
+#
+#  current_ways_timestamp_idx  (timestamp)
+#
+# Foreign Keys
+#
+#  current_ways_changeset_id_fkey  (changeset_id => changesets.id)
+#
+
 class Way < ActiveRecord::Base
   require "xml/libxml"
 
@@ -49,12 +68,15 @@ class Way < ActiveRecord::Base
     way = Way.new
 
     raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil?
+
     way.version = pt["version"]
     raise OSM::APIBadXMLError.new("way", pt, "Changeset id is missing") if pt["changeset"].nil?
+
     way.changeset_id = pt["changeset"]
 
     unless create
       raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt["id"].nil?
+
       way.id = pt["id"].to_i
       # .to_i will return 0 if there is no number that can be parsed.
       # We want to make sure that there is no id with zero anyway
@@ -73,6 +95,7 @@ class Way < ActiveRecord::Base
     pt.find("tag").each do |tag|
       raise OSM::APIBadXMLError.new("way", pt, "tag is missing key") if tag["k"].nil?
       raise OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag["v"].nil?
+
       way.add_tag_keyval(tag["k"], tag["v"])
     end
 
@@ -101,14 +124,10 @@ class Way < ActiveRecord::Base
     way_nodes.each do |nd|
       if visible_nodes
         # if there is a list of visible nodes then use that to weed out deleted nodes
-        if visible_nodes[nd.node_id]
-          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
-        end
+        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id]
       else
         # otherwise, manually go to the db to check things
-        if nd.node && nd.node.visible?
-          ordered_nodes[nd.sequence_id] = nd.node_id.to_s
-        end
+        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node&.visible?
       end
     end
 
@@ -165,9 +184,7 @@ class Way < ActiveRecord::Base
     Way.transaction do
       lock!
       check_consistency(self, new_way, user)
-      unless new_way.preconditions_ok?(nds)
-        raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid."
-      end
+      raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds)
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
@@ -180,9 +197,8 @@ class Way < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
-    unless preconditions_ok?
-      raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid."
-    end
+    raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok?
+
     self.version = 0
     self.visible = true
     save_with_history!
@@ -190,9 +206,7 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if nds.empty?
-    if nds.length > MAX_NUMBER_OF_WAY_NODES
-      raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES)
-    end
+    raise OSM::APITooManyWayNodesError.new(id, nds.length, Settings.max_number_of_way_nodes) if nds.length > Settings.max_number_of_way_nodes
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
     # be deleted when they're in-use.
@@ -240,9 +254,10 @@ class Way < ActiveRecord::Base
   # to IDs +id_map+.
   def fix_placeholders!(id_map, placeholder_id = nil)
     nds.map! do |node_id|
-      if node_id < 0
+      if node_id.negative?
         new_id = id_map[:node][node_id]
         raise OSM::APIBadUserInput, "Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}" if new_id.nil?
+
         new_id
       else
         node_id