FIX bug with LWN/RWN/NWN paths: route=hiking was not being set.

CHANGE route=foot to route=hiking on these relations. It's about twice as popular on taginfo.

diff --git a/resources/map_features.xml b/resources/map_features.xml
index 56299f2e8b8de0a54e670029f4e624a28b1ef65b..10740004bd617bb6f21e25cc82dfde4ff4446a87 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -472,6 +472,7 @@ Quick documentation:
   <inputSet id="ldp">
     <input type="route" name="National Walking Route" description="National walking route" category="Walking" priority="normal">
       <match k="type" v="route"/>
+      <match k="route" v="hiking"/>
       <match k="network" v="nwn"/>
       <icon image="features/route__nwn.png" background="red" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
@@ -480,6 +481,7 @@ Quick documentation:
     </input>
     <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walking" priority="low">
       <match k="type" v="route"/>
+      <match k="route" v="hiking"/>
       <match k="network" v="rwn"/>
       <icon image="features/route__rwn.png" background="cyan" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
@@ -488,6 +490,7 @@ Quick documentation:
     </input>
     <input type="route" name="Local Walking Route" description="Local walking route" category="Walking" priority="lowest">
       <match k="type" v="route"/>
+      <match k="route" v="hiking"/>
       <match k="network" v="lwn"/>
       <icon image="features/route__lwn.png" background="blue" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>

diff --git a/resources/map_features/paths.xml b/resources/map_features/paths.xml
index df2b79373ad0d709e67a19399024afcf2bb481df..f574de00e808b3e03658ca90a0ac64737d15eb82 100644 (file)
--- a/resources/map_features/paths.xml
+++ b/resources/map_features/paths.xml
@@ -1,78 +1,78 @@
-<featureGroup>
-  <feature name="Footpath">
-    <category>paths</category>
-    <icon image="features/paths__footway.png">
-      ${name} <i>${ref}</i>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>
-    <line/>
-    <tag k="highway" v="footway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-    <inputset ref="naming"/>
-  </feature>
-
-  <feature name="Cycle path">
-    <category>paths</category>
-    <icon image="features/paths__bike.png">
-      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>
-    <line/>
-    <tag k="highway" v="cycleway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-    <inputset ref="naming"/>
-  </feature>
-
-  <feature name="Pedestrian street">
-    <category>paths</category>
-    <icon image="features/paths__pedestrian.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-
-    <tag k="highway" v="pedestrian"/>
-    <!-- pedestrian roads can be lines or areas, with different tags -->
-    <!-- TODO - implement this! -->
-    <line>
-      <tag k="highway" v="pedestrian"/>
-    </line>
-    <area>
-      <tag k="highway" v="pedestrian"/>
-      <tag k="area" v="yes"/>
-    </area>
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-    <inputset ref="naming"/>
-  </feature>
-
-  <feature name="Bridleway">
-    <category>paths</category>
-    <icon image="features/paths__bridleway.png">
-    </icon>
-
-    <line/>
-    <tag k="highway" v="bridleway"/>
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-    <inputset ref="naming"/>
-  </feature>
-
-  <feature name="Steps">
-    <category>paths</category>
-    <icon image="features/paths__steps.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>
-
-    <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"/>
-    <inputSet ref="common"/>
-  </feature>
-  
+<featureGroup>\r
+  <feature name="Footpath">\r
+    <category>paths</category>\r
+    <icon image="features/paths__footway.png">\r
+      ${name} <i>${ref}</i>\r
+    </icon>\r
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>\r
+    <line/>\r
+    <tag k="highway" v="footway"/>\r
+    <inputSet ref="path"/>\r
+    <inputSet ref="common"/>\r
+    <inputset ref="naming"/>\r
+  </feature>\r
+\r
+  <feature name="Cycle path">\r
+    <category>paths</category>\r
+    <icon image="features/paths__bike.png">\r
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>\r
+    </icon>\r
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>\r
+    <line/>\r
+    <tag k="highway" v="cycleway"/>\r
+    <inputSet ref="path"/>\r
+    <inputSet ref="common"/>\r
+    <inputset ref="naming"/>\r
+  </feature>\r
+\r
+  <feature name="Pedestrian street">\r
+    <category>paths</category>\r
+    <icon image="features/paths__pedestrian.png">\r
+      <font size="14pt">\r
+        <b>${name}</b>\r
+      </font>\r
+    </icon>\r
+\r
+    <tag k="highway" v="pedestrian"/>\r
+    <!-- pedestrian roads can be lines or areas, with different tags -->\r
+    <!-- TODO - implement this! -->\r
+    <line>\r
+      <tag k="highway" v="pedestrian"/>\r
+    </line>\r
+    <area>\r
+      <tag k="highway" v="pedestrian"/>\r
+      <tag k="area" v="yes"/>\r
+    </area>\r
+    <inputSet ref="minorRoad"/>\r
+    <inputSet ref="common"/>\r
+    <inputset ref="naming"/>\r
+  </feature>\r
+\r
+  <feature name="Bridleway">\r
+    <category>paths</category>\r
+    <icon image="features/paths__bridleway.png">\r
+    </icon>\r
+\r
+    <line/>\r
+    <tag k="highway" v="bridleway"/>\r
+    <inputSet ref="path"/>\r
+    <inputSet ref="common"/>\r
+    <inputset ref="naming"/>\r
+  </feature>\r
+\r
+  <feature name="Steps">\r
+    <category>paths</category>\r
+    <icon image="features/paths__steps.png">\r
+    </icon>\r
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>\r
+\r
+    <line/>\r
+    <tag k="highway" v="steps"/>\r
+    <inputSet ref="path"/>\r
+    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+  \r
   <feature name="Generic path">
     <category>paths</category>
     <icon image="features/paths__unofficial.png">
@@ -87,82 +87,82 @@
     <inputset ref="naming"/>
   </feature>
 
-  
-  <!-- Bicycle routes -->
-  <feature name="National Cycle Network">
-    <category>paths</category>
+  \r
+  <!-- Bicycle routes -->\r
+  <feature name="National Cycle Network">\r
+    <category>paths</category>\r
     <icon image="features/route__ncn.png" background="red" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
+      <font size="14pt">\r
+        <b>${ref}</b>\r
+      </font>\r
+      <br/>\r
+      <font size="12pt">${name}</font>\r
+    </icon>\r
+\r
+    <relation/>\r
+    <tag k="type" v="route"/>\r
     <tag k="route" v="bicycle"/>
-    <tag k="network" v="ncn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Regional Cycle Network">
-    <category>paths</category>
+    <tag k="network" v="ncn"/>\r
+\r
+    <inputSet ref="route"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+\r
+\r
+  <feature name="Regional Cycle Network">\r
+    <category>paths</category>\r
     <icon image="features/route__rcn.png" background="cyan" 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="bicycle"/>
-    <tag k="network" v="rcn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Local Cycle Network">
-    <category>paths</category>
-    <icon image="features/route__lcn.png" background="blue" foreground="white">
-      <font size="14pt">
-        <b>${ref}</b>
-      </font>
-      <br/>
-      <font size="12pt">${name}</font>
-    </icon>
-
-    <relation/>
-    <tag k="type" v="route"/>
+      <font size="14pt"><b>${ref}</b></font><br/>\r
+      <font size="12pt">${name}</font>\r
+    </icon>\r
+\r
+    <relation/>\r
+    <tag k="type" v="route"/>\r
+    <tag k="route" v="bicycle"/>\r
+    <tag k="network" v="rcn"/>\r
+\r
+    <inputSet ref="route"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+\r
+\r
+  <feature name="Local Cycle Network">\r
+    <category>paths</category>\r
+    <icon image="features/route__lcn.png" background="blue" foreground="white">\r
+      <font size="14pt">\r
+        <b>${ref}</b>\r
+      </font>\r
+      <br/>\r
+      <font size="12pt">${name}</font>\r
+    </icon>\r
+\r
+    <relation/>\r
+    <tag k="type" v="route"/>\r
     <tag k="route" v="bicycle"/>
-    <tag k="network" v="lcn"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-  
-  <!-- hiking -->
-  
-  <feature name="Long Distance Path">
-    <category>paths</category>
+    <tag k="network" v="lcn"/>\r
+\r
+    <inputSet ref="route"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+  \r
+  <!-- hiking -->\r
+  \r
+  <feature name="Long Distance Path">\r
+    <category>paths</category>\r
     <icon image="features/route__nwn.png" background="green" 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="foot"/>
-
-    <inputSet ref="route"/>
-    <inputSet ref="common"/>
-  </feature>
-  
+      <font size="14pt">\r
+        <b>${ref}</b>\r
+      </font>\r
+      <br/>\r
+      <font size="12pt">${name}</font>\r
+    </icon>\r
+\r
+    <relation/>\r
+    <tag k="type" v="route"/>\r
+    <tag k="route" v="hiking"/>\r
+\r
+    <inputSet ref="route"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+  \r
 </featureGroup>
\ No newline at end of file