From f9570c4f054411c92007a146683f9f4724c1f9db Mon Sep 17 00:00:00 2001
From: Andrew Hain <andrewhainosm@hotmail.co.uk>
Date: Sun, 1 Nov 2015 22:24:16 +0000
Subject: [PATCH] Update key and data browser for new road colours

Update colours for main roads to match new style and replace
references to trunk, primary and secondary in the key with a
generic reference to main roads as trunk, primary and secondary
here have OSM specific meaning.

Also change road icons in the data browser to be the same colours
as the revised colours in the standard map style. The top and bottom
lines for motorway, trunk and primary are in the casing colours,
secondary and tertiary are 50% intensity of casing colour. Tertiary
is made deeper.
---
 app/assets/images/browse/motorway.20.png      | Bin 85 -> 148 bytes
 app/assets/images/browse/primary.20.png       | Bin 85 -> 145 bytes
 app/assets/images/browse/secondary.20.png     | Bin 83 -> 138 bytes
 app/assets/images/browse/tertiary.20.png      | Bin 75 -> 133 bytes
 app/assets/images/browse/trunk.20.png         | Bin 88 -> 148 bytes
 app/assets/images/key/mapnik/construction.png | Bin 330 -> 242 bytes
 app/assets/images/key/mapnik/mainroad.png     | Bin 0 -> 146 bytes
 app/assets/images/key/mapnik/mainroad12.png   | Bin 0 -> 197 bytes
 app/assets/images/key/mapnik/mainroad7.png    | Bin 0 -> 165 bytes
 app/assets/images/key/mapnik/mainroad9.png    | Bin 0 -> 182 bytes
 app/assets/images/key/mapnik/motorway.png     | Bin 114 -> 150 bytes
 app/assets/images/key/mapnik/primary.png      | Bin 115 -> 0 bytes
 app/assets/images/key/mapnik/primary12.png    | Bin 145 -> 0 bytes
 app/assets/images/key/mapnik/secondary.png    | Bin 98 -> 0 bytes
 app/assets/images/key/mapnik/secondary12.png  | Bin 140 -> 0 bytes
 app/assets/images/key/mapnik/trunk.png        | Bin 114 -> 0 bytes
 app/assets/images/key/mapnik/trunk12.png      | Bin 147 -> 0 bytes
 config/key.yml                                |  10 ++++------
 config/locales/en.yml                         |   1 +
 19 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/images/key/mapnik/mainroad.png
 create mode 100644 app/assets/images/key/mapnik/mainroad12.png
 create mode 100644 app/assets/images/key/mapnik/mainroad7.png
 create mode 100644 app/assets/images/key/mapnik/mainroad9.png
 delete mode 100644 app/assets/images/key/mapnik/primary.png
 delete mode 100644 app/assets/images/key/mapnik/primary12.png
 delete mode 100644 app/assets/images/key/mapnik/secondary.png
 delete mode 100644 app/assets/images/key/mapnik/secondary12.png
 delete mode 100644 app/assets/images/key/mapnik/trunk.png
 delete mode 100644 app/assets/images/key/mapnik/trunk12.png

diff --git a/app/assets/images/browse/motorway.20.png b/app/assets/images/browse/motorway.20.png
index 183c7941167501914e2335c029ef69480483ca01..4528ad560f5e4adf647776b19ec3bcfb5eec0cb9 100644
GIT binary patch
delta 118
zcmWHY!Z<;tfU!8p-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!QLM0%~crQ)9
z0w}2I>Ealo5uE(z@ALQdY+6jmtfO9DG5v6KiED`I1WvDD-hjIfTJ4I=%nYACa=*XC
Syn7l@6N9I#pUXO@geCxLNhZ|*

delta 55
zcmbQj7&<}4P{z~6F{FYqIb+8D`OULtEKK~?7=Pu6@|6SUuN+~x9O$rN$&vXl8Gyjk
L)z4*}Q$iB}qKz1V

diff --git a/app/assets/images/browse/primary.20.png b/app/assets/images/browse/primary.20.png
index 7a6efb4c8ea66dceb637509a373b6ea31df6334e..91204ac6afede772a4af9f7c6963735e02e3122e 100644
GIT binary patch
delta 115
zcmWHY$T&eIm$5j=-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!QLM0%~crQ)9
z0w}2F>Ealo5uE(z`|I!ZY+6jmSZDHFG5v6Ut7?ep1WvDD-hi8@d3YF>ec-P1)myO#
PsDr`N)z4*}Q$iB}(^@3E

delta 55
zcmbQp7&<}4P{z~6F{FYqdB^+<2ONFRd{Ei`!QS-a1%nUlriKih&Hn?dpXjhM0D-5g
KpUXO@geCxDffWM)

diff --git a/app/assets/images/browse/secondary.20.png b/app/assets/images/browse/secondary.20.png
index dfdfd1bfbee16226013df291ee95ec5294a1eb77..13e0aa6a40fa60e15f1bba4ffdb9071132b7bf4a 100644
GIT binary patch
delta 108
zcmWIUVw|9o##kKW?!>U}oXkrG1_qXNM_)$<hK>E)e-c@Ne9i)o$YKTtp%M^gyq6|l
z0Th(?ba4#P2u}X<|NHfNHZ7)Ox?9&=G5zp+{om%Btvoyo9ECi>vzsS`0F^R$y85}S
Ib4q9e0Q(FhHvj+t

delta 53
zcmeBT44$B(FXidt7*fHQ{A0KM{N`B_DG%zil4eQ#05Tcg$i4KepL|b}0SG)@{an^L
HB{Ts5CYuyR

diff --git a/app/assets/images/browse/tertiary.20.png b/app/assets/images/browse/tertiary.20.png
index 49a51f113e405755c9689dbe271dc49fe2a52141..bccaa7e0e6f00ad2822870d6d30becd79e9f6b2b 100644
GIT binary patch
delta 116
zcmeZnWt<?M$HKwJz`)QKFFy@PF%}28J29*~C-V}>VM%xNb!1@J*w6hZkrl}2Ebxdd
zW?&F10b#~_Y4R07K`Boc#}JL+<Ujl@JRvMS$NS}%uWM|+)5^ocuxv8l(kpH+egIW5
Nc)I$ztaD0e0sy81ApZaW

delta 58
zcmZo=^qwGY!o<PGz`zi}_NN<233<9WhEy;n|M-}Ey*?{xl{5!KWWl7&NzFn*Kv@P)
LS3j3^P6<r_(H0RL

diff --git a/app/assets/images/browse/trunk.20.png b/app/assets/images/browse/trunk.20.png
index 930de64e7724883bac5f4cc3c8a24cd93c35ee5c..c753a3189416d1f7a62f698626cf8b5bbb120503 100644
GIT binary patch
delta 118
zcma!;!Z<;tfU!8p-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!QLM0%~crQ)9
z0w}2I>Ealo5uE(z@AvQZY+6jmgzJ7?G5zp-nPrIS1WvDD-hjIfTJ4I=%nWx-xKEzY
Si0K7tV(@hJb6Mw<&;$Tq<0a1k

delta 58
zcmbQj7%@S`MBdZIF{FYqIpfCt1CG9D0_r#Yvp4<dVY1<2%3=PjBnHuy786**KR7V}
Nfv2mV%Q~loCIF=<79{`x

diff --git a/app/assets/images/key/mapnik/construction.png b/app/assets/images/key/mapnik/construction.png
index bec836d7e4c367e42fa0baf3f21ebd0eca9998ce..5ce63ded239eed97cb60ac2a4dda43a146fe5964 100644
GIT binary patch
delta 227
zcmX@b^oenTc)cJ88v_GF!O<z=K#H+A$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBK4*bP
zWHAGSPzeY#-b<6O01CEyx;Tb-cqi{!JoVrF#2F07#3zd_tZ=h27dv%`FU~KHC)M#l
zLeP1ZrR}T|Ve=&8DxcX4INWrWGnn_`vb^2ApD{Z#`MT0?)J$He^X9?zXFCJLSa{UF
zE?#;wf%UNVd7jmmavaSLfB1N2eztdj&EYkYys3%o_3QOpHz_0-td!S1%cd>iR@v6b
a$Z+wsbCkEH+-#tm7(8A5T-G@yGywqjm{OPk

delta 316
zcmV-C0mJ_C0m=f97k>~40{{R3j7PVC0001WP)t-sagN4-pTFj8aDd5xft$eOZgS;q
zaev8wfSka9$$;c-aD>W)hs=kJ&WwPYz=NK_hM>cXq{ZZIap!@9>yec2sH=d<fQ`<K
zn$wwpo4~Bvs*R<^ny$>Kxzen>)6CW4f60HR*rm(o$mDHt?0=b?^uogb`}$6XHaq|T
z03dWyPE!dGP+DPoh?A9=n3|lPrKhN?(AL}H`1$$z`uqF*{QW&;OvnHL0Axu-K~#9!
zy~{ZQKrj$M(Xks#5QJDm$o-F~m<x<1ulmi0SP0Q}q~SH>TI<u1o!4HU?I0_!0fOHk
zQ%cPXnRpFoj5WC(xp?jEi4d`>Ny%#n)8C-5*1nEBy!Q4aQp#Z@J+D8_15-V|k>k+-
O0000<MNUMnLSTZ;U#S@Y

diff --git a/app/assets/images/key/mapnik/mainroad.png b/app/assets/images/key/mapnik/mainroad.png
new file mode 100644
index 0000000000000000000000000000000000000000..269959b65d746b2337dd6e5c4c6b5f9771efb993
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^#z4%*!3HGr#Fm)=DaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9EWB_ParFHODzD5&n~;uvD#pZsTM=DGT|M5Y-FzHDGvJWp~>
nLPTZTM|%N>o6a%@1`G_p9<cj{&hA(a)WYED>gTe~DWM4fcfBYk

literal 0
HcmV?d00001

diff --git a/app/assets/images/key/mapnik/mainroad12.png b/app/assets/images/key/mapnik/mainroad12.png
new file mode 100644
index 0000000000000000000000000000000000000000..c289a3f8c8069fe64f407cda2354ac42e56df49d
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8{!3HD?j!qE=QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0V%N<f(LUYdLbP%z5V#WBRgJK5&p^8fP_XD}R_Kl>Sv^mzlv
zmx+vRQ`6hR=l$eo3HUaFy@z{~WLtmwznEyFs9C&j27A0VCj#X|Gs6N-Th-Wn{(Jr3
n#Y;H`O%Fq7@y@q7e1L%=zeMgwap|l|pe+oZu6{1-oD!M<8l^%f

literal 0
HcmV?d00001

diff --git a/app/assets/images/key/mapnik/mainroad7.png b/app/assets/images/key/mapnik/mainroad7.png
new file mode 100644
index 0000000000000000000000000000000000000000..05b4dac857982c5f878c4d01553109900963ad0a
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^#z4%&!3HGH_qKur7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0h7I;J!GcX91fH32|H2Dgkpp~bKV~B@$@}HfV=jz)MnPx2bvVmdoJjpc)
z5tVHp?FAfeI?EaS+qo@ei-~kk!WH9Y(Vl5(&B6u-3=A)t_)bi7=;H&L!r<xZ=d#Wz
Gp$PznSTQsJ

literal 0
HcmV?d00001

diff --git a/app/assets/images/key/mapnik/mainroad9.png b/app/assets/images/key/mapnik/mainroad9.png
new file mode 100644
index 0000000000000000000000000000000000000000..334f8fc0d29b94d458d01725cc132db3b48b523c
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8{!3HD?j!qE=QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0V%N<f(LUYdLbP|(}c#WBRgJNeJf%yac^iA*yVeA&RTc%I~%
zgow(vkM;r%H=X4S{_WhBvc*KYC*g{5vuMw>v}RF*y8m12;X*vh=M4-P7@ipjHH37P
RzX2M{;OXk;vd$@?2>>S{IGq3h

literal 0
HcmV?d00001

diff --git a/app/assets/images/key/mapnik/motorway.png b/app/assets/images/key/mapnik/motorway.png
index 3940c83d2da2b40f304d136c3ecd5ac47bb99a3d..484fc9daa3bbae3d126a4810ac83de738a462ac9 100644
GIT binary patch
delta 120
zcmXS##yCNxh_N`x-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!QLM0%~crQ)9
z0w}2M>Eak-;h(%`@zj6w6D1griBA^e)#f*Je3{7HHn+VkUhWq^OTae+1|A-UeGc3|
U{F2}L1GO=Dy85}Sb4q9e07JecQUCw|

delta 84
zcmV-a0IUC&0dkNePB}?LK~#7FV`ymD&(bh|KgV#u|NsAIU}%_gU~0qc1HXm?26{?h
q)I;>gqaHdq0m%709B}!}-TVLpygWfbouEAc0000<MNUMnLSTYZ4J4}o

diff --git a/app/assets/images/key/mapnik/primary.png b/app/assets/images/key/mapnik/primary.png
deleted file mode 100644
index a51703c4f065bc956f3e0eba35957011f603ed0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)}!3HF`;?6$?QdXWWjv*C{$v^I2I8bE2urb-<
z!T<mNjSXy0>dyG6vi-yVf&<^Vxmeitw!7JWvDjW<G~qK)$?nXje;C$?PyQoV_9_)<
O3WKMspUXO@geCwhODezs

diff --git a/app/assets/images/key/mapnik/primary12.png b/app/assets/images/key/mapnik/primary12.png
deleted file mode 100644
index 741b13896b60762ccd4a8e157446d8f109b91c83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)_!3HFIPVMytQW2gmjv*C{$ul0kN;SE7)VRdr
z!OUaF*6@S}8H>kzp8a7j^I_|ooWwTuovg<5o{0UE=lfCT*m&T>=L;)at~@>dcyc{2
vdySP*Xv@OO2ZNX0zj`&n;z8)bg=ZKpt=uH`JfQ9z&<+MqS3j3^P6<r_R3tj_

diff --git a/app/assets/images/key/mapnik/secondary.png b/app/assets/images/key/mapnik/secondary.png
deleted file mode 100644
index cbd457839c28fdc7a811557fa943e1e7a25abac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)>!3HD`GRe3BDNRoo$B+uf<R823=d*TLwlV+v
x|KFbZgtKwOkN*Y-nGRoap4|B3xWU0c3?I{?i#NSo$^q2G;OXk;vd$@?2>|FjAT0m@

diff --git a/app/assets/images/key/mapnik/secondary12.png b/app/assets/images/key/mapnik/secondary12.png
deleted file mode 100644
index b95b18822b5c0d9c1f60c6c5c4552c769c60a3d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)_!3HFIPVMytQo)`sjv*C{$q|9?Q(2BIJj|%S
z?ps1?#cs>wkF$MW{%>cl+pg+7<Kg>%e<U6L)Xzw0eE59f@$5;{?IUJ>$+mcKT>Fu$
p#59wNQ#xxu8A<R}gl1?MGX&eKzJJ=;tphZk!PC{xWt~$(69D*3H5UK?

diff --git a/app/assets/images/key/mapnik/trunk.png b/app/assets/images/key/mapnik/trunk.png
deleted file mode 100644
index 93611efa3e2bc3621cb1c71daaaa68b79afe4812..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)_!3HFIPVMytQkI@Bjv*C{$r(59A7DBnbC~h}
z|NrwF7d}im-1BSl*Z=Lzc^3B-3|=W#Jr3k&l$_i+@0X!W!OxjRbqw6k)C1Rk4!;L9
Ogu&C*&t;ucLK6V{xhZh~

diff --git a/app/assets/images/key/mapnik/trunk12.png b/app/assets/images/key/mapnik/trunk12.png
deleted file mode 100644
index d8becf0208fbbac7117c767cd4995c91be5126cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^CP2*2!3HGVr{%o>Qc<2Rjv*C{$sbmKxco))bD=cf
zjfDprTNhSjfBbaFxAlKJv);XMokJH2HYK|KJ^AbZVMg;g`2rGO<fOg^{A>I3bZ2%^
xJumy5U7DdS2aT@>AKQB1YJ$as3l{>?7;ddMPJDObq9V{122WQ%mvv4FO#pr+JzoF-

diff --git a/config/key.yml b/config/key.yml
index 8d632a177a..b6c9b50cf4 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,11 +1,9 @@
 mapnik:
   - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.png }
-  - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png }
-  - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png }
-  - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png }
-  - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }
-  - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
-  - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }
+  - { min_zoom: 0, max_zoom: 6, name: main_road, image: mainroad.png }
+  - { min_zoom: 7, max_zoom: 8, name: main_road, image: mainroad7.png }
+  - { min_zoom: 9, max_zoom: 11, name: main_road, image: mainroad9.png }
+  - { min_zoom: 12, max_zoom: 19, name: main_road, image: mainroad12.png }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
   - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad20f49052..32f4649dac 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1425,6 +1425,7 @@ en:
       table:
         entry:
           motorway: "Motorway"
+          main_road: "Main road"
           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"