From 92ab24baa0abfd88609dd0f320d06d09613d1195 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Dec 2023 23:05:03 +0300 Subject: [PATCH] Update landuse features --- app/assets/images/key/mapnik/allotments.png | Bin 98 -> 0 bytes app/assets/images/key/mapnik/brownfield.png | Bin 114 -> 0 bytes app/assets/images/key/mapnik/cemetery.png | Bin 89 -> 0 bytes app/assets/images/key/mapnik/centre.png | Bin 111 -> 0 bytes app/assets/images/key/mapnik/commercial.png | Bin 119 -> 0 bytes app/assets/images/key/mapnik/farm.png | Bin 117 -> 0 bytes app/assets/images/key/mapnik/golf.png | Bin 114 -> 0 bytes app/assets/images/key/mapnik/industrial.png | Bin 111 -> 0 bytes app/assets/images/key/mapnik/park.png | Bin 110 -> 0 bytes app/assets/images/key/mapnik/pitch.png | Bin 114 -> 0 bytes app/assets/images/key/mapnik/resident.png | Bin 109 -> 0 bytes app/assets/images/key/mapnik/retail.png | Bin 116 -> 0 bytes config/key.yml | 33 ++++++++++++-------- config/locales/en.yml | 3 +- 14 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 app/assets/images/key/mapnik/allotments.png delete mode 100644 app/assets/images/key/mapnik/brownfield.png delete mode 100644 app/assets/images/key/mapnik/cemetery.png delete mode 100644 app/assets/images/key/mapnik/centre.png delete mode 100644 app/assets/images/key/mapnik/commercial.png delete mode 100644 app/assets/images/key/mapnik/farm.png delete mode 100644 app/assets/images/key/mapnik/golf.png delete mode 100644 app/assets/images/key/mapnik/industrial.png delete mode 100644 app/assets/images/key/mapnik/park.png delete mode 100644 app/assets/images/key/mapnik/pitch.png delete mode 100644 app/assets/images/key/mapnik/resident.png delete mode 100644 app/assets/images/key/mapnik/retail.png diff --git a/app/assets/images/key/mapnik/allotments.png b/app/assets/images/key/mapnik/allotments.png deleted file mode 100644 index e3977188507d3304e158f6b0a9e1f1eed48c9d41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQktGFjv*C{$rc+Is4#^J7jGjmav#ck+>m4@o0W~pry85}Sb4q9e07=#wkpKVy diff --git a/app/assets/images/key/mapnik/brownfield.png b/app/assets/images/key/mapnik/brownfield.png deleted file mode 100644 index c0a12794a4f008f5455d434f52dfb8548d76c3f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQkI@Bjv*C{$urFLtyACKnIpgD z$meHIebN|=j2eE}>l$7#Hg4POx>&3?YD-qA#^*mjIc2sS;pOGkVK}7RBkNocUkEgW N!PC{xWt~$(69Db}FmBs%7wW^>bP0l+XkKirN@@ diff --git a/app/assets/images/key/mapnik/centre.png b/app/assets/images/key/mapnik/centre.png deleted file mode 100644 index a1c4522b795ee7b7e0ba64cef052b7356a07dfd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQf8hmjv*C{$p&`D#;hIn7lfqe z&b5@xxY)y^@Z4V4@WLX=!#5WNcDw0v#cu7onfSkk@75zWF$U3<^|m#Ktv!GyFnGH9 KxvXi^e?F?jW4M*Zo& Rs0B2K!PC{xWt~$(698nqEIpFoAv1L??{F}vi=&!B-8%`ObP0l+XkKUehSQ diff --git a/app/assets/images/key/mapnik/park.png b/app/assets/images/key/mapnik/park.png deleted file mode 100644 index 149795a876861f7f0cfd882f441eb288ca5b0dfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQl_3Rjv*C{$v1wbXP?@(|90I4 z3IDVkzsj@OCVZSfO(NrX&%>OHD_j?gt^KvXtMdQjv*C{$v;Xyr=2<;y}j;& z$o+k`Ganva8!hQ@u0HCK|MtAI66eHvqfD|c{{R1f=KuTq&pQV1ski55;Jr4fFr?Jd Q6=)2Dr>mdKI;Vst09Sh|$^ZZW diff --git a/config/key.yml b/config/key.yml index 4317b89be..1caf3a0d9 100644 --- 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" } - # 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 } @@ -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" } + # 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 - - { 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 } diff --git a/config/locales/en.yml b/config/locales/en.yml index b51f047d7..9c6dbc3bd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2324,11 +2324,12 @@ en: 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" -- 2.45.2