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 (file)
index 0000000..1143ec6
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 0a12e187511c37ff35c2b3794208f0caf8a98a79..d57e808b8a9ddc489fd876bbe5878a563615f040 100644 (file)
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 (file)
index 0000000..db29b4b
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 (file)
index 0000000..096e695
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 (file)
index 0000000..cf5528a
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 d481aab75296bd919e515aafab9e62a157658560..5632f52d35ea84a58f3d2ab0b9bfd41aa02f8b6c 100644 (file)
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 (file)
index 0000000..6d826c4
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 (file)
index 0000000..fd348a8
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 0fdd441359d23ae5c7cb7e4f08ebbbe1ac4356aa..4c356394fb7595ef08dd415e6296cd94c576a348 100644 (file)
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 (file)
index 0000000..16daae0
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 (file)
index 0000000..bc10102
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 (file)
index 0000000..ce5855e
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 b8e1e0b0682d7101d71b01e44830dcb2b588aa61..5018b4712844f694cc90618683a138c41807e312 100644 (file)
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 (file)
index 0000000..32a4896
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 9359af261cfb8bb68bdc18dfdda9523fdf99528e..ae6ea7ba374fd2a7ebee65dc12ccba25bc736b3f 100644 (file)
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 (file)
index 0000000..d61d54a
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 ecf9f3314805022aafea7dca9f08522ba32119a6..a15956aeff498de8c3b08c0f4a832ecfcebfa37a 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -573,9 +573,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Motorway link" icon="features/motorway_link.png">
+  <feature name="Motorway link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__motorway.png"/>
+    <icon image="features/highway__motorway_link.png"/>

     <line/>
     <tag k="highway" v="motorway_link"/>
 
     <line/>
     <tag k="highway" v="motorway_link"/>
 


@@ -598,9 +598,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Trunk link" icon="features/motorway_link.png">
+  <feature name="Trunk link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__trunk.png"/>
+    <icon image="features/highway__trunk_link.png"/>

     <line/>
     <tag k="highway" v="trunk_link"/>
 
     <line/>
     <tag k="highway" v="trunk_link"/>
 


@@ -610,7 +610,7 @@ Quick documentation:
 
   <feature name="Primary road">
     <category>roads</category>
 
   <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>
       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>


@@ -623,9 +623,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Primary road link">
+  <feature name="Primary link">

     <category>roads</category>
     <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>
       <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>
 
   <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>
       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>


@@ -654,9 +654,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Secondary road link">
+  <feature name="Secondary link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__secondary_link.png">

       <font size="16pt">
         <b>${ref}</b>
       </font>
       <font size="16pt">
         <b>${ref}</b>
       </font>


@@ -676,7 +676,7 @@ Quick documentation:
 
   <feature name="Tertiary road">
     <category>roads</category>
 
   <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>
       <font size="14pt"><b>${name}</b></font><br/>
       <font size="10pt">${ref}</font>
     </icon>


@@ -689,9 +689,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Tertiary road link">
+  <feature name="Tertiary link">

     <category>roads</category>
     <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>
       <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>
 
   <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>
 
       <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>
 
   <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>
       <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>
 
   <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>
 
       <font size="14pt"><b>${name}</b></font>
     </icon>