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

diff --git a/resources/map_features.xml b/resources/map_features.xml
index b9108c1603094e82e0ffde8332f87fcca5a75635..d79146c02f36e1d43ec6f2d94f13b030ecdae2f5 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -506,7 +506,7 @@ Quick documentation:
   </inputSet>
 
   <inputSet id="waterways">
-    <input type="freetext" presence="always" name="Name" category="Naming" key="name" description="The name"/>
+    <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres"/>
     <inputSet ref="boatPermissions"/>
   </inputSet>

diff --git a/resources/map_features/amenities.xml b/resources/map_features/amenities.xml
index 6a28b2942d5619480d60680413549a59c6fc40c3..561c0f5d0ae8cf5f02a9b9a3216342a2194ffd2b 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

diff --git a/resources/map_features/tourism.xml b/resources/map_features/tourism.xml
index d5ff6016345ec6f59ecc1df7c1085f9d56a2856d..826a52e6cc00c39ae280de7545b891820edad148 100644 (file)
--- a/resources/map_features/tourism.xml
+++ b/resources/map_features/tourism.xml
@@ -201,7 +201,7 @@
     <point/>\r
     <area/>\r
     <tag k="amenity" v="cinema"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>\r
+    <inputSet ref="simpleName"/>\r
     <inputSet ref="common"/>\r
   </feature>\r
 \r

diff --git a/resources/map_features/transport.xml b/resources/map_features/transport.xml
index 026dcd2345418203245955d8206634dbdda8c35f..a039e0ad8d9732e2f10c9085dd0fef09f3715100 100644 (file)
--- a/resources/map_features/transport.xml
+++ b/resources/map_features/transport.xml
@@ -255,7 +255,7 @@
     <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
     <point/>
     <tag k="aeroway" v="aerodrome"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -431,7 +431,7 @@
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
     <point/>
     <tag k="amenity" v="ferry_terminal"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal."/>
+    <inputSet ref="simpleName" />
     <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
     <input type="freetext" presence="onTagMatch" category="Cargo" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
     <inputSet ref="common"/>