From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Dec 2010 11:35:54 +0000 (+0000)
Subject: New highway icons for Potlatch 2
X-Git-Tag: live~6250^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/19d683b4df6f7d4098ef786dd36c96b6f90c8df5

New highway icons for Potlatch 2
---

diff --git a/public/potlatch2/features/highway__living_street.png b/public/potlatch2/features/highway__living_street.png
new file mode 100644
index 000000000..1143ec613
Binary files /dev/null and b/public/potlatch2/features/highway__living_street.png differ
diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png
index 0a12e1875..d57e808b8 100644
Binary files a/public/potlatch2/features/highway__motorway.png and b/public/potlatch2/features/highway__motorway.png differ
diff --git a/public/potlatch2/features/highway__motorway_link.png b/public/potlatch2/features/highway__motorway_link.png
new file mode 100644
index 000000000..db29b4ba5
Binary files /dev/null and b/public/potlatch2/features/highway__motorway_link.png differ
diff --git a/public/potlatch2/features/highway__primary.png b/public/potlatch2/features/highway__primary.png
new file mode 100644
index 000000000..096e69579
Binary files /dev/null and b/public/potlatch2/features/highway__primary.png differ
diff --git a/public/potlatch2/features/highway__primary_link.png b/public/potlatch2/features/highway__primary_link.png
new file mode 100644
index 000000000..cf5528a13
Binary files /dev/null and b/public/potlatch2/features/highway__primary_link.png differ
diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png
index d481aab75..5632f52d3 100644
Binary files a/public/potlatch2/features/highway__residential.png and b/public/potlatch2/features/highway__residential.png differ
diff --git a/public/potlatch2/features/highway__secondary.png b/public/potlatch2/features/highway__secondary.png
new file mode 100644
index 000000000..6d826c4d7
Binary files /dev/null and b/public/potlatch2/features/highway__secondary.png differ
diff --git a/public/potlatch2/features/highway__secondary_link.png b/public/potlatch2/features/highway__secondary_link.png
new file mode 100644
index 000000000..fd348a8d0
Binary files /dev/null and b/public/potlatch2/features/highway__secondary_link.png differ
diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png
index 0fdd44135..4c356394f 100644
Binary files a/public/potlatch2/features/highway__service.png and b/public/potlatch2/features/highway__service.png differ
diff --git a/public/potlatch2/features/highway__tertiary.png b/public/potlatch2/features/highway__tertiary.png
new file mode 100644
index 000000000..16daae046
Binary files /dev/null and b/public/potlatch2/features/highway__tertiary.png differ
diff --git a/public/potlatch2/features/highway__tertiary_link.png b/public/potlatch2/features/highway__tertiary_link.png
new file mode 100644
index 000000000..bc1010208
Binary files /dev/null and b/public/potlatch2/features/highway__tertiary_link.png differ
diff --git a/public/potlatch2/features/highway__track.png b/public/potlatch2/features/highway__track.png
new file mode 100644
index 000000000..ce5855ed2
Binary files /dev/null and b/public/potlatch2/features/highway__track.png differ
diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png
index b8e1e0b06..5018b4712 100644
Binary files a/public/potlatch2/features/highway__trunk.png and b/public/potlatch2/features/highway__trunk.png differ
diff --git a/public/potlatch2/features/highway__trunk_link.png b/public/potlatch2/features/highway__trunk_link.png
new file mode 100644
index 000000000..32a489621
Binary files /dev/null and b/public/potlatch2/features/highway__trunk_link.png differ
diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png
index 9359af261..ae6ea7ba3 100644
Binary files a/public/potlatch2/features/highway__unclassified.png and b/public/potlatch2/features/highway__unclassified.png differ
diff --git a/public/potlatch2/features/highway__unknown.png b/public/potlatch2/features/highway__unknown.png
new file mode 100644
index 000000000..d61d54a91
Binary files /dev/null and b/public/potlatch2/features/highway__unknown.png differ
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index ecf9f3314..a15956aef 100644
--- a/public/potlatch2/map_features.xml
+++ b/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>