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

diff --git a/app/assets/images/key/cyclemap/common.png b/app/assets/images/key/cyclemap/common.png
deleted file mode 100644 (file)
index 7c10815..0000000
Binary files a/app/assets/images/key/cyclemap/common.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_local.png b/app/assets/images/key/cyclemap/cycleway_local.png
deleted file mode 100644 (file)
index 2a29331..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_local.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_local13.png b/app/assets/images/key/cyclemap/cycleway_local13.png
deleted file mode 100644 (file)
index 3f2c535..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_local13.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_national.png b/app/assets/images/key/cyclemap/cycleway_national.png
deleted file mode 100644 (file)
index 0f5455f..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_national.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_national13.png b/app/assets/images/key/cyclemap/cycleway_national13.png
deleted file mode 100644 (file)
index 252b07a..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_national13.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_regional.png b/app/assets/images/key/cyclemap/cycleway_regional.png
deleted file mode 100644 (file)
index 9224999..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_regional.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/cycleway_regional13.png b/app/assets/images/key/cyclemap/cycleway_regional13.png
deleted file mode 100644 (file)
index 5195704..0000000
Binary files a/app/assets/images/key/cyclemap/cycleway_regional13.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/forest.png b/app/assets/images/key/cyclemap/forest.png
deleted file mode 100644 (file)
index a7ebe8e..0000000
Binary files a/app/assets/images/key/cyclemap/forest.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/lake.png b/app/assets/images/key/cyclemap/lake.png
deleted file mode 100644 (file)
index 918d496..0000000
Binary files a/app/assets/images/key/cyclemap/lake.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/motorway.png b/app/assets/images/key/cyclemap/motorway.png
deleted file mode 100644 (file)
index 296f176..0000000
Binary files a/app/assets/images/key/cyclemap/motorway.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/primary.png b/app/assets/images/key/cyclemap/primary.png
deleted file mode 100644 (file)
index 78ae0e4..0000000
Binary files a/app/assets/images/key/cyclemap/primary.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/secondary.png b/app/assets/images/key/cyclemap/secondary.png
deleted file mode 100644 (file)
index 7928b18..0000000
Binary files a/app/assets/images/key/cyclemap/secondary.png and /dev/null differ

diff --git a/app/assets/images/key/cyclemap/trunk.png b/app/assets/images/key/cyclemap/trunk.png
deleted file mode 100644 (file)
index d312a65..0000000
Binary files a/app/assets/images/key/cyclemap/trunk.png and /dev/null differ

diff --git a/config/key.yml b/config/key.yml
index 267e68934244d7fe2e308befaf8dffa45e146f80..23657633308708327e7630e9bd58a1f03b5078a5 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -85,29 +85,29 @@ mapnik:
   - { min_zoom: 15, name: destination, image: destination.png }
   - { min_zoom: 12, name: construction, image: construction.png }
 cyclemap:
-  - { min_zoom:  0, name: motorway, image: motorway.png }
+  - { min_zoom:  0, name: motorway, width: 50, height: 3, fill: "#9a9ab1" }
   - { min_zoom: 12, name: motorway, image: motorway12.png }
-  - { min_zoom:  0, name: trunk, image: trunk.png }
+  - { min_zoom:  0, name: trunk, width: 50, height: 2, fill: "#c8d8c8" }
   - { min_zoom: 12, name: trunk, image: trunk12.png }
-  - { min_zoom:  7, name: primary, image: primary.png }
+  - { min_zoom:  7, name: primary, width: 50, height: 2, fill: "#d8c8c8" }
   - { min_zoom: 12, name: primary, image: primary12.png }
-  - { min_zoom:  9, name: secondary, image: secondary.png }
+  - { min_zoom:  9, name: secondary, width: 50, height: 1, fill: "#dadacc" }
   - { min_zoom: 12, name: secondary, image: secondary12.png }
   - { min_zoom: 15, name: pedestrian, image: pedestrian.svg }
   - { min_zoom: 13, name: track, image: track.png }
   - { min_zoom:  8, name: cycleway, image: cycleway.png }
-  - { min_zoom:  5, name: cycleway_national, image: cycleway_national.png }
-  - { min_zoom: 13, name: cycleway_national, image: cycleway_national13.png }
-  - { min_zoom:  5, name: cycleway_regional, image: cycleway_regional.png }
-  - { min_zoom: 13, name: cycleway_regional, image: cycleway_regional13.png }
-  - { min_zoom:  8, name: cycleway_local, image: cycleway_local.png }
-  - { min_zoom: 13, name: cycleway_local, image: cycleway_local13.png }
+  - { min_zoom:  5, name: cycleway_national, width: 50, height: 2, fill: "#fe0000" }
+  - { min_zoom: 13, name: cycleway_national, width: 50, height: 4, fill: "#ffb3b3" }
+  - { min_zoom:  5, name: cycleway_regional, width: 50, height: 2, fill: "#b638fb" }
+  - { min_zoom: 13, name: cycleway_regional, width: 50, height: 4, fill: "#ddb5d9" }
+  - { min_zoom:  8, name: cycleway_local, width: 50, height: 2, fill: "#0100fe" }
+  - { min_zoom: 13, name: cycleway_local, width: 50, height: 4, fill: "#b2b2ff" }
   - { min_zoom: 13, name: footway, image: footway.svg }
   - { min_zoom:  7, name: rail, image: rail.png }
   - { min_zoom: 14, name: rail, image: rail14.png }
-  - { min_zoom:  9, name: forest, image: forest.png }
-  - { min_zoom: 10, name: common, image: common.png }
-  - { min_zoom:  7, name: lake, image: lake.png }
+  - { min_zoom:  9, name: forest, width: 26, height: 10, fill: "#cde1c4" }
+  - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#bcdd92" }
+  - { min_zoom:  7, name: lake, width: 26, height: 10, fill: "#b5d0d0" }
   - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
   - { min_zoom: 14, name: bicycle_parking, image: bicycle_parking.png }
   - { min_zoom: 16, name: toilets, image: toilets.png }