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

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index cfb602817..29ab4535a 100644
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -186,6 +186,17 @@ module Potlatch
         }
       end
 
+      # Read POI presets
+      icon_list=[]; icon_tags={};
+      File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file|
+        file.each_line {|line|
+          (icon,tags)=line.chomp.split("\t")
+          icon_list.push(icon)
+          icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
+        }
+      end
+      icon_list.reverse!
+      
       # Read auto-complete
       autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};
       File.open("#{RAILS_ROOT}/config/potlatch/autocomplete.txt") do |file|
@@ -199,10 +210,7 @@ module Potlatch
         }
       end
 
-	  # Read internationalisation
-	  localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml"))
-
-      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,localised]
+      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,{},icon_tags]
     end
   end