add year to source and output dirs

DataUSA · Apr 6, 2016 · 2ffa6a4 · 2ffa6a4
1 parent 79519bd
commit 2ffa6a4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/acs/yg_income.yaml b/acs/yg_income.yaml
@@ -1,15 +1,15 @@
 inherits: "acs/acs_template.yaml"
 global:
-    source: "data/acs/<sumlevel>_<tbl><race>_<column>.json"
+    source: "data/acs_<estimate>yr/<sumlevel>_<tbl><race>_<column>.json"
     source_vars:
         tbl: ["B19013"]
         race: ["", "A", "B", "C", "D", "E", "F", "G", "H", "I"]
         column:
           start: 1
           end: 1
           zfill: 3
-    web_paths: "http://api.census.gov/data/<year>/acs5?get=GEOID,<tbl><race>_<column>E,<tbl><race>_<column>M&for=<sumlevel>&key=$ACS_KEY"
-    output: "data/acs_5year/<tbl><race>/<sumlevel>/<column>"
+    web_paths: "http://api.census.gov/data/<year>/acs<estimate>?get=GEOID,<tbl><race>_<column>E,<tbl><race>_<column>M&for=<sumlevel>&key=$ACS_KEY"
+    output: "data/acs_<estimate>yr/<tbl><race>/<sumlevel>/<column>"
 
     transform:
         - type: drop

diff --git a/acs/yg_income_tracts.yaml b/acs/yg_income_tracts.yaml
@@ -1,13 +1,13 @@
 inherits: ["acs/acs_template.yaml", "acs/yg_income.yaml"]
 global:
-    source: "data/acs_<estimate>yr/<sumlevel>_<state>_<tbl>_<column>.json"
+    source: "data/acs_<estimate>yr/<year>_<sumlevel>_<state>_<tbl>_<column>.json"
     source_vars:
         estimate: [5]
         state: ["01","02","04","05","06","08","09","10","11","12","13","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40","41","42","44","45","46","47","48","49","50","51","53","54","55","56","72"]
         sumlevel:
           - "tract"
 
-    output: "data/output/acs_<estimate>yr/<sumlevel>_<state>_<tbl>_<column>"
+    output: "data/output/acs_<estimate>yr/<year>_<sumlevel>_<state>_<tbl>_<column>"
     web_paths: "http://api.census.gov/data/<year>/acs5?get=GEOID,<tbl>_<column>E,<tbl>_<column>M&for=<sumlevel>&in=state:<state>&key=$ACS_KEY"
 
 tables:

diff --git a/acs/yg_nativity_age.yaml b/acs/yg_nativity_age.yaml
@@ -1,12 +1,12 @@
 inherits: "acs/acs_template.yaml"
 global:
-    source: "data/acs/<sumlevel>_<column>.json"
+    source: "data/acs_<estimate>yr/<year>_<sumlevel>_<column>.json"
     source_vars:
         column: ['B06001_014', 'B06001_015', 'B06001_016', 'B06001_017', 'B06001_018', 'B06001_019', 'B06001_020', 'B06001_021', 'B06001_022', 'B06001_023', 'B06001_024', 'B06001_025', 'B06001_026', 'B06001_027', 'B06001_028', 'B06001_029', 'B06001_030', 'B06001_031', 'B06001_032', 'B06001_033', 'B06001_034', 'B06001_035', 'B06001_036', 'B06001_037', 'B06001_038', 'B06001_039', 'B06001_040', 'B06001_041', 'B06001_042', 'B06001_043', 'B06001_044', 'B06001_045', 'B06001_046', 'B06001_047', 'B06001_048', 'B06001_049', 'B06001_050', 'B06001_051', 'B06001_052', 'B06001_053', 'B06001_054', 'B06001_055', 'B06001_056', 'B06001_057', 'B06001_058', 'B06001_059', 'B06001_060', 'B05004_004', 'B05004_007']
 
-    output: "data/output/acs/<sumlevel>_<column>"
+    output: "data/output/acs_<estimate>yr/<year>_<sumlevel>_<column>"
 
-    web_paths: "http://api.census.gov/data/<year>/acs5?get=GEOID,<column>E,<column>M&for=<sumlevel>&key=$ACS_KEY"
+    web_paths: "http://api.census.gov/data/<year>/acs<estimate>?get=GEOID,<column>E,<column>M&for=<sumlevel>&key=$ACS_KEY"
 
     regex_drop:
         "B06001_0(25|37|49)<e_m>": "delete"
@@ -22,7 +22,7 @@ global:
         values: ["B06001_014M", "B06001_026M", "B06001_038M"]
         drop: YES
       - type: add
-        column: nativity_us_5_to_17
+        column: nativity_us_5to17
         values: ["[B06001_015E]", "[B06001_027E]", "[B06001_039E]"]
         drop: YES
       - type: combine_moes

diff --git a/acs/yg_poverty_race.yaml b/acs/yg_poverty_race.yaml
@@ -1,6 +1,6 @@
 inherits: "acs/acs_template.yaml"
 global:
-  source: "data/acs/<sumlevel>_<tbl><race>_<column>.json"
+  source: "data/acs_<estimate>yr/<sumlevel>_<tbl><race>_<column>.json"
   source_vars:
     tbl: ["B17001"]
     column:
@@ -9,9 +9,9 @@ global:
       zfill: 3
     race: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I']
 
-  output: "data/output/acs/<sumlevel>_<tbl><race>_<column>"
+  output: "data/output/acs_<estimate>yr/<sumlevel>_<tbl><race>_<column>"
 
-  web_paths: "http://api.census.gov/data/<year>/acs5?get=GEOID,<tbl><race>_<column>E,<tbl><race>_<column>M&for=<sumlevel>&key=$ACS_KEY"
+  web_paths: "http://api.census.gov/data/<year>/acs<estimate>?get=GEOID,<tbl><race>_<column>E,<tbl><race>_<column>M&for=<sumlevel>&key=$ACS_KEY"
 
   rename:
     GEOID: geo