Merge pull request #923 from conveyal/census-loader-update

Update Census loader to handle new decade

Author: abyrd

src/main/java/com/conveyal/data/census/TigerLineSource.java

@@ -34,7 +34,7 @@ public void load (ShapeDataStore store) throws Exception {
         for (SimpleFeatureIterator it = sfc.features(); it.hasNext();) {
             GeobufFeature feat = new GeobufFeature(it.next());
             feat.id = null;
-            feat.numericId = Long.parseLong((String) feat.properties.get("GEOID10"));
+            feat.numericId = Long.parseLong((String) feat.properties.get("GEOID20"));
             feat.properties = new HashMap<>();
             store.add(feat);
         }

src/test/java/com/conveyal/data/census/IntegrationTest.java

@@ -89,7 +89,7 @@ public void testAll () throws Exception {
         assertTrue(features.containsKey(110010014023009L));
 
         // read the workplace area characteristics csv
-        InputStream csv = new GZIPInputStream(new FileInputStream(new File(new File(dir, "jobs"), "dc_wac_S000_JT00_2013.csv.gz")));
+        InputStream csv = new GZIPInputStream(new FileInputStream(new File(new File(dir, "jobs"), "DC_2021_wac.csv.gz")));
         reader = new CsvReader(new InputStreamReader(csv));
         reader.readHeaders();
 
@@ -153,7 +153,7 @@ public void testAll () throws Exception {
         assertTrue(foundJobsEntry);
 
         // read the rac csv
-        csv = new GZIPInputStream(new FileInputStream(new File(new File(dir, "workforce"), "dc_rac_S000_JT00_2013.csv.gz")));
+        csv = new GZIPInputStream(new FileInputStream(new File(new File(dir, "workforce"), "DC_2021_rac.csv.gz")));
         reader = new CsvReader(new InputStreamReader(csv));
 
         reader.readHeaders();