Merge pull request #1205 from NYCPlanning/staging

Staging to Develop (PFF Data Updates)
NYCPlanning · Jun 6, 2024 · a063302 · a063302
2 parents 2044b94 + 7f01725
commit a063302
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 87 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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',