From: Tom Hughes <tom@compton.nu>
Date: Fri, 31 Dec 2010 13:34:32 +0000 (+0000)
Subject: Update Potlatch 2 to r24923 build
X-Git-Tag: live~6251^2^2~15
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2e5fa5848fe0343fcd99d628961f9c9e2921f2cd?hp=3c2e3ecb8f63fd716eeb80b6e199a60ada5759aa

Update Potlatch 2 to r24923 build
---

diff --git a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png
new file mode 100644
index 000000000..71d79bd10
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_bench.n.24.png b/public/potlatch2/features/pois/amenity_bench.n.24.png
new file mode 100644
index 000000000..08c66b07a
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_bench.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_fountain2.n.24.png b/public/potlatch2/features/pois/amenity_fountain2.n.24.png
new file mode 100644
index 000000000..f8c5e3755
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_fountain2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_library.n.24.png b/public/potlatch2/features/pois/amenity_library.n.24.png
new file mode 100644
index 000000000..658e1f1ba
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_library.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_playground.n.24.png b/public/potlatch2/features/pois/amenity_playground.n.24.png
new file mode 100644
index 000000000..1e8494739
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_playground.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_post_office.n.24.png b/public/potlatch2/features/pois/amenity_post_office.n.24.png
new file mode 100644
index 000000000..803665d05
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_post_office.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_telephone.n.24.png b/public/potlatch2/features/pois/amenity_telephone.n.24.png
new file mode 100644
index 000000000..0fc460d20
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_telephone.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_toilets.n.24.png b/public/potlatch2/features/pois/amenity_toilets.n.24.png
new file mode 100644
index 000000000..f8475f06f
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_toilets.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png
new file mode 100644
index 000000000..fb06a04b7
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png differ
diff --git a/public/potlatch2/features/pois/boat-launch-24.png b/public/potlatch2/features/pois/boat-launch-24.png
new file mode 100644
index 000000000..62312b927
Binary files /dev/null and b/public/potlatch2/features/pois/boat-launch-24.png differ
diff --git a/public/potlatch2/features/pois/education_nursery3.n.24.png b/public/potlatch2/features/pois/education_nursery3.n.24.png
new file mode 100644
index 000000000..b0314ff3e
Binary files /dev/null and b/public/potlatch2/features/pois/education_nursery3.n.24.png differ
diff --git a/public/potlatch2/features/pois/emergency-telephone-24.png b/public/potlatch2/features/pois/emergency-telephone-24.png
new file mode 100644
index 000000000..466ef96b7
Binary files /dev/null and b/public/potlatch2/features/pois/emergency-telephone-24.png differ
diff --git a/public/potlatch2/features/pois/food_drinkingtap.n.24.png b/public/potlatch2/features/pois/food_drinkingtap.n.24.png
new file mode 100644
index 000000000..313572e50
Binary files /dev/null and b/public/potlatch2/features/pois/food_drinkingtap.n.24.png differ
diff --git a/public/potlatch2/features/pois/landuse_coniferous.n.24.png b/public/potlatch2/features/pois/landuse_coniferous.n.24.png
new file mode 100644
index 000000000..93f6c0df2
Binary files /dev/null and b/public/potlatch2/features/pois/landuse_coniferous.n.24.png differ
diff --git a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png
new file mode 100644
index 000000000..7e2bd19af
Binary files /dev/null and b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png
new file mode 100644
index 000000000..a0e0c61a7
Binary files /dev/null and b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png differ
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 00a2b266e..bc818a049 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -102,6 +102,10 @@ Quick documentation:
   <category name="Places" id="places">
   </category>
 
+  <category name="Sport&amp;Leisure" id="sport">
+  </category>
+
+
   <!-- Common input sets -->
 
   <inputSet id="simpleName">
@@ -126,6 +130,9 @@ Quick documentation:
     <input type="freetext" presence="onTagMatch"
         name="Historical Name" category="Naming" priority="low"
         key="old_name" description="The historic or previous name"/>
+    <input type="freetext" presence="onTagMatch"
+        name="Alternative Name" category="Naming" priority="low"
+        key="alt_name" description="An alternative, currently used, name"/>
   </inputSet>
 
   <inputSet id="wifi">
@@ -149,6 +156,7 @@ Quick documentation:
 
   <inputSet id="cuisine">
     <input type="choice" presence="always" name="Cuisine" category="Eating" description="The type of food that they serve" key="cuisine">
+      <!-- The 30 most popular values according to taginfo 23/12/2010 -->
       <choice value="burger" text="Burger"/>
       <choice value="chicken" text="Chicken"/>
       <choice value="chinese" text="Chinese"/>
@@ -156,7 +164,30 @@ Quick documentation:
       <choice value="greek" text="Greek"/>
       <choice value="pizza" text="Pizza"/>
       <choice value="sandwich" text="Sandwich"/>
-      <choice value="sea_food" text="Sea Food"/>
+      <choice value="seafood" text="Sea Food"/>
+      <choice value="regional" text="Regional"/>
+      <choice value="italian" text="Italian"/>
+      <choice value="german" text="German"/>
+      <choice value="kebab" text="Kebab/souvlaki/gyro"/>
+      <choice value="indian" text="Indian"/>
+      <choice value="asian" text="Asian"/>
+      <choice value="mexican" text="Mexican"/>
+      <choice value="thai" text="Thai"/>
+      <choice value="japanese" text="Japanese"/>
+      <choice value="ice_cream" text="Ice-cream"/>
+      <choice value="fish_and_chips" text="Fish &amp; Chips"/>
+      <choice value="turkish" text="Turkish"/>
+      <choice value="french" text="French"/>
+      <choice value="sushi" text="Sushi"/>
+      <choice value="american" text="American"/>
+      <choice value="steak_house" text="Steak House"/>
+      <choice value="international" text="International"/>
+      <choice value="spanish" text="Spanish"/>
+      <choice value="vietnamese" text="Vietnamese"/>
+      <choice value="fish" text="Fish"/>
+      <choice value="bavarian" text="Bavarian"/>
+      <choice value="vegetarian" text="Vegetarian"/>
+
       <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help>
     </input>
   </inputSet>
@@ -805,6 +836,40 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Raceway/racing track">
+    <category>roads</category>
+    <category>sport</category>
+    <icon>
+      <font size="10pt">A purpose built track for racing motor vehicles.</font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="highway" v="raceway"/>
+
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Sports track">
+    <category>roads</category>
+    <category>sport</category>
+    <icon>
+      <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="leisure" v="track"/>
+
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
 
   <!-- ************************************************************************
        Paths
@@ -815,11 +880,12 @@ Quick documentation:
     <icon image="features/paths__footway.png">
       ${name} <i>${ref}</i>
     </icon>
-
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>
     <line/>
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Cycle path">
@@ -827,13 +893,29 @@ Quick documentation:
     <icon image="features/paths__bike.png">
       ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
     </icon>
-
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>
     <line/>
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  <feature name="Generic path">
+    <category>paths</category>
+    <icon >
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>
+
+    <line/>
+    <tag k="highway" v="path"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
+
   <feature name="Pedestrian street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
@@ -854,6 +936,7 @@ Quick documentation:
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Bridleway">
@@ -865,6 +948,7 @@ Quick documentation:
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Steps">
@@ -886,6 +970,7 @@ Quick documentation:
 
   <feature name="Park">
     <category>natural</category>
+    <category>sport</category>
     <icon image="icons/natural_blank.png">
       <b>${name}</b>
       <br/>
@@ -898,7 +983,7 @@ Quick documentation:
 
   <feature name="Forest">
     <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
+    <icon image="/features/pois/landuse_coniferous.n.24.png"/>
 
     <area/>
     <tag k="landuse" v="forest"/>
@@ -915,84 +1000,7 @@ Quick documentation:
   </feature>
 
 
-  <!-- ************************************************************************
-       Barrier
-       ************************************************************************ -->
-
-  <feature name="Wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
-
-    <line/>
-    <tag k="barrier" v="wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Ditch">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
-
-    <line/>
-    <tag k="barrier" v="ditch"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Retaining wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
-
-    <line/>
-    <tag k="barrier" v="retaining_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="City wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
-
-    <line/>
-    <tag k="barrier" v="city_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fence">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
-
-    <line/>
-    <tag k="barrier" v="fence"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hedge">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
-
-    <line/>
-    <tag k="barrier" v="hedge"/>
-    <inputSet ref="common"/>
-  </feature>
-
+  
 
 
   <!-- ************************************************************************
@@ -1189,6 +1197,8 @@ Quick documentation:
 
   <feature name="Slipway">
     <category>water</category>
+    <!-- icon from http://www.clker.com/clipart-map-symbols-boat-launch-white.html, feel free to (re)move this notice -->
+    <icon image="features/pois/boat-launch-24.png"/>
     <point />
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>
@@ -1359,7 +1369,7 @@ Quick documentation:
 
   <feature name="Bus station">
     <category>transport</category>
-    <icon image="icons/transport_blank.png">
+    <icon image="/features/pois/transport_bus_station.n.24.png">
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
@@ -1485,7 +1495,20 @@ Quick documentation:
 
     <area/>
     <tag k="amenity" v="college"/>
-    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="University">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="university"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
@@ -1560,37 +1583,6 @@ Quick documentation:
   </feature>
 
 
-  <feature name="University">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="university"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Attraction">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_attraction.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="attraction"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
 
   <feature name="Museum">
     <category>buildings</category>
@@ -1601,7 +1593,6 @@ Quick documentation:
 
     <area/>
     <tag k="tourism" v="museum"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
@@ -1617,7 +1608,6 @@ Quick documentation:
 
     <area/>
     <tag k="tourism" v="zoo"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
@@ -1657,7 +1647,7 @@ Quick documentation:
 
   <feature name="Sports centre">
     <category>buildings</category>
-    <icon >
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
@@ -1736,6 +1726,7 @@ Quick documentation:
 
   <feature name="Marketplace">
     <category>landuse</category>
+    <point />
     <area/>
     <icon image="features/pois/shopping_greengrocer.n.24.png">
       <b>${name}</b>
@@ -1748,6 +1739,7 @@ Quick documentation:
 
   <feature name="Cemetery">
     <category>landuse</category>
+    <point />
     <area/>
     <icon image="features/pois/place_of_worship_unknown3.n.24.png">
       <b>${name}</b>
@@ -1757,6 +1749,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Graveyard">
+    <category>landuse</category>
+    <point />
+    <area/>
+    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="amenity" v="grave_yard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <feature name="Quarry">
     <category>landuse</category>
@@ -1792,9 +1795,10 @@ Quick documentation:
 
 
   <feature name="Playground">
-    <category>landuse</category>
+    <category>sport</category>
     <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
+    <point/>
+    <icon image="features/pois/amenity_playground.n.24.png">
       <b>${name}</b>
     </icon>
     <tag k="leisure" v="playground"/>
@@ -1804,7 +1808,7 @@ Quick documentation:
 
 
   <feature name="Golf course">
-    <category>landuse</category>
+    <category>sport</category>
     <area/>
     <icon  image="features/pois/sport_golf.n.24.png">
       <b>${name}</b>
@@ -1817,6 +1821,7 @@ Quick documentation:
 
   <feature name="Recreation ground">
     <category>landuse</category>
+    <category>sport</category>    
     <area/>
     <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name}</b>
@@ -1880,6 +1885,7 @@ Quick documentation:
 
   <feature name="Sports track">
     <category>landuse</category>
+    <category>sport</category>
     <area/>
     <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name}</b>
@@ -2084,8 +2090,22 @@ Quick documentation:
     <icon image="features/pois/amenity_police2.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
     <point/>
+    <area/>
     <tag k="amenity" v="police"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Library">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_library.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="library"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -2095,6 +2115,7 @@ Quick documentation:
     <icon image="features/pois/health_hospital.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
     <point/>
+    <area/>
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
     <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
@@ -2180,6 +2201,33 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Kindergarten">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/education_nursery3.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>
+    <point/>
+    <tag k="amenity" v="kindergarten"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town hall">
+    <category>amenity</category>
+    <icon >
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>
+    <point/>
+    <tag k="amenity" v="townhall"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Post Box">
     <category>amenity</category>
@@ -2194,13 +2242,154 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Post Office">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/amenity_post_office.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="post_office"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
+    <inputset ref="simpleName"/>
+  </feature>
+
+  <feature name="Trash/rubbish bin">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_waste_bin.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>
+    <point/>
+    <tag k="amenity" v="waste_basket"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
   <feature name="Toilets">
     <category>amenity</category>
+    <icon image="features/pois/amenity_toilets.n.24.png">
+      ${ref}
+    </icon>
     <point/>
     <tag k="amenity" v="toilets"/>
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Water fountain">
+    <category>amenity</category>
+    <category>water</category>
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_drinkingtap.n.24.png">
+      ${ref}
+    </icon>
+    <point/>
+    <tag k="amenity" v="drinking_water"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Shelter">
+    <category>amenity</category>
+    <icon image="features/pois/accommodation_shelter2.n.24.png">
+      ${name}
+    </icon>    
+    <point/>
+    <area/>
+    <tag k="amenity" v="shelter"/>
+    <inputset ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Barbecue">
+    <category>amenity</category>
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <!-- specific icon needed -->
+    <point/>
+    <tag k="amenity" v="bbq"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Hunting stand">
+    <category>amenity</category>
+    <category>sport</category>
+    <!-- icon needed -->
+    <point/>
+    <tag k="amenity" v="hunting_stand"/>
+    <inputSet ref="common"/>
+    <inputSet ref="names"/>
+  </feature>
+
+
+  <feature name="Park bench">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_bench.n.24.png" />
+    <point/>
+    <tag k="amenity" v="bench"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Public telephone">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_telephone.n.24.png" />
+    <point/>
+    <tag k="amenity" v="telephone"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Emergency phone">
+    <category>amenity</category>
+    <icon image="features/pois/emergency-telephone-24.png" />
+    <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->
+    <point/>
+    <tag k="amenity" v="emergency_phone"/>
+    <inputSet ref="common"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    
+  </feature>
+
+
+  <feature name="Swimming pool">
+    <category>amenity</category>
+    <category>sport</category>
+    <icon image="features/pois/sport_swimming_outdoor.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <area/>
+    <tag k="amenity" v="swimming_pool"/>
+    <inputSet ref="simpleName"/>    
+    <inputSet ref="common"/>
+
+  </feature>
+
+  <feature name="Fountain">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_fountain2.n.24.png">
+    ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="fountain"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Vending machine">
+    <category>amenity</category>
+    <category>foodanddrink</category>
+    <icon>A vending machine.</icon>
+    <!-- icon needed -->
+    <point/>
+    <tag k="amenity" v="vending_machine"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+    <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
+    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
+  </feature>
+
 
   <!-- ========= Accommodation ========= -->
   <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
@@ -2298,21 +2487,20 @@ Quick documentation:
 
 
   <!-- ========= Tourism ========= -->
-
-  <!-- This is a very popular tag, can't be left out -->
   <feature name="Attraction">
     <category>tourism</category>
-    <icon image="icons/tourist_blank.png"/>
-    <point/>
+    <icon image="features/pois/tourist_attraction.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
     <area/>
-    <inputSet ref="simpleName"/>
     <tag k="tourism" v="attraction"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
   </feature>
 
-
-
-
   <feature name="Museum">
     <category>tourism</category>
     <icon image="features/pois/tourist_museum.n.24.png"/>
@@ -2436,20 +2624,19 @@ Quick documentation:
     <category>tourism</category>
     <point/>
     <area/>
-    <inputSet ref="simpleName"/>
     <icon image="features/pois/tourist_zoo.n.24.png"/>
     <tag k="tourism" v="zoo"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
 
-  <!-- icons needed-->
   <feature name="Information">
     <category>tourism</category>
     <icon image="features/pois/amenity_information.n.24.png"/>
     <point/>
-    <inputSet ref="simpleName"/>
     <tag k="tourism" v="information"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -2668,6 +2855,80 @@ Quick documentation:
 
   <!-- ========= Barriers ========= -->
 
+  <feature name="Wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
+
+    <line/>
+    <tag k="barrier" v="wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Ditch">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
+
+    <line/>
+    <tag k="barrier" v="ditch"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Retaining wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
+
+    <line/>
+    <tag k="barrier" v="retaining_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
+
+    <line/>
+    <tag k="barrier" v="city_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fence">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
+
+    <line/>
+    <tag k="barrier" v="fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hedge">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
+
+    <line/>
+    <tag k="barrier" v="hedge"/>
+    <inputSet ref="common"/>
+  </feature>
+
   <feature name="Bollard">
     <category>barrier</category>
     <icon image="features/pois/barrier_bollard.n.24.png">
@@ -2772,6 +3033,19 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Wire fence">
+    <!-- no idea, but taginfo says 2700 uses -->
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+   
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>
+
+    <line/>
+    <tag k="barrier" v="wire_fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- **************************************************************** -->
 
   <feature name="Turning circle">
     <category>transport</category>
@@ -3238,6 +3512,7 @@ Quick documentation:
   <feature name="Administrative Boundary">
     <category>places</category>
     <line/>
+    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
     <tag k="boundary" v="administrative"/>
     <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
index e54ce6230..7c3c51f83 100644
--- a/public/potlatch2/potlatch.css
+++ b/public/potlatch2/potlatch.css
@@ -117,7 +117,8 @@ way[leisure=marina] :area					{ color: pink; fill-color: pink; fill-opacity: 0.4
 way[leisure=slipway]						{ color: grey; width: 3; casing-color: blue; casing-width: 7; }
 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 
-way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; }
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
+way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
 way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
 
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 7abfafdbc..1162fd539 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ