From: Emersion Date: Sat, 11 Jul 2015 10:56:20 +0000 (+0200) Subject: Adds first try to add key to cyclemap X-Git-Tag: live~3822^2~11 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56316e17ada73e35b7ddf9782619823788a92d71 Adds first try to add key to cyclemap --- diff --git a/app/assets/images/key/cyclemap/motorway.png b/app/assets/images/key/cyclemap/motorway.png new file mode 100644 index 000000000..296f17677 Binary files /dev/null and b/app/assets/images/key/cyclemap/motorway.png differ diff --git a/app/assets/images/key/cyclemap/motorway12.png b/app/assets/images/key/cyclemap/motorway12.png new file mode 100644 index 000000000..749493ad6 Binary files /dev/null and b/app/assets/images/key/cyclemap/motorway12.png differ diff --git a/app/assets/images/key/cyclemap/primary.png b/app/assets/images/key/cyclemap/primary.png new file mode 100644 index 000000000..78ae0e4e5 Binary files /dev/null and b/app/assets/images/key/cyclemap/primary.png differ diff --git a/app/assets/images/key/cyclemap/primary12.png b/app/assets/images/key/cyclemap/primary12.png new file mode 100644 index 000000000..fed37d054 Binary files /dev/null and b/app/assets/images/key/cyclemap/primary12.png differ diff --git a/app/assets/images/key/cyclemap/secondary.png b/app/assets/images/key/cyclemap/secondary.png new file mode 100644 index 000000000..7928b182b Binary files /dev/null and b/app/assets/images/key/cyclemap/secondary.png differ diff --git a/app/assets/images/key/cyclemap/secondary12.png b/app/assets/images/key/cyclemap/secondary12.png new file mode 100644 index 000000000..cde008523 Binary files /dev/null and b/app/assets/images/key/cyclemap/secondary12.png differ diff --git a/app/assets/images/key/cyclemap/trunk.png b/app/assets/images/key/cyclemap/trunk.png new file mode 100644 index 000000000..d312a65cb Binary files /dev/null and b/app/assets/images/key/cyclemap/trunk.png differ diff --git a/app/assets/images/key/cyclemap/trunk12.png b/app/assets/images/key/cyclemap/trunk12.png new file mode 100644 index 000000000..51230a021 Binary files /dev/null and b/app/assets/images/key/cyclemap/trunk12.png differ diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js index 68e822e7f..5223b1420 100644 --- a/app/assets/javascripts/leaflet.key.js +++ b/app/assets/javascripts/leaflet.key.js @@ -60,7 +60,7 @@ L.OSM.key = function (options) { } function updateButton() { - var disabled = map.getMapBaseLayerId() !== 'mapnik'; + var disabled = ['mapnik', 'cyclemap'].indexOf(map.getMapBaseLayerId()) === -1; button .toggleClass('disabled', disabled) .attr('data-original-title', diff --git a/config/key.yml b/config/key.yml index f1bfde91f..cbb39ee75 100644 --- a/config/key.yml +++ b/config/key.yml @@ -50,3 +50,12 @@ mapnik: - { min_zoom: 15, max_zoom: 19, name: permissive, image: permissive.png } - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png } - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png } +cyclemap: + - { min_zoom: 0, max_zoom: 11, name: motorway, image: motorway.png } + - { min_zoom: 12, max_zoom: 19, name: motorway, image: motorway12.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 } \ No newline at end of file