From 3cecb62993bb05d93a2b78469c04e08d734be579 Mon Sep 17 00:00:00 2001 From: Maciej Ziarkowski Date: Mon, 28 Oct 2019 15:55:40 +0000 Subject: [PATCH 1/3] Adjust likes colour scale and legend --- app/map_styles/polygon.xml | 12 ++++++------ app/src/frontend/map/legend.tsx | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index 601fa773..7d0e8552 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -222,27 +222,27 @@ diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx index 207c41c0..440e56b3 100644 --- a/app/src/frontend/map/legend.tsx +++ b/app/src/frontend/map/legend.tsx @@ -102,12 +102,12 @@ const LEGEND_CONFIG = { like: { title: 'Like Me', elements: [ - { color: '#bd0026', text: '👍👍👍 ≥10' }, - { color: '#e31a1c', text: '👍👍 5–10' }, - { color: '#fc4e2a', text: '👍 4' }, - { color: '#fd8d3c', text: '👍 3' }, - { color: '#feb24c', text: '👍 2' }, - { color: '#fed976', text: '👍 1' }, + { color: '#bd0026', text: '👍👍👍 ≥100' }, + { color: '#e31a1c', text: '👍👍 70–100' }, + { color: '#fc4e2a', text: '👍 40-69' }, + { color: '#fd8d3c', text: '👍 15-39' }, + { color: '#feb24c', text: '👍 5-14' }, + { color: '#fed976', text: '👍 1-4' }, ] } }; From c2ea90a372b9a2dcc0eadb610bf6793275d68312 Mon Sep 17 00:00:00 2001 From: Maciej Ziarkowski Date: Mon, 28 Oct 2019 16:07:22 +0000 Subject: [PATCH 2/3] Fix typo in likes legend --- app/src/frontend/map/legend.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx index 440e56b3..71150ab4 100644 --- a/app/src/frontend/map/legend.tsx +++ b/app/src/frontend/map/legend.tsx @@ -103,7 +103,7 @@ const LEGEND_CONFIG = { title: 'Like Me', elements: [ { color: '#bd0026', text: '👍👍👍 ≥100' }, - { color: '#e31a1c', text: '👍👍 70–100' }, + { color: '#e31a1c', text: '👍👍 70–99' }, { color: '#fc4e2a', text: '👍 40-69' }, { color: '#fd8d3c', text: '👍 15-39' }, { color: '#feb24c', text: '👍 5-14' }, From bf1a8def6e57448a4d12966ff2d8ababf0372155 Mon Sep 17 00:00:00 2001 From: Maciej Ziarkowski Date: Thu, 31 Oct 2019 13:22:34 +0000 Subject: [PATCH 3/3] Revise like bins and colour scale --- app/map_styles/polygon.xml | 14 +++++++++----- app/src/frontend/map/legend.tsx | 13 +++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index 7d0e8552..a2f88975 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -226,24 +226,28 @@ - [likes] >= 70 and [likes] < 100 + [likes] >= 50 and [likes] < 100 - [likes] >= 40 and [likes] < 70 + [likes] >= 20 and [likes] < 50 - [likes] >= 15 and [likes] < 40 + [likes] >= 10 and [likes] < 20 - [likes] >= 5 and [likes] < 15 + [likes] >= 3 and [likes] < 10 - [likes] < 5 + [likes] = 2 + + [likes] = 1 + + diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx index 71150ab4..b1e8bddb 100644 --- a/app/src/frontend/map/legend.tsx +++ b/app/src/frontend/map/legend.tsx @@ -102,12 +102,13 @@ const LEGEND_CONFIG = { like: { title: 'Like Me', elements: [ - { color: '#bd0026', text: '👍👍👍 ≥100' }, - { color: '#e31a1c', text: '👍👍 70–99' }, - { color: '#fc4e2a', text: '👍 40-69' }, - { color: '#fd8d3c', text: '👍 15-39' }, - { color: '#feb24c', text: '👍 5-14' }, - { color: '#fed976', text: '👍 1-4' }, + { color: '#bd0026', text: '👍👍👍👍 100+' }, + { color: '#e31a1c', text: '👍👍👍 50–99' }, + { color: '#fc4e2a', text: '👍👍 20–49' }, + { color: '#fd8d3c', text: '👍👍 10–19' }, + { color: '#feb24c', text: '👍 3–9' }, + { color: '#fed976', text: '👍 2' }, + { color: '#ffe8a9', text: '👍 1'} ] } };