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

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

diff --git a/app/assets/images/key/mapnik/bridge.svg b/app/assets/images/key/mapnik/bridge.svg
new file mode 100644 (file)
index 0000000..4096e81
--- /dev/null
+++ b/app/assets/images/key/mapnik/bridge.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='30' height='5' stroke='black'>
+<line y1='0.5' y2='0.5' x2='30' />
+<line y1='4.5' y2='4.5' x2='30' />
+</svg>

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

diff --git a/app/assets/images/key/mapnik/building15.svg b/app/assets/images/key/mapnik/building15.svg
new file mode 100644 (file)
index 0000000..cc05073
--- /dev/null
+++ b/app/assets/images/key/mapnik/building15.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='10' height='10'>
+<rect x='.5' y='.5' width='9' height='9' fill='#b9a99c' stroke='#a99a8d' />
+</svg>

diff --git a/app/assets/images/key/mapnik/building16.svg b/app/assets/images/key/mapnik/building16.svg
new file mode 100644 (file)
index 0000000..6ff2210
--- /dev/null
+++ b/app/assets/images/key/mapnik/building16.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='10' height='10'>
+<rect x='.5' y='.5' width='9' height='9' fill='#c4b6ab' stroke='#a99a8d' />
+</svg>

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

diff --git a/app/assets/images/key/mapnik/school.svg b/app/assets/images/key/mapnik/school.svg
new file mode 100644 (file)
index 0000000..b7600bf
--- /dev/null
+++ b/app/assets/images/key/mapnik/school.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<rect x='.5' y='.5' width='25' height='9' fill='#ffffe5' stroke='#fdfdb2' />
+</svg>

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

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

diff --git a/app/assets/images/key/mapnik/summit.svg b/app/assets/images/key/mapnik/summit.svg
new file mode 100644 (file)
index 0000000..e9c831c
--- /dev/null
+++ b/app/assets/images/key/mapnik/summit.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8'>
+<path d='M4,1 0,8 8,8 z' fill='#d08f55' />
+</svg>

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

diff --git a/app/assets/images/key/mapnik/tunnel.svg b/app/assets/images/key/mapnik/tunnel.svg
new file mode 100644 (file)
index 0000000..05cd7e7
--- /dev/null
+++ b/app/assets/images/key/mapnik/tunnel.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='30' height='5' stroke='grey' stroke-dasharray='4 2' stroke-dashoffset='-1'>
+<line y1='0.5' y2='0.5' x2='30' />
+<line y1='4.5' y2='4.5' x2='30' />
+</svg>

diff --git a/config/key.yml b/config/key.yml
index 5ee24e9137428bdf3efc7c181a9a8d253f388e44..cdd070131e5073702be80ea3a2063d7da2af7a45 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -58,13 +58,19 @@ mapnik:
   - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" }
   - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss
   - { min_zoom: 8, name: military, image: military.svg }
+  - { min_zoom: 13, name: school, image: school.svg }
+  # buildings: buildings.mss
+  - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
+  - { min_zoom: 15, name: building, image: building15.svg }
+  - { min_zoom: 16, name: building, image: building16.svg }
+  # stations: stations.mss
+  - { min_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" }
+  - { min_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" }
+  - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }
   # other
-  - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
-  - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
-  - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
-  - { min_zoom: 11, max_zoom: 19, name: summit, image: summit.png }
-  - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
-  - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
+  - { min_zoom: 11, name: summit, image: summit.svg } # amenity-points.mss
+  - { min_zoom: 13, name: tunnel, image: tunnel.svg } # roads.mss
+  - { min_zoom: 13, name: bridge, image: bridge.svg } # roads.mss
   - { 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 }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9c6dbc3bdea9701e840de58ba9adb15dda72d1a8..2e13fe13c0b787081f66a38a6916020d055975e3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2350,6 +2350,7 @@ en:
           school:
             - School
             - university
+            - hospital
           building: "Significant building"
           station: "Railway station"
           summit: