Merge remote-tracking branch 'upstream/pull/5926'

diff --git a/config/key.yml b/config/key.yml
index 798d9ca546db80f0b82960bb79f0db13078615f0..775cdf461d7b2afeab0c693a49ee1a968073f83a 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -104,6 +104,44 @@ mapnik:
   - { min_zoom: 15, name: private, image: private.png }
   - { min_zoom: 15, name: destination, image: destination.png }
   - { min_zoom: 12, name: construction, image: construction.png }
+cyclosm:
+  # bicycle routes: roads.mss, road-colors.mss
+  - { min_zoom:  2, name: international_bike_route, width: 50, height:  1, fill: "#ff00ff", opacity: 0.75 }
+  - { min_zoom:  8, name: international_bike_route, width: 50, height:  1, fill: "#ff00ff", opacity: 0.6 }
+  - { min_zoom:  9, name: international_bike_route, width: 50, height:  2, fill: "#ff00ff", opacity: 0.6 }
+  - { min_zoom: 11, name: international_bike_route, width: 50, height:  3, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 12, name: international_bike_route, width: 50, height:  4, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 14, name: international_bike_route, width: 50, height:  5, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 15, name: international_bike_route, width: 50, height:  6, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 16, name: international_bike_route, width: 50, height:  7, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 17, name: international_bike_route, width: 50, height: 10, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom: 18, name: international_bike_route, width: 50, height: 14, fill: "#ff00ff", opacity: 0.25 }
+  - { min_zoom:  5, name: national_bike_route,      width: 50, height:  1, fill: "#aa00ff", opacity: 0.75 }
+  - { min_zoom:  8, name: national_bike_route,      width: 50, height:  1, fill: "#aa00ff", opacity: 0.6 }
+  - { min_zoom:  9, name: national_bike_route,      width: 50, height:  2, fill: "#aa00ff", opacity: 0.6 }
+  - { min_zoom: 11, name: national_bike_route,      width: 50, height:  3, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 12, name: national_bike_route,      width: 50, height:  4, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 14, name: national_bike_route,      width: 50, height:  5, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 15, name: national_bike_route,      width: 50, height:  6, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 16, name: national_bike_route,      width: 50, height:  7, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 17, name: national_bike_route,      width: 50, height: 10, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom: 18, name: national_bike_route,      width: 50, height: 14, fill: "#aa00ff", opacity: 0.25 }
+  - { min_zoom:  8, name: regional_bike_route,      width: 50, height:  1, fill: "#5500ff", opacity: 0.6 }
+  - { min_zoom:  9, name: regional_bike_route,      width: 50, height:  2, fill: "#5500ff", opacity: 0.6 }
+  - { min_zoom: 11, name: regional_bike_route,      width: 50, height:  3, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 12, name: regional_bike_route,      width: 50, height:  4, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 14, name: regional_bike_route,      width: 50, height:  5, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 15, name: regional_bike_route,      width: 50, height:  6, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 16, name: regional_bike_route,      width: 50, height:  7, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 17, name: regional_bike_route,      width: 50, height: 10, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 18, name: regional_bike_route,      width: 50, height: 14, fill: "#5500ff", opacity: 0.25 }
+  - { min_zoom: 11, name: local_bike_route,         width: 50, height:  3, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 12, name: local_bike_route,         width: 50, height:  4, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 14, name: local_bike_route,         width: 50, height:  5, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 15, name: local_bike_route,         width: 50, height:  6, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 16, name: local_bike_route,         width: 50, height:  7, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 17, name: local_bike_route,         width: 50, height: 10, fill: "#0000ff", opacity: 0.25 }
+  - { min_zoom: 18, name: local_bike_route,         width: 50, height: 14, fill: "#0000ff", opacity: 0.25 }
 cyclemap:
   - { min_zoom:  5, name: motorway, width: 50, height: 2, fill: "#9a9ab1" }
   - { min_zoom:  9, name: motorway, width: 50, height: 3, fill: "#9a9ab1" }
@@ -124,17 +162,17 @@ cyclemap:
   - { min_zoom: 17, name: track, width: 50, height: 5, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
   - { min_zoom: 13, name: bridleway, width: 52, height: 3, line: green, line-width: 1.5, line-dasharray: "4 2" }
   - { min_zoom:  8, name: cycleway, width: 50, height: 3, line: "#0100fe", line-width: 1.5, line-dasharray: "6 2" }
-  - { min_zoom:  5, name: cycleway_national, width: 50, height:  2, fill: "#fe0000" }
-  - { min_zoom: 12, name: cycleway_national, width: 50, height:  3, fill: "#fe0000" }
-  - { min_zoom: 13, name: cycleway_national, width: 50, height: 12, fill: "#ffb3b3" }
-  - { min_zoom:  7, name: cycleway_regional, width: 50, height:  2, fill: "#b638fb" }
-  - { min_zoom: 12, name: cycleway_regional, width: 50, height:  3, fill: "#b638fb" }
-  - { min_zoom: 13, name: cycleway_regional, width: 50, height: 10, fill: "#ddb5d9" }
-  - { min_zoom:  8, name: cycleway_local, width: 50, height: 2, fill: "#0100fe" }
-  - { min_zoom: 12, name: cycleway_local, width: 50, height: 3, fill: "#0100fe" }
-  - { min_zoom: 13, name: cycleway_local, width: 50, height: 8, fill: "#b2b2ff" }
-  - { min_zoom: 10, name: cycleway_mtb, width: 50, height: 2, fill: "#ff7b1c" }
-  - { min_zoom: 13, name: cycleway_mtb, width: 50, height: 6, fill: "#fbcaa3" }
+  - { min_zoom:  5, name: national_bike_route, width: 50, height:  2, fill: "#fe0000" }
+  - { min_zoom: 12, name: national_bike_route, width: 50, height:  3, fill: "#fe0000" }
+  - { min_zoom: 13, name: national_bike_route, width: 50, height: 12, fill: "#ffb3b3" }
+  - { min_zoom:  7, name: regional_bike_route, width: 50, height:  2, fill: "#b638fb" }
+  - { min_zoom: 12, name: regional_bike_route, width: 50, height:  3, fill: "#b638fb" }
+  - { min_zoom: 13, name: regional_bike_route, width: 50, height: 10, fill: "#ddb5d9" }
+  - { min_zoom:  8, name: local_bike_route, width: 50, height: 2, fill: "#0100fe" }
+  - { min_zoom: 12, name: local_bike_route, width: 50, height: 3, fill: "#0100fe" }
+  - { min_zoom: 13, name: local_bike_route, width: 50, height: 8, fill: "#b2b2ff" }
+  - { min_zoom: 10, name: mountain_bike_route, width: 50, height: 2, fill: "#ff7b1c" }
+  - { min_zoom: 13, name: mountain_bike_route, width: 50, height: 6, fill: "#fbcaa3" }
   - { min_zoom: 13, name: footway, width: 50, height: 3, line: "#bd6d6e", line-width: 1.5, line-dasharray: "6 2" }
   - { min_zoom:  7, name: rail, width: 50, height: 3, line: "#999999", line-width: 1.5 }
   - { min_zoom: 14, name: rail, width: 50, height: 4, fill: "#999999", line: white, line-dasharray: 4, line-width: 2 }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16b967ead238558d2e84b69e0462f1c392b6e8b2..ddcc672cc17b26d84517d668418639f5ed19bc91 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2529,10 +2529,11 @@ en:
         track: "Track"
         bridleway: "Bridleway"
         cycleway: "Cycleway"
-        cycleway_national: "National cycleway"
-        cycleway_regional: "Regional cycleway"
-        cycleway_local: "Local cycleway"
-        cycleway_mtb: "Mountain bike route"
+        international_bike_route: "International bike route"
+        national_bike_route: "National bike route"
+        regional_bike_route: "Regional bike route"
+        local_bike_route: "Local bike route"
+        mountain_bike_route: "Mountain bike route"
         footway: "Footway"
         rail: "Railway"
         train: "Train"

diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index d7b9f279e9d3d874ca3240d604749efa9e25173f..df7682fe9eceb65240da47ad7314c4f1b4051a4d 100644 (file)
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -28,7 +28,7 @@ class SiteTest < ApplicationSystemTestCase
   end
 
   test "tooltip shows for Map Key button on a layer without a key provided" do
-    visit "/#layers=Y" # assumes that CyclOSM layer has no map key
+    visit "/#layers=H" # assumes that HOT layer has no map key
 
     assert_no_selector ".tooltip"
     button = find ".control-key .control-button"