Merge branch 'master' into flex4
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:14:23 +0000 (17:14 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:14:23 +0000 (17:14 +0100)
Conflicts:
net/systemeD/halcyon/connection/Connection.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/paths.xml
resources/map_features/transport.xml

1  2 
build.xml
net/systemeD/halcyon/connection/Connection.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/map_features.xml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/paths.xml
resources/map_features/transport.xml

diff --cc build.xml
Simple merge
@@@ -439,15 -439,22 +439,22 @@@ package net.systemeD.halcyon.connectio
              return changeset;
          }
  
-         protected function addTrace(t:Trace):void {
 -        public function addTrace(t:Object):void {
++        public function addTrace(t:Trace):void {
              traces.push(t);
          }
  
          protected function clearTraces():void {
 -            traces = [];
 +            traces = new Vector.<Trace>();
          }
  
 -        public function getTraces():Array {
+               public function findTrace(id:int):Trace {
+                       for each (var t:Trace in traces) {
+                               if (t.id == id) return t;
+                       }
+                       return null;
+               }
 +        public function getTraces():Vector.<Trace> {
              return traces;
          }
  
@@@ -76,9 -74,8 +76,8 @@@
          }
          
          private function goToSelected():void {
-             FlexGlobals.topLevelApplication.theMap.updateCoordsFromLatLon(selectedResult.lat, selectedResult.lon);
-             FlexGlobals.topLevelApplication.theMap.download();
 -            Application.application.theMap.moveMapFromLatLon(selectedResult.lat, selectedResult.lon);
 -            //Application.application.theMap.redraw();            
++            FlexGlobals.topLevelApplication.theMap.moveMapFromLatLon(selectedResult.lat, selectedResult.lon);
 +            //FlexGlobals.topLevelApplication.theMap.redraw();
              PopUpManager.removePopUp(this);
          }
          
diff --cc potlatch2.mxml
        addedToStage="startInit()"
        preloader="net.systemeD.potlatch2.Preloader">
  
 -    <map:LocalizationMap xmlns:map="l10n.map.*" />
  
 -      <mx:Style source="styles/Application.css"/>
  
 -    <mx:Glow id="glowImage" duration="100" 
 -        alphaFrom="0.3" alphaTo="1.0" 
 -        blurXFrom="0.0" blurXTo="5.0" 
 -        blurYFrom="0.0" blurYTo="5.0" 
 -        color="0xFF8000"/>
 -    <mx:Glow id="unglowImage" duration="100" 
 -        alphaFrom="1.0" alphaTo="0.3" 
 -        blurXFrom="5.0" blurXTo="0.0" 
 -        blurYFrom="5.0" blurYTo="0.0" 
 -        color="0xFF8000"/>
 -    <mx:WipeLeft id="wipeOut" duration="250"/>
 -    <mx:WipeRight id="wipeIn" duration="250"/>
 +      <fx:Style source="styles/Application.css"/>
  
 -    <mx:ApplicationControlBar dock="true">
 +    <fx:Declarations>
 +        <map:LocalizationMap xmlns:map="l10n.map.*" />
 +        <mx:Glow id="glowImage" duration="100"
 +            alphaFrom="0.3" alphaTo="1.0"
 +            blurXFrom="0.0" blurXTo="5.0"
 +            blurYFrom="0.0" blurYTo="5.0"
 +            color="0xFF8000"/>
 +        <mx:Glow id="unglowImage" duration="100"
 +            alphaFrom="1.0" alphaTo="0.3"
 +            blurXFrom="5.0" blurXTo="0.0"
 +            blurYFrom="5.0" blurYTo="0.0"
 +            color="0xFF8000"/>
 +        <mx:WipeLeft id="wipeOut" duration="250"/>
 +        <mx:WipeRight id="wipeIn" duration="250"/>
 +    </fx:Declarations>
 +
 +    <mx:ApplicationControlBar id="controlbar" dock="true">
+         <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
+                       click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
+         <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
+         <mx:Spacer width="40"/>
+         <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
+             enabled="{MainUndoStack.getGlobalStack().canUndo()}"
+             toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
+         <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
+             enabled="{MainUndoStack.getGlobalStack().canRedo()}"
+             toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
+         <mx:Spacer width="100%"/>
          <mx:PopUpButton id="bgButton" label="Background" openAlways="true" styleName="appBarButton"
              creationComplete="bgButton.popUp = new BackgroundSelector();"/>
          <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true" styleName="appBarButton"
                                                     mx.controls.Menu(gpsButton.popUp).selectedIndex=0; /* Yes, we do need to call it twice */
                                                     theMap.removeLayerByName('GPS tracks'); }">
                        <mx:dataProvider>
 -                              <mx:Array>
 -                                      <mx:Object label="GPS data" id="gpsData" />
 -                                      <mx:Object label="My tracks" id="myTracks" />
 -                                      <mx:Object label="Clear" id="clearGps" />
 -                              </mx:Array>
 +                              <fx:Array>
 +                                      <fx:Object label="GPS data" id="gpsData" />
 +                                      <fx:Object label="My tracks" id="myTracks" />
 +                                      <fx:Object label="Clear" id="clearGps" />
 +                              </fx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>
-         <mx:Spacer width="100%"/>
-         <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
-             enabled="{MainUndoStack.getGlobalStack().canUndo()}"
-             toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
-         <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
-             enabled="{MainUndoStack.getGlobalStack().canRedo()}"
-             toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
-         <mx:Spacer width="100%"/>
-         <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
          <mx:Button id="optionsButton" label="Options" click="new OptionsDialog().init();" styleName="appBarButton" />
-         <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
-                       click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
      </mx:ApplicationControlBar>
      
      <mx:HDividedBox width="100%" height="100%">
          }
  
          private function loadTrace(id:Number):void {
-             var conn:Connection = theMap.editableLayer.connection;
-             conn.addEventListener(Connection.TRACES_LOADED, function (e:Event):void {
-                 for each (var trace:Trace in conn.getTraces()) {
-                     if (trace.id == id) { trace.addToMap(); }
-                 }
-             });
-             conn.fetchUserTraces();
+                       var conn:Connection = theMap.editableLayer.connection;
+                       conn.addEventListener(Connection.TRACES_LOADED, function (e:Event):void {
+                               var t:Trace = conn.findTrace(id);
+                               if (!t) { t=new Trace(conn,id); conn.addTrace(t); }
+                               t.addToMap();
+                               conn.removeEventListener(Connection.TRACES_LOADED, arguments.callee);
+                       });
+                       conn.fetchUserTraces();
          }
  
 -      ]]></mx:Script>
 +      ]]></fx:Script>
  
  </mx:Application>
  
      <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." />
    </inputSet>
  
+    <inputSet id="simpleBrand"> 
+      <input type="freetext" category="Naming" presence="always" name="Brand" key="brand" description="Brand, i.e. Acme"/> 
+    </inputSet> 
+   
+    <inputSet id="simpleOperator"> 
+      <input type="freetext" category="Naming" presence="always" name="Operator" key="operator" description="Operator, i.e. Acme Springfield Ltd"/> 
+    </inputSet> 
  
    <inputSet id="source">
 -    <input type="freetext" category="Misc" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
 +    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
    </inputSet>
  
    <inputSet id="designation">
    </inputSet>
  
    <inputSet id="rail-electrification">
 -    <input type="choice" name="Electrified" category="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
 +    <input type="choice" name="Electrified" category="Details" subcategory="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
             key="electrified">
        <choice value="yes" text="Yes"/>
+       <choice value="contact_line" text="Overhead line"/>
+       <choice value="rail" text="Third rail"/>
        <choice value="no" text="No"/>
      </input>
 -    <input type="choice" name="Voltage" category="Electrification" description="Nominal voltage of electric wires"
 +    <input type="choice" name="Voltage" category="Details" subcategory="Electrification" description="Nominal voltage of electric wires"
             key="voltage" presence="withCategory">
        <choice value="600" text="600V"/>
        <choice value="750" text="750V"/>
      </input>
    </inputSet>
  
+   <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"/>
+       <choice value="10pin" text="10 pin bowling"/>
+       <choice value="american_football" text="American football"/>
+       <choice value="archery" text="Archery"/>
+       <choice value="athletics" text="Athletics"/>
+       <choice value="australian_football" text="Australian Rules Football"/>
+       <choice value="baseball" text="Baseball"/>
+       <choice value="basketball" text="Basketball"/>
+       <choice value="beachvolleyball" text="Beach volleyball"/>
+       <choice value="boules" text="Boules/petanque/bocci"/>
+       <choice value="bowls" text="Lawn bowls"/>
+       <choice value="canadian_football" text="Canadian football"/>
+       <choice value="chess" text="Chess"/>
+       <choice value="cricket" text="Cricket"/>
+       <choice value="cricket_nets" text="Cricket nets"/>
+       <choice value="croquet" text="Croquet"/>
+       <choice value="equestrian" text="Equestrian"/>
+       <choice value="gaelic_football" text="Gaelic football"/>
+       <choice value="gymnastics" text="Gymnastics"/>
+       <choice value="team_handball" text="(Team) handball"/>
+       <choice value="hockey" text="(Field) hockey"/>
+       <choice value="korfball" text="Korfball"/>
+       <choice value="pelota" text="Pelota"/>
+       <choice value="rugby_league" text="Rugby league"/>
+       <choice value="rugby_union" text="Rugby union"/>
+       <choice value="shooting" text="Shooting"/>
+       <choice value="skating" text="Ice skating"/>
+       <choice value="skateboard" text="Skateboarding"/>
+       <choice value="soccer" text="Soccer/football"/>
+       <choice value="swimming" text="Swimming"/>
+       <choice value="table_tennis" text="Table tennis"/>
+       <choice value="tennis" text="Tennis"/>
+       <choice value="volleyball" text="Volleyball"/>
+     </input>
+   </inputSet>
++  <inputSet id="pitchSport">
++    <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here.">
++      <choice value="9pin" text="9 pin bowling"/>
++      <choice value="10pin" text="10 pin bowling"/>
++      <choice value="american_football" text="American football"/>
++      <choice value="archery" text="Archery"/>
++      <choice value="athletics" text="Athletics"/>
++      <choice value="australian_football" text="Australian Rules Football"/>
++      <choice value="baseball" text="Baseball"/>
++      <choice value="basketball" text="Basketball"/>
++      <choice value="beachvolleyball" text="Beach volleyball"/>
++      <choice value="boules" text="Boules/petanque/bocci"/>
++      <choice value="bowls" text="Lawn bowls"/>
++      <choice value="canadian_football" text="Canadian football"/>
++      <choice value="chess" text="Chess"/>
++      <choice value="cricket" text="Cricket"/>
++      <choice value="cricket_nets" text="Cricket nets"/>
++      <choice value="croquet" text="Croquet"/>
++      <choice value="equestrian" text="Equestrian"/>
++      <choice value="gaelic_football" text="Gaelic football"/>
++      <choice value="gymnastics" text="Gymnastics"/>
++      <choice value="team_handball" text="(Team) handball"/>
++      <choice value="hockey" text="(Field) hockey"/>
++      <choice value="korfball" text="Korball"/>
++      <choice value="pelota" text="Pelota"/>
++      <choice value="rugby_league" text="Rugby league"/>
++      <choice value="rugby_union" text="Rugby union"/>
++      <choice value="shooting" text="Shooting"/>
++      <choice value="skating" text="Ice skating"/>
++      <choice value="skateboard" text="Skateboarding"/>
++      <choice value="soccer" text="Soccer/football"/>
++      <choice value="swimming" text="Swimming"/>
++      <choice value="table_tennis" text="Table tennis"/>
++      <choice value="tennis" text="Tennis"/>
++      <choice value="volleyball" text="Volleyball"/>
++    </input>
++  </inputSet>
  
  <!-- Features -->
  
- <featureGroup>
-   <!-- =========== Amenity ============ -->
-   <feature name="Fire station">
-     <category>amenity</category>
-     <icon image="features/pois/amenity_firestation2.n.24.png"/>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
-     <point/>
-     <tag k="amenity" v="fire_station"/>
-     <inputSet ref="simpleName" />
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Police Station">
-     <category>amenity</category>
-     <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"/>
-     <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>
-   <feature name="Hospital">
-     <category>amenity</category>
-     <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"/>
-     <inputSet ref="simpleName"/>
-     <input type="choice" presence="always" category="Details" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
-       <choice value="yes" text="Yes"/>
-       <choice value="no" text="No"/>
-     </input>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Place of Worship">
-     <category>amenity</category>
-     <icon image="features/pois/place_of_worship_unknown.n.24.png"/>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>
-     <point/>
-     <tag k="amenity" v="place_of_worship"/>
-     <inputSet ref="simpleName" />
-     <input type="choice" presence="always" category="Details" name="Religion" key="religion" description="The religion worshipped here.">
-       <choice value="christian" text="Christianity (church)"/>
-       <choice value="jewish" text="Judaism (synagogue)"/>
-       <choice value="muslim" text="Islam (mosque)"/>
-       <choice value="hindu" text="Hinduism (temple)"/>
-       <choice value="buddhist" text="Buddhism (temple)"/>
-       <choice value="sikh" text="Sikhism (gurdwara)"/>
-       <choice value="shinto" text="Shinto (shrine)"/>
-     </input>
-     <input type="freetext" presence="always" category="Details" 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"/>
-     <help>http://wiki.openstreetmap.org/wiki/Atm</help>
-     <point/>
-     <tag k="amenity" v="atm"/>
-     <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
-     <input type="freetext" presence="always" category="Details" 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">
-       ${name}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
-     <point/>
-     <tag k="amenity" v="bank"/>
-     <inputSet ref="names"/>
-     <inputSet ref="buildingAddress"/>
-     <input type="choice" presence="always" category="Details" name="Public ATM available" key="atm" description="Is there a public ATM available?">
-       <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">
-       ${name}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
-     <point/>
-     <tag k="amenity" v="school"/>
-     <inputSet ref="names"/>
-     <inputSet ref="buildingAddress"/>
-     <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 image="features/pois/amenity_town_hall.n.24.png">
-       ${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>
-     <icon image="features/pois/amenity_post_box.n.24.png">
-       ${ref}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
-     <point/>
-     <tag k="amenity" v="post_box"/>
-     <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post box"/>
-     <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-     <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="Details" name="Ref" key="ref" description="Reference number of the post office"/>
-     <input type="freetext" presence="always" category="Details" 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>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>sport</category>
-     <icon image="features/pois/sport_shooting.n.24.png"/>
-     <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="Details" 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 image="features/pois/shopping_vending_machine.n.24.png">A vending machine.</icon>
-     <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>
-   <!-- ========= Entertainment ========= -->
-   <feature name="Pub">
-     <category>foodanddrink</category>
-     <icon image="features/pois/food_pub.n.24.png">
-       ${name}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
-     <point/>
-     <tag k="amenity" v="pub"/>
-     <inputSet ref="names"/>
-     <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">
-       ${name}
-     </icon>
-     <point/>
-     <tag k="amenity" v="bar"/>
-     <inputSet ref="names"/>
-     <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">
-       ${name}
-     </icon>
-     <point/>
-     <tag k="amenity" v="restaurant"/>
-     <inputSet ref="names"/>
-     <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">
-       ${name}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
-     <point/>
-     <tag k="amenity" v="cafe"/>
-     <inputSet ref="names"/>
-     <inputSet ref="web"/>
-     <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">
-       ${name}
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
-     <point/>
-     <tag k="amenity" v="fast_food"/>
-     <inputSet ref="names"/>
-     <inputSet ref="web"/>
-     <inputSet ref="buildingAddress"/>
-     <inputSet ref="cuisine"/>
-     <inputSet ref="common"/>
-   </feature>
+ <featureGroup>\r
+   <!-- =========== Amenity ============ -->\r
\r
+   <feature name="Fire station">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_firestation2.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>\r
+     <point/>\r
+     <tag k="amenity" v="fire_station"/>\r
+     <inputSet ref="simpleName" />\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Police Station">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_police2.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="police"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Library">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_library.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="library"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Hospital">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/health_hospital.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="hospital"/>\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
++    <input type="choice" presence="always" category="Details" 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
+     </input>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Place of Worship">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/place_of_worship_unknown.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>\r
+     <point/>\r
+     <tag k="amenity" v="place_of_worship"/>\r
+     <inputSet ref="simpleName" />\r
 -    <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">\r
++    <input type="choice" presence="always" category="Details" name="Religion" key="religion" description="The religion worshipped here.">\r
+       <choice value="christian" text="Christianity (church)"/>\r
+       <choice value="jewish" text="Judaism (synagogue)"/>\r
+       <choice value="muslim" text="Islam (mosque)"/>\r
+       <choice value="hindu" text="Hinduism (temple)"/>\r
+       <choice value="buddhist" text="Buddhism (temple)"/>\r
+       <choice value="sikh" text="Sikhism (gurdwara)"/>\r
+       <choice value="shinto" text="Shinto (shrine)"/>\r
+     </input>\r
\r
 -    <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>\r
++    <input type="freetext" presence="always" category="Details" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="ATM">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/money_atm.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Atm</help>\r
+     <point/>\r
+     <tag k="amenity" v="atm"/>\r
 -    <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>\r
 -    <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>\r
++    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>\r
++    <input type="freetext" presence="always" category="Details" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Bank">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/money_bank2.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>\r
+     <point/>\r
+     <tag k="amenity" v="bank"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="buildingAddress"/>\r
 -    <input type="choice" presence="always" category="Bank" name="Public ATM available" key="atm" description="Is there a public ATM available?">\r
++    <input type="choice" presence="always" category="Details" name="Public ATM available" key="atm" description="Is there a public ATM available?">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Recycling">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_recycling.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="recycling"/>\r
+     <inputSet ref="simpleName"/>\r
 -    <input type="choice" presence="always" category="Recycling" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">\r
++    <input type="choice" presence="always" category="Details" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">\r
+       <choice value="container" text="Container"/>\r
+       <choice value="centre" text="Recycling centre"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Books" key="recycling:books" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Books" key="recycling:books" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Green waste" key="recycling:green_waste" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Green waste" key="recycling:green_waste" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Newspaper" key="recycling:newspaper" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Newspaper" key="recycling:newspaper" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper" key="recycling:paper" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Paper" key="recycling:paper" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic" key="recycling:plastic" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Plastic" key="recycling:plastic" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
 -    <input type="choice" presence="onTagMatch" category="Recycling" name="Wood" key="recycling:wood" description="" priority="low">\r
++    <input type="choice" presence="onTagMatch" category="Details" name="Wood" key="recycling:wood" description="" priority="low">\r
+       <choice value="yes" text="Yes"/>\r
+       <choice value="no" text="No"/>\r
+     </input>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
 -\r
+   <feature name="School">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/education_school.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>\r
+     <point/>\r
+     <tag k="amenity" v="school"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Kindergarten">\r
+     <category>amenity</category>\r
+     <category>buildings</category>\r
+     <icon image="features/pois/education_nursery3.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>\r
+     <point/>\r
+     <tag k="amenity" v="kindergarten"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Town hall">\r
+     <category>amenity</category>\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
+     <point/>\r
+     <tag k="amenity" v="townhall"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Post Box">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_post_box.n.24.png">\r
+       ${ref}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Post_box</help>\r
+     <point/>\r
+     <tag k="amenity" v="post_box"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
++    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post box"/>\r
++    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Post Office">\r
+     <category>amenity</category>\r
+     <category>buildings</category>\r
+     <icon image="features/pois/amenity_post_office.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="post_office"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
++    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post office"/>\r
++    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
+     <inputSet ref="common"/>\r
+     <inputSet ref="simpleName"/>\r
+   </feature>\r
\r
+   <feature name="Trash/rubbish bin">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_waste_bin.n.24.png">\r
+       ${ref}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>\r
+     <point/>\r
+     <tag k="amenity" v="waste_basket"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Toilets">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_toilets.n.24.png">\r
+       ${ref}\r
+     </icon>\r
+     <point/>\r
+     <tag k="amenity" v="toilets"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Water fountain">\r
+     <category>amenity</category>\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_drinkingtap.n.24.png">\r
+       ${ref}\r
+     </icon>\r
+     <point/>\r
+     <tag k="amenity" v="drinking_water"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Shelter">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/accommodation_shelter2.n.24.png">\r
+       ${name}\r
+     </icon>    \r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="shelter"/>\r
 -    <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">\r
 -      <choice value="picnic_shelter" text="Picnic shelter"/>\r
 -      <choice value="public_transport" text="Public transport"/>\r
 -      <choice value="weather_shelter" text="Weather shelter"/>\r
 -      <choice value="wildlife_hide" text="Wildlife hide"/>\r
 -    </input>\r
 -    <inputSet ref="names"/>\r
++      <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">\r
++        <choice value="picnic_shelter" text="Picnic shelter"/>\r
++        <choice value="public_transport" text="Public transport"/>\r
++        <choice value="weather_shelter" text="Weather shelter"/>\r
++        <choice value="wildlife_hide" text="Wildlife hide"/>\r
++      </input>\r
++    <inputset ref="names"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Barbecue">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/tourist_picnic.n.24.png"/>\r
+     <!-- specific icon needed -->\r
+     <point/>\r
+     <tag k="amenity" v="bbq"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Hunting stand">\r
+     <category>sport</category>\r
+     <icon image="features/pois/sport_shooting.n.24.png"/>\r
+     <point/>\r
+     <tag k="amenity" v="hunting_stand"/>\r
+     <inputSet ref="common"/>\r
+     <inputSet ref="names"/>\r
+   </feature>\r
\r
\r
+   <feature name="Park bench">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_bench.n.24.png" />\r
+     <point/>\r
+     <tag k="amenity" v="bench"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Public telephone">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_telephone.n.24.png" />\r
+     <point/>\r
+     <tag k="amenity" v="telephone"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Emergency phone">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/emergency-telephone-24.png" />\r
+     <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->\r
+     <point/>\r
+     <tag k="amenity" v="emergency_phone"/>\r
+     <inputSet ref="common"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    \r
++    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of emergency phone."/>    \r
+   </feature>\r
\r
\r
+   <feature name="Swimming pool">\r
+     <category>amenity</category>\r
+     <category>sport</category>\r
+     <icon image="features/pois/sport_swimming_outdoor.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <point/>\r
+     <area/>\r
+     <tag k="amenity" v="swimming_pool"/>\r
+     <inputSet ref="simpleName"/>    \r
+     <inputSet ref="common"/>\r
\r
+   </feature>\r
\r
+   <feature name="Fountain">\r
+     <category>amenity</category>\r
+     <icon image="features/pois/amenity_fountain2.n.24.png">\r
+     ${name}\r
+     </icon>\r
+     <point/>\r
+     <tag k="amenity" v="fountain"/>\r
+     <inputSet ref="common"/>\r
+     <inputSet ref="simpleName"/>\r
+   </feature>\r
\r
+   <feature name="Vending machine">\r
+     <category>amenity</category>\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/shopping_vending_machine.n.24.png">A vending machine.</icon>\r
\r
+     <point/>\r
+     <tag k="amenity" v="vending_machine"/>\r
+     <inputSet ref="common"/>\r
+     <inputSet ref="simpleName"/>\r
+     <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>\r
 -    <inputSet ref="simpleOperator"/>\r
++    <inputSet ref="simpleOperator" />\r
+   </feature>\r
\r
+   <!-- ========= Entertainment ========= -->\r
\r
+   <feature name="Pub">\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_pub.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>\r
+     <point/>\r
+     <tag k="amenity" v="pub"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="web"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="wifi"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Bar">\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_bar.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <point/>\r
+     <tag k="amenity" v="bar"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="web"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="wifi"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Restaurant">\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_restaurant.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <point/>\r
+     <tag k="amenity" v="restaurant"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="web"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="cuisine"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Cafe">\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_cafe.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>\r
+     <point/>\r
+     <tag k="amenity" v="cafe"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="web"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="cuisine"/>\r
+     <inputSet ref="wifi"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Fast Food">\r
+     <category>foodanddrink</category>\r
+     <icon image="features/pois/food_fastfood.n.24.png">\r
+       ${name}\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>\r
+     <point/>\r
+     <tag k="amenity" v="fast_food"/>\r
+     <inputSet ref="names"/>\r
+     <inputSet ref="web"/>\r
+     <inputSet ref="buildingAddress"/>\r
+     <inputSet ref="cuisine"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
 -</featureGroup>\r
 +</featureGroup>
- <featureGroup>
-   <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
-     <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
-     <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
-     <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
-     <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
-     <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">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
-     <point/>
-     <tag k="barrier" v="toll_booth"/>
-     <tagSet ref="fee"/>
-     <input type="freetext" presence="onTagMatch" category="Details" 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="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>
+ <featureGroup>\r
+   <feature name="Wall">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="wall"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Ditch">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="ditch"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Retaining wall">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="retaining_wall"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="City wall">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="city_wall"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Fence">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="fence"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Hedge">\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+     <icon>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="hedge"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Bollard">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_bollard.n.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="bollard"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Gate">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_gate.n.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="gate"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Lift Gate">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_lift_gate.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>\r
+     <point/>\r
+     <tag k="barrier" v="lift_gate"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Kissing Gate">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_kissing_gate.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>\r
+     <point/>\r
+     <tag k="barrier" v="kissing_gate"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
\r
+   <feature name="Cycle Barrier">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_cycle_barrier.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="cycle_barrier"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Big Concrete Blocks">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_blocks.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="block"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Cattle Grid">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_cattle_grid.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="cattle_grid"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Toll Booth">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_toll_booth.n.24.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>\r
\r
+     <point/>\r
+     <tag k="barrier" v="toll_booth"/>\r
+     <inputSet ref="fee"/>\r
 -    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>\r
++    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the toll" priority="low"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Stile">\r
+     <category>barrier</category>\r
+     <icon image="features/pois/barrier_stile.n.24.png"/>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>\r
+     <point/>\r
+     <tag k="barrier" v="stile"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Wire fence">\r
+     <!-- no idea, but taginfo says 2700 uses -->\r
+     <category>barrier</category>\r
+     <icon image="features/barrier_generic.png"/>\r
+    \r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>\r
\r
+     <line/>\r
+     <tag k="barrier" v="wire_fence"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
  </featureGroup>
- <!-- This is a bit of a dumping ground for real landuse=*, but also outdoor natural/leisure/agriculture type keys. -->
- <featureGroup>
-   <feature name="Industrial Area">
-     <category>landuse</category>
-     <area/>
-     <icon image="features/pois/building_generic.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="landuse" v="industrial"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Offices">
-     <category>landuse</category>
-     <area/>
-     <icon image="features/pois/building_generic.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="landuse" v="commercial"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Residential Area">
-     <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 Area">
-     <category>landuse</category>
-     <area/>
-     <icon image="features/pois/building_generic.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="landuse" v="retail"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Construction Site">
-     <category>landuse</category>
-     <area/>
-     <icon image="features/pois/building_generic.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="landuse" v="construction"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Marketplace">
-     <category>shopping</category>
-     <point />
-     <area/>
-     <icon image="features/pois/shopping_marketplace.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="amenity" v="marketplace"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Cemetery">
-     <category>landuse</category>
-     <point />
-     <area/>
-     <icon image="features/pois/place_of_worship_unknown3.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="landuse" v="cemetery"/>
-     <inputSet ref="simpleName"/>
-     <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>
-     <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">
-     <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>sport</category>
-     <area/>
-     <point/>
-     <icon image="features/pois/amenity_playground.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="leisure" v="playground"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Golf course">
-     <category>sport</category>
-     <area/>
-     <icon  image="features/pois/sport_golf.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="leisure" v="golf_course"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Recreation ground">
-     <category>sport</category>    
-     <area/>
-     <icon image="features/pois/sport_leisure_centre.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="leisure" v="recreation_ground"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Sports pitch">
-     <category>sport</category>
-     <area/>
-     <icon image="features/pois/sport_leisure_centre.n.24.png">
-       <b>${name}</b>
-     </icon>
-     <tag k="leisure" v="pitch"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="pitchSport"/>
-     <inputSet ref="common"/>
-   </feature>
-   <inputSet id="pitchSport">
-     <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here.">
-       <choice value="9pin" text="9 pin bowling"/>
-       <choice value="10pin" text="10 pin bowling"/>
-       <choice value="american_football" text="American football"/>
-       <choice value="archery" text="Archery"/>
-       <choice value="athletics" text="Athletics"/>
-       <choice value="australian_football" text="Australian Rules Football"/>
-       <choice value="baseball" text="Baseball"/>
-       <choice value="basketball" text="Basketball"/>
-       <choice value="beachvolleyball" text="Beach volleyball"/>
-       <choice value="boules" text="Boules/petanque/bocci"/>
-       <choice value="bowls" text="Lawn bowls"/>
-       <choice value="canadian_football" text="Canadian football"/>
-       <choice value="chess" text="Chess"/>
-       <choice value="cricket" text="Cricket"/>
-       <choice value="cricket_nets" text="Cricket nets"/>
-       <choice value="croquet" text="Croquet"/>
-       <choice value="equestrian" text="Equestrian"/>
-       <choice value="gaelic_football" text="Gaelic football"/>
-       <choice value="gymnastics" text="Gymnastics"/>
-       <choice value="team_handball" text="(Team) handball"/>
-       <choice value="hockey" text="(Field) hockey"/>
-       <choice value="korfball" text="Korball"/>
-       <choice value="pelota" text="Pelota"/>
-       <choice value="rugby_league" text="Rugby league"/>
-       <choice value="rugby_union" text="Rugby union"/>
-       <choice value="shooting" text="Shooting"/>
-       <choice value="skating" text="Ice skating"/>
-       <choice value="skateboard" text="Skateboarding"/>
-       <choice value="soccer" text="Soccer/football"/>
-       <choice value="swimming" text="Swimming"/>
-       <choice value="table_tennis" text="Table tennis"/>
-       <choice value="tennis" text="Tennis"/>
-       <choice value="volleyball" text="Volleyball"/>
-     </input>
-   </inputSet>
-   <feature name="Sports track">
-     <category>sport</category>
-     <area/>
-     <line/>
-     <icon image="features/pois/sport_leisure_centre.n.24.png">
-       <b>${name}</b>
-       <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
-     </icon>
-     <tag k="leisure" v="track"/>
-     <inputSet ref="simpleName"/>
-     <inputSet ref="roadPhysical"/>
-     <inputSet ref="common"/>
-   </feature>
-   <!-- **************** Agriculture *************** -->
-   <feature name="Farm">
-     <category>agriculture</category>
-     <icon image="features/pois/landuse_grass.n.24.png"/>
-     <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">
-     <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>
- <!-- ************************************************************************
-        Natural
-        ************************************************************************ -->
-   <feature name="Park">
-     <category>natural</category>
-     <category>sport</category>
-     <icon image="icons/natural_blank.png">
-       <b>${name}</b>
-       <br/>
-     </icon>
-     <area/>
-     <tag k="leisure" v="park"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Forest">
-     <category>natural</category>
-     <icon image="/features/pois/landuse_coniferous.n.24.png"/>
-     <area/>
-     <tag k="landuse" v="forest"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Meadow">
-     <category>natural</category>
-     <icon image="icons/natural_blank.png"/>
-     <area/>
-     <tag k="landuse" v="meadow"/>
-     <inputSet ref="common"/>
-   </feature>
+ <!-- This is a bit of a dumping ground for real landuse=*, but also outdoor natural/leisure/agriculture type keys. -->\r
+ <featureGroup>\r
+   <feature name="Industrial Area">\r
+     <category>landuse</category>\r
+     <area/>\r
+     <icon image="features/pois/building_generic.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="industrial"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Offices">\r
+     <category>landuse</category>\r
+     <area/>\r
+     <icon image="features/pois/building_generic.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="commercial"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Residential Area">\r
+     <category>landuse</category>\r
+     <area/>\r
+     <icon image="features/pois/building_generic.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="residential"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Retail Area">\r
+     <category>landuse</category>\r
+     <area/>\r
+     <icon image="features/pois/building_generic.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="retail"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Construction Site">\r
+     <category>landuse</category>\r
+     <area/>\r
+     <icon image="features/pois/building_generic.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="construction"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Marketplace">\r
+     <category>shopping</category>\r
+     <point />\r
+     <area/>\r
+     <icon image="features/pois/shopping_marketplace.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="amenity" v="marketplace"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Cemetery">\r
+     <category>landuse</category>\r
+     <point />\r
+     <area/>\r
+     <icon image="features/pois/place_of_worship_unknown3.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="landuse" v="cemetery"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Graveyard">\r
+     <category>landuse</category>\r
+     <point />\r
+     <area/>\r
+     <icon image="features/pois/place_of_worship_unknown3.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="amenity" v="grave_yard"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Quarry">\r
+     <category>landuse</category>\r
+     <icon image="features/pois/poi_mine.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="quarry"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Military">\r
+     <category>landuse</category>\r
+     <icon image="features/pois/poi_military_bunker.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="military"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Conservation">\r
+     <category>natural</category>\r
+     <icon image="icons/natural_blank.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="conservation"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
\r
\r
\r
+   <feature name="Playground">\r
+     <category>sport</category>\r
+     <area/>\r
+     <point/>\r
+     <icon image="features/pois/amenity_playground.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="leisure" v="playground"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Golf course">\r
+     <category>sport</category>\r
+     <area/>\r
+     <icon  image="features/pois/sport_golf.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="leisure" v="golf_course"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Recreation ground">\r
+     <category>sport</category>    \r
+     <area/>\r
+     <icon image="features/pois/sport_leisure_centre.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="leisure" v="recreation_ground"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Sports pitch">\r
+     <category>sport</category>\r
+     <area/>\r
+     <icon image="features/pois/sport_leisure_centre.n.24.png">\r
+       <b>${name}</b>\r
+     </icon>\r
+     <tag k="leisure" v="pitch"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="pitchSport"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
 -\r
+   <feature name="Sports track">\r
+     <category>sport</category>\r
+     <area/>\r
+     <line/>\r
+     <icon image="features/pois/sport_leisure_centre.n.24.png">\r
+       <b>${name}</b>\r
+       <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>\r
+     </icon>\r
+     <tag k="leisure" v="track"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="roadPhysical"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <!-- **************** Agriculture *************** -->\r
+   <feature name="Farm">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="farm"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Farmyard">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="farmyard"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Farmland">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="farmland"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Field">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="meadow"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Orchard">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="orchard"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Vineyard">\r
+     <category>agriculture</category>\r
+     <icon image="features/pois/landuse_grass.n.24.png"/>\r
+     <area/>\r
+     <tag k="landuse" v="vineyard"/>\r
+     <inputSet ref="simpleName"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+ <!-- ************************************************************************\r
+        Natural\r
+        ************************************************************************ -->\r
\r
+   <feature name="Park">\r
+     <category>natural</category>\r
+     <category>sport</category>\r
+     <icon image="icons/natural_blank.png">\r
+       <b>${name}</b>\r
+       <br/>\r
+     </icon>\r
\r
+     <area/>\r
+     <tag k="leisure" v="park"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Forest">\r
+     <category>natural</category>\r
 -    <icon image="features/pois/landuse_coniferous.n.24.png"/>\r
++    <icon image="/features/pois/landuse_coniferous.n.24.png"/>\r
\r
+     <area/>\r
+     <tag k="landuse" v="forest"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Meadow">\r
+     <category>natural</category>\r
+     <icon image="icons/natural_blank.png"/>\r
\r
+     <area/>\r
+     <tag k="landuse" v="meadow"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
 -\r
 -\r
  </featureGroup>
- <featureGroup>
-   <feature name="Footpath">
-     <category>paths</category>
-     <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">
-     <category>paths</category>
-     <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"/>
-     <input type="choice"
-         name="Cycleway type" category="Cycle" description="What kind of bike path is this?"
-         key="cycleway" presence="onTagMatch" priority="low">
-         <choice value="segregated" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb."/>
-         <choice value="shared" text="Shared" description="Cyclists and pedestrians share the full width of the path."/>
-     </input> 
-   </feature>
-   <feature name="Pedestrian street">
-     <category>paths</category>
-     <icon image="features/paths__pedestrian.png">
-       <font size="14pt">
-         <b>${name}</b>
-       </font>
-     </icon>
-     <tag k="highway" v="pedestrian"/>
-     <!-- pedestrian roads can be lines or areas, with different tags -->
-     <!-- TODO - implement this! -->
-     <line>
-       <tag k="highway" v="pedestrian"/>
-     </line>
-     <area>
-       <tag k="highway" v="pedestrian"/>
-       <tag k="area" v="yes"/>
-     </area>
-     <inputSet ref="minorRoad"/>
-     <inputSet ref="common"/>
-     <inputset ref="naming"/>
-   </feature>
-   <feature name="Bridleway">
-     <category>paths</category>
-     <icon image="features/paths__bridleway.png">
-     </icon>
-     <line/>
-     <tag k="highway" v="bridleway"/>
-     <inputSet ref="path"/>
-     <inputSet ref="common"/>
-     <inputset ref="naming"/>
-   </feature>
-   <feature name="Steps">
-     <category>paths</category>
-     <icon image="features/paths__steps.png">
-     </icon>
-     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>
-     <line/>
-     <tag k="highway" v="steps"/>
-     <inputSet ref="path"/>
-     <input type="freetext" presence="always" category="Details" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
-     <inputSet ref="common"/>
-   </feature>
-   
-   <feature name="Generic path">
-     <category>paths</category>
-     <icon image="features/paths__unofficial.png">
-       ${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>
-   
-   <!-- Bicycle routes -->
-   <feature name="National Cycle Network">
-     <category>paths</category>
-     <icon image="features/route__ncn.png" background="red" foreground="white">
-       <font size="14pt">
-         <b>${ref}</b>
-       </font>
-       <br/>
-       <font size="12pt">${name}</font>
-     </icon>
-     <relation/>
-     <tag k="type" v="route"/>
-     <tag k="route" v="bicycle"/>
-     <tag k="network" v="ncn"/>
-     <inputSet ref="route"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Regional Cycle Network">
-     <category>paths</category>
-     <icon image="features/route__rcn.png" background="cyan" foreground="white">
-       <font size="14pt"><b>${ref}</b></font><br/>
-       <font size="12pt">${name}</font>
-     </icon>
-     <relation/>
-     <tag k="type" v="route"/>
-     <tag k="route" v="bicycle"/>
-     <tag k="network" v="rcn"/>
-     <inputSet ref="route"/>
-     <inputSet ref="common"/>
-   </feature>
-   <feature name="Local Cycle Network">
-     <category>paths</category>
-     <icon image="features/route__lcn.png" background="blue" foreground="white">
-       <font size="14pt">
-         <b>${ref}</b>
-       </font>
-       <br/>
-       <font size="12pt">${name}</font>
-     </icon>
-     <relation/>
-     <tag k="type" v="route"/>
-     <tag k="route" v="bicycle"/>
-     <tag k="network" v="lcn"/>
-     <inputSet ref="route"/>
-     <inputSet ref="common"/>
-   </feature>
-   
-   <!-- hiking -->
-   
-   <feature name="Long Distance Path">
-     <category>paths</category>
-     <icon image="features/route__nwn.png" background="green" foreground="white">
-       <font size="14pt">
-         <b>${ref}</b>
-       </font>
-       <br/>
-       <font size="12pt">${name}</font>
-     </icon>
-     <relation/>
-     <tag k="type" v="route"/>
-     <tag k="route" v="hiking" vmatch="hiking|foot"/>
-     <inputSet ref="route"/>
-     <inputSet ref="common"/>
-   </feature>
-   
- </featureGroup>
+ <featureGroup>\r
+   <feature name="Footpath">\r
+     <category>paths</category>\r
+     <icon image="features/paths__footway.png">\r
+       ${name} <i>${ref}</i>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>\r
+     <line/>\r
+     <tag k="highway" v="footway"/>\r
+     <inputSet ref="path"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Cycle path">\r
+     <category>paths</category>\r
+     <icon image="features/paths__bike.png">\r
+       ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>\r
+     <line/>\r
+     <tag k="highway" v="cycleway"/>\r
+     <inputSet ref="path"/>\r
+     <inputSet ref="common"/>\r
 -    <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low"> \r
 -       <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." /> \r
 -       <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." /> \r
 -    </input> \r
++    <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low">\r
++      <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." />\r
++      <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." />\r
+   </feature>\r
\r
+   <feature name="Pedestrian street">\r
+     <category>paths</category>\r
+     <icon image="features/paths__pedestrian.png">\r
+       <font size="14pt">\r
+         <b>${name}</b>\r
+       </font>\r
+     </icon>\r
\r
+     <tag k="highway" v="pedestrian"/>\r
+     <!-- pedestrian roads can be lines or areas, with different tags -->\r
+     <!-- TODO - implement this! -->\r
+     <line>\r
+       <tag k="highway" v="pedestrian"/>\r
+     </line>\r
+     <area>\r
+       <tag k="highway" v="pedestrian"/>\r
+       <tag k="area" v="yes"/>\r
+     </area>\r
+     <inputSet ref="minorRoad"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Bridleway">\r
+     <category>paths</category>\r
+     <icon image="features/paths__bridleway.png">\r
+     </icon>\r
\r
+     <line/>\r
+     <tag k="highway" v="bridleway"/>\r
+     <inputSet ref="path"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   <feature name="Steps">\r
+     <category>paths</category>\r
+     <icon image="features/paths__steps.png">\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>\r
\r
+     <line/>\r
+     <tag k="highway" v="steps"/>\r
+     <inputSet ref="path"/>\r
 -    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>\r
++    <input type="freetext" presence="always" category="Details" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
+   \r
+   <feature name="Generic path">\r
+     <category>paths</category>\r
+     <icon image="features/paths__unofficial.png">\r
+       ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>\r
+     </icon>\r
+     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>\r
\r
+     <line/>\r
+     <tag k="highway" v="path"/>\r
+     <inputSet ref="path"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
+   \r
+   <!-- Bicycle routes -->\r
+   <feature name="National Cycle Network">\r
+     <category>paths</category>\r
+     <icon image="features/route__ncn.png" background="red" foreground="white">\r
+       <font size="14pt">\r
+         <b>${ref}</b>\r
+       </font>\r
+       <br/>\r
+       <font size="12pt">${name}</font>\r
+     </icon>\r
\r
+     <relation/>\r
+     <tag k="type" v="route"/>\r
+     <tag k="route" v="bicycle"/>\r
+     <tag k="network" v="ncn"/>\r
\r
+     <inputSet ref="route"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Regional Cycle Network">\r
+     <category>paths</category>\r
+     <icon image="features/route__rcn.png" background="cyan" foreground="white">\r
+       <font size="14pt"><b>${ref}</b></font><br/>\r
+       <font size="12pt">${name}</font>\r
+     </icon>\r
\r
+     <relation/>\r
+     <tag k="type" v="route"/>\r
+     <tag k="route" v="bicycle"/>\r
+     <tag k="network" v="rcn"/>\r
\r
+     <inputSet ref="route"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
\r
\r
+   <feature name="Local Cycle Network">\r
+     <category>paths</category>\r
+     <icon image="features/route__lcn.png" background="blue" foreground="white">\r
+       <font size="14pt">\r
+         <b>${ref}</b>\r
+       </font>\r
+       <br/>\r
+       <font size="12pt">${name}</font>\r
+     </icon>\r
\r
+     <relation/>\r
+     <tag k="type" v="route"/>\r
+     <tag k="route" v="bicycle"/>\r
+     <tag k="network" v="lcn"/>\r
\r
+     <inputSet ref="route"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
+   \r
+   <!-- hiking -->\r
+   \r
+   <feature name="Long Distance Path">\r
+     <category>paths</category>\r
+     <icon image="features/route__nwn.png" background="green" foreground="white">\r
+       <font size="14pt">\r
+         <b>${ref}</b>\r
+       </font>\r
+       <br/>\r
+       <font size="12pt">${name}</font>\r
+     </icon>\r
\r
+     <relation/>\r
+     <tag k="type" v="route"/>\r
+     <tag k="route" v="hiking" vmatch="hiking|foot"/>\r
\r
+     <inputSet ref="route"/>\r
+     <inputSet ref="common"/>\r
+   </feature>\r
+   \r
+ </featureGroup>\r
  
  
    <feature name="Fuel">
 -    <category>transport</category> 
 -    <point /> 
 -    <inputSet ref="simpleName" /> 
 +    <category>transport</category>
-     <point/>
-     <inputSet ref="simpleName"/>
-     <icon image="features/pois/transport_fuel.n.24.png"/>
++    <point />
++    <inputSet ref="simpleName" />
+     <icon image="features/pois/transport_fuel.n.24.png" />
      <tag k="amenity" v="fuel"/>
-     <input type="freetext" category="Details" name="Operator" key="operator" description="The provider of the service"/>
-     <input type="choice" category="Details" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+     <inputSet ref="simpleBrand"/>
+     <inputSet ref="simpleOperator"/>
 -    <input type="choice" category="Fuels" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
 -    <input type="choice" category="Fuels" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
 -    <input type="choice" category="Fuels" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>
-     <input type="choice" category="Details" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
 -    <input type="choice" category="Fuels" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low">
++    <input type="choice" category="Details" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low">
++    <input type="choice" category="Details" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low">
++    <input type="choice" category="Details" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low">
++    <input type="choice" category="Details" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low">
++    <input type="choice" category="Details" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low">
++    <input type="choice" category="Details" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low">
+       <choice value="yes" text="Yes"/>
+       <choice value="no" text="No"/>
+     </input>
 -    <input type="choice" category="Fuels" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low">
++    <input type="choice" category="Details" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low">
        <choice value="yes" text="Yes"/>
        <choice value="no" text="No"/>
      </input>