Update landuse features

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/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/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/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/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/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/config/key.yml b/config/key.yml
index 4317b89beae66e02b49f10da1d4aafef88a1f8c5..1caf3a0d9b6946126ee7aec50e2a276c0412f997 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -17,7 +17,7 @@ mapnik:
   - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }

-  # landcover: landcover.mss, water.mss
+  # 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 }
   - { 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 }


@@ -37,19 +37,26 @@ mapnik:
   - { 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" }
   - { 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" }

   # other
   # other

-  - { 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: 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: 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 }
   - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
   - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
   - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
   - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b51f047d708f64f0514dcc872d7fccabffb25580..9c6dbc3bdea9701e840de58ba9adb15dda72d1a8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2324,11 +2324,12 @@ en:
           sand: "Sand"
           golf: "Golf course"
           park: "Park"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"

-          resident: "Residential area"

           common:
             - Common
             - meadow
             - garden
           common:
             - Common
             - meadow
             - garden

+          built_up: "Built-up area"
+          resident: "Residential area"

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"