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.

diff --git a/app/assets/images/browse/motorway.20.png b/app/assets/images/browse/motorway.20.png
index 183c7941167501914e2335c029ef69480483ca01..4528ad560f5e4adf647776b19ec3bcfb5eec0cb9 100644 (file)
Binary files a/app/assets/images/browse/motorway.20.png and b/app/assets/images/browse/motorway.20.png differ

diff --git a/app/assets/images/browse/primary.20.png b/app/assets/images/browse/primary.20.png
index 7a6efb4c8ea66dceb637509a373b6ea31df6334e..91204ac6afede772a4af9f7c6963735e02e3122e 100644 (file)
Binary files a/app/assets/images/browse/primary.20.png and b/app/assets/images/browse/primary.20.png differ

diff --git a/app/assets/images/browse/secondary.20.png b/app/assets/images/browse/secondary.20.png
index dfdfd1bfbee16226013df291ee95ec5294a1eb77..13e0aa6a40fa60e15f1bba4ffdb9071132b7bf4a 100644 (file)
Binary files a/app/assets/images/browse/secondary.20.png and b/app/assets/images/browse/secondary.20.png differ

diff --git a/app/assets/images/browse/tertiary.20.png b/app/assets/images/browse/tertiary.20.png
index 49a51f113e405755c9689dbe271dc49fe2a52141..bccaa7e0e6f00ad2822870d6d30becd79e9f6b2b 100644 (file)
Binary files a/app/assets/images/browse/tertiary.20.png and b/app/assets/images/browse/tertiary.20.png differ

diff --git a/app/assets/images/browse/trunk.20.png b/app/assets/images/browse/trunk.20.png
index 930de64e7724883bac5f4cc3c8a24cd93c35ee5c..c753a3189416d1f7a62f698626cf8b5bbb120503 100644 (file)
Binary files a/app/assets/images/browse/trunk.20.png and b/app/assets/images/browse/trunk.20.png differ

diff --git a/app/assets/images/key/mapnik/construction.png b/app/assets/images/key/mapnik/construction.png
index bec836d7e4c367e42fa0baf3f21ebd0eca9998ce..5ce63ded239eed97cb60ac2a4dda43a146fe5964 100644 (file)
Binary files a/app/assets/images/key/mapnik/construction.png and b/app/assets/images/key/mapnik/construction.png differ

diff --git a/app/assets/images/key/mapnik/mainroad.png b/app/assets/images/key/mapnik/mainroad.png
new file mode 100644 (file)
index 0000000..269959b
Binary files /dev/null and b/app/assets/images/key/mapnik/mainroad.png differ

diff --git a/app/assets/images/key/mapnik/mainroad12.png b/app/assets/images/key/mapnik/mainroad12.png
new file mode 100644 (file)
index 0000000..c289a3f
Binary files /dev/null and b/app/assets/images/key/mapnik/mainroad12.png differ

diff --git a/app/assets/images/key/mapnik/mainroad7.png b/app/assets/images/key/mapnik/mainroad7.png
new file mode 100644 (file)
index 0000000..05b4dac
Binary files /dev/null and b/app/assets/images/key/mapnik/mainroad7.png differ

diff --git a/app/assets/images/key/mapnik/mainroad9.png b/app/assets/images/key/mapnik/mainroad9.png
new file mode 100644 (file)
index 0000000..334f8fc
Binary files /dev/null and b/app/assets/images/key/mapnik/mainroad9.png differ

diff --git a/app/assets/images/key/mapnik/motorway.png b/app/assets/images/key/mapnik/motorway.png
index 3940c83d2da2b40f304d136c3ecd5ac47bb99a3d..484fc9daa3bbae3d126a4810ac83de738a462ac9 100644 (file)
Binary files a/app/assets/images/key/mapnik/motorway.png and b/app/assets/images/key/mapnik/motorway.png differ

diff --git a/app/assets/images/key/mapnik/primary.png b/app/assets/images/key/mapnik/primary.png
deleted file mode 100644 (file)
index a51703c..0000000
Binary files a/app/assets/images/key/mapnik/primary.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/primary12.png b/app/assets/images/key/mapnik/primary12.png
deleted file mode 100644 (file)
index 741b138..0000000
Binary files a/app/assets/images/key/mapnik/primary12.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/secondary.png b/app/assets/images/key/mapnik/secondary.png
deleted file mode 100644 (file)
index cbd4578..0000000
Binary files a/app/assets/images/key/mapnik/secondary.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/secondary12.png b/app/assets/images/key/mapnik/secondary12.png
deleted file mode 100644 (file)
index b95b188..0000000
Binary files a/app/assets/images/key/mapnik/secondary12.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/trunk.png b/app/assets/images/key/mapnik/trunk.png
deleted file mode 100644 (file)
index 93611ef..0000000
Binary files a/app/assets/images/key/mapnik/trunk.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/trunk12.png b/app/assets/images/key/mapnik/trunk12.png
deleted file mode 100644 (file)
index d8becf0..0000000
Binary files a/app/assets/images/key/mapnik/trunk12.png and /dev/null differ

diff --git a/config/key.yml b/config/key.yml
index 8d632a177ab8b547ae031aa9c6836c79ce1cda18..b6c9b50cf42b1933bb72b44c103e0b1abef5f049 100644 (file)
--- 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 ad20f490521e43e66f4c81f3459ee85a2f51f848..32f4649dac62b0619bd04c33757577c8f5d97518 100644 (file)
--- 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"