<inputSet ref="tunnel"/>
<inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
- <inputSet ref="rail-usage"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
+
</feature>
<tag k="railway" v="rail"/>
<tag k="service" v="spur"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<tag k="railway" v="rail"/>
<tag k="service" v="siding"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<line/>
<tag k="railway" v="preserved"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<line/>
<tag k="railway" v="disused"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<line/>
<tag k="railway" v="abandoned"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<tag k="railway" v="light_rail"/>
<inputSet ref="bridge"/>
<inputSet ref="tunnel"/>
- <inputset ref="embankment-cutting"/>
+ <inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
+ <inputSet ref="tram-route"/>
+ <inputSet ref="train-route"/>
</feature>
<line/>
<tag k="railway" v="tram"/>
- <input ref="tram-route"/>
+ <inputSet ref="tram-route"/>
<inputSet ref="bridge"/>
<inputSet ref="tunnel"/>
- <inputset ref="embankment-cutting"/>
+ <inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
</feature>
<tag k="railway" v="subway"/>
<inputSet ref="bridge"/>
<inputSet ref="tunnel"/>
- <inputset ref="embankment-cutting"/>
+ <inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
</feature>
<line/>
<area/>
<tag k="railway" v="platform"/>
- <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The number of the platform" priority="low"/>
<inputSet ref="common"/>
</feature>
+ <feature name="Car Wash">
+ <category>transport</category>
+ <icon image="features/pois/transport_car_wash.n.24.png">
+ ${name}
+ </icon>
+ <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help>
+ <point/>
+ <tag k="amenity" v="car_wash"/>
+ <inputSet ref="names"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Opening hours" key="opening_hours" priority="normal"/>
+ <input type="choice" presence="onTagMatch" category="Details" name="Self service" key="self_service" priority="low">
+ <choice value="yes" text="Yes" />
+ <choice value="no" text="No" />
+ </input>
+ <input type="choice" presence="onTagMatch" category="Details" name="Automated" key="automated" priority="low">
+ <choice value="yes" text="Yes" />
+ <choice value="no" text="No" />
+ </input>
+
+ <inputSet ref="common"/>
+ </feature>
<feature name="Bus station">
<category>transport</category>
<area/>
<point/>
<inputSet ref="names"/>
- <input type="freetext" presence="always" category="Naming" name="International Air Transport Association (IATA) airport code" key="ref"/>
+ <input type="freetext" presence="always" category="Details" name="International Air Transport Association (IATA) airport code" key="ref"/>
<help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
<inputSet ref="common"/>
</feature>
<tag k="aeroway" v="runway"/>
<line/>
<inputSet ref="names"/>
- <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
+ <input type="freetext" presence="always" category="Details" name="Runway number (01-36)" key="ref"/>
<help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
<inputSet ref="common"/>
</feature>
<tag k="aeroway" v="taxiway"/>
<line/>
<inputSet ref="names"/>
- <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref" />
+ <input type="freetext" presence="always" category="Details" name="Taxiway number" key="ref" />
<help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
<inputSet ref="common"/>
</feature>
<icon image="features/pois/transport_airport_gate.n.24.png"/>
<tag k="aeroway" v="gate"/>
<point/>
- <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref"/>
+ <input type="freetext" presence="always" category="Details" name="Gate number" key="ref"/>
<help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
<inputSet ref="common"/>
</feature>
<area/>
<tag k="amenity" v="parking"/>
<inputSet ref="names"/>
- <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
<input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
+ <input type="choice" presence="always" category="Parking" name="Type" key="parking" priority="high">
+ <choice value="surface" text="Surface (outdoor)" />
+ <choice value="multi-storey" text="Multi-storey" />
+ <choice value="underground" text="Underground" />
+ <choice value="garage" text="Garage" />
+ <choice value="park_and_ride" text="Park-and-ride" />
+ <choice value="garage_boxes" text="Garage boxes" />
+ </input>
+ <input type="freetext" presence="onTagMatch" category="Parking" name="Maximum stay" key="maxstay" description="The maximum permitted duration of parking (eg, 4h)."/>
<inputSet ref="fee"/>
<inputSet ref="common"/>
</feature>
<point/>
<tag k="amenity" v="bicycle_parking"/>
<inputSet ref="names"/>
- <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
<input type="number" minimum="0" maximum="99999" stepSize="1"
presence="always" category="Cycle" name="Capacity" key="capacity"
description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
<point/>
<tag k="railway" v="station"/>
<inputSet ref="names"/>
- <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
- <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+ <input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/>
<inputSet ref="common"/>
+ <inputSet ref="train-route"/>
+
</feature>
<feature name="Fuel">
<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="Naming" name="Operator" key="operator" description="The provider of the service"/>
- <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+ <inputSet ref="simpleBrand"/>
+ <inputSet ref="simpleOperator"/>
+
+ <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="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+ <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="Fuels" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
+ <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="Fuels" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
+ <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="Fuels" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
+ <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="Fuels" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
+ <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="Fuels" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
+ <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="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+ <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="Fuels" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
+ <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="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="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="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="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="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="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="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>
-
-
<inputSet ref="common"/>
</feature>
<tag k="amenity" v="ferry_terminal"/>
<inputSet ref="simpleName" />
<input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
- <input type="freetext" presence="onTagMatch" category="Cargo" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
<inputSet ref="common"/>
</feature>
<tag k="route" v="bus"/>
<inputSet ref="route"/>
- <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
- <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>
+ <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
+ <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the bus service" priority="low"/>
<inputSet ref="common"/>
</feature>
<tag k="route" v="tram"/>
<inputSet ref="route"/>
- <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
- <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the tram service" priority="low"/>
+ <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
+ <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the tram service" priority="low"/>
<inputSet ref="common"/>
</feature>
+ <feature name="Train Route">
+ <category>transport</category>
+ <icon image="features/transport__railway.png">
+ <font size="12pt">
+ ${name|operator} <b>(${ref})</b>
+ </font>
+ </icon>
+
+ <relation/>
+ <tag k="type" v="route"/>
+ <tag k="route" v="train"/>
+ <input type="freetext" presence="always" category="Details" name="Name" priority="high" key="name" description="Official route name"/>
+ <input type="freetext" presence="always" category="Details" name="Reference" priority="high" key="ref" description="The official reference number"/>
+ <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the train service" priority="high"/>
+ <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the train service" priority="low"/>
+ <input type="freetext" presence="onTagMatch" category="Details" name="Colour code" key="colour" description="Official colour designation for the route, if any." priority="low" />
+ <inputSet ref="source"/>
+ <inputSet ref="wheelchair-basic" />
+ </feature>
+
-</featureGroup>
\ No newline at end of file
+</featureGroup>