Move cycleway=segregated and cycleway=shared to highway=cycleway, rather than road...

diff --git a/resources/map_features.xml b/resources/map_features.xml
index afb3c4b43586aefb199ecff99482c944013b6e57..1c54acf28d65af9e5dec5dd1ebfd1a895d060e91 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -464,8 +464,6 @@ Quick documentation:
       <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."/>
-      <choice value="segregated" text="Segregated cycle path" description="A path where cyclists and pedestrians are separated by a painted line or kerb."/>
-      <choice value="shared" text="Shared cycle path" description="A path where cyclists and pedestrians share the full width of the path."/>
       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>

diff --git a/resources/map_features/paths.xml b/resources/map_features/paths.xml
index 4b7b2a3ee1fb9d6b9a50888c9778f154de5f4cc7..87e7e0d05e85e21362170d91ec326a366f5cd7b0 100644 (file)
--- a/resources/map_features/paths.xml
+++ b/resources/map_features/paths.xml
@@ -23,6 +23,12 @@
     <inputSet ref="path"/>\r
     <inputSet ref="common"/>\r
     <inputset ref="naming"/>\r
+    <input type="choice"\r
+        name="Cycleway type" category="Cycle" description="What kind of bike path is this?"\r
+        key="cycleway" presence="onTagMatch" priority="low">\r
+        <choice value="segregated" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb."/>\r
+        <choice value="shared" text="Shared" description="Cyclists and pedestrians share the full width of the path."/>\r
+    </input> \r
   </feature>\r
 \r
   <feature name="Pedestrian street">\r