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

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 76944e3940de39e27ec8cd9ffe3845afae56a9d3..f481e4412da7517b835b9d3200158fb6ff05fee4 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -24,7 +24,7 @@ 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
 
       a[0]
     end
 


@@ -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
 


@@ -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,8 +177,8 @@ module Potlatch
       presetnames = { "point" => {}, "way" => {}, "POI" => {} }
       presettype = ""
       presetcategory = ""
       presetnames = { "point" => {}, "way" => {}, "POI" => {} }
       presettype = ""
       presetcategory = ""

-      #        StringIO.open(txt) do |file|
-      File.open(Rails.root.join("config", "potlatch", "presets.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
           if t =~ %r{(\w+)/(\w+)}
         file.each_line do |line|
           t = line.chomp
           if t =~ %r{(\w+)/(\w+)}


@@ -201,7 +202,7 @@ module Potlatch
       colours = {}
       casing = {}
       areas = {}
       colours = {}
       casing = {}
       areas = {}

-      File.open(Rails.root.join("config", "potlatch", "colours.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/colours.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 


@@ -216,7 +217,7 @@ module Potlatch
       relcolours = {}
       relalphas = {}
       relwidths = {}
       relcolours = {}
       relalphas = {}
       relwidths = {}

-      File.open(Rails.root.join("config", "potlatch", "relation_colours.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/relation_colours.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 


@@ -230,7 +231,7 @@ module Potlatch
       # Read POI presets
       icon_list = []
       icon_tags = {}
       # Read POI presets
       icon_list = []
       icon_tags = {}

-      File.open(Rails.root.join("config", "potlatch", "icon_presets.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/icon_presets.txt")) do |file|

         file.each_line do |line|
           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)
         file.each_line do |line|
           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)


@@ -241,7 +242,7 @@ module Potlatch
 
       # Read auto-complete
       autotags = { "point" => {}, "way" => {}, "POI" => {} }
 
       # Read auto-complete
       autotags = { "point" => {}, "way" => {}, "POI" => {} }

-      File.open(Rails.root.join("config", "potlatch", "autocomplete.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/autocomplete.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}
 
         file.each_line do |line|
           next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}