From: Andrew Hain Date: Sun, 1 Nov 2015 22:24:16 +0000 (+0000) Subject: Update key and data browser for new road colours X-Git-Tag: live~4006 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f9570c4f054411c92007a146683f9f4724c1f9db?ds=sidebyside 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 183c79411..4528ad560 100644 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 7a6efb4c8..91204ac6a 100644 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 dfdfd1bfb..13e0aa6a4 100644 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 49a51f113..bccaa7e0e 100644 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 930de64e7..c753a3189 100644 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 bec836d7e..5ce63ded2 100644 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 index 000000000..269959b65 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 index 000000000..c289a3f8c 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 index 000000000..05b4dac85 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 index 000000000..334f8fc0d 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 3940c83d2..484fc9daa 100644 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 index a51703c4f..000000000 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 index 741b13896..000000000 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 index cbd457839..000000000 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 index b95b18822..000000000 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 index 93611efa3..000000000 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 index d8becf020..000000000 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 8d632a177..b6c9b50cf 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 ad20f4905..32f4649da 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"