# 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)
- getlong(s).times.collect do
- getvalue(s)
- end
+ Array.new(getlong(s)) { getvalue(s) }
end
# Return object/hash
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
# 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
# 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
- 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
- when "String"
+ when String
2.chr + encodestring(n)
- when "Bignum", "Fixnum", "Float"
+ when Numeric, GeoRecord::Coord
0.chr + encodedouble(n)
- when "NilClass"
+ when NilClass
5.chr
- when "TrueClass"
+ when TrueClass
0.chr + encodedouble(1)
- when "FalseClass"
+ when FalseClass
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
# 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
# The Dispatcher class handles decoding a series of RPC calls
# from the request, dispatching them, and encoding the response
class Dispatcher
- def initialize(request, &_block)
+ def initialize(request, &block)
# Get stream for request data
@request = StringIO.new(request + 0.chr)
end
# Capture the dispatch routine
- @dispatch = Proc.new
+ @dispatch = block
end
def each(&_block)
# 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")
presetnames = { "point" => {}, "way" => {}, "POI" => {} }
presettype = ""
presetcategory = ""
- # StringIO.open(txt) do |file|
- File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
- file.each_line do|line|
+ # 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 =~ /(\w+)\/(\w+)/
- presettype = $1
- presetcategory = $2
+ if t =~ %r{(\w+)/(\w+)}
+ presettype = Regexp.last_match(1)
+ presetcategory = Regexp.last_match(2)
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] = {}
- 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
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]+)/
- 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
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]+)/
- 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 = {}
- 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)
# Read auto-complete
autotags = { "point" => {}, "way" => {}, "POI" => {} }
- File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
- file.each_line do|line|
- next unless line.chomp =~ /^([\w:]+)\/(\w+)\s+(.+)$/
-
- tag = $1
- type = $2
- values = $3
- if values == "-"
- autotags[type][tag] = []
- else
- autotags[type][tag] = values.split(",").sort.reverse
- end
+ File.open(Rails.root.join("config/potlatch/autocomplete.txt")) do |file|
+ file.each_line do |line|
+ next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}
+
+ 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
projects / rails.git / blobdiff