From 671028edbd739e6cea48c8063959e624927693c3 Mon Sep 17 00:00:00 2001 From: AndrewHain Date: Wed, 14 Oct 2015 22:53:09 +0100 Subject: [PATCH 1/5] Change colours of icons for roads in the browser Change road icons in the data browser to be the same colours as the revised road 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 5 files changed, 0 insertions(+), 0 deletions(-) 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_)$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 zcmeZnWtVM%xNb!1@J*w6hZkrl}2Ebxdd zW?&F10b#~_Y4R07K`Boc#}JL+*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 Date: Wed, 21 Oct 2015 23:15:53 +0100 Subject: [PATCH 2/5] 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_p9gTe~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~8a~60+7Besim4Gngy)^j>pkTPCi(`m~ce2gH<^Sg=&R{q;fA%vT>GKAT zFB2Ktrlz-r&-=;G67X#Tdk^;}$+rIVe=*TUQL}j64EA_!P6Wz_W^Su1zx3hbneXwx l-Mu#-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!ra~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 Date: Sun, 25 Oct 2015 20:15:31 +0000 Subject: [PATCH 3/5] Correct location of main_road Correct location of main_road, it lives under key --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 911e64aee2..168410118f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -529,7 +529,6 @@ footway: "Footpath" ford: "Ford" living_street: "Living Street" - main_road: "Main Road" milestone: "Milestone" motorway: "Motorway" motorway_junction: "Motorway Junction" @@ -1426,6 +1425,7 @@ table: entry: motorway: "Motorway" + main_road: "Main road" trunk: "Trunk road" primary: "Primary road" secondary: "Secondary road" From 51efa771a1c19779b2ac0dcf9f671078f22c0cfb Mon Sep 17 00:00:00 2001 From: AndrewHain Date: Sat, 31 Oct 2015 11:39:46 +0000 Subject: [PATCH 4/5] Add construction to key in revised colours --- app/assets/images/key/mapnik/construction.png | Bin 330 -> 257 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/key/mapnik/construction.png b/app/assets/images/key/mapnik/construction.png index bec836d7e4c367e42fa0baf3f21ebd0eca9998ce..c08d49da57a1a5b66226bcc20df2514adca66695 100644 GIT binary patch delta 240 zcmX@b)W|eJvYw5BfnoPd_f0^Gu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|zfk$L9 z1A|Zr2s7SGldk{@PV;ne4Ds+z-m`e>zxjzX7>JVR?UmQ=Wr z^DIl-StY{eNyb$^vlno<=`3e3@55zzyLmr%W@hqrrQfKTyin)OgX_4=gG=fv iL>UgN&one(V0dN})3@1f|0AFi89ZJ6T-G@yGywp@8eJ^_ delta 314 zcmV-A0mc4-0?GoA8Gi!+004|fw}1cu0CiAIR7G))#( Date: Sat, 31 Oct 2015 12:09:54 +0000 Subject: [PATCH 5/5] Make roads same width in key --- app/assets/images/key/mapnik/construction.png | Bin 257 -> 242 bytes app/assets/images/key/mapnik/mainroad12.png | Bin 194 -> 197 bytes app/assets/images/key/mapnik/mainroad9.png | Bin 179 -> 182 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/key/mapnik/construction.png b/app/assets/images/key/mapnik/construction.png index c08d49da57a1a5b66226bcc20df2514adca66695..5ce63ded239eed97cb60ac2a4dda43a146fe5964 100644 GIT binary patch delta 86 zcmZo<`ouUvoJ){{je&uo;OG?biHfF-?GwY}ZE_sV4uAM~W`4GJfX(4GlDw&j?DgyQ qTQ?~r7_5}nJv{v?BM^!%TN{s z3?}uAf37V-@eH$OG?axM{Jp*u%7TEwq<(l60K+GlF)#oC<}zH4vp&D#00000NkvXX Hu0mjf;7cf4 diff --git a/app/assets/images/key/mapnik/mainroad12.png b/app/assets/images/key/mapnik/mainroad12.png index 9c65ba87fd9782b88b488172d1bb8634a0793348..c289a3f8c8069fe64f407cda2354ac42e56df49d 100644 GIT binary patch delta 71 zcmX@ac$9I1IF}#?8v_GF!OV^fJwyLrD{P+65i07YYyv1^@s6yO~F_ks&n!SCLmiDz<)i((v)j_h0)*OS8cUhEXzO aU;qG=79gtkH}2a20000^e^4&(p; delta 51 zcmdnSxS4T+IF|qi8v_Hw?wRhJCMudTdQ1#=mJ~KHU|8bg=d#Wz Gp$Py}Ney8D