diff --git a/app/choropleth-config/index.js b/app/choropleth-config/index.js
index acba5a93..ec3305b1 100644
--- a/app/choropleth-config/index.js
+++ b/app/choropleth-config/index.js
@@ -172,7 +172,7 @@ const choroplethConfigs = [
},
{
group: 'Census',
- id: 'pop65pl',
+ id: 'pop65pl1',
label: '65 Years and Over',
tooltip: 'Population 65 years and over',
legendTitle: 'Population 65 years and over',
diff --git a/app/components/data-table-row-previous.js b/app/components/data-table-row-previous.js
index 8bfc906e..ab2bb518 100644
--- a/app/components/data-table-row-previous.js
+++ b/app/components/data-table-row-previous.js
@@ -46,6 +46,7 @@ export default Component.extend({
},
click() {
+ console.log('click - data table', this);
this.set('isSelected', !this.isSelected);
},
});
diff --git a/app/table-config/acs/demographic/sex-and-age.js b/app/table-config/acs/demographic/sex-and-age.js
index be16af2c..a07113f2 100644
--- a/app/table-config/acs/demographic/sex-and-age.js
+++ b/app/table-config/acs/demographic/sex-and-age.js
@@ -113,7 +113,7 @@ export default [
{
title: 'Under 18 years',
classNames: '',
- data: 'popu18',
+ data: 'popu181',
},
{
title: '65 years and over',
@@ -125,7 +125,8 @@ export default [
},
{
title: 'Median age (years)',
- tooltip: 'Medians are calculated using linear interpolation, which may result in top-coded values',
+ tooltip:
+ 'Medians are calculated using linear interpolation, which may result in top-coded values',
classNames: '',
data: 'mdage',
special: true,
diff --git a/app/table-config/acs/social/place-of-birth.js b/app/table-config/acs/social/place-of-birth.js
index 2f93eb18..8ca26dc3 100755
--- a/app/table-config/acs/social/place-of-birth.js
+++ b/app/table-config/acs/social/place-of-birth.js
@@ -50,6 +50,26 @@ export default [
title: 'Northern Europe',
data: 'neur',
},
+ {
+ indent: 2,
+ title: 'Denmark',
+ data: 'denmark',
+ },
+ {
+ indent: 2,
+ title: 'Ireland',
+ data: 'ireland',
+ },
+ {
+ indent: 2,
+ title: 'Norway',
+ data: 'norway',
+ },
+ {
+ indent: 2,
+ title: 'Sweden',
+ data: 'sweden',
+ },
{
indent: 2,
title: 'United Kingdom (inc. Crown Dependencies)',
@@ -70,26 +90,6 @@ export default [
title: 'Scotland',
data: 'scot',
},
- {
- indent: 2,
- title: 'Ireland',
- data: 'ireland',
- },
- {
- indent: 2,
- title: 'Denmark',
- data: 'denmark',
- },
- {
- indent: 2,
- title: 'Norway',
- data: 'norway',
- },
- {
- indent: 2,
- title: 'Sweden',
- data: 'sweden',
- },
{
indent: 2,
title: 'Other Northern Europe',
@@ -185,6 +185,11 @@ export default [
title: 'Belarus',
data: 'belarus',
},
+ {
+ indent: 2,
+ title: 'Bosnia and Herzegovina',
+ data: 'bosniah',
+ },
{
indent: 2,
title: 'Bulgaria',
@@ -217,13 +222,13 @@ export default [
},
{
indent: 2,
- title: 'North Macedonia (Macedonia)',
- data: 'mcdonia',
+ title: 'Moldova',
+ data: 'moldova',
},
{
indent: 2,
- title: 'Moldova',
- data: 'moldova',
+ title: 'North Macedonia (Macedonia)',
+ data: 'mcdonia',
},
{
indent: 2,
@@ -245,11 +250,6 @@ export default [
title: 'Ukraine',
data: 'ukraine',
},
- {
- indent: 2,
- title: 'Bosnia and Herzegovina',
- data: 'bosniah',
- },
{
indent: 2,
title: 'Serbia',
@@ -374,6 +374,11 @@ export default [
title: 'South Eastern Asia',
data: 'seasia',
},
+ {
+ indent: 2,
+ title: 'Burma (Myanmar)',
+ data: 'burma',
+ },
{
indent: 2,
title: 'Cambodia',
@@ -394,11 +399,6 @@ export default [
title: 'Malaysia',
data: 'malaysia',
},
- {
- indent: 2,
- title: 'Burma',
- data: 'burma',
- },
{
indent: 2,
title: 'Philippines',
@@ -801,11 +801,6 @@ export default [
title: 'Central America',
data: 'cam',
},
- {
- indent: 3,
- title: 'Mexico',
- data: 'mexico',
- },
{
indent: 3,
title: 'Belize',
@@ -831,6 +826,11 @@ export default [
title: 'Honduras',
data: 'honduras',
},
+ {
+ indent: 3,
+ title: 'Mexico',
+ data: 'mexico',
+ },
{
indent: 3,
title: 'Nicaragua',
diff --git a/app/table-config/census/detailed-race-and-ethnicity.js b/app/table-config/census/detailed-race-and-ethnicity.js
index 56e86a39..e2075251 100644
--- a/app/table-config/census/detailed-race-and-ethnicity.js
+++ b/app/table-config/census/detailed-race-and-ethnicity.js
@@ -166,7 +166,7 @@ export default [
indent: 3,
},
{
- data: 'weurazrbn',
+ data: 'weurazrbjn',
title: 'Azerbaijani',
indent: 3,
},
@@ -221,7 +221,7 @@ export default [
indent: 3,
},
{
- data: 'weurengsh',
+ data: 'weurenglsh',
title: 'English',
indent: 3,
},
@@ -301,7 +301,7 @@ export default [
indent: 3,
},
{
- data: 'weurmtgrn',
+ data: 'weurmntgrn',
title: 'Montenegrin',
indent: 3,
},
@@ -331,12 +331,12 @@ export default [
indent: 3,
},
{
- data: 'weurscdvn',
+ data: 'weurscndvn',
title: 'Scandinavian',
indent: 3,
},
{
- data: 'weursirsh',
+ data: 'weurstirsh',
title: 'Scots-Irish',
indent: 3,
},
@@ -396,7 +396,7 @@ export default [
indent: 2,
},
{
- data: 'wmenaagrn',
+ data: 'wmenaalgrn',
title: 'Algerian',
indent: 3,
},
@@ -406,7 +406,7 @@ export default [
indent: 3,
},
{
- data: 'wmenaegtn',
+ data: 'wmenaegptn',
title: 'Egyptian',
indent: 3,
},
@@ -441,7 +441,7 @@ export default [
indent: 3,
},
{
- data: 'wmenapstn',
+ data: 'wmenaplstn',
title: 'Palestinian',
indent: 3,
},
@@ -466,7 +466,7 @@ export default [
indent: 2,
},
{
- data: 'wothastrn',
+ data: 'wothastrln',
title: 'Australian',
indent: 3,
},
@@ -476,12 +476,12 @@ export default [
indent: 3,
},
{
- data: 'wothfrcdn',
+ data: 'wothfrcndn',
title: 'French Canadian',
indent: 3,
},
{
- data: 'wothnzldr',
+ data: 'wothnzlndr',
title: 'New Zealander',
indent: 3,
},
@@ -499,7 +499,7 @@ export default [
indent: 2,
},
{
- data: 'bssafbrkb',
+ data: 'bssafbrknb',
title: 'Burkinabe',
indent: 3,
},
@@ -509,12 +509,12 @@ export default [
indent: 3,
},
{
- data: 'bssafcgls',
+ data: 'bssafcngls',
title: 'Congolese',
indent: 3,
},
{
- data: 'bssafethn',
+ data: 'bssafethpn',
title: 'Ethiopian',
indent: 3,
},
@@ -559,7 +559,7 @@ export default [
indent: 3,
},
{
- data: 'bssafsgls',
+ data: 'bssafsngls',
title: 'Senegalese',
indent: 3,
},
@@ -589,7 +589,7 @@ export default [
indent: 2,
},
{
- data: 'bcrbatbrb',
+ data: 'bcrbantbrb',
title: 'Antiguan and Barbudan',
indent: 3,
},
@@ -604,7 +604,7 @@ export default [
indent: 3,
},
{
- data: 'bcrbdmis',
+ data: 'bcrbdmncis',
title: 'Dominica Islander',
indent: 3,
},
@@ -624,7 +624,7 @@ export default [
indent: 3,
},
{
- data: 'bcrbktnv',
+ data: 'bcrbktnnev',
title: 'Kittian and Nevisian',
indent: 3,
},
@@ -639,12 +639,12 @@ export default [
indent: 3,
},
{
- data: 'bcrbusvis',
+ data: 'bcrbusvgis',
title: 'U.S. Virgin Islander',
indent: 3,
},
{
- data: 'bcrbvnctn',
+ data: 'bcrbvncntn',
title: 'Vincentian',
indent: 3,
},
@@ -656,7 +656,7 @@ export default [
{
data: 'both',
title: 'Other Black or African American',
- indent: 3,
+ indent: 2,
},
{
title: 'American Indian and Alaska Native',
@@ -672,17 +672,17 @@ export default [
indent: 2,
},
{
- data: 'aianainbf',
+ data: 'aianainbft',
title: 'Blackfeet Tribe of the Blackfeet Indian Reservation of Montana',
indent: 4,
},
{
- data: 'aianainch',
+ data: 'aianainchr',
title: 'Cherokee',
indent: 4,
},
{
- data: 'aiancnain',
+ data: 'aiancnamin',
title: 'Central American Indian (all tribes)',
indent: 2,
},
@@ -692,7 +692,7 @@ export default [
indent: 2,
},
{
- data: 'aianmxina',
+ data: 'aianmxinaz',
title: 'Aztec',
indent: 3,
},
@@ -702,7 +702,7 @@ export default [
indent: 2,
},
{
- data: 'aiansaiei',
+ data: 'aiansaieci',
title: 'Ecuadorian Indian',
indent: 3,
},
@@ -712,7 +712,7 @@ export default [
indent: 3,
},
{
- data: 'aiansaiic',
+ data: 'aiansaiinc',
title: 'Inca',
indent: 3,
},
@@ -722,7 +722,7 @@ export default [
indent: 2,
},
{
- data: 'aiancrbt',
+ data: 'aiancrbtno',
title: 'Taino',
indent: 3,
},
@@ -732,7 +732,7 @@ export default [
indent: 2,
},
{
- data: 'aianmsinm',
+ data: 'aianmsinmy',
title: 'Maya',
indent: 3,
},
@@ -742,10 +742,10 @@ export default [
{
data: 'aea',
title: 'East Asian',
- indent: 3,
+ indent: 2,
},
{
- data: 'aeachnsnt',
+ data: 'aeachnsnot',
title: 'Chinese, except Taiwanese',
indent: 3,
},
@@ -805,7 +805,7 @@ export default [
indent: 3,
},
{
- data: 'asabngdsh',
+ data: 'asabngldsh',
title: 'Bangladeshi',
indent: 3,
},
@@ -850,7 +850,7 @@ export default [
indent: 3,
},
{
- data: 'aseaindsn',
+ data: 'aseaindnsn',
title: 'Indonesian',
indent: 3,
},
@@ -860,7 +860,7 @@ export default [
indent: 3,
},
{
- data: 'aseasgprn',
+ data: 'aseasngprn',
title: 'Singaporean',
indent: 3,
},
@@ -893,7 +893,7 @@ export default [
indent: 3,
},
{
- data: 'nhpiplysm',
+ data: 'nhpiplysmn',
title: 'Samoan',
indent: 3,
},
@@ -903,7 +903,7 @@ export default [
indent: 2,
},
{
- data: 'nhpimcchr',
+ data: 'nhpimcchmr',
title: 'Chamorro',
indent: 3,
},
diff --git a/app/table-config/census/household-type.js b/app/table-config/census/household-type.js
index 4a511e07..45ba162f 100644
--- a/app/table-config/census/household-type.js
+++ b/app/table-config/census/household-type.js
@@ -9,7 +9,7 @@ export default [
{ data: 'hh_2', title: 'Total households', highlight: true },
{ data: 'mrdcplhh', title: 'Married couple household' },
{ data: 'mrdch18', title: 'With own children under 18', indent: 1 },
- { data: 'cocplhh', title: 'Cohabitng couple household' },
+ { data: 'cocplhh', title: 'Cohabiting couple household' },
{ data: 'cocplch18', title: 'With own children under 18', indent: 1 },
{ data: 'malehhns', title: 'Male householder, no spouse or partner present' },
{ data: 'mnspchu18', title: 'With own children under 18', indent: 1 },
diff --git a/app/templates/components/data-table-row-change.hbs b/app/templates/components/data-table-row-change.hbs
index a16fec9c..bd488952 100644
--- a/app/templates/components/data-table-row-change.hbs
+++ b/app/templates/components/data-table-row-change.hbs
@@ -1,4 +1,8 @@
-{{#unless (or @rowConfig.divider this.noPriorData)}}
+{{#unless (or
+ @rowConfig.divider
+ this.noPriorData
+ (eq @data.category 'detailed_race_and_ethnicity')
+)}}
|
{{@rowConfig.title}}
@@ -194,7 +198,17 @@
{{/with}}
{{/with}}
{{else}}
- {{#if this.noPriorData}}
+ {{#if (eq @data.category 'detailed_race_and_ethnicity')}}
+ {{!-- disable change over time for subregions in detailed_race_and_ethnicity chart --}}
+ |
+
+ {{@rowConfig.title}}
+
+ |
+
+ Data for this row are not comparable or are unavailable
+ |
+ {{else if this.noPriorData}}
{{!-- if 2006-2010 sum is null, just return empty cells --}}
diff --git a/app/templates/components/data-table-row-current.hbs b/app/templates/components/data-table-row-current.hbs
index 43608997..60394809 100644
--- a/app/templates/components/data-table-row-current.hbs
+++ b/app/templates/components/data-table-row-current.hbs
@@ -19,7 +19,7 @@
class="cell-border-left no-compare-message"
colspan={{if this.reliability "5" "2"}}
>
- Data are not available
+ Data are suppressed for selected area
|
{{else}}
{{data-table-column-group
diff --git a/app/templates/components/data-table-row-previous.hbs b/app/templates/components/data-table-row-previous.hbs
index db871ba9..c5879f47 100644
--- a/app/templates/components/data-table-row-previous.hbs
+++ b/app/templates/components/data-table-row-previous.hbs
@@ -19,7 +19,7 @@
class="cell-border-left no-compare-message"
colspan={{if this.reliability "5" "2"}}
>
- Data are not available
+ Data are suppressed for selected area
{{else}}
{{data-table-column-group
diff --git a/app/templates/components/default-modal.hbs b/app/templates/components/default-modal.hbs
index c2851ce9..b78d364b 100644
--- a/app/templates/components/default-modal.hbs
+++ b/app/templates/components/default-modal.hbs
@@ -1,6 +1,12 @@