cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert r18163 as it is completely broken.

Browse source
This commit is contained in:
Tom Hughes 2009-10-15 07:46:54 +00:00
parent a35b194330
commit d0c63b6d5d
4 changed files with 30 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/potlatch.rb
View file

@ -187,11 +187,12 @@ module Potlatch
end
# Read POI presets
icon_list=[]; icon_tags={};
icon_list=[]; icon_names={}; icon_tags={};
File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file|
file.each_line {|line|
(icon,tags)=line.chomp.split("\t")
(icon,name,tags)=line.chomp.split("\t")
icon_list.push(icon)
icon_names[icon]=name
icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
}
end
@ -210,7 +211,7 @@ module Potlatch
}
end
[presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,nil,icon_tags]
[presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,icon_names,icon_tags]
end
end