Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop branch into staging #1194

Closed
wants to merge 11 commits into from
Closed

Merge develop branch into staging #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4fe9278
Remove row header values from previous decennial data
bmarchena Apr 18, 2024
2a4e120
Remove row header values from change over time decennial data
bmarchena Apr 18, 2024
a02e3ef
Remove address from map when closing out search (#1167)
bmarchena Apr 19, 2024
12f49ce
Merging ACS 2022 updates to staging (#1149)
TylerMatteo Mar 11, 2024
478e287
issue 1164 updated pff variables for Detailed Race and Ethnicity table
horatiorosa Apr 5, 2024
ff3b741
1168 updated id for pop 65 nad over
horatiorosa Apr 15, 2024
b026ea2
1169 updated copy in censusjs
horatiorosa Apr 15, 2024
3e45cf6
1170 updated intendtation in DR&E table
horatiorosa Apr 15, 2024
b570ff7
1171 updated copy to inform of supressed data
horatiorosa Apr 15, 2024
0d8c9b9
1177 reordered place of birth table
horatiorosa Apr 15, 2024
1f3ce4b
1175 updated under 18 years data variabe
horatiorosa Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/choropleth-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion app/components/data-table-row-change.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default Component.extend({

noPriorData: computed('data.previous.sum', function() {
const { 'data.previous': previous } = this.getProperties('data.previous');
if (previous && (typeof previous.sum === 'undefined' || previous.sum === null)) {
if ((previous && (typeof previous.sum === 'undefined' || previous.sum === null)) || typeof previous === 'undefined') {
return true
}
return false
Expand Down
2 changes: 1 addition & 1 deletion app/components/data-table-row-previous.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default Component.extend({

noPriorData: computed('data.previous.sum', function() {
const { 'data.previous': previous } = this.getProperties('data.previous');
if (previous && (typeof previous.sum === 'undefined' || previous.sum === null)) {
if ((previous && (typeof previous.sum === 'undefined' || previous.sum === null)) || typeof previous === 'undefined') {
return true
}
return false
Expand Down
1 change: 1 addition & 0 deletions app/components/map-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export default Component.extend({

const selection = this.get('selection');
selection.set('searchResultFeature', null);
selection.set('currentAddress', []);
},

goTo(result) {
Expand Down
5 changes: 3 additions & 2 deletions app/table-config/acs/demographic/sex-and-age.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default [
{
title: 'Under 18 years',
classNames: '',
data: 'popu18',
data: 'popu181',
},
{
title: '65 years and over',
Expand All @@ -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,
Expand Down
78 changes: 39 additions & 39 deletions app/table-config/acs/social/place-of-birth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand All @@ -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',
Expand Down Expand Up @@ -185,6 +185,11 @@ export default [
title: 'Belarus',
data: 'belarus',
},
{
indent: 2,
title: 'Bosnia and Herzegovina',
data: 'bosniah',
},
{
indent: 2,
title: 'Bulgaria',
Expand Down Expand Up @@ -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,
Expand All @@ -245,11 +250,6 @@ export default [
title: 'Ukraine',
data: 'ukraine',
},
{
indent: 2,
title: 'Bosnia and Herzegovina',
data: 'bosniah',
},
{
indent: 2,
title: 'Serbia',
Expand Down Expand Up @@ -374,6 +374,11 @@ export default [
title: 'South Eastern Asia',
data: 'seasia',
},
{
indent: 2,
title: 'Burma (Myanmar)',
data: 'burma',
},
{
indent: 2,
title: 'Cambodia',
Expand All @@ -394,11 +399,6 @@ export default [
title: 'Malaysia',
data: 'malaysia',
},
{
indent: 2,
title: 'Burma',
data: 'burma',
},
{
indent: 2,
title: 'Philippines',
Expand Down Expand Up @@ -801,11 +801,6 @@ export default [
title: 'Central America',
data: 'cam',
},
{
indent: 3,
title: 'Mexico',
data: 'mexico',
},
{
indent: 3,
title: 'Belize',
Expand All @@ -831,6 +826,11 @@ export default [
title: 'Honduras',
data: 'honduras',
},
{
indent: 3,
title: 'Mexico',
data: 'mexico',
},
{
indent: 3,
title: 'Nicaragua',
Expand Down
Loading
Loading