Update Potlatch 2 to 2.3-121-geaece4c build

[rails.git] / public / potlatch2 / map_features / paths.xml

diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml
index fbac906b654be260185700e26948858d8d610e23..b737f1637117e700468602e0ce6ffe8967112a70 100644 (file)
--- a/public/potlatch2/map_features/paths.xml
+++ b/public/potlatch2/map_features/paths.xml
@@ -9,7 +9,6 @@
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Cycle path">
@@ -22,13 +21,10 @@
     <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> 
+    <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low">
+      <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." />
+      <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." />
+    </input>
   </feature>
 
   <feature name="Pedestrian street">
@@ -51,7 +47,6 @@
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Bridleway">
@@ -63,7 +58,6 @@
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Steps">
@@ -75,7 +69,7 @@
     <line/>
     <tag k="highway" v="steps"/>
     <inputSet ref="path"/>
-    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
+    <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>
   
@@ -90,7 +84,6 @@
     <tag k="highway" v="path"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   
@@ -150,6 +143,31 @@
     <inputSet ref="route"/>
     <inputSet ref="common"/>
   </feature>
+
+  <feature name="Mountain bike route">
+    <category>paths</category>
+    <icon image="features/route__mtb.png" background="#9f4404" 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="mtb"/>
+
+    <input type="choice" presence="always" category="Details" name="Route type" key="mtb:type" description="What type of route is it?">
+      <choice value="crosscountry" text="Cross-country"/>
+      <choice value="allmountain" text="All-mountain"/>
+      <choice value="freeride" text="Freeride"/>
+      <choice value="downhill" text="Downhill"/>
+      <choice value="trial" text="Trial"/>
+    </input>
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
   
   <!-- hiking -->
   
@@ -171,4 +189,4 @@
     <inputSet ref="common"/>
   </feature>
   
-</featureGroup>
\ No newline at end of file
+</featureGroup>