Merge branch 'master' into openstreetbugs

[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 f27f57779a481f265aa04b7c3d92e67f4d723d2d..4e064aa54ceef3b24a71afe8bda044c87178c247 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,7 +21,6 @@
     <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="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." /> 
@@ -49,7 +47,6 @@
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Bridleway">
@@ -61,7 +58,6 @@
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Steps">
@@ -88,7 +84,6 @@
     <tag k="highway" v="path"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>