Issue reopens on Reports coming in after instance update

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 29cc9343053552de413f712002e65165aa936ded..f7661e39dbf177fe678cf0b56e208a8daeddd9ef 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -1,4 +1,4 @@
-require 'stringio'
+require "stringio"

 
 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch
 
 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch


@@ -24,44 +24,39 @@ module Potlatch
 
     # Return eight-byte double-precision float
     def self.getdouble(s)
 
     # Return eight-byte double-precision float
     def self.getdouble(s)

-      a = s.read(8).unpack('G')                        # G big-endian, E little-endian
+      a = s.read(8).unpack("G")        # G big-endian, E little-endian

       a[0]
     end
 
     # Return numeric array
     def self.getarray(s)
       a[0]
     end
 
     # Return numeric array
     def self.getarray(s)

-      len = getlong(s)
-      arr = []
-      for i in (0..len - 1)
-        arr[i] = getvalue(s)
-      end
-      arr
+      Array.new(getlong(s)) { getvalue(s) }

     end
 
     # Return object/hash
     def self.getobject(s)
       arr = {}
       while (key = getstring(s))
     end
 
     # Return object/hash
     def self.getobject(s)
       arr = {}
       while (key = getstring(s))

-        if (key == '') then break end
+        break if key == ""

         arr[key] = getvalue(s)
       end
         arr[key] = getvalue(s)
       end

-      s.getbyte                # skip the 9 'end of object' value
+      s.getbyte        # skip the 9 'end of object' value

       arr
     end
 
     # Parse and get value
     def self.getvalue(s)
       case s.getbyte
       arr
     end
 
     # Parse and get value
     def self.getvalue(s)
       case s.getbyte

-      when 0 then      return getdouble(s)                     # number
-      when 1 then      return s.getbyte                        # boolean
-      when 2 then      return getstring(s)                     # string
-      when 3 then      return getobject(s)                     # object/hash
-      when 5 then      return nil                              # null
-      when 6 then      return nil                              # undefined
-      when 8 then      s.read(4)                               # mixedArray
-                  return getobject(s)                  #  |
-      when 10 then  return getarray(s)                 # array
-      else;    return nil                              # error
+      when 0 then return getdouble(s)                  # number
+      when 1 then return s.getbyte                     # boolean
+      when 2 then return getstring(s)                  # string
+      when 3 then return getobject(s)                  # object/hash
+      when 5 then return nil                           # null
+      when 6 then return nil                           # undefined
+      when 8 then s.read(4)                            # mixedArray
+                  return getobject(s)                  #  |
+      when 10 then return getarray(s)                  # array
+      else         return nil                          # error

       end
     end
 
       end
     end
 


@@ -71,35 +66,36 @@ module Potlatch
       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)
       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)

+      d

     end
 
     # Pack variables as AMF
     def self.encodevalue(n)
       case n.class.to_s
     end
 
     # Pack variables as AMF
     def self.encodevalue(n)
       case n.class.to_s

-      when 'Array'
+      when "Array"

         a = 10.chr + encodelong(n.length)
         n.each do |b|
           a += encodevalue(b)
         end
         a
         a = 10.chr + encodelong(n.length)
         n.each do |b|
           a += encodevalue(b)
         end
         a

-      when 'Hash'
+      when "Hash"

         a = 3.chr
         n.each do |k, v|
           a += encodestring(k.to_s) + encodevalue(v)
         end
         a + 0.chr + 0.chr + 9.chr
         a = 3.chr
         n.each do |k, v|
           a += encodestring(k.to_s) + encodevalue(v)
         end
         a + 0.chr + 0.chr + 9.chr

-      when 'String'
+      when "String"

         2.chr + encodestring(n)
         2.chr + encodestring(n)

-      when 'Bignum', 'Fixnum', 'Float'
+      when "Bignum", "Fixnum", "Float"

         0.chr + encodedouble(n)
         0.chr + encodedouble(n)

-      when 'NilClass'
+      when "NilClass"

         5.chr
         5.chr

-    when 'TrueClass'
-      0.chr + encodedouble(1)
-    when 'FalseClass'
-      0.chr + encodedouble(0)
-    else
-      Rails.logger.error("Unexpected Ruby type for AMF conversion: " + n.class.to_s)
+      when "TrueClass"
+        0.chr + encodedouble(1)
+      when "FalseClass"
+        0.chr + encodedouble(0)
+      else
+        Rails.logger.error("Unexpected Ruby type for AMF conversion: " + n.class.to_s)

       end
     end
 
       end
     end
 


@@ -112,12 +108,12 @@ module Potlatch
 
     # Encode number as eight-byte double precision float
     def self.encodedouble(n)
 
     # Encode number as eight-byte double precision float
     def self.encodedouble(n)

-      [n].pack('G')
+      [n].pack("G")

     end
 
     # Encode number as four-byte long
     def self.encodelong(n)
     end
 
     # Encode number as four-byte long
     def self.encodelong(n)

-      [n].pack('N')
+      [n].pack("N")

     end
   end
 
     end
   end
 


@@ -154,7 +150,7 @@ module Potlatch
       bodies.times do                     # Read each body
         name = AMF.getstring(@request)    #  | get message name
         index = AMF.getstring(@request)   #  | get index in response sequence
       bodies.times do                     # Read each body
         name = AMF.getstring(@request)    #  | get message name
         index = AMF.getstring(@request)   #  | get index in response sequence

-        bytes = AMF.getlong(@request)     #  | get total size in bytes
+        AMF.getlong(@request)             #  | get total size in bytes

         args = AMF.getvalue(@request)     #  | get response (probably an array)
 
         result = @dispatch.call(name, *args)
         args = AMF.getvalue(@request)     #  | get response (probably an array)
 
         result = @dispatch.call(name, *args)


@@ -177,62 +173,66 @@ module Potlatch
 
       # Read preset menus
       presets = {}
 
       # Read preset menus
       presets = {}

-      presetmenus = {}; presetmenus['point'] = []; presetmenus['way'] = []; presetmenus['POI'] = []
-      presetnames = {}; presetnames['point'] = {}; presetnames['way'] = {}; presetnames['POI'] = {}
-      presettype = ''
-      presetcategory = ''
+      presetmenus = { "point" => [], "way" => [], "POI" => [] }
+      presetnames = { "point" => {}, "way" => {}, "POI" => {} }
+      presettype = ""
+      presetcategory = ""

       #        StringIO.open(txt) do |file|
       File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
       #        StringIO.open(txt) do |file|
       File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|

-        file.each_line do|line|
+        file.each_line do |line|

           t = line.chomp
           t = line.chomp

-          if t =~ /(\w+)\/(\w+)/
+          if t =~ %r{(\w+)/(\w+)}

             presettype = $1
             presetcategory = $2
             presetmenus[presettype].push(presetcategory)
             presetnames[presettype][presetcategory] = ["(no preset)"]
           elsif t =~ /^([\w\s]+):\s?(.+)$/
             presettype = $1
             presetcategory = $2
             presetmenus[presettype].push(presetcategory)
             presetnames[presettype][presetcategory] = ["(no preset)"]
           elsif t =~ /^([\w\s]+):\s?(.+)$/

-            pre = $1; kv = $2
+            pre = $1
+            kv = $2

             presetnames[presettype][presetcategory].push(pre)
             presets[pre] = {}
             presetnames[presettype][presetcategory].push(pre)
             presets[pre] = {}

-            kv.split(',').each do|a|
-              if a =~ /^(.+)=(.*)$/ then presets[pre][$1] = $2 end
+            kv.split(",").each do |a|
+              presets[pre][$1] = $2 if a =~ /^(.+)=(.*)$/

             end
           end
         end
       end
 
       # Read colours/styling
             end
           end
         end
       end
 
       # Read colours/styling

-      colours = {}; casing = {}; areas = {}
+      colours = {}
+      casing = {}
+      areas = {}

       File.open("#{Rails.root}/config/potlatch/colours.txt") do |file|
       File.open("#{Rails.root}/config/potlatch/colours.txt") do |file|

-        file.each_line do|line|
-          t = line.chomp
-          if t =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
-            tag = $1
-            if ($2 != '-') then colours[tag] = $2.hex end
-            if ($3 != '-') then casing[tag] = $3.hex end
-            if ($4 != '-') then areas[tag] = $4.hex end
-          end
+        file.each_line do |line|
+          next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
+
+          tag = $1
+          colours[tag] = $2.hex if $2 != "-"
+          casing[tag] = $3.hex if $3 != "-"
+          areas[tag] = $4.hex if $4 != "-"

         end
       end
 
       # Read relations colours/styling
         end
       end
 
       # Read relations colours/styling

-      relcolours = {}; relalphas = {}; relwidths = {}
+      relcolours = {}
+      relalphas = {}
+      relwidths = {}

       File.open("#{Rails.root}/config/potlatch/relation_colours.txt") do |file|
       File.open("#{Rails.root}/config/potlatch/relation_colours.txt") do |file|

-        file.each_line do|line|
-          t = line.chomp
-          if t =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
-            tag = $1
-            if ($2 != '-') then relcolours[tag] = $2.hex end
-            if ($3 != '-') then relalphas[tag] = $3.to_i end
-            if ($4 != '-') then relwidths[tag] = $4.to_i end
-          end
+        file.each_line do |line|
+          next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
+
+          tag = $1
+          relcolours[tag] = $2.hex if $2 != "-"
+          relalphas[tag] = $3.to_i if $3 != "-"
+          relwidths[tag] = $4.to_i if $4 != "-"

         end
       end
 
       # Read POI presets
         end
       end
 
       # Read POI presets

-      icon_list = []; icon_tags = {}
+      icon_list = []
+      icon_tags = {}

       File.open("#{Rails.root}/config/potlatch/icon_presets.txt") do |file|
       File.open("#{Rails.root}/config/potlatch/icon_presets.txt") do |file|

-        file.each_line do|line|
+        file.each_line do |line|

           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)
           icon_tags[icon] = Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)
           icon_tags[icon] = Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]


@@ -241,15 +241,19 @@ module Potlatch
       icon_list.reverse!
 
       # Read auto-complete
       icon_list.reverse!
 
       # Read auto-complete

-      autotags = {}; autotags['point'] = {}; autotags['way'] = {}; autotags['POI'] = {}
+      autotags = { "point" => {}, "way" => {}, "POI" => {} }

       File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
       File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|

-        file.each_line do|line|
-          t = line.chomp
-          if t =~ /^([\w:]+)\/(\w+)\s+(.+)$/
-            tag = $1; type = $2; values = $3
-            if values == '-' then autotags[type][tag] = []
-            else autotags[type][tag] = values.split(',').sort.reverse end
-          end
+        file.each_line do |line|
+          next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}
+
+          tag = $1
+          type = $2
+          values = $3
+          autotags[type][tag] = if values == "-"
+                                  []
+                                else
+                                  values.split(",").sort.reverse
+                                end

         end
       end
 
         end
       end