From bddfd09188d925a4d9ec95596badf2e01e3ba611 Mon Sep 17 00:00:00 2001
From: AndrewHain <andrewhainosm@hotmail.co.uk>
Date: Wed, 21 Oct 2015 23:15:53 +0100
Subject: [PATCH] New road colours and simplify text in key

Update colours for main roads to match
gravitystorm/openstreetmap-carto#1736 and replace the OSM keywords
trunk, primary and secondary (which have different meanings from OSM use
in some places) with a new keyword main_road (main road),
---
 app/assets/images/key/mapnik/mainroad.png   | Bin 0 -> 146 bytes
 app/assets/images/key/mapnik/mainroad12.png | Bin 0 -> 194 bytes
 app/assets/images/key/mapnik/mainroad7.png  | Bin 0 -> 165 bytes
 app/assets/images/key/mapnik/mainroad9.png  | Bin 0 -> 179 bytes
 app/assets/images/key/mapnik/motorway.png   | Bin 114 -> 150 bytes
 config/key.yml                              |  10 ++++------
 config/locales/en.yml                       |   3 ++-
 7 files changed, 6 insertions(+), 7 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

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..9c65ba87fd9782b88b488172d1bb8634a0793348
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8<!3HFE&vf4eq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7Besim4Gngy)^j>pkTPCi(`m~ce2gH<^Sg=&R{q;fA%vT>GKAT
zFB2Ktrlz-r&-=;G67X#Tdk^;}$+rIVe=*TUQL}j64EA_!P6Wz_W^Su1zx3hbneXwx
l-Mu#-<Y)^tN={&4m?EaI>bv>7+dwNAJYD@<);T3K0RWoyK{x;a

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..e6ec9f0c6a2173f1b692678442962d520c85b169
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8<!3HFE&vf4eq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7Besim4Gngy)^j>prD7Ri(`m~ck-W|ndj=;5}9T!__Bdv@jS^j
z2@#cTAMFJkZaT{u{M)%LWs8Y)Pr?=BX3?H$Y0aVrb^o{4!-Rwl3>X+h?g`a3DX-N5
Pn#thl>gTe~DWM4ftTs0t

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/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..911e64aee2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,4 @@
-en:
+en:
   html:
     dir: ltr
   time:
@@ -529,6 +529,7 @@ en:
           footway: "Footpath"
           ford: "Ford"
           living_street: "Living Street"
+          main_road: "Main Road"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"