Add "source" tag to every single object.
authorSteve Bennett <stevagewp@gmail.com>
Sat, 16 Oct 2010 12:05:34 +0000 (12:05 +0000)
committerSteve Bennett <stevagewp@gmail.com>
Sat, 16 Oct 2010 12:05:34 +0000 (12:05 +0000)
(Oh, and, um, my editor beautified every single <feature>. Hope that doesn't offend anyone.)

resources/map_features.xml

index 247ecff..094fffa 100644 (file)
@@ -115,6 +115,10 @@ Quick documentation:
     <input type="freetext" category="Misc" presence="always" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, nearmap...)" priority="high" />
   </inputSet>
 
+  <inputSet id="common">
+    <inputSet ref="source"/>
+  </inputSet>
+
   <inputSet id="names">
     <input type="freetext" presence="always"
         name="Name" category="Naming" priority="highest"
@@ -164,7 +168,6 @@ Quick documentation:
 
   <inputSet id="majorRoad">
     <inputSet ref="names"/>
-    <inputSet ref="source"/>
     <inputSet ref="roadRefs"/>
     <inputSet ref="roadRestrictions"/>
     <inputSet ref="roadPhysical"/>
@@ -179,7 +182,6 @@ Quick documentation:
 
     <inputSet id="minorRoad">
       <inputSet ref="names"/>
-      <inputSet ref="source"/>
       <inputSet ref="roadRestrictions"/>
       <inputSet ref="roadPhysical"/>
       <inputSet ref="cycle"/>
@@ -193,7 +195,6 @@ Quick documentation:
 
   <inputSet id="path">
     <inputSet ref="simpleName"/>
-    <inputSet ref="source"/>
     <inputSet ref="roadPhysical"/>
     <inputSet ref="cycle"/>
     <inputSet ref="ldp"/>
@@ -554,6 +555,7 @@ Quick documentation:
     <tag k="highway" v="motorway"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Motorway link" icon="features/motorway_link.png">
@@ -563,6 +565,7 @@ Quick documentation:
     <tag k="highway" v="motorway_link"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Trunk road">
@@ -577,6 +580,7 @@ Quick documentation:
     <tag k="highway" v="trunk"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Trunk link" icon="features/motorway_link.png">
@@ -586,6 +590,7 @@ Quick documentation:
     <tag k="highway" v="trunk_link"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Primary road">
@@ -600,6 +605,7 @@ Quick documentation:
     <tag k="highway" v="primary"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Primary road link">
@@ -614,6 +620,7 @@ Quick documentation:
     <tag k="highway" v="primary_link"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
 
@@ -629,12 +636,16 @@ Quick documentation:
     <tag k="highway" v="secondary"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Secondary road link">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="16pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
       <font size="10pt">${name}</font>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link</help>
@@ -643,6 +654,7 @@ Quick documentation:
     <tag k="highway" v="secondary_link"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
 
@@ -659,6 +671,7 @@ Quick documentation:
     <tag k="highway" v="tertiary"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Tertiary road link">
@@ -673,6 +686,7 @@ Quick documentation:
     <tag k="highway" v="tertiary_link"/>
 
     <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
 
@@ -687,13 +701,18 @@ Quick documentation:
     <tag k="highway" v="unclassified"/>
 
     <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Residential road">
     <category>roads</category>
     <icon image="features/highway__residential.png">
-      <font size="14pt"><b>${name}</b></font><br/>
-      <font size="8pt">${postal_code}</font><br/>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+      <br/>
+      <font size="8pt">${postal_code}</font>
+      <br/>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
 
@@ -701,6 +720,7 @@ Quick documentation:
     <tag k="highway" v="residential"/>
 
     <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Service road">
@@ -724,6 +744,7 @@ Quick documentation:
       <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/>
       <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services." />
     </input>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Unknown road">
@@ -736,6 +757,7 @@ Quick documentation:
     <tag k="highway" v="road"/>
 
     <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Living Street">
@@ -749,6 +771,7 @@ Quick documentation:
     <tag k="highway" v="living_street"/>
 
     <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Track">
@@ -761,6 +784,7 @@ Quick documentation:
     <tag k="highway" v="track"/>
 
     <inputSet ref="path"/>
+    <inputSet ref="common"/>
   </feature>
 
 
@@ -777,6 +801,7 @@ Quick documentation:
     <line/>
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Cycle path">
@@ -788,12 +813,15 @@ Quick documentation:
     <line/>
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Pedestrian Street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <tag k="highway" v="pedestrian"/>
@@ -807,6 +835,7 @@ Quick documentation:
       <tag k="area" v="yes"/>
     </area>
     <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Bridleway">
@@ -817,6 +846,7 @@ Quick documentation:
     <line/>
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Steps">
@@ -829,6 +859,7 @@ Quick documentation:
     <tag k="highway" v="steps"/>
     <inputSet ref="path"/>
     <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
   <!-- ************************************************************************
@@ -838,11 +869,13 @@ Quick documentation:
   <feature name="Park">
     <category>natural</category>
     <icon image="icons/natural_blank.png">
-      <b>${name}</b><br/>
+      <b>${name}</b>
+      <br/>
     </icon>
 
     <area/>
     <tag k="leisure" v="park"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Forest">
@@ -851,6 +884,7 @@ Quick documentation:
 
     <area/>
     <tag k="landuse" v="forest"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Meadow">
@@ -859,6 +893,7 @@ Quick documentation:
 
     <area/>
     <tag k="landuse" v="meadow"/>
+    <inputSet ref="common"/>
   </feature>
 
 
@@ -875,6 +910,7 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="wall"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Ditch">
@@ -886,6 +922,7 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="ditch"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Retaining wall">
@@ -897,6 +934,7 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="retaining_wall"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="City wall">
@@ -908,8 +946,10 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="city_wall"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Fence">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
@@ -919,8 +959,10 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="fence"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Hedge">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
@@ -930,9 +972,11 @@ Quick documentation:
 
     <line/>
     <tag k="barrier" v="hedge"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- ************************************************************************
        Waterways
        ************************************************************************ -->
@@ -941,14 +985,18 @@ Quick documentation:
     <category>water</category>
     <description>A very narrow river.</description>
     <icon image="features/waterway__stream.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="waterway" v="stream"/>
     <inputSet ref="waterways" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="River">
     <category>water</category>
     <icon image="features/waterway__river.png">
@@ -958,20 +1006,26 @@ Quick documentation:
     <line/>
     <tag k="waterway" v="river"/>
     <inputSet ref="waterways" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Canal">
     <category>water</category>
     <icon image="features/waterway__canal.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="waterway" v="canal"/>
     <inputSet ref="waterways" />
 
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Drain">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
@@ -980,18 +1034,24 @@ Quick documentation:
 
     <line/>
     <tag k="waterway" v="drain"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Dam">
     <category>water</category>
     <icon image="features/waterway__dam.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="waterway" v="dam"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Riverbank">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
@@ -1000,30 +1060,40 @@ Quick documentation:
 
     <area/>
     <tag k="waterway" v="riverbank"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Reservoir">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <area/>
     <tag k="landuse" v="reservoir"/>
     <inputSet ref="boatPermissions" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Lake">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
     <area/>
     <tag k="natural" v="water" />
     <inputSet ref="names" />
     <inputSet ref="boatPermissions" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Basin">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
@@ -1035,8 +1105,10 @@ Quick documentation:
     <area/>
     <tag k="landuse" v="basin"/>
     <inputSet ref="boatPermissions" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Weir">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
@@ -1048,21 +1120,27 @@ Quick documentation:
     <line/>
     <point/>
     <tag k="waterway" v="weir"/>
- </feature>
+    <inputSet ref="common"/>
+  </feature>
+
 
 
 
   <feature name="Dock">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <area/>
     <tag k="waterway" v="dock"/>
     <inputSet ref="names"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Marina">
     <category>water</category>
     <icon image="features/pois/transport_marina.n.24.png">
@@ -1075,16 +1153,20 @@ Quick documentation:
     <point/>
     <tag k="leisure" v="marina"/>
     <inputSet ref="names"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Slipway">
     <category>water</category>
     <icon image="features/pois/water_generic.24.png"/>
     <line/>
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <area/>
 
   <!-- ************************************************************************
@@ -1094,7 +1176,9 @@ Quick documentation:
   <feature name="Railway line">
     <category>transport</category>
     <icon image="features/transport__railway.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
@@ -1104,30 +1188,40 @@ Quick documentation:
     <inputSet ref="embankment-cutting"/>
     <inputSet ref="rail-electrification"/>
     <inputSet ref="rail-usage"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Railway spur">
     <category>transport</category>
     <icon image="features/transport__railway.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="railway" v="rail"/>
     <tag k="service" v="spur"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Railway siding">
     <category>transport</category>
     <icon image="features/transport__railway.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="railway" v="rail"/>
     <tag k="service" v="siding"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Preserved line">
     <category>transport</category>
     <icon image="features/transport__railway.png">
@@ -1136,18 +1230,24 @@ Quick documentation:
 
     <line/>
     <tag k="railway" v="preserved"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Disused tracks">
     <category>transport</category>
     <icon image="features/transport__railway_disused.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
     <tag k="railway" v="disused"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Old trackbed">
     <category>transport</category>
     <icon image="features/transport__railway_abandoned.png">
@@ -1156,12 +1256,16 @@ Quick documentation:
 
     <line/>
     <tag k="railway" v="abandoned"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Light rail line">
     <category>transport</category>
     <icon image="features/transport__tram.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
@@ -1170,8 +1274,10 @@ Quick documentation:
     <inputSet ref="tunnel"/>
     <inputset ref="embankment-cutting"/>
     <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Tram line">
     <category>transport</category>
     <icon image="features/transport__tram.png">
@@ -1185,12 +1291,16 @@ Quick documentation:
     <inputSet ref="tunnel"/>
     <inputset ref="embankment-cutting"/>
     <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Subway line">
     <category>transport</category>
     <icon image="features/transport__subway.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <line/>
@@ -1199,8 +1309,10 @@ Quick documentation:
     <inputSet ref="tunnel"/>
     <inputset ref="embankment-cutting"/>
     <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Railway platform">
     <category>transport</category>
     <icon image="features/transport__railway_platform.png" />
@@ -1208,8 +1320,10 @@ Quick documentation:
     <area />
     <tag k="railway" v="platform"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bus station">
     <category>transport</category>
     <icon image="icons/transport_blank.png">
@@ -1222,8 +1336,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport">
     <category>transport</category>
     <icon image="icons/transport_airport_48.png"/>
@@ -1233,8 +1349,10 @@ Quick documentation:
     <inputSet ref="names"/>
     <input type="freetext" presence="always" category="Naming" name="International Air Transport Association (IATA) airport code" key="ref"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport terminal">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1243,8 +1361,10 @@ Quick documentation:
     <point/>
     <inputSet ref="names"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Helipad">
     <category>transport</category>
     <icon image="icons/transport_helipad_48.png"/>
@@ -1253,8 +1373,10 @@ Quick documentation:
     <point/>
     <inputSet ref="names"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport runway">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1263,8 +1385,10 @@ Quick documentation:
     <inputSet ref="names"/>
     <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport taxiway">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1273,8 +1397,10 @@ Quick documentation:
     <inputSet ref="names"/>
     <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref"  />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport apron">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1282,8 +1408,10 @@ Quick documentation:
     <area/>
     <inputSet ref="names"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Airport gate">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1291,8 +1419,10 @@ Quick documentation:
     <point/>
     <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref" />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- ************************************************************************
        Buildings
        ************************************************************************ -->
@@ -1309,8 +1439,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="College">
     <category>buildings</category>
     <icon image="features/pois/education_university.n.24.png">
@@ -1323,8 +1455,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Supermarket">
     <category>buildings</category>
     <icon image="features/pois/shopping_supermarket.n.24.png">
@@ -1337,8 +1471,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Place of worship">
     <category>buildings</category>
     <icon image="icons/place_of_worship.png">
@@ -1355,8 +1491,10 @@ Quick documentation:
       <choice value="christian" text="Christianity (church)" />
       <choice value="jewish" text="Judaism (synagogue)" />
     </input>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Public building">
     <category>buildings</category>
     <icon image="features/pois/building_generic.png">
@@ -1369,8 +1507,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Hospital">
     <category>buildings</category>
     <icon image="features/pois/health_hospital.n.24.png">
@@ -1383,8 +1523,10 @@ Quick documentation:
     <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">
@@ -1397,8 +1539,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Attraction">
     <category>buildings</category>
     <icon image="icons/tourist_blank.png">
@@ -1411,8 +1555,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Museum">
     <category>buildings</category>
     <icon image="features/pois/tourist_museum.n.24.png">
@@ -1425,8 +1571,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Zoo">
     <category>buildings</category>
     <icon image="features/pois/tourist_zoo.n.24.png">
@@ -1439,8 +1587,10 @@ Quick documentation:
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Stadium">
     <category>buildings</category>
     <icon image="icons/tourist_blank.png">
@@ -1452,8 +1602,10 @@ Quick documentation:
     <tag k="leisure" v="stadium"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Building">
     <category>buildings</category>
     <icon image="features/pois/building_generic.png">
@@ -1465,8 +1617,10 @@ Quick documentation:
     <tag k="building" v="*"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Sports centre">
     <category>buildings</category>
     <icon >
@@ -1480,9 +1634,11 @@ Quick documentation:
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
     <inputSet ref="pitchSport"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- ************************************************************************
        Landuse
        ************************************************************************ -->
@@ -1495,8 +1651,10 @@ Quick documentation:
     </icon>
     <tag k="landuse" v="industrial"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Offices">
     <category>landuse</category>
     <area/>
@@ -1505,6 +1663,18 @@ Quick documentation:
     </icon>
     <tag k="landuse" v="commercial"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Residential">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="residential"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
   <feature name="Retail">
@@ -1515,8 +1685,10 @@ Quick documentation:
     </icon>
     <tag k="landuse" v="retail"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Marketplace">
     <category>landuse</category>
     <area/>
@@ -1525,8 +1697,10 @@ Quick documentation:
     </icon>
     <tag k="amenity" v="marketplace"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Cemetery">
     <category>landuse</category>
     <area/>
@@ -1535,35 +1709,43 @@ Quick documentation:
     </icon>
     <tag k="landuse" v="cemetery"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Quarry">
     <category>landuse</category>
     <icon image="features/pois/poi_mine.n.24.png" />
     <area/>
     <tag k="landuse" v="quarry"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
- <feature name="Military">
+
+  <feature name="Military">
     <category>landuse</category>
     <icon image="features/pois/poi_military_bunker.n.24.png" />
     <area/>
     <tag k="landuse" v="military"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Conservation">
     <category>natural</category>
     <icon image="icons/natural_blank.png"/>
     <area/>
     <tag k="landuse" v="conservation"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
 
 
 
+
   <feature name="Playground">
     <category>landuse</category>
     <area/>
@@ -1572,8 +1754,10 @@ Quick documentation:
     </icon>
     <tag k="leisure" v="playground"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Golf course">
     <category>landuse</category>
     <area/>
@@ -1582,8 +1766,10 @@ Quick documentation:
     </icon>
     <tag k="leisure" v="golf_course"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Recreation ground">
     <category>landuse</category>
     <area/>
@@ -1592,8 +1778,10 @@ Quick documentation:
     </icon>
     <tag k="leisure" v="recreation_ground"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Sports pitch">
     <category>landuse</category>
     <area/>
@@ -1603,8 +1791,10 @@ Quick documentation:
     <tag k="leisure" v="pitch"/>
     <inputSet ref="simpleName"/>
     <inputSet ref="pitchSport"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <inputSet id="pitchSport">
     <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
       <choice value="9pin" text="9 pin bowling"/>
@@ -1651,8 +1841,10 @@ Quick documentation:
     </icon>
     <tag k="leisure" v="track"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- ************************************************************************
        Power
        ************************************************************************ -->
@@ -1663,30 +1855,38 @@ Quick documentation:
     <line/>
     <tag k="power" v="line"/>
     <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Low-voltage line">
     <category>power</category>
     <icon image="features/power_low.png" />
     <line/>
     <tag k="power" v="minor_line"/>
     <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="High-voltage pylon">
     <category>power</category>
     <icon image="icons/power_tower_24.png"/>
     <point/>
     <tag k="power" v="tower"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Power pole">
     <category>power</category>
     <icon image="icons/power_pole_24.png"/>
     <point/>
     <tag k="power" v="pole"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Plant (station)">
     <category>power</category>
     <icon image="icons/power_blank.png"/>
@@ -1707,24 +1907,30 @@ Quick documentation:
       <choice value="solar_thermal" text="Solar thermal" />
       <choice value="biofuel" text="Biofuel" />
     </input>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Substation">
     <category>power</category>
     <icon image="icons/power_blank.png"/>"
     <area/>
     <point/>
     <tag k="power" v="station"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Transformer">
     <category>power</category>
     <icon image="icons/power_blank.png"/>
     <area/>
     <point/>
     <tag k="power" v="sub_station"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <inputSet id="powerCables">
     <input type="choice" name="Cables" key="cables" presence="always" category="Power">
       <choice value="2" text="2"/>
@@ -1776,10 +1982,12 @@ Quick documentation:
       <choice value="island" text="Island"/>
       <choice value="islet" text="Islet"/>
     </input>
+    <inputSet ref="common"/>
   </feature>
 
 
 
+
   <!-- ************************************************************************
        POIs
        ************************************************************************ -->
@@ -1793,8 +2001,10 @@ Quick documentation:
     <point />
     <tag k="amenity" v="fire_station"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Police Station">
     <category>amenity</category>
     <icon image="features/pois/amenity_police2.n.24.png"/>
@@ -1802,8 +2012,10 @@ Quick documentation:
     <point />
     <tag k="amenity" v="police"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Hospital">
     <category>amenity</category>
     <icon image="features/pois/health_hospital.n.24.png"/>
@@ -1811,8 +2023,10 @@ Quick documentation:
     <point />
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Place of Worship">
     <category>amenity</category>
     <icon image="icons/place_of_worship.png"/>
@@ -1831,8 +2045,10 @@ Quick documentation:
     </input>
 
     <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="ATM">
     <category>amenity</category>
     <icon image="features/pois/money_atm.n.24.png"/>
@@ -1841,8 +2057,10 @@ Quick documentation:
     <tag k="amenity" v="atm"/>
     <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
     <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bank">
     <category>amenity</category>
     <icon image="features/pois/money_bank2.n.24.png">
@@ -1857,16 +2075,20 @@ Quick documentation:
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Recycling">
     <category>amenity</category>
     <icon image="features/pois/amenity_recycling.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
     <point />
     <tag k="amenity" v="recycling"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">
@@ -1877,8 +2099,10 @@ Quick documentation:
     <tag k="amenity" v="school"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Post Box">
     <category>amenity</category>
     <icon image="features/pois/amenity_post_box.n.24.png">
@@ -1889,8 +2113,10 @@ Quick documentation:
     <tag k="amenity" v="post_box"/>
     <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box" />
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- ========= Accommodation ========= -->
   <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
   <feature name="Hotel">
@@ -1901,8 +2127,10 @@ Quick documentation:
     <area />
     <tag k="tourism" v="hotel"/>
     <inputSet ref="simpleName" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Motel">
     <category>accommodation</category>
     <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>
@@ -1911,9 +2139,11 @@ Quick documentation:
     <icon image="icons/accommodation_blank.png"/>
     <tag k="tourism" v="motel"/>
     <inputSet ref="simpleName" />
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <feature name="Hostel">
     <category>accommodation</category>
     <point />
@@ -1921,8 +2151,10 @@ Quick documentation:
     <inputSet ref="simpleName" />
     <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
     <tag k="tourism" v="hostel"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- Note that tourism=bed_and_breakfast also gets some use. -->
   <feature name="Guesthouse (B&amp;B)">
     <category>accommodation</category>
@@ -1931,8 +2163,10 @@ Quick documentation:
     <inputSet ref="simpleName" />
     <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
     <tag k="tourism" v="guest_house"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Campsite">
     <category>accommodation</category>
     <point />
@@ -1940,8 +2174,10 @@ Quick documentation:
     <inputSet ref="simpleName" />
     <icon image="features/pois/accommodation_camping.n.24.png"/>
     <tag k="tourism" v="camp_site"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Caravan park">
     <category>accommodation</category>
     <point />
@@ -1949,8 +2185,10 @@ Quick documentation:
     <inputSet ref="simpleName" />
     <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
     <tag k="tourism" v="caravan_site"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Alpine hut">
     <category>accommodation</category>
     <point />
@@ -1958,8 +2196,10 @@ Quick documentation:
     <inputSet ref="simpleName" />
     <icon image="features/pois/accommodation_alpinehut.n.24.png"/>
     <tag k="tourism" v="alpine_hut"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Chalet">
     <category>accommodation</category>
     <icon image="icons/accommodation_blank.png"/>
@@ -1967,9 +2207,11 @@ Quick documentation:
     <area />
     <inputSet ref="simpleName" />
     <tag k="tourism" v="chalet"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- ========= Tourism ========= -->
 
   <!-- This is a very popular tag, can't be left out -->
@@ -1980,10 +2222,12 @@ Quick documentation:
     <area />
     <inputSet ref="simpleName" />
     <tag k="tourism" v="attraction"/>
+    <inputSet ref="common"/>
   </feature>
 
 
 
+
   <feature name="Museum">
     <category>tourism</category>
     <icon image="features/pois/tourist_museum.n.24.png"/>
@@ -1992,62 +2236,84 @@ Quick documentation:
     <area />
     <tag k="tourism" v="museum"/>
     <inputSet ref="simpleName" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Archaeological">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_archaeological.n.24.png"/>
+    <icon image="features/pois/tourist_archaeological.n.24.png"/>
     <tag k="historic" v="archaeological_site"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Battlefield">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_battlefield.n.24.png"/>
+    <icon image="features/pois/tourist_battlefield.n.24.png"/>
     <tag k="historic" v="battlefield"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Castle">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_castle.n.24.png"/>
+    <icon image="features/pois/tourist_castle.n.24.png"/>
     <tag k="historic" v="castle"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Memorial">
-    <category>tourism</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_memorial.n.24.png"/>
+    <category>tourism</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/tourist_memorial.n.24.png"/>
     <tag k="historic" v="memorial"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Monument">
-    <category>tourism</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_monument.n.24.png"/>
+    <category>tourism</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/tourist_monument.n.24.png"/>
     <tag k="historic" v="monument"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Picnic site">
-    <category>tourism</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <category>tourism</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
     <tag k="tourism" v="picnic_site"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Ruin">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_ruin.n.24.png"/>
+    <icon image="features/pois/tourist_ruin.n.24.png"/>
     <tag k="historic" v="ruin"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Cinema">
     <category>tourism</category>
     <icon image="features/pois/tourist_cinema.n.24.png"/>
@@ -2056,34 +2322,42 @@ Quick documentation:
     <area />
     <tag k="amenity" v="cinema"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Theatre">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_theatre.n.24.png"/>
+    <icon image="features/pois/tourist_theatre.n.24.png"/>
     <tag k="amenity" v="theatre"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Viewpoint">
     <category>tourism</category>
     <point />
     <inputSet ref="simpleName" />
        <icon image="features/pois/tourist_view_point.n.24.png"/>
     <tag k="tourism" v="viewpoint"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Zoo">
     <category>tourism</category>
     <point />
     <area />
     <inputSet ref="simpleName" />
-       <icon image="features/pois/tourist_zoo.n.24.png"/>
+    <icon image="features/pois/tourist_zoo.n.24.png"/>
     <tag k="tourism" v="zoo"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- icons needed-->
   <feature name="Information">
     <category>tourism</category>
@@ -2091,17 +2365,21 @@ Quick documentation:
     <point />
     <inputSet ref="simpleName" />
     <tag k="tourism" v="information"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Artwork">
     <category>tourism</category>
     <icon image="icons/tourist_blank.png"/>
     <point />
     <inputSet ref="simpleName" />
     <tag k="tourism" v="artwork"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <feature name="Theme park">
     <category>tourism</category>
     <icon image="icons/tourist_blank.png"/>
@@ -2109,9 +2387,11 @@ Quick documentation:
     <area />
     <inputSet ref="simpleName" />
     <tag k="tourism" v="theme_park"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- ========= Transport ========= -->
 
   <feature name="Aerodrome">
@@ -2121,8 +2401,10 @@ Quick documentation:
     <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="common"/>
   </feature>
 
+
   <feature name="Bus Stop">
     <category>transport</category>
     <icon image="features/pois/transport_bus_stop2.n.24.png">
@@ -2131,8 +2413,10 @@ Quick documentation:
     <point />
     <tag k="highway" v="bus_stop"/>
     <inputSet ref="buses" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Car Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_car.n.24.png">
@@ -2146,8 +2430,10 @@ Quick documentation:
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
     <inputSet ref="fee"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bicycle Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_bicycle.n.24.png">
@@ -2166,12 +2452,16 @@ Quick documentation:
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Railway station">
     <category>transport</category>
     <icon image="features/pois/transport_train_station.n.24.png">
-      <font size="14pt"><b>${name}</b></font>
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
     </icon>
 
     <point/>
@@ -2179,11 +2469,15 @@ Quick documentation:
     <inputSet ref="names"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Fuel">
-    <category>transport</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/transport_fuel.n.24.png"/>
+    <category>transport</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_fuel.n.24.png"/>
     <tag k="amenity" v="fuel"/>
     <input type="freetext" category="Naming" name="Operator" key="operator" description="The provider of the service"/>
     <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
@@ -2224,38 +2518,58 @@ Quick documentation:
     </input>
 
 
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bus station">
-    <category>transport</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/transport_bus_station.n.24.png"/>
+    <category>transport</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_bus_station.n.24.png"/>
     <tag k="amenity" v="bus_station"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Taxi rank">
-    <category>transport</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/transport_taxi_rank.n.24.png"/>
+    <category>transport</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_taxi_rank.n.24.png"/>
     <tag k="amenity" v="taxi"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Tram stop">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_tram_stop.n.24.png"/>
     <tag k="railway" v="tram_stop"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bicycle rental">
-    <category>transport</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
+    <category>transport</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
     <tag k="amenity" v="bicycle_rental"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Car rental">
-    <category>transport</category><point /><inputSet ref="simpleName" />
-       <icon image="features/pois/transport_rental_car.n.24.png"/>
+    <category>transport</category>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_rental_car.n.24.png"/>
     <tag k="amenity" v="car_rental"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Ferry Terminal">
     <category>transport</category>
     <icon image="features/pois/transport_port.n.24.png"/>
@@ -2265,8 +2579,10 @@ Quick documentation:
     <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal."/>
     <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"/>
   </feature>
 
+
   <!-- ========= Barriers ========= -->
 
   <feature name="Bollard">
@@ -2277,8 +2593,10 @@ Quick documentation:
 
     <point />
     <tag k="barrier" v="bollard"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Gate">
     <category>barrier</category>
     <icon image="features/pois/barrier_gate.n.24.png">
@@ -2287,25 +2605,31 @@ Quick documentation:
 
     <point />
     <tag k="barrier" v="gate"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Lift Gate">
     <category>barrier</category>
     <icon image="features/pois/barrier_lift_gate.n.24.png" />
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>
     <point />
     <tag k="barrier" v="lift_gate"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Kissing Gate">
     <category>barrier</category>
     <icon image="features/pois/barrier_kissing_gate.24.png" />
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>
     <point />
     <tag k="barrier" v="kissing_gate"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <feature name="Cycle Barrier">
     <category>barrier</category>
     <icon image="features/pois/barrier_cycle_barrier.24.png">
@@ -2314,8 +2638,10 @@ Quick documentation:
 
     <point />
     <tag k="barrier" v="cycle_barrier"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Big Concrete Blocks">
     <category>barrier</category>
     <icon image="features/pois/barrier_blocks.24.png">
@@ -2324,8 +2650,10 @@ Quick documentation:
 
     <point />
     <tag k="barrier" v="block"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Cattle Grid">
     <category>barrier</category>
     <icon image="features/pois/barrier_cattle_grid.24.png">
@@ -2334,8 +2662,10 @@ Quick documentation:
 
     <point />
     <tag k="barrier" v="cattle_grid"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Toll Booth">
     <category>barrier</category>
     <icon image="features/pois/barrier_toll_booth.n.24.png">
@@ -2346,25 +2676,32 @@ Quick documentation:
     <tag k="barrier" v="toll_booth"/>
     <tagSet ref="fee"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Stile">
     <category>barrier</category>
     <icon image="features/pois/barrier_stile.n.24.png" />
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>
     <point />
     <tag k="barrier" v="stile"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Turning circle">
     <category>transport</category>
     <icon image="icons/transport_blank.png" />
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle
+    <help>
+      http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle
     </help>
     <point />
     <tag k="highway" v="turning_circle"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Traffic calming">
 
     <category>transport</category>
@@ -2386,9 +2723,11 @@ Quick documentation:
       <choice value="choker" text="Choker" description="An artificial narrowing of the road."/>
     </input>
 
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- ========= Entertainment ========= -->
 
   <feature name="Pub">
@@ -2403,8 +2742,10 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress" />
     <inputSet ref="wifi" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bar">
     <category>foodanddrink</category>
     <icon image="features/pois/food_bar.n.24.png">
@@ -2416,8 +2757,10 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress" />
     <inputSet ref="wifi" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Restaurant">
     <category>foodanddrink</category>
     <icon image="features/pois/food_restaurant.n.24.png">
@@ -2429,8 +2772,10 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
     <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Cafe">
     <category>foodanddrink</category>
     <icon image="features/pois/food_cafe.n.24.png">
@@ -2444,8 +2789,10 @@ Quick documentation:
     <inputSet ref="buildingAddress"/>
     <inputSet ref="cuisine"/>
     <inputSet ref="wifi" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Fast Food">
     <category>foodanddrink</category>
     <icon image="features/pois/food_fastfood.n.24.png">
@@ -2458,8 +2805,10 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
     <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- ========= Shops ========= -->
 
   <feature name="Small Convenience Store">
@@ -2473,8 +2822,10 @@ Quick documentation:
     <inputSet ref="names"/>
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Supermarket">
     <category>shopping</category>
     <icon image="features/pois/shopping_supermarket.n.24.png">
@@ -2486,179 +2837,238 @@ Quick documentation:
     <inputSet ref="names"/>
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Alcohol shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_alcohol.n.24.png"/>
+    <icon image="features/pois/shopping_alcohol.n.24.png"/>
     <tag k="shop" v="alcohol"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bakery">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_bakery.n.24.png"/>
+    <icon image="features/pois/shopping_bakery.n.24.png"/>
     <tag k="shop" v="bakery"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bike shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_bicycle.n.24.png"/>
+    <icon image="features/pois/shopping_bicycle.n.24.png"/>
     <tag k="shop" v="bicycle"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Bookshop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_book.n.24.png"/>
+    <icon image="features/pois/shopping_book.n.24.png"/>
     <tag k="shop" v="book"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Butcher">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_butcher.n.24.png"/>
+    <icon image="features/pois/shopping_butcher.n.24.png"/>
     <tag k="shop" v="butcher"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Car repair">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_car_repair.n.24.png"/>
+    <icon image="features/pois/shopping_car_repair.n.24.png"/>
     <tag k="shop" v="car_repair"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Clothes shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_clothes.n.24.png"/>
+    <icon image="features/pois/shopping_clothes.n.24.png"/>
     <tag k="shop" v="clothes"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Confectionery">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_confectionery.n.24.png"/>
+    <icon image="features/pois/shopping_confectionery.n.24.png"/>
     <tag k="shop" v="confectionery"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="DIY">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_diy.n.24.png"/>
+    <icon image="features/pois/shopping_diy.n.24.png"/>
     <tag k="shop" v="doityourself"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Fishmonger">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_fish.n.24.png"/>
+    <icon image="features/pois/shopping_fish.n.24.png"/>
     <tag k="shop" v="fishmonger"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Garden centre">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_garden_centre.n.24.png"/>
+    <icon image="features/pois/shopping_garden_centre.n.24.png"/>
     <tag k="shop" v="garden_centre"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Gift shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_gift.n.24.png"/>
+    <icon image="features/pois/shopping_gift.n.24.png"/>
     <tag k="shop" v="gift"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Greengrocer">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_greengrocer.n.24.png"/>
+    <icon image="features/pois/shopping_greengrocer.n.24.png"/>
     <tag k="shop" v="greengrocer"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Hairdresser">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_hairdresser.n.24.png"/>
+    <icon image="features/pois/shopping_hairdresser.n.24.png"/>
     <tag k="shop" v="hairdresser"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Hifi shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_hifi.n.24.png"/>
+    <icon image="features/pois/shopping_hifi.n.24.png"/>
     <tag k="shop" v="hifi"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Jewellery">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_jewelry.n.24.png"/>
+    <icon image="features/pois/shopping_jewelry.n.24.png"/>
     <tag k="shop" v="jewelry"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Laundrette">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_laundrette.n.24.png"/>
+    <icon image="features/pois/shopping_laundrette.n.24.png"/>
     <tag k="shop" v="laundry"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Motorbike shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_motorcycle.n.24.png"/>
+    <icon image="features/pois/shopping_motorcycle.n.24.png"/>
     <tag k="shop" v="motorcycle"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Music shop">
-    <category>shopping</category><point />
+    <category>shopping</category>
+    <point />
     <inputSet ref="simpleName" />
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
-       <icon image="features/pois/shopping_music.n.24.png"/>
+    <icon image="features/pois/shopping_music.n.24.png"/>
     <tag k="shop" v="music"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Pharmacy">
     <category>shopping</category>
     <icon image="features/pois/health_pharmacy.n.24.png">
@@ -2671,8 +3081,10 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
     <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- **************** Agriculture *************** -->
   <feature name="Farm">
     <category>agriculture</category>
@@ -2680,48 +3092,60 @@ Quick documentation:
     <area />
     <tag k="landuse" v="farm"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Farmyard">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
     <area />
     <tag k="landuse" v="farmyard"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
- <feature name="Farmland">
+
+  <feature name="Farmland">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
     <area />
     <tag k="landuse" v="farmland"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Field">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
     <area />
     <tag k="landuse" v="meadow"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Orchard">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
     <area />
     <tag k="landuse" v="orchard"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Vineyard">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
     <area />
     <tag k="landuse" v="vineyard"/>
     <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- ************************************************************************
        Relations
        ************************************************************************ -->
@@ -2750,19 +3174,26 @@ Quick documentation:
     <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on"  description="What time of day does it start?"     layout="horizontal" priority="low" />
     <input type="freetext" category="Restrictions" presence="always" name="End day"    key="day_off"  description="What day of the week does it end?"   layout="horizontal" priority="lowest" />
     <input type="freetext" category="Restrictions" presence="always" name="End time"   key="hour_off" description="What time of day does it end?"       layout="horizontal" priority="lowest" />
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Multipolygon">
     <category>advanced</category>
     <relation/>
     <tag k="type" v="multipolygon"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <!-- cycle stuff -->
   <feature name="National Cycle Network">
     <category>paths</category>
     <icon image="features/cycle__ncn.png" background="red" foreground="white">
-      <font size="14pt"><b>${ref}</b></font><br />
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br />
       <font size="12pt">${name}</font>
     </icon>
 
@@ -2771,8 +3202,10 @@ Quick documentation:
     <tag k="network" v="ncn"/>
 
     <inputSet ref="route"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Regional Cycle Network">
     <category>paths</category>
     <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
@@ -2785,12 +3218,17 @@ Quick documentation:
     <tag k="network" v="rcn"/>
 
     <inputSet ref="route"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Local Cycle Network">
     <category>paths</category>
     <icon image="features/cycle__lcn.png" background="blue" foreground="white">
-      <font size="14pt"><b>${ref}</b></font><br />
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br />
       <font size="12pt">${name}</font>
     </icon>
 
@@ -2799,14 +3237,19 @@ Quick documentation:
     <tag k="network" v="lcn"/>
 
     <inputSet ref="route"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- paths -->
   <feature name="Long Distance Path">
     <category>paths</category>
     <icon image="features/paths__footway.png" background="green" foreground="white">
-      <font size="14pt"><b>${ref}</b></font><br />
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br />
       <font size="12pt">${name}</font>
     </icon>
 
@@ -2815,14 +3258,18 @@ Quick documentation:
     <tag k="route" v="foot"/>
 
     <inputSet ref="route"/>
+    <inputSet ref="common"/>
   </feature>
 
 
+
   <!-- public transit routes -->
   <feature name="Bus Route">
     <category>transport</category>
     <icon image="features/transport__bus.png">
-      <font size="12pt">${operator} <b>${ref}</b></font>
+      <font size="12pt">
+        ${operator} <b>${ref}</b>
+      </font>
     </icon>
 
     <relation/>
@@ -2832,12 +3279,16 @@ Quick documentation:
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
+
   <feature name="Tram Route">
     <category>transport</category>
     <icon image="features/transport__tram.png">
-      <font size="12pt">${operator} <b>${reg}</b></font>
+      <font size="12pt">
+        ${operator} <b>${reg}</b>
+      </font>
     </icon>
 
     <relation/>
@@ -2847,15 +3298,19 @@ Quick documentation:
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the tram service" priority="low"/>
+    <inputSet ref="common"/>
   </feature>
 
 
-    <!-- Junction nodes (for turn restrictions) -->
 
-    <feature>
-       <point/>
-       <within entity="way" k="highway" minimum="2"/>
-       <inputSet ref="junctionNode"/>
-    </feature>
+  <!-- Junction nodes (for turn restrictions) -->
+
+  <feature>
+    <point/>
+    <within entity="way" k="highway" minimum="2"/>
+    <inputSet ref="junctionNode"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
 </mapFeatures>