X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..64b3e289ac14533c6fb2b1223b6417ad0446878c:/lib/potlatch.rb diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 49e1e7a74..f481e4412 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -24,7 +24,7 @@ module Potlatch # 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 @@ -178,7 +178,7 @@ module Potlatch presettype = "" presetcategory = "" # StringIO.open(txt) do |file| - File.open(Rails.root.join("config", "potlatch", "presets.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+)} @@ -202,7 +202,7 @@ module Potlatch 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]+)/ @@ -217,7 +217,7 @@ module Potlatch 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]+)/ @@ -231,7 +231,7 @@ module Potlatch # 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) @@ -242,7 +242,7 @@ module Potlatch # 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+(.+)$}