[country_map] use Albers USA projection (apache#3946)

* [country_map] use Albers USA projection * Minor touchups * Adding color scheme
michellethomas · May 23, 2018 · 1e0fc7b · 1e0fc7b
1 parent cd02c48
commit 1e0fc7b
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 56 deletions.
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -228,6 +228,7 @@ export const controls = {
       ['white_black', 'white/black'],
       ['black_white', 'black/white'],
       ['dark_blue', 'light/dark blue'],
+      ['pink_grey', 'pink/white/grey'],
     ],
     default: 'blue_white_yellow',
     clearable: false,

diff --git a/superset/assets/javascripts/explore/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js
@@ -993,8 +993,9 @@ export const visTypes = {
       },
       {
         label: t('Options'),
+        expanded: true,
         controlSetRows: [
-          ['select_country'],
+          ['select_country', 'number_format'],
           ['linear_color_scheme'],
         ],
       },

diff --git a/superset/assets/javascripts/modules/colors.js b/superset/assets/javascripts/modules/colors.js
@@ -101,6 +101,11 @@ export const spectrums = {
     '#1B4150',
     '#092935',
   ],
+  pink_grey: [
+    '#E70B81',
+    '#FAFAFA',
+    '#666666',
+  ],
 };
 
 /**

diff --git a/superset/assets/visualizations/countries/usa.geojson b/superset/assets/visualizations/countries/usa.geojson
diff --git a/superset/assets/visualizations/country_map.js b/superset/assets/visualizations/country_map.js
@@ -12,6 +12,7 @@ function countryMapChart(slice, payload) {
   let resultText;
   const container = slice.container;
   const data = payload.data;
+  const format = d3.format(fd.number_format);
 
   const colorScaler = colorScalerFactory(fd.linear_color_scheme, data, v => v.metric);
   const colorMap = {};
@@ -91,7 +92,7 @@ function countryMapChart(slice, payload) {
 
   const updateMetrics = function (region) {
     if (region.length > 0) {
-      resultText.text(d3.format(',')(region[0].metric));
+      resultText.text(format(region[0].metric));
     }
   };