Merge branch 'master' into openID

[rails.git] / config / potlatch / colours.txt

diff --git a/config/potlatch/colours.txt b/config/potlatch/colours.txt
index c54247cb162ce62606493ffdd924046ec3cd4ea3..99883f7a5e59a14cbd12cde4146aa8a4beb84391 100644 (file)
--- a/config/potlatch/colours.txt
+++ b/config/potlatch/colours.txt
@@ -9,12 +9,17 @@ trunk_link            0x7FC97F        1       -
 primary                        0xE46D71        1       -
 primary_link   0xE46D71        1       -
 secondary              0xFDBF6F        1       -
+secondary_link 0xFDBF6F        1       -
 tertiary               0xFEFECB        1       -
+tertiary_link  0xFEFECB        1       -
 unclassified   0xE8E8E8        1       -
 residential            0xE8E8E8        1       -
+road                   0xAAAAAA        1       -
 footway                        0xFF6644        -       -
-cycleway               0xFF6644        -       -
-bridleway              0xFF6644        -       -
+path                   0xFF8866        -       -
+bridleway              0x996644        -       -
+track                  0x996644        -       -
+cycleway               0x2222FF        -       -
 rail                   0x000001        -       -
 river                  0x8888FF        -       -
 canal                  0x8888FF        -       -
@@ -29,3 +34,4 @@ landuse                       -                       -       0x444444
 military               -                       -       0xD6D6D6
 natural                        -                       -       0xADD6A5
 sport                  -                       -       0x8CD6B5
+building               -                       -       0xFF6EC7