New highway icons for Potlatch 2

public/potlatch2/map_features.xml

@@ -573,9 +573,9 @@ Quick documentation:
     <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"/>
 
@@ -598,9 +598,9 @@ Quick documentation:
     <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"/>
 
@@ -610,7 +610,7 @@ Quick documentation:
 
   <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>
@@ -623,9 +623,9 @@ Quick documentation:
     <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>
@@ -641,7 +641,7 @@ Quick documentation:
 
   <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>
@@ -654,9 +654,9 @@ Quick documentation:
     <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>
@@ -676,7 +676,7 @@ Quick documentation:
 
   <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>
@@ -689,9 +689,9 @@ Quick documentation:
     <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>
@@ -764,7 +764,7 @@ Quick documentation:
 
   <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>
 
@@ -777,7 +777,7 @@ Quick documentation:
 
   <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>
@@ -791,7 +791,7 @@ Quick documentation:
 
   <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>