Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 27ee0253bbc4a569a0b0be1cf4b2a49c07561733..717622762e9a383402ed7135fdfd540f0395bd85 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -24,15 +24,13 @@ 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)

-      getlong(s).times.collect do
-        getvalue(s)
-      end
+      Array.new(getlong(s)) { getvalue(s) }

     end
 
     # Return object/hash
     end
 
     # Return object/hash


@@ -42,23 +40,22 @@ module Potlatch
         break if key == ""
         arr[key] = getvalue(s)
       end
         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
 
     # 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 getdouble(s)                  # number
+      when 1 then s.getbyte                     # boolean
+      when 2 then getstring(s)                  # string
+      when 3 then getobject(s)                  # object/hash
+      when 5 then nil                           # null
+      when 6 then nil                           # undefined
+      when 8 then s.read(4) # mixedArray
+                  getobject(s)                  #  |
+      when 10 then getarray(s)                  # array

       end
     end
 
       end
     end
 


@@ -180,21 +177,21 @@ module Potlatch
       presettype = ""
       presetcategory = ""
       #        StringIO.open(txt) do |file|
       presettype = ""
       presetcategory = ""
       #        StringIO.open(txt) do |file|

-      File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
-        file.each_line do|line|
+      File.open(Rails.root.join("config", "potlatch", "presets.txt")) do |file|
+        file.each_line do |line|

           t = line.chomp
           if t =~ %r{(\w+)/(\w+)}
           t = line.chomp
           if t =~ %r{(\w+)/(\w+)}

-            presettype = $1
-            presetcategory = $2
+            presettype = Regexp.last_match(1)
+            presetcategory = Regexp.last_match(2)

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

-            pre = $1
-            kv = $2
+            pre = Regexp.last_match(1)
+            kv = Regexp.last_match(2)

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

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

             end
           end
         end
             end
           end
         end


@@ -204,14 +201,14 @@ module Potlatch
       colours = {}
       casing = {}
       areas = {}
       colours = {}
       casing = {}
       areas = {}

-      File.open("#{Rails.root}/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]+)/
 

-          tag = $1
-          colours[tag] = $2.hex if $2 != "-"
-          casing[tag] = $3.hex if $3 != "-"
-          areas[tag] = $4.hex if $4 != "-"
+          tag = Regexp.last_match(1)
+          colours[tag] = Regexp.last_match(2).hex if Regexp.last_match(2) != "-"
+          casing[tag] = Regexp.last_match(3).hex if Regexp.last_match(3) != "-"
+          areas[tag] = Regexp.last_match(4).hex if Regexp.last_match(4) != "-"

         end
       end
 
         end
       end
 


@@ -219,21 +216,21 @@ module Potlatch
       relcolours = {}
       relalphas = {}
       relwidths = {}
       relcolours = {}
       relalphas = {}
       relwidths = {}

-      File.open("#{Rails.root}/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]+)/
 

-          tag = $1
-          relcolours[tag] = $2.hex if $2 != "-"
-          relalphas[tag] = $3.to_i if $3 != "-"
-          relwidths[tag] = $4.to_i if $4 != "-"
+          tag = Regexp.last_match(1)
+          relcolours[tag] = Regexp.last_match(2).hex if Regexp.last_match(2) != "-"
+          relalphas[tag] = Regexp.last_match(3).to_i if Regexp.last_match(3) != "-"
+          relwidths[tag] = Regexp.last_match(4).to_i if Regexp.last_match(4) != "-"

         end
       end
 
       # Read POI presets
       icon_list = []
       icon_tags = {}
         end
       end
 
       # Read POI presets
       icon_list = []
       icon_tags = {}

-      File.open("#{Rails.root}/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)


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

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

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

-          tag = $1
-          type = $2
-          values = $3
-          if values == "-"
-            autotags[type][tag] = []
-          else
-            autotags[type][tag] = values.split(",").sort.reverse
-          end
+          tag = Regexp.last_match(1)
+          type = Regexp.last_match(2)
+          values = Regexp.last_match(3)
+          autotags[type][tag] = if values == "-"
+                                  []
+                                else
+                                  values.split(",").sort.reverse
+                                end

         end
       end
 
         end
       end