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

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

diff --git a/app/assets/images/key/mapnik/rail12.png b/app/assets/images/key/mapnik/rail12.png
deleted file mode 100644 (file)
index 957f17c..0000000
Binary files a/app/assets/images/key/mapnik/rail12.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/rail12.svg b/app/assets/images/key/mapnik/rail12.svg
new file mode 100644 (file)
index 0000000..45c76a4
--- /dev/null
+++ b/app/assets/images/key/mapnik/rail12.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='3'>
+<rect width='100%' height='100%' fill='#707070' />
+<line x2='100%' y1='50%' y2='50%' stroke='white' stroke-dasharray='8' stroke-dashoffset='2' />
+</svg>

diff --git a/app/assets/images/key/mapnik/rail18.svg b/app/assets/images/key/mapnik/rail18.svg
new file mode 100644 (file)
index 0000000..5094baf
--- /dev/null
+++ b/app/assets/images/key/mapnik/rail18.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='4'>
+<rect width='100%' height='100%' fill='#707070' />
+<line x2='100%' y1='50%' y2='50%' stroke='white' stroke-dasharray='8' stroke-dashoffset='2' stroke-width='2' />
+</svg>

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

diff --git a/app/assets/images/key/mapnik/tram.png b/app/assets/images/key/mapnik/tram.png
deleted file mode 100644 (file)
index 1c64b28..0000000
Binary files a/app/assets/images/key/mapnik/tram.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/tram15.svg b/app/assets/images/key/mapnik/tram15.svg
new file mode 100644 (file)
index 0000000..8f873f7
--- /dev/null
+++ b/app/assets/images/key/mapnik/tram15.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='3'>
+<line x2='100%' y1='50%' y2='50%' stroke='#6e6e6e' stroke-width='1.5' />
+</svg>

diff --git a/config/key.yml b/config/key.yml
index 1aca2942b393e9a2d56163f3ecd82d5801da49f4..f64ab8b372a306e911e4ff055810c0283e42e044 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,5 +1,5 @@
 mapnik:
-  # transportation
+  # transportation: roads.mss
   - { min_zoom: 6, max_zoom: 19, name: motorway, image: motorway.png }
   - { min_zoom: 6, max_zoom: 7, name: main_road, image: mainroad.png }
   - { min_zoom: 8, max_zoom: 11, name: main_road, image: mainroad8.png }
@@ -8,10 +8,17 @@ mapnik:
   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
   - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
-  - { min_zoom: 8, max_zoom: 11, name: rail, image: rail.png }
-  - { min_zoom: 12, max_zoom: 19, name: rail, image: rail12.png }
-  - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png }
-  - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png }
+  - { min_zoom:  8, name: rail, width: 52, height: 1, fill: "#787878" }
+  - { min_zoom: 12, name: rail, image: rail12.svg }
+  - { min_zoom: 18, name: rail, image: rail18.svg }
+  - { min_zoom: 12, name: subway, width: 52, height: 2, fill: "#999" }
+  - { min_zoom:  8, name: light_rail, width: 52, height: 1, fill: "#ccc" }
+  - { min_zoom: 10, name: light_rail, width: 52, height: 1, fill: "#aaa" }
+  - { min_zoom: 13, name: light_rail, width: 52, height: 2, fill: "#666" }
+  - { min_zoom: 12, name: tram_only, width: 52, height: 1, fill: "#6e6e6eaa" }
+  - { min_zoom: 14, name: tram_only, width: 52, height: 1, fill: "#6e6e6e" }
+  - { min_zoom: 15, name: tram_only, image: tram15.svg }
+  - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
   - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
   - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
   - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3c99d024216f526011530823dc9cc38b123b4ce..31563243ad0f209cfa4027c28e6af392ad39ce51 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2293,9 +2293,6 @@ en:
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
-          tram:
-            - Light rail
-            - tram
           light_rail: "Light rail"
           tram_only: "Tram"
           trolleybus: "Trolleybus"