<category name="Advanced" id="advanced">
</category>
- <category name="Misc" id="misc">
+ <category name="Places" id="places">
</category>
<!-- Common input sets -->
</inputSet>
<inputSet id="source">
- <!-- Can you do a combined freetext/dropdown? -->
- <!-- Also need to make sure every object gets this -->
- <input type="freetext" category="Misc" presence="always" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, nearmap...)" priority="high"/>
+ <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"/>
</inputSet>
<inputSet id="common">
<inputSet ref="bridge"/>
<inputSet ref="tunnel"/>
<inputSet ref="embankment-cutting"/>
+ <!-- not sure which category best suits put area=yes -->
+ <input type="checkbox" presence="onTagMatch" category="Restrictions" key="area" name="Open area" description="The way is a large open space, like at a dock, where vehicles can move anywhere within the space, rather than just along the edge." />
</inputSet>
<inputSet id="roadLanes">
<input type="choice"
name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
key="bicycle">
- <choice value="no" text="Prohibited"/>
+ <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>
<choice value="yes" text="Allowed"/>
+ <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/>
<choice value="designated" text="Designated"/>
<choice value="private" text="Private"/>
<help>http://wiki.openstreetmap.org/wiki/Key:access</help>
name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
key="cycleway" layout="horizontal">
<choice value="no" text="No bike lanes"/>
- <choice value="opposite" text="No, but two-way bicycle traffic permitted" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane. Common in Belgium, Netherlands, Denmark."/>
- <choice value="lane" text="Standard bike lane" description="Separated by painted line"/>
- <choice value="track" text="Copenhagen-style bike lane" description="Separated by kerb or parked cars"/>
- <choice value="opposite_lane" text="Two-way bike lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
- <choice value="opposite_track" text="Two-way Copenhagen-style bike lane" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+ <choice value="lane" text="On-road bike lane" description="Separated by painted line"/>
+ <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
+ <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
+ <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+ <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
<help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
</input>
</inputSet>
</inputSet>
+ <inputSet id="places">
+ <input type="choice" name="Type of Place" presence="always" key="place">
+ <choice value="locality" text="Locality"/>
+ <choice value="hamlet" text="Hamlet"/>
+ <choice value="village" text="Village"/>
+ <choice value="suburb" text="Suburb"/>
+ <choice value="town" text="Town"/>
+ <choice value="city" text="City"/>
+ <choice value="county" text="County"/>
+ <choice value="region" text="Region"/>
+ <choice value="state" text="State"/>
+ <choice value="country" text="Country"/>
+ <choice value="continent" text="Continent"/>
+ <choice value="island" text="Island"/>
+ <choice value="islet" text="Islet"/>
+ </input>
+ </inputSet>
+
<!-- ************************************************************************
Roads
************************************************************************ -->
<inputSet ref="common"/>
</feature>
- <feature name="Motorway link" icon="features/motorway_link.png">
+ <feature name="Motorway link">
<category>roads</category>
- <icon image="features/highway__motorway.png"/>
+ <icon image="features/highway__motorway_link.png"/>
<line/>
<tag k="highway" v="motorway_link"/>
<inputSet ref="common"/>
</feature>
- <feature name="Trunk link" icon="features/motorway_link.png">
+ <feature name="Trunk link">
<category>roads</category>
- <icon image="features/highway__trunk.png"/>
+ <icon image="features/highway__trunk_link.png"/>
<line/>
<tag k="highway" v="trunk_link"/>
<feature name="Primary road">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__primary.png">
<font size="16pt"><b>${ref}</b></font><br/>
<font size="10pt">${name}</font>
</icon>
<inputSet ref="common"/>
</feature>
- <feature name="Primary road link">
+ <feature name="Primary link">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__primary_link.png">
<font size="16pt"><b>${ref}</b></font><br/>
<font size="10pt">${name}</font>
</icon>
<feature name="Secondary road">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__secondary.png">
<font size="16pt"><b>${ref}</b></font><br/>
<font size="10pt">${name}</font>
</icon>
<inputSet ref="common"/>
</feature>
- <feature name="Secondary road link">
+ <feature name="Secondary link">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__secondary_link.png">
<font size="16pt">
<b>${ref}</b>
</font>
<feature name="Tertiary road">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__tertiary.png">
<font size="14pt"><b>${name}</b></font><br/>
<font size="10pt">${ref}</font>
</icon>
<inputSet ref="common"/>
</feature>
- <feature name="Tertiary road link">
+ <feature name="Tertiary link">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__tertiary_link.png">
<font size="14pt"><b>${name}</b></font><br/>
<font size="10pt">${ref}</font>
</icon>
<feature name="Unknown road">
<category>roads</category>
- <icon image="features/highway__service.png">
+ <icon image="features/highway__unknown.png">
<font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
</icon>
<feature name="Living Street">
<category>roads</category>
- <icon image="features/highway__residential.png">
+ <icon image="features/highway__living_street.png">
<font size="14pt"><b>${name}</b></font>
</icon>
<help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
<feature name="Track">
<category>roads</category>
- <icon image="features/highway__unclassified.png">
+ <icon image="features/highway__track.png">
<font size="14pt"><b>${name}</b></font>
</icon>
<inputSet ref="common"/>
</feature>
- <feature name="Pedestrian Street">
+ <feature name="Pedestrian street">
<category>paths</category>
<icon image="features/paths__pedestrian.png">
<font size="14pt">
<feature name="Drain">
<category>water</category>
- <icon image="features/pois/water_generic.24.png">
+ <icon image="features/waterway__drain.png">
<font size="14pt"><b>${name}</b></font>
</icon>
<feature name="Weir">
<category>water</category>
- <icon image="features/pois/water_generic.24.png">
+ <icon image="features/waterway__weir.png">
<font size="14pt">
<b>${name}</b>
</font>
<feature name="Slipway">
<category>water</category>
- <icon image="features/pois/water_generic.24.png"/>
+ <icon image="features/waterway__slipway.png" />
<line/>
<tag k="leisure" v="slipway"/>
<inputSet ref="names"/>
<inputSet ref="common"/>
</feature>
+ <feature name="Slipway">
+ <category>water</category>
+ <point />
+ <tag k="leisure" v="slipway"/>
+ <inputSet ref="names"/>
+ <inputSet ref="common"/>
+ </feature>
- <area/>
+ <feature name="Coastline">
+ <category>water</category>
+ <line/>
+ <tag k="natural" v="coastline"/>
+ <inputSet ref="common"/>
+ </feature>
<!-- ************************************************************************
Transport
</icon>
<area/>
- <tag k="building" v="*"/>
+ <!-- <tag k="building" v="*"/> -->
+ <tag k="building" v="yes"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="common"/>
Landuse
************************************************************************ -->
- <feature name="Industry">
+ <feature name="Industrial Area">
<category>landuse</category>
<area/>
<icon image="features/pois/building_generic.png">
<inputSet ref="common"/>
</feature>
- <feature name="Residential">
+ <feature name="Residential Area">
<category>landuse</category>
<area/>
<icon image="features/pois/building_generic.png">
<inputSet ref="common"/>
</feature>
- <feature name="Retail">
+ <feature name="Retail Area">
<category>landuse</category>
<area/>
<icon image="features/pois/building_generic.png">
<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>landuse</category>
</inputSet>
<!-- Places -->
- <feature name="Place">
- <category>misc</category>
+
+
+ <feature name="Hamlet">
+ <category>places</category>
<icon image="icons/place.png"/>
<point/>
<area/>
- <!-- TODO: make this work -->
- <tag k="place" v="*"/>
+ <tag k="place" v="hamlet" />
<inputSet ref="names"/>
- <input type="choice" name="Type of place name" presence="always" key="place">
- <choice value="locality" text="Locality"/>
- <choice value="hamlet" text="Hamlet"/>
- <choice value="village" text="Village"/>
- <choice value="suburb" text="Suburb"/>
- <choice value="county" text="County"/>
- <choice value="city" text="City"/>
- <choice value="region" text="Region"/>
- <choice value="state" text="State"/>
- <choice value="country" text="Country"/>
- <choice value="continent" text="Continent"/>
- <choice value="island" text="Island"/>
- <choice value="islet" text="Islet"/>
- </input>
+ <inputSet ref="places"/>
<inputSet ref="common"/>
</feature>
+ <feature name="Village">
+ <category>places</category>
+ <icon image="icons/place.png"/>
+ <point/>
+ <area/>
+ <tag k="place" v="village" />
+ <inputSet ref="names"/>
+ <inputSet ref="places"/>
+ <inputSet ref="common"/>
+ </feature>
+ <feature name="Suburb">
+ <category>places</category>
+ <icon image="icons/place.png"/>
+ <point/>
+ <area/>
+ <tag k="place" v="suburb" />
+ <inputSet ref="names"/>
+ <inputSet ref="places"/>
+ <inputSet ref="common"/>
+ </feature>
+ <feature name="Town">
+ <category>places</category>
+ <icon image="icons/place.png"/>
+ <point/>
+ <area/>
+ <tag k="place" v="town" />
+ <inputSet ref="names"/>
+ <inputSet ref="places"/>
+ <inputSet ref="common"/>
+ </feature>
+
+ <feature name="City">
+ <category>places</category>
+ <icon image="icons/place.png"/>
+ <point/>
+ <area/>
+ <tag k="place" v="city" />
+ <inputSet ref="names"/>
+ <inputSet ref="places"/>
+ <inputSet ref="common"/>
+ </feature>
<!-- ************************************************************************
POIs
<inputSet ref="common"/>
</feature>
+ <feature name="Toilets">
+ <category>amenity</category>
+ <point/>
+ <tag k="amenity" v="toilets"/>
+ <inputSet ref="common"/>
+ </feature>
+
<!-- ========= Accommodation ========= -->
<!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
<inputSet ref="common"/>
</feature>
-
-
<!-- ========= Transport ========= -->
<feature name="Aerodrome">
<inputSet ref="common"/>
</feature>
+ <feature name="Mini Roundabout">
+ <category>transport</category>
+ <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
+ <point/>
+ <tag k="highway" v="mini_roundabout"/>
+ <inputSet ref="common"/>
+ </feature>
+
<feature name="Traffic calming">
<help>http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming</help>
<point/>
<!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
- <tag k="traffic_calming" v="*"/>
+ <!--<tag k="traffic_calming" v="*"/>-->
+ <tag k="traffic_calming" v="yes"/>
<input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
<choice value="yes" text="Unspecified"/>
<choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
<inputSet ref="common"/>
</feature>
+ <!-- boundaries -->
+
+ <feature name="Administrative Boundary">
+ <category>places</category>
+ <line/>
+ <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
+ <tag k="boundary" v="administrative"/>
+ <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+ </feature>
<!-- ************************************************************************
Relations
projects / rails.git / blobdiff