X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a35b1943302dbd2d2b6515b2a712956a88e4e4ce..d0c63b6d5dbf6580c333e1d638d19fc17fd2a351:/lib/potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 38091861a..7a7926f04 100644
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -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