Merge remote-tracking branch 'upstream/pull/2182'

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 76944e3940de39e27ec8cd9ffe3845afae56a9d3..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[key] = getvalue(s)
       end
-      s.getbyte        # skip the 9 'end of object' value
+      s.getbyte # skip the 9 'end of object' value
       arr
     end
 
@@ -162,11 +163,11 @@ module Potlatch
   # 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")
 
@@ -176,7 +177,7 @@ module Potlatch
       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