Revert r18163 as it is completely broken.

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 7df237de87e245fa4a15ef24a8c46967fdbb7527..687262e749b3ee21953edae898b7c34e45156c87 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -232,12 +232,6 @@ class AmfController < ApplicationController
     help = localised["help_html"]
     localised.delete("help_html")
 
-    # Populate icon names
-    POTLATCH_PRESETS[10].each { |id|
-      POTLATCH_PRESETS[11][id] = localised["preset_icon_#{id}"]
-      localised.delete("preset_icon_#{id}")
-    }
-
     return POTLATCH_PRESETS+[localised,help]
   end
 

diff --git a/config/potlatch/icon_presets.txt b/config/potlatch/icon_presets.txt
index f81d47c3fa50b51e0058ef8ccbea8d72c691b48f..3269286400f6790b348b6ef8685dc8594b48d1ab 100644 (file)
--- a/config/potlatch/icon_presets.txt
+++ b/config/potlatch/icon_presets.txt
@@ -1,26 +1,26 @@
-airport        amenity=airport
-bus_stop       highway=bus_stop
-ferry_terminal amenity=ferry_terminal
-parking        amenity=parking
-station        railway=station
-taxi   amenity=taxi
-bar    amenity=bar
-cafe   amenity=cafe
-cinema amenity=cinema
-fast_food      amenity=fast_food
-pub    amenity=pub
-restaurant     amenity=restaurant
-theatre        amenity=theatre
-convenience    shop=convenience
-hotel  tourism=hotel
-pharmacy       amenity=pharmacy
-post_box       amenity=post_box
-recycling      amenity=recycling
-supermarket    shop=supermarket
-telephone      amenity=telephone
-fire_station   amenity=fire_station
-hospital       amenity=hospital
-police amenity=police
-place_of_worship       amenity=place_of_worship
-museum tourism=museum
-school amenity=school
+airport        Airport amenity=airport
+bus_stop       Bus stop        highway=bus_stop
+ferry_terminal Ferry   amenity=ferry_terminal
+parking        Parking amenity=parking
+station        Rail station    railway=station
+taxi   Taxi rank       amenity=taxi
+bar    Bar     amenity=bar
+cafe   Cafe    amenity=cafe
+cinema Cinema  amenity=cinema
+fast_food      Fast food       amenity=fast_food
+pub    Pub     amenity=pub
+restaurant     Restaurant      amenity=restaurant
+theatre        Theatre amenity=theatre
+convenience    Convenience shop        shop=convenience
+hotel  Hotel   tourism=hotel
+pharmacy       Pharmacy        amenity=pharmacy
+post_box       Postbox amenity=post_box
+recycling      Recycling       amenity=recycling
+supermarket    Supermarket     shop=supermarket
+telephone      Telephone       amenity=telephone
+fire_station   Fire station    amenity=fire_station
+hospital       Hospital        amenity=hospital
+police Police station  amenity=police
+place_of_worship       Place of worship        amenity=place_of_worship
+museum Museum  tourism=museum
+school School  amenity=school

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 142fc4f794845dfeffff2189059b830bc8eeb438..2c712e211bf546a422b27952262f9575393f41ba 100644 (file)
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -145,29 +145,3 @@ en:
   tip_undo: Undo $1 (Z)
   uploading: Uploading...
   way: Way
-  preset_icon_school: School
-  preset_icon_restaurant: Restaurant
-  preset_icon_station: Rail station
-  preset_icon_airport: Airport
-  preset_icon_police: Police station
-  preset_icon_pharmacy: Pharmacy
-  preset_icon_fast_food: Fast food
-  preset_icon_fire_station: Fire station
-  preset_icon_hotel: Hotel
-  preset_icon_supermarket: Supermarket
-  preset_icon_post_box: Postbox
-  preset_icon_theatre: Theatre
-  preset_icon_ferry_terminal: Ferry
-  preset_icon_bus_stop: Bus stop
-  preset_icon_hospital: Hospital
-  preset_icon_convenience: Convenience shop
-  preset_icon_parking: Parking
-  preset_icon_recycling: Recycling
-  preset_icon_pub: Pub
-  preset_icon_cafe: Cafe
-  preset_icon_telephone: Telephone
-  preset_icon_cinema: Cinema
-  preset_icon_bar: Bar
-  preset_icon_museum: Museum
-  preset_icon_place_of_worship: Place of worship
-  preset_icon_taxi: Taxi rank

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 38091861a9e651ceb2dab9370b6987a52beb9e6d..7a7926f043864f74fe7128b47cd6b4d9bf987257 100644 (file)
--- 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