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

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

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

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

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

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

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

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

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

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

diff --git a/app/assets/images/key/mapnik/glacier10.svg b/app/assets/images/key/mapnik/glacier10.svg
new file mode 100644 (file)
index 0000000..be79f23
--- /dev/null
+++ b/app/assets/images/key/mapnik/glacier10.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='#ddecec' stroke='#9cf' stroke-dasharray='4 2' />
+</svg>

diff --git a/app/assets/images/key/mapnik/glacier5.svg b/app/assets/images/key/mapnik/glacier5.svg
new file mode 100644 (file)
index 0000000..8e6d368
--- /dev/null
+++ b/app/assets/images/key/mapnik/glacier5.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='#ddecec' stroke='#9cf' />
+</svg>

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

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

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

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

diff --git a/app/assets/images/key/mapnik/military.svg b/app/assets/images/key/mapnik/military.svg
new file mode 100644 (file)
index 0000000..7a6872d
--- /dev/null
+++ b/app/assets/images/key/mapnik/military.svg
@@ -0,0 +1,9 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<defs>
+<pattern id='hatch' width='8' height='8' patternUnits='userSpaceOnUse'>
+<rect width='8' height='8' fill='#ff555514' />
+<line x1='8' y2='8' stroke='#ff555544' />
+</pattern>
+</defs>
+<rect x='.5' y='.5' width='25' height='9' fill='url(#hatch)' stroke='#ff555544' />
+</svg>

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

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

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

diff --git a/app/assets/images/key/mapnik/reserve.svg b/app/assets/images/key/mapnik/reserve.svg
new file mode 100644 (file)
index 0000000..5a53f0a
--- /dev/null
+++ b/app/assets/images/key/mapnik/reserve.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<rect x='1' y='1' width='24' height='8' fill='none' stroke='#008000' stroke-width='2' opacity='.15' />
+<rect x='2' y='2' width='22' height='6' fill='none' stroke='#008000' stroke-width='4' opacity='.15' />
+</svg>

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

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

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

diff --git a/config/key.yml b/config/key.yml
index dfc2f4025b932ca6f55f52dafda82a83bc9cf2c0..5ee24e9137428bdf3efc7c181a9a8d253f388e44 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,4 +1,5 @@
 mapnik:
+  # transportation
   - { 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 }
@@ -14,26 +15,50 @@ mapnik:
   - { 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 }
-  - { min_zoom: 0, max_zoom: 19, name: admin, image: admin.png }
-  - { min_zoom: 5, max_zoom: 19, name: forest, image: forest.png }
-  - { min_zoom: 5, max_zoom: 19, name: wood, image: wood.png }
-  - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
-  - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
-  - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
-  - { min_zoom: 5, max_zoom: 19, name: common, image: common.png }
-  - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
-  - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
-  - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
-  - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
-  - { min_zoom: 0, max_zoom: 19, name: lake, width: 26, height: 10, fill: "#aad3df" }
-  - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
-  - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
-  - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }
-  - { min_zoom: 11, max_zoom: 19, name: allotments, image: allotments.png }
-  - { min_zoom: 11, max_zoom: 19, name: pitch, image: pitch.png }
-  - { min_zoom: 11, max_zoom: 19, name: centre, image: centre.png }
-  - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
-  - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
+  # administrative boundaries: admin.mss
+  - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
+  # landcover z5: landcover.mss, water.mss
+  - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { min_zoom: 5, max_zoom: 9, name: glacier, image: glacier5.svg }
+  - { min_zoom: 10, name: glacier, image: glacier10.svg }
+  - { min_zoom: 5, max_zoom: 11, name: forest, width: 26, height: 10, fill: "#bddab1" }
+  - { min_zoom: 12, name: forest, width: 26, height: 10, fill: "#add19e" }
+  - { min_zoom: 5, max_zoom: 11, name: orchard, width: 26, height: 10, fill: "#bee5b5" }
+  - { min_zoom: 12, name: orchard, width: 26, height: 10, fill: "#aedfa3" }
+  - { min_zoom: 5, max_zoom: 11, name: grass, width: 26, height: 10, fill: "#d7efc0" }
+  - { min_zoom: 12, name: grass, width: 26, height: 10, fill: "#cdebb0" }
+  - { min_zoom: 5, max_zoom: 11, name: farmland, width: 26, height: 10, fill: "#f1f3dd" }
+  - { min_zoom: 12, name: farmland, width: 26, height: 10, fill: "#eef0d5" }
+  - { min_zoom: 5, max_zoom: 11, name: heathland, width: 26, height: 10, fill: "#dee1b2" }
+  - { min_zoom: 12, name: heathland, width: 26, height: 10, fill: "#d6d99f" }
+  - { min_zoom: 5, max_zoom: 11, name: scrubland, width: 26, height: 10, fill: "#d3dfbc" }
+  - { min_zoom: 12, name: scrubland, width: 26, height: 10, fill: "#c8d7ab" }
+  - { min_zoom: 5, max_zoom: 11, name: bare_rock, width: 26, height: 10, fill: "#f1eae3" }
+  - { min_zoom: 12, name: bare_rock, width: 26, height: 10, fill: "#eee5dc" }
+  - { min_zoom: 5, max_zoom: 11, name: sand, width: 26, height: 10, fill: "#f7edd1" }
+  - { min_zoom: 12, name: sand, width: 26, height: 10, fill: "#f5e9c6" }
+  # landuse z8, z10: landcover.mss
+  - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#c8facc" }
+  - { min_zoom: 10, name: golf, width: 26, height: 10, fill: "#def6c0" }
+  - { min_zoom: 8, max_zoom: 11, name: built_up, width: 26, height: 10, fill: "#d9d9d9" }
+  - { min_zoom: 12, max_zoom: 12, name: built_up, width: 26, height: 10, fill: "#dddddd" }
+  - { min_zoom: 13, name: resident, width: 26, height: 10, fill: "#e0dfdf" }
+  - { min_zoom: 13, name: retail, width: 26, height: 10, fill: "#ffd6d1" }
+  - { min_zoom: 13, name: commercial, width: 26, height: 10, fill: "#f2dad9" }
+  - { min_zoom: 13, name: industrial, width: 26, height: 10, fill: "#ebdbe8" }
+  - { min_zoom: 10, max_zoom: 11, name: farm, width: 26, height: 10, fill: "#f7e3c8" }
+  - { min_zoom: 12, name: farm, width: 26, height: 10, fill: "#f5dcba" }
+  - { min_zoom: 10, max_zoom: 11, name: brownfield, width: 26, height: 10, fill: "#d2d2c3" }
+  - { min_zoom: 12, name: brownfield, width: 26, height: 10, fill: "#c7c7b4" }
+  - { min_zoom: 10, max_zoom: 11, name: cemetery, width: 26, height: 10, fill: "#bbd5be" }
+  - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#aacbaf" }
+  - { min_zoom: 10, max_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d4e6cc" }
+  - { min_zoom: 12, name: allotments, width: 26, height: 10, fill: "#c9e1bf" }
+  - { min_zoom: 11, name: pitch, width: 26, height: 10, fill: "#88e0be" }
+  - { 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 }
+  # 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 }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4b4f6b301807fd6cb5198e1ae8d4a8391e127e97..9c6dbc3bdea9701e840de58ba9adb15dda72d1a8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2310,22 +2310,35 @@ en:
             - Airport apron
             - terminal
           admin: "Administrative boundary"
-          forest: "Forest"
-          wood: "Wood"
+          orchard:
+            - Orchard
+            - vineyard
+          forest:
+            - Forest
+            - wood
+          farmland: "Farmland"
+          grass:
+            - Grass
+            - meadow
+          bare_rock: "Bare rock"
+          sand: "Sand"
           golf: "Golf course"
           park: "Park"
-          resident: "Residential area"
           common:
             - Common
             - meadow
             - garden
+          built_up: "Built-up area"
+          resident: "Residential area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
+          scrubland: "Scrubland"
           lake:
             - Lake
             - reservoir
+          glacier: "Glacier"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"