Update to iD v2.15.3

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 717622762e9a383402ed7135fdfd540f0395bd85..49e1e7a7404af3a6f248e57e650b98f84a3f8f02 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -38,9 +38,10 @@ module Potlatch
       arr = {}
       while (key = getstring(s))
         break if key == ""
       arr = {}
       while (key = getstring(s))
         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
 
       arr
     end
 


@@ -70,31 +71,31 @@ module Potlatch
 
     # Pack variables as AMF
     def self.encodevalue(n)
 
     # Pack variables as AMF
     def self.encodevalue(n)

-      case n.class.to_s
-      when "Array"
+      case n
+      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 Numeric, GeoRecord::Coord

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

-      when "NilClass"
+      when NilClass

         5.chr
         5.chr

-      when "TrueClass"
+      when TrueClass

         0.chr + encodedouble(1)
         0.chr + encodedouble(1)

-      when "FalseClass"
+      when FalseClass

         0.chr + encodedouble(0)
       else
         0.chr + encodedouble(0)
       else

-        Rails.logger.error("Unexpected Ruby type for AMF conversion: " + n.class.to_s)
+        raise "Unexpected Ruby type for AMF conversion: #{n.class.name}"

       end
     end
 
       end
     end
 


@@ -107,7 +108,7 @@ 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.to_f].pack("G")

     end
 
     # Encode number as four-byte long
     end
 
     # Encode number as four-byte long


@@ -162,11 +163,11 @@ module Potlatch
   # The Potlatch class is a helper for Potlatch
   class Potlatch
     # ----- getpresets
   # The Potlatch class is a helper for Potlatch
   class Potlatch
     # ----- getpresets

-    #            in:   none
-    #            does: reads tag preset menus, colours, and autocomplete config files
-    #        out:  [0] presets, [1] presetmenus, [2] presetnames,
-    #                          [3] colours, [4] casing, [5] areas, [6] autotags
-    #                          (all hashes)
+    #      in:   none
+    #      does: reads tag preset menus, colours, and autocomplete config files
+    #        out:  [0] presets, [1] presetmenus, [2] presetnames,
+    #        [3] colours, [4] casing, [5] areas, [6] autotags
+    #        (all hashes)

     def self.get_presets
       Rails.logger.info("  Message: getpresets")
 
     def self.get_presets
       Rails.logger.info("  Message: getpresets")
 


@@ -176,7 +177,7 @@ module Potlatch
       presetnames = { "point" => {}, "way" => {}, "POI" => {} }
       presettype = ""
       presetcategory = ""
       presetnames = { "point" => {}, "way" => {}, "POI" => {} }
       presettype = ""
       presetcategory = ""

-      #        StringIO.open(txt) do |file|
+      #  StringIO.open(txt) do |file|

       File.open(Rails.root.join("config", "potlatch", "presets.txt")) do |file|
         file.each_line do |line|
           t = line.chomp
       File.open(Rails.root.join("config", "potlatch", "presets.txt")) do |file|
         file.each_line do |line|
           t = line.chomp