X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ab3df6fc56a2a16c6af65ac429505d682153a60d..39a1600c3ab98991e717515c4366c047d1fdf283:/lib/potlatch.rb diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 898a5a07f..6fe0b0152 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -40,7 +40,7 @@ module Potlatch 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 @@ -85,7 +85,7 @@ module Potlatch a + 0.chr + 0.chr + 9.chr when String 2.chr + encodestring(n) - when Numeric + when Numeric, GeoRecord::Coord 0.chr + encodedouble(n) when NilClass 5.chr @@ -107,7 +107,7 @@ module Potlatch # 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 @@ -162,11 +162,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 +176,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