Fix new rubocop warnings

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 0b01daf2964bad39810e284874c9d30a950660bf..f481e4412da7517b835b9d3200158fb6ff05fee4 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -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+(.+)$}