From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Aug 2016 19:20:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1004'
X-Git-Tag: live~4824
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7?hp=c2ece47a58e5141f8e423896117f565aeb90b9f7

Merge remote-tracking branch 'openstreetmap/pull/1004'
---

diff --git a/app/assets/images/key/cyclemap/bicycle_parking.png b/app/assets/images/key/cyclemap/bicycle_parking.png
new file mode 100644
index 000000000..c900a4495
Binary files /dev/null and b/app/assets/images/key/cyclemap/bicycle_parking.png differ
diff --git a/app/assets/images/key/cyclemap/bicycle_shop.png b/app/assets/images/key/cyclemap/bicycle_shop.png
new file mode 100644
index 000000000..5ccf71442
Binary files /dev/null and b/app/assets/images/key/cyclemap/bicycle_shop.png differ
diff --git a/app/assets/images/key/cyclemap/common.png b/app/assets/images/key/cyclemap/common.png
new file mode 100644
index 000000000..7c108152a
Binary files /dev/null and b/app/assets/images/key/cyclemap/common.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway.png b/app/assets/images/key/cyclemap/cycleway.png
new file mode 100644
index 000000000..13bed4a7d
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_local.png b/app/assets/images/key/cyclemap/cycleway_local.png
new file mode 100644
index 000000000..2a2933169
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_local.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_local13.png b/app/assets/images/key/cyclemap/cycleway_local13.png
new file mode 100644
index 000000000..3f2c53587
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_local13.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_national.png b/app/assets/images/key/cyclemap/cycleway_national.png
new file mode 100644
index 000000000..0f5455f71
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_national.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_national13.png b/app/assets/images/key/cyclemap/cycleway_national13.png
new file mode 100644
index 000000000..252b07a30
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_national13.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_regional.png b/app/assets/images/key/cyclemap/cycleway_regional.png
new file mode 100644
index 000000000..7e3306e46
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_regional.png differ
diff --git a/app/assets/images/key/cyclemap/cycleway_regional13.png b/app/assets/images/key/cyclemap/cycleway_regional13.png
new file mode 100644
index 000000000..9b3409fdf
Binary files /dev/null and b/app/assets/images/key/cyclemap/cycleway_regional13.png differ
diff --git a/app/assets/images/key/cyclemap/footway.png b/app/assets/images/key/cyclemap/footway.png
new file mode 100644
index 000000000..c78756f8c
Binary files /dev/null and b/app/assets/images/key/cyclemap/footway.png differ
diff --git a/app/assets/images/key/cyclemap/forest.png b/app/assets/images/key/cyclemap/forest.png
new file mode 100644
index 000000000..a7ebe8e5d
Binary files /dev/null and b/app/assets/images/key/cyclemap/forest.png differ
diff --git a/app/assets/images/key/cyclemap/lake.png b/app/assets/images/key/cyclemap/lake.png
new file mode 100644
index 000000000..918d496ae
Binary files /dev/null and b/app/assets/images/key/cyclemap/lake.png differ
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/rail.png b/app/assets/images/key/cyclemap/rail.png
new file mode 100644
index 000000000..0abf0c1df
Binary files /dev/null and b/app/assets/images/key/cyclemap/rail.png differ
diff --git a/app/assets/images/key/cyclemap/rail14.png b/app/assets/images/key/cyclemap/rail14.png
new file mode 100644
index 000000000..957f17c85
Binary files /dev/null and b/app/assets/images/key/cyclemap/rail14.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/toilets.png b/app/assets/images/key/cyclemap/toilets.png
new file mode 100644
index 000000000..d1c7a00a9
Binary files /dev/null and b/app/assets/images/key/cyclemap/toilets.png differ
diff --git a/app/assets/images/key/cyclemap/track.png b/app/assets/images/key/cyclemap/track.png
new file mode 100644
index 000000000..f294edca0
Binary files /dev/null and b/app/assets/images/key/cyclemap/track.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 b6c9b50cf..4446fbe6e 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -44,3 +44,29 @@ mapnik:
   - { min_zoom: 15, max_zoom: 19, name: private, image: private.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 }
+  - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
+  - { min_zoom: 8, max_zoom: 19, name: cycleway, image: cycleway.png }
+  - { min_zoom: 5, max_zoom: 12, name: cycleway_national, image: cycleway_national.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_national, image: cycleway_national13.png }
+  - { min_zoom: 5, max_zoom: 12, name: cycleway_regional, image: cycleway_regional.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_regional, image: cycleway_regional13.png }
+  - { min_zoom: 8, max_zoom: 12, name: cycleway_local, image: cycleway_local.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_local, image: cycleway_local13.png }
+  - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
+  - { min_zoom: 7, max_zoom: 13, name: rail, image: rail.png }
+  - { min_zoom: 14, max_zoom: 19, name: rail, image: rail14.png }
+  - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png }
+  - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
+  - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png }
+  - { min_zoom: 14, max_zoom: 19, name: bicycle_shop, image: bicycle_shop.png }
+  - { min_zoom: 14, max_zoom: 19, name: bicycle_parking, image: bicycle_parking.png }
+  - { min_zoom: 16, max_zoom: 19, name: toilets, image: toilets.png }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1cfbf8ab1..807ad1649 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1433,6 +1433,9 @@ en:
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
+          cycleway_national: "National cycleway"
+          cycleway_regional: "Regional cycleway"
+          cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"
           subway: "Subway"
@@ -1485,6 +1488,8 @@ en:
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"
+          bicycle_shop: "Bicycle shop"
+          bicycle_parking: "Bicycle parking"
     richtext_area:
       edit: Edit
       preview: Preview