Ensure consistent capitalisation of interface by hunting down rogue name=name feature...

[potlatch2.git] / resources / map_features / amenities.xml

diff --git a/resources/map_features/amenities.xml b/resources/map_features/amenities.xml
index 6bae242..561c0f5 100644 (file)
--- a/resources/map_features/amenities.xml
+++ b/resources/map_features/amenities.xml
@@ -7,7 +7,7 @@
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>\r
     <point/>\r
     <tag k="amenity" v="fire_station"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>\r
+    <inputSet ref="simpleName" />\r
     <inputSet ref="common"/>\r
   </feature>\r
 \r
@@ -44,7 +44,7 @@
     <point/>\r
     <area/>\r
     <tag k="amenity" v="hospital"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>\r
+    <inputSet ref="simpleName"/>\r
     <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">\r
       <choice value="yes" text="Yes"/>\r
       <choice value="no" text="No"/>\r
@@ -59,7 +59,7 @@
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>\r
     <point/>\r
     <tag k="amenity" v="place_of_worship"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of it." priority="low"/>\r
+    <inputSet ref="simpleName" />\r
     <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">\r
       <choice value="christian" text="Christianity (church)"/>\r
       <choice value="jewish" text="Judaism (synagogue)"/>\r
@@ -144,7 +144,7 @@
 \r
   <feature name="Town hall">\r
     <category>amenity</category>\r
-    <icon >\r
+    <icon image="features/pois/amenity_town_hall.n.24.png">\r
       ${name}\r
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>\r
@@ -209,7 +209,6 @@
 \r
   <feature name="Water fountain">\r
     <category>amenity</category>\r
-    <category>water</category>\r
     <category>foodanddrink</category>\r
     <icon image="features/pois/food_drinkingtap.n.24.png">\r
       ${ref}\r