Update landcover features visible on z5

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/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/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/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 daf0a9a3f459860ef070d540b0d11cdc53fb2d9a..f9ce0a3ee2db764975e1c85fecc8ff3004114d40 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -18,18 +18,31 @@ mapnik:
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover: landcover.mss, water.mss
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover: landcover.mss, water.mss

-  - { min_zoom: 0, max_zoom: 19, name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { name: glacier, width: 26, height: 10, fill: "#ddecec" }
+  - { 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" }

   # other
   # other

-  - { 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: 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: 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: 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: 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 }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4b4f6b301807fd6cb5198e1ae8d4a8391e127e97..b51f047d708f64f0514dcc872d7fccabffb25580 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2310,8 +2310,18 @@ en:
             - Airport apron
             - terminal
           admin: "Administrative boundary"
             - 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"
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"


@@ -2323,9 +2333,11 @@ en:
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"

+          scrubland: "Scrubland"

           lake:
             - Lake
             - reservoir
           lake:
             - Lake
             - reservoir

+          glacier: "Glacier"

           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"