Rename "cycleways" that are routes to "bike routes" in map key

diff --git a/config/key.yml b/config/key.yml
index 798d9ca546db80f0b82960bb79f0db13078615f0..f36f2946bf3c585d23af4163a14af40f8757d301 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -124,17 +124,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: 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 }
   - { 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..d99202b540fbad3163e396be32da502042629b9f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2529,10 +2529,10 @@ en:
         track: "Track"
         bridleway: "Bridleway"
         cycleway: "Cycleway"
         track: "Track"
         bridleway: "Bridleway"
         cycleway: "Cycleway"

-        cycleway_national: "National cycleway"
-        cycleway_regional: "Regional cycleway"
-        cycleway_local: "Local cycleway"
-        cycleway_mtb: "Mountain 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"
         footway: "Footway"
         rail: "Railway"
         train: "Train"