Merge branch 'master' into openID

[rails.git] / config / potlatch / icon_presets.txt

diff --git a/config/potlatch/icon_presets.txt b/config/potlatch/icon_presets.txt
index 3269286400f6790b348b6ef8685dc8594b48d1ab..d90bc5c603e8ce5eaf71535c69c4bc7a321694d0 100644 (file)
--- a/config/potlatch/icon_presets.txt
+++ b/config/potlatch/icon_presets.txt
@@ -1,26 +1,27 @@
-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
+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
+disaster       building=yes;earthquake_damage=(type damage here)