X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..dd4e7667885db46bc24a79be6431e27cdad13b07:/app/controllers/amf_controller.rb?ds=sidebyside

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 75dc16458..fb50b6aad 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -38,8 +38,8 @@
 class AmfController < ApplicationController
   include Potlatch
 
-  skip_before_filter :verify_authenticity_token
-  before_filter :check_api_writable
+  skip_before_action :verify_authenticity_token
+  before_action :check_api_writable
 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.
@@ -51,17 +51,17 @@ class AmfController < ApplicationController
       logger.info("Executing AMF #{message}(#{args.join(',')})")
 
       case message
-        when 'getpresets' then        result = getpresets(*args)
-        when 'whichways' then         result = whichways(*args)
-        when 'whichways_deleted' then result = whichways_deleted(*args)
-        when 'getway' then            result = getway(args[0].to_i)
-        when 'getrelation' then       result = getrelation(args[0].to_i)
-        when 'getway_old' then        result = getway_old(args[0].to_i, args[1])
-        when 'getway_history' then    result = getway_history(args[0].to_i)
-        when 'getnode_history' then   result = getnode_history(args[0].to_i)
-        when 'findgpx' then           result = findgpx(*args)
-        when 'findrelations' then     result = findrelations(*args)
-        when 'getpoi' then            result = getpoi(*args)
+      when "getpresets" then        result = getpresets(*args)
+      when "whichways" then         result = whichways(*args)
+      when "whichways_deleted" then result = whichways_deleted(*args)
+      when "getway" then            result = getway(args[0].to_i)
+      when "getrelation" then       result = getrelation(args[0].to_i)
+      when "getway_old" then        result = getway_old(args[0].to_i, args[1])
+      when "getway_history" then    result = getway_history(args[0].to_i)
+      when "getnode_history" then   result = getnode_history(args[0].to_i)
+      when "findgpx" then           result = findgpx(*args)
+      when "findrelations" then     result = findrelations(*args)
+      when "getpoi" then            result = getpoi(*args)
       end
 
       result
@@ -82,15 +82,20 @@ class AmfController < ApplicationController
         result = [-5, nil]
       else
         case message
-          when 'putway' then         orn = renumberednodes.dup
-                                     result = putway(renumberednodes, *args)
-                                     result[4] = renumberednodes.reject { |k, _v| orn.key?(k) }
-                                     if result[0] == 0 && result[2] != result[3] then renumberedways[result[2]] = result[3] end
-          when 'putrelation' then    result = putrelation(renumberednodes, renumberedways, *args)
-          when 'deleteway' then      result = deleteway(*args)
-          when 'putpoi' then         result = putpoi(*args)
-                                     if result[0] == 0 && result[2] != result[3] then renumberednodes[result[2]] = result[3] end
-          when 'startchangeset' then result = startchangeset(*args)
+        when "putway" then
+          orn = renumberednodes.dup
+          result = putway(renumberednodes, *args)
+          result[4] = renumberednodes.reject { |k, _v| orn.key?(k) }
+          renumberedways[result[2]] = result[3] if result[0] == 0 && result[2] != result[3]
+        when "putrelation" then
+          result = putrelation(renumberednodes, renumberedways, *args)
+        when "deleteway" then
+          result = deleteway(*args)
+        when "putpoi" then
+          result = putpoi(*args)
+          renumberednodes[result[2]] = result[3] if result[0] == 0 && result[2] != result[3]
+        when "startchangeset" then
+          result = startchangeset(*args)
         end
 
         err = true if result[0] == -3  # If a conflict is detected, don't execute any more writes
@@ -114,7 +119,7 @@ class AmfController < ApplicationController
     return [-2, "Sorry - I can't get the map for that area. The server said: #{ex}"]
   rescue OSM::APIError => ex
     return [-1, ex.to_s]
-  rescue Exception => ex
+  rescue StandardError => ex
     return [-2, "An unusual error happened (in #{call}). The server said: #{ex}"]
   end
 
@@ -132,12 +137,12 @@ class AmfController < ApplicationController
   def startchangeset(usertoken, cstags, closeid, closecomment, opennew)
     amf_handle_error("'startchangeset'", nil, nil) do
       user = getuser(usertoken)
-      unless user then return -1, "You are not logged in, so Potlatch can't write any changes to the database." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
-      if REQUIRE_TERMS_AGREED && user.terms_agreed.nil? then return -1, "You must accept the contributor terms before you can edit." end
+      return -1, "You are not logged in, so Potlatch can't write any changes to the database." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
+      return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
 
       if cstags
-        unless tags_ok(cstags) then return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end
+        return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(cstags)
         cstags = strip_non_xml_chars cstags
       end
 
@@ -150,7 +155,7 @@ class AmfController < ApplicationController
         elsif closecomment.empty?
           cs.save!
         else
-          cs.tags['comment'] = closecomment
+          cs.tags["comment"] = closecomment
           # in case closecomment has chars not allowed in xml
           cs.tags = strip_non_xml_chars cs.tags
           cs.save_with_tags!
@@ -163,7 +168,7 @@ class AmfController < ApplicationController
         cs.tags = cstags
         cs.user_id = user.id
         unless closecomment.empty?
-          cs.tags['comment'] = closecomment
+          cs.tags["comment"] = closecomment
           # in case closecomment has chars not allowed in xml
           cs.tags = strip_non_xml_chars cs.tags
         end
@@ -171,9 +176,9 @@ class AmfController < ApplicationController
         cs.created_at = Time.now.getutc
         cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT
         cs.save_with_tags!
-        return [0, '', cs.id]
+        return [0, "", cs.id]
       else
-        return [0, '', nil]
+        return [0, "", nil]
       end
     end
   end
@@ -210,12 +215,12 @@ class AmfController < ApplicationController
 
   def getlocalized(lang)
     # What we end up actually using. Reported in Potlatch's created_by=* string
-    loaded_lang = 'en'
+    loaded_lang = "en"
 
     # Load English defaults
     en = YAML.load(File.open("#{Rails.root}/config/potlatch/locales/en.yml"))["en"]
 
-    if lang == 'en'
+    if lang == "en"
       return [loaded_lang, en]
     else
       # Use English as a fallback
@@ -249,8 +254,10 @@ class AmfController < ApplicationController
   def whichways(xmin, ymin, xmax, ymax) #:doc:
     amf_handle_error_with_timeout("'whichways'", nil, nil) do
       enlarge = [(xmax - xmin) / 8, 0.01].min
-      xmin -= enlarge; ymin -= enlarge
-      xmax += enlarge; ymax += enlarge
+      xmin -= enlarge
+      ymin -= enlarge
+      xmax += enlarge
+      ymax += enlarge
 
       # check boundary is sane and area within defined
       # see /config/application.yml
@@ -281,7 +288,7 @@ class AmfController < ApplicationController
         relations = relations.collect { |relation| [relation.id, relation.version] }.uniq
       end
 
-      [0, '', ways, points, relations]
+      [0, "", ways, points, relations]
     end
   end
 
@@ -291,8 +298,10 @@ class AmfController < ApplicationController
   def whichways_deleted(xmin, ymin, xmax, ymax) #:doc:
     amf_handle_error_with_timeout("'whichways_deleted'", nil, nil) do
       enlarge = [(xmax - xmin) / 8, 0.01].min
-      xmin -= enlarge; ymin -= enlarge
-      xmax += enlarge; ymax += enlarge
+      xmin -= enlarge
+      ymin -= enlarge
+      xmax += enlarge
+      ymax += enlarge
 
       # check boundary is sane and area within defined
       # see /config/application.yml
@@ -303,7 +312,7 @@ class AmfController < ApplicationController
       nodes_in_area = Node.bbox(bbox).joins(:ways_via_history).where(:current_ways => { :visible => false })
       way_ids = nodes_in_area.collect { |node| node.ways_via_history.invisible.collect(&:id) }.flatten.uniq
 
-      [0, '', way_ids]
+      [0, "", way_ids]
     end
   end
 
@@ -311,7 +320,7 @@ class AmfController < ApplicationController
   # Returns the way id, a Potlatch-style array of points, a hash of tags, the version number, and the user ID.
 
   def getway(wayid) #:doc:
-    amf_handle_error_with_timeout("'getway' #{wayid}", 'way', wayid) do
+    amf_handle_error_with_timeout("'getway' #{wayid}", "way", wayid) do
       if POTLATCH_USE_SQL
         points = sql_get_nodes_in_way(wayid)
         tags = sql_get_tags_in_way(wayid)
@@ -324,11 +333,11 @@ class AmfController < ApplicationController
         way = Way.where(:id => wayid).first
 
         # check case where way has been deleted or doesn't exist
-        return [-4, 'way', wayid] if way.nil? || !way.visible
+        return [-4, "way", wayid] if way.nil? || !way.visible
 
         points = way.nodes.preload(:node_tags).collect do |node|
           nodetags = node.tags
-          nodetags.delete('created_by')
+          nodetags.delete("created_by")
           [node.lon, node.lat, node.id, nodetags, node.version]
         end
         tags = way.tags
@@ -336,7 +345,7 @@ class AmfController < ApplicationController
         uid = way.changeset.user.id
       end
 
-      [0, '', wayid, points, tags, version, uid]
+      [0, "", wayid, points, tags, version, uid]
     end
   end
 
@@ -356,8 +365,8 @@ class AmfController < ApplicationController
   # 5. is this the current, visible version? (boolean)
 
   def getway_old(id, timestamp) #:doc:
-    amf_handle_error_with_timeout("'getway_old' #{id}, #{timestamp}", 'way', id) do
-      if timestamp == ''
+    amf_handle_error_with_timeout("'getway_old' #{id}, #{timestamp}", "way", id) do
+      if timestamp == ""
         # undelete
         old_way = OldWay.where(:visible => true, :way_id => id).unredacted.order("version DESC").first
         points = old_way.get_nodes_undelete unless old_way.nil?
@@ -367,14 +376,16 @@ class AmfController < ApplicationController
           timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S")
           old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
           unless old_way.nil?
-            points = old_way.get_nodes_revert(timestamp)
-            unless old_way.visible
+            if old_way.visible
+              points = old_way.get_nodes_revert(timestamp)
+            else
               return [-1, "Sorry, the way was deleted at that time - please revert to a previous version.", id]
             end
           end
         rescue ArgumentError
           # thrown by date parsing method. leave old_way as nil for
           # the error handler below.
+          old_way = nil
         end
       end
 
@@ -382,8 +393,8 @@ class AmfController < ApplicationController
         return [-1, "Sorry, the server could not find a way at that time.", id]
       else
         curway = Way.find(id)
-        old_way.tags['history'] = "Retrieved from v#{old_way.version}"
-        return [0, '', id, points, old_way.tags, curway.version, (curway.version == old_way.version && curway.visible)]
+        old_way.tags["history"] = "Retrieved from v#{old_way.version}"
+        return [0, "", id, points, old_way.tags, curway.version, (curway.version == old_way.version && curway.visible)]
       end
     end
   end
@@ -403,11 +414,11 @@ class AmfController < ApplicationController
     revusers = {}
     Way.find(wayid).old_ways.unredacted.collect do |a|
       revdates.push(a.timestamp)
-      unless revusers.key?(a.timestamp.to_i) then revusers[a.timestamp.to_i] = change_user(a) end
+      revusers[a.timestamp.to_i] = change_user(a) unless revusers.key?(a.timestamp.to_i)
       a.nds.each do |n|
         Node.find(n).old_nodes.unredacted.collect do |o|
           revdates.push(o.timestamp)
-          unless revusers.key?(o.timestamp.to_i) then revusers[o.timestamp.to_i] = change_user(o) end
+          revusers[o.timestamp.to_i] = change_user(o) unless revusers.key?(o.timestamp.to_i)
         end
       end
     end
@@ -424,9 +435,9 @@ class AmfController < ApplicationController
     revdates.collect! { |d| [(d + 1).strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] }
     revdates.uniq!
 
-    return ['way', wayid, revdates]
+    return ["way", wayid, revdates]
   rescue ActiveRecord::RecordNotFound
-    return ['way', wayid, []]
+    return ["way", wayid, []]
   end
 
   # Find history of a node. Returns 'node', id, and an array of previous versions as above.
@@ -435,14 +446,14 @@ class AmfController < ApplicationController
     history = Node.find(nodeid).old_nodes.unredacted.reverse.collect do |old_node|
       [(old_node.timestamp + 1).strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node)
     end
-    return ['node', nodeid, history]
+    return ["node", nodeid, history]
   rescue ActiveRecord::RecordNotFound
-    return ['node', nodeid, []]
+    return ["node", nodeid, []]
   end
 
   def change_user(obj)
     user_object = obj.changeset.user
-    user = user_object.data_public? ? user_object.display_name : 'anonymous'
+    user = user_object.data_public? ? user_object.display_name : "anonymous"
     uid  = user_object.data_public? ? user_object.id : 0
     [user, uid]
   end
@@ -453,8 +464,9 @@ class AmfController < ApplicationController
   def findgpx(searchterm, usertoken)
     amf_handle_error_with_timeout("'findgpx'", nil, nil) do
       user = getuser(usertoken)
-      unless user then return -1, "You must be logged in to search for GPX traces." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
+
+      return -1, "You must be logged in to search for GPX traces." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
 
       query = Trace.visible_to(user)
       if searchterm.to_i > 0
@@ -465,7 +477,7 @@ class AmfController < ApplicationController
       gpxs = query.collect do |gpx|
         [gpx.id, gpx.name, gpx.description]
       end
-      [0, '', gpxs]
+      [0, "", gpxs]
     end
   end
 
@@ -479,11 +491,11 @@ class AmfController < ApplicationController
   # 5. version.
 
   def getrelation(relid) #:doc:
-    amf_handle_error("'getrelation' #{relid}", 'relation', relid) do
+    amf_handle_error("'getrelation' #{relid}", "relation", relid) do
       rel = Relation.where(:id => relid).first
 
-      return [-4, 'relation', relid] if rel.nil? || !rel.visible
-      [0, '', relid, rel.tags, rel.members, rel.version]
+      return [-4, "relation", relid] if rel.nil? || !rel.visible
+      [0, "", relid, rel.tags, rel.members, rel.version]
     end
   end
 
@@ -515,13 +527,14 @@ class AmfController < ApplicationController
   # 3. version.
 
   def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc:
-    amf_handle_error("'putrelation' #{relid}", 'relation', relid)  do
+    amf_handle_error("'putrelation' #{relid}", "relation", relid)  do
       user = getuser(usertoken)
-      unless user then return -1, "You are not logged in, so the relation could not be saved." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
-      if REQUIRE_TERMS_AGREED && user.terms_agreed.nil? then return -1, "You must accept the contributor terms before you can edit." end
 
-      unless tags_ok(tags) then return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end
+      return -1, "You are not logged in, so the relation could not be saved." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
+      return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
+
+      return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(tags)
       tags = strip_non_xml_chars tags
 
       relid = relid.to_i
@@ -531,9 +544,7 @@ class AmfController < ApplicationController
       relation = nil
       Relation.transaction do
         # create a new relation, or find the existing one
-        if relid > 0
-          relation = Relation.find(relid)
-        end
+        relation = Relation.find(relid) if relid > 0
         # We always need a new node, based on the data that has been sent to us
         new_relation = Relation.new
 
@@ -542,8 +553,8 @@ class AmfController < ApplicationController
         members.each do |m|
           mid = m[1].to_i
           if mid < 0
-            mid = renumberednodes[mid] if m[0] == 'Node'
-            mid = renumberedways[mid] if m[0] == 'Way'
+            mid = renumberednodes[mid] if m[0] == "Node"
+            mid = renumberedways[mid] if m[0] == "Way"
           end
           if mid
             typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")]
@@ -572,9 +583,9 @@ class AmfController < ApplicationController
       end # transaction
 
       if relid <= 0
-        return [0, '', relid, new_relation.id, new_relation.version]
+        return [0, "", relid, new_relation.id, new_relation.version]
       else
-        return [0, '', relid, relid, relation.version]
+        return [0, "", relid, relid, relation.version]
       end
     end
   end
@@ -600,20 +611,21 @@ class AmfController < ApplicationController
   # 3. new way id,
   # 4. hash of renumbered nodes (old id=>new id),
   # 5. way version,
-  # 6. hash of node versions (node=>version)
+  # 6. hash of changed node versions (node=>version)
+  # 7. hash of deleted node versions (node=>version)
 
   def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:
-    amf_handle_error("'putway' #{originalway}", 'way', originalway) do
+    amf_handle_error("'putway' #{originalway}", "way", originalway) do
       # -- Initialise
 
       user = getuser(usertoken)
-      unless user then return -1, "You are not logged in, so the way could not be saved." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
-      if REQUIRE_TERMS_AGREED && user.terms_agreed.nil? then return -1, "You must accept the contributor terms before you can edit." end
+      return -1, "You are not logged in, so the way could not be saved." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
+      return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
 
-      if pointlist.length < 2 then return -2, "Server error - way is only #{points.length} points long." end
+      return -2, "Server error - way is only #{pointlist.length} points long." if pointlist.length < 2
 
-      unless tags_ok(attributes) then return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end
+      return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(attributes)
       attributes = strip_non_xml_chars attributes
 
       originalway = originalway.to_i
@@ -630,9 +642,10 @@ class AmfController < ApplicationController
           id = a[2].to_i
           version = a[3].to_i
 
-          if id == 0  then return -2, "Server error - node with id 0 found in way #{originalway}." end
-          if lat == 90 then return -2, "Server error - node with latitude -90 found in way #{originalway}." end
-          if renumberednodes[id] then id = renumberednodes[id] end
+          return -2, "Server error - node with id 0 found in way #{originalway}." if id == 0
+          return -2, "Server error - node with latitude -90 found in way #{originalway}." if lat == 90
+
+          id = renumberednodes[id]  if renumberednodes[id]
 
           node = Node.new
           node.changeset_id = changeset_id
@@ -641,10 +654,10 @@ class AmfController < ApplicationController
           node.tags = a[4]
 
           # fixup node tags in a way as well
-          unless tags_ok(node.tags) then return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end
+          return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(node.tags)
           node.tags = strip_non_xml_chars node.tags
 
-          node.tags.delete('created_by')
+          node.tags.delete("created_by")
           node.version = version
           if id <= 0
             # We're creating the node
@@ -691,14 +704,14 @@ class AmfController < ApplicationController
           new_node.id = id.to_i
           begin
             node.delete_with_history!(new_node, user)
-          rescue OSM::APIPreconditionFailedError => ex
+          rescue OSM::APIPreconditionFailedError
             # We don't do anything here as the node is being used elsewhere
             # and we don't want to delete it
           end
         end
       end # transaction
 
-      [0, '', originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes]
+      [0, "", originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes]
     end
   end
 
@@ -712,13 +725,13 @@ class AmfController < ApplicationController
   # 4. version.
 
   def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) #:doc:
-    amf_handle_error("'putpoi' #{id}", 'node', id) do
+    amf_handle_error("'putpoi' #{id}", "node", id) do
       user = getuser(usertoken)
-      unless user then return -1, "You are not logged in, so the point could not be saved." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
-      if REQUIRE_TERMS_AGREED && user.terms_agreed.nil? then return -1, "You must accept the contributor terms before you can edit." end
+      return -1, "You are not logged in, so the point could not be saved." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
+      return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
 
-      unless tags_ok(tags) then return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end
+      return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(tags)
       tags = strip_non_xml_chars tags
 
       id = id.to_i
@@ -727,10 +740,14 @@ class AmfController < ApplicationController
       new_node = nil
       Node.transaction do
         if id > 0
-          node = Node.find(id)
+          begin
+            node = Node.find(id)
+          rescue ActiveRecord::RecordNotFound
+            return [-4, "node", id]
+          end
 
-          unless visible
-            unless node.ways.empty? then return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version end
+          unless visible || node.ways.empty?
+            return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version
           end
         end
         # We always need a new node, based on the data that has been sent to us
@@ -756,9 +773,9 @@ class AmfController < ApplicationController
       end # transaction
 
       if id <= 0
-        return [0, '', id, new_node.id, new_node.version]
+        return [0, "", id, new_node.id, new_node.version]
       else
-        return [0, '', id, node.id, node.version]
+        return [0, "", id, node.id, node.version]
       end
     end
   end
@@ -769,18 +786,20 @@ class AmfController < ApplicationController
   # Returns array of id, long, lat, hash of tags, (current) version.
 
   def getpoi(id, timestamp) #:doc:
-    amf_handle_error("'getpoi' #{id}", 'node', id) do
+    amf_handle_error("'getpoi' #{id}", "node", id) do
       id = id.to_i
-      n = Node.find(id)
-      v = n.version
-      unless timestamp == ''
-        n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
+      n = Node.where(:id => id).first
+      if n
+        v = n.version
+        unless timestamp == ""
+          n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first
+        end
       end
 
       if n
-        return [0, '', n.id, n.lon, n.lat, n.tags, v]
+        return [0, "", id, n.lon, n.lat, n.tags, v]
       else
-        return [-4, 'node', id]
+        return [-4, "node", id]
       end
     end
   end
@@ -796,11 +815,11 @@ class AmfController < ApplicationController
   # Returns 0 (success), unchanged way id, new way version, new node versions.
 
   def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) #:doc:
-    amf_handle_error("'deleteway' #{way_id}", 'way', way_id) do
+    amf_handle_error("'deleteway' #{way_id}", "way", way_id) do
       user = getuser(usertoken)
-      unless user then return -1, "You are not logged in, so the way could not be deleted." end
-      if user.blocks.active.exists? then return -1, t('application.setup_user_auth.blocked') end
-      if REQUIRE_TERMS_AGREED && user.terms_agreed.nil? then return -1, "You must accept the contributor terms before you can edit." end
+      return -1, "You are not logged in, so the way could not be deleted." unless user
+      return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists?
+      return -1, "You must accept the contributor terms before you can edit." if REQUIRE_TERMS_AGREED && user.terms_agreed.nil?
 
       way_id = way_id.to_i
       nodeversions = {}
@@ -827,13 +846,13 @@ class AmfController < ApplicationController
           begin
             node.delete_with_history!(new_node, user)
             nodeversions[node.id] = node.version
-          rescue OSM::APIPreconditionFailedError => ex
+          rescue OSM::APIPreconditionFailedError
             # We don't do anything with the exception as the node is in use
             # elsewhere and we don't want to delete it
           end
         end
       end # transaction
-      [0, '', way_id, old_way.version, nodeversions]
+      [0, "", way_id, old_way.version, nodeversions]
     end
   end
 
@@ -896,7 +915,7 @@ class AmfController < ApplicationController
        AND current_ways.visible=TRUE
        AND #{OSM.sql_for_area(bbox, "current_nodes.")}
     EOF
-    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['wayid'].to_i, a['version'].to_i] }
+    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a["wayid"].to_i, a["version"].to_i] }
   end
 
   def sql_find_pois_in_area(bbox)
@@ -912,9 +931,9 @@ class AmfController < ApplicationController
     ActiveRecord::Base.connection.select_all(sql).each do |row|
       poitags = {}
       ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
-        poitags[n['k']] = n['v']
+        poitags[n["k"]] = n["v"]
       end
-      pois << [row['id'].to_i, row['lon'].to_f, row['lat'].to_f, poitags, row['version'].to_i]
+      pois << [row["id"].to_i, row["lon"].to_f, row["lat"].to_f, poitags, row["version"].to_i]
     end
     pois
   end
@@ -939,7 +958,7 @@ class AmfController < ApplicationController
          AND crm.member_id IN (#{way_ids.join(',')})
         EOF
     end
-    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i, a['version'].to_i] }
+    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a["relid"].to_i, a["version"].to_i] }
   end
 
   def sql_get_nodes_in_way(wayid)
@@ -955,10 +974,10 @@ class AmfController < ApplicationController
     ActiveRecord::Base.connection.select_all(sql).each do |row|
       nodetags = {}
       ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
-        nodetags[n['k']] = n['v']
+        nodetags[n["k"]] = n["v"]
       end
-      nodetags.delete('created_by')
-      points << [row['lon'].to_f, row['lat'].to_f, row['id'].to_i, nodetags, row['version'].to_i]
+      nodetags.delete("created_by")
+      points << [row["lon"].to_f, row["lat"].to_f, row["id"].to_i, nodetags, row["version"].to_i]
     end
     points
   end
@@ -966,16 +985,16 @@ class AmfController < ApplicationController
   def sql_get_tags_in_way(wayid)
     tags = {}
     ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row|
-      tags[row['k']] = row['v']
+      tags[row["k"]] = row["v"]
     end
     tags
   end
 
   def sql_get_way_version(wayid)
-    ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")['version']
+    ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")["version"]
   end
 
   def sql_get_way_user(wayid)
-    ActiveRecord::Base.connection.select_one("SELECT user FROM current_ways,changesets WHERE current_ways.id=#{wayid.to_i} AND current_ways.changeset=changesets.id")['user']
+    ActiveRecord::Base.connection.select_one("SELECT user FROM current_ways,changesets WHERE current_ways.id=#{wayid.to_i} AND current_ways.changeset=changesets.id")["user"]
   end
 end