X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/212d56ce884b5f1ff036a1508ffe397381cf7e1b..3acd63cd7a65a4a3f02d4df2b2714a1d0a04b6df:/lib/potlatch.rb diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 7a7926f04..29ab4535a 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -187,12 +187,11 @@ module Potlatch end # Read POI presets - icon_list=[]; icon_names={}; icon_tags={}; + icon_list=[]; icon_tags={}; File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file| file.each_line {|line| - (icon,name,tags)=line.chomp.split("\t") + (icon,tags)=line.chomp.split("\t") icon_list.push(icon) - icon_names[icon]=name icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten] } end @@ -211,7 +210,7 @@ module Potlatch } end - [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,icon_names,icon_tags] + [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,{},icon_tags] end end