tidy route icons a little (very sorry to see the epic bus icon go, obviously)

diff --git a/resources/features/cycle__lcn.png b/resources/features/cycle__lcn.png
deleted file mode 100644 (file)
index b46ab05..0000000
Binary files a/resources/features/cycle__lcn.png and /dev/null differ

diff --git a/resources/features/cycle__ncn.png b/resources/features/cycle__ncn.png
deleted file mode 100644 (file)
index 49456c4..0000000
Binary files a/resources/features/cycle__ncn.png and /dev/null differ

diff --git a/resources/features/cycle__rcn.png b/resources/features/cycle__rcn.png
deleted file mode 100644 (file)
index ed79223..0000000
Binary files a/resources/features/cycle__rcn.png and /dev/null differ

diff --git a/resources/features/route__bus.png b/resources/features/route__bus.png
new file mode 100644 (file)
index 0000000..bb816ac
Binary files /dev/null and b/resources/features/route__bus.png differ

diff --git a/resources/features/route__lcn.png b/resources/features/route__lcn.png
new file mode 100644 (file)
index 0000000..21d5916
Binary files /dev/null and b/resources/features/route__lcn.png differ

diff --git a/resources/features/route__lwn.png b/resources/features/route__lwn.png
new file mode 100644 (file)
index 0000000..50ee446
Binary files /dev/null and b/resources/features/route__lwn.png differ

diff --git a/resources/features/route__ncn.png b/resources/features/route__ncn.png
new file mode 100644 (file)
index 0000000..7cc7779
Binary files /dev/null and b/resources/features/route__ncn.png differ

diff --git a/resources/features/route__nwn.png b/resources/features/route__nwn.png
new file mode 100644 (file)
index 0000000..92ac048
Binary files /dev/null and b/resources/features/route__nwn.png differ

diff --git a/resources/features/route__rcn.png b/resources/features/route__rcn.png
new file mode 100644 (file)
index 0000000..614ac95
Binary files /dev/null and b/resources/features/route__rcn.png differ

diff --git a/resources/features/route__rwn.png b/resources/features/route__rwn.png
new file mode 100644 (file)
index 0000000..fff9b23
Binary files /dev/null and b/resources/features/route__rwn.png differ

diff --git a/resources/features/transport__bus.png b/resources/features/transport__bus.png
deleted file mode 100644 (file)
index b779706..0000000
Binary files a/resources/features/transport__bus.png and /dev/null differ

diff --git a/resources/map_features.xml b/resources/map_features.xml
index d502fc2ec1c8cf08057bb18148e0bca222ed17a2..56299f2e8b8de0a54e670029f4e624a28b1ef65b 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -393,7 +393,7 @@ Quick documentation:
     <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
       <match k="route" v="bus"/>
-      <icon image="features/transport__bus.png">
+      <icon image="features/route__bus.png">
         <font size="12pt">${operator} <b>${ref}</b></font>
       </icon>
     </input>
@@ -415,7 +415,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="ncn"/>
-      <icon image="features/cycle__ncn.png" background="#ff6f7a" foreground="white">
+      <icon image="features/route__ncn.png" background="#ff6f7a" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -424,7 +424,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="rcn"/>
-      <icon image="features/cycle__rcn.png" background="#6ff7ff" foreground="white">
+      <icon image="features/route__rcn.png" background="#6ff7ff" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -433,7 +433,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="lcn"/>
-      <icon image="features/cycle__lcn.png" background="#7d6fff" foreground="white">
+      <icon image="features/route__lcn.png" background="#7d6fff" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -473,7 +473,7 @@ Quick documentation:
     <input type="route" name="National Walking Route" description="National walking route" category="Walking" priority="normal">
       <match k="type" v="route"/>
       <match k="network" v="nwn"/>
-      <icon background="red" foreground="white">
+      <icon image="features/route__nwn.png" background="red" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -481,7 +481,7 @@ Quick documentation:
     <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walking" priority="low">
       <match k="type" v="route"/>
       <match k="network" v="rwn"/>
-      <icon background="cyan" foreground="white">
+      <icon image="features/route__rwn.png" background="cyan" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -489,7 +489,7 @@ Quick documentation:
     <input type="route" name="Local Walking Route" description="Local walking route" category="Walking" priority="lowest">
       <match k="type" v="route"/>
       <match k="network" v="lwn"/>
-      <icon background="blue" foreground="white">
+      <icon image="features/route__lwn.png" background="blue" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>

diff --git a/resources/map_features/paths.xml b/resources/map_features/paths.xml
index c182cdf7a8f91f5580fc48e9f05ace082c24d642..9a1768fa7ac9000d49d3cadae49b2c4f2d1a01b7 100644 (file)
--- a/resources/map_features/paths.xml
+++ b/resources/map_features/paths.xml
@@ -91,7 +91,7 @@
   <!-- Bicycle routes -->
   <feature name="National Cycle Network">
     <category>paths</category>
-    <icon image="features/cycle__ncn.png" background="red" foreground="white">
+    <icon image="features/route__ncn.png" background="red" foreground="white">
       <font size="14pt">
         <b>${ref}</b>
       </font>
@@ -110,7 +110,7 @@
 
   <feature name="Regional Cycle Network">
     <category>paths</category>
-    <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
+    <icon image="features/route__rcn.png" background="cyan" foreground="white">
       <font size="14pt"><b>${ref}</b></font><br/>
       <font size="12pt">${name}</font>
     </icon>
@@ -126,7 +126,7 @@
 
   <feature name="Local Cycle Network">
     <category>paths</category>
-    <icon image="features/cycle__lcn.png" background="blue" foreground="white">
+    <icon image="features/route__lcn.png" background="blue" foreground="white">
       <font size="14pt">
         <b>${ref}</b>
       </font>
@@ -146,7 +146,7 @@
   
   <feature name="Long Distance Path">
     <category>paths</category>
-    <icon image="features/paths__footway.png" background="green" foreground="white">
+    <icon image="features/route__nwn.png" background="green" foreground="white">
       <font size="14pt">
         <b>${ref}</b>
       </font>

diff --git a/resources/map_features/transport.xml b/resources/map_features/transport.xml
index 29ddc16c98fd0e5c67f1ca92d3c7eeffc5cec302..d0030a51608e347424691316de6fd34138fd1616 100644 (file)
--- a/resources/map_features/transport.xml
+++ b/resources/map_features/transport.xml
@@ -441,7 +441,7 @@
   <!-- public transit routes -->
   <feature name="Bus Route">
     <category>transport</category>
-    <icon image="features/transport__bus.png">
+    <icon image="features/route__bus.png">
       <font size="12pt">
         ${operator} <b>${ref}</b>
       </font>