DOI-ONRR · gemfarmer · Jun 8, 2016 · Jun 8, 2016 · Jun 8, 2016 · Jun 8, 2016
diff --git a/Makefile b/Makefile
@@ -20,6 +20,23 @@ all: db
 clean:
 	rm -f $(db)
 
+collections/regional: \
+	collections/states \
+	collections/offshore_areas \
+	collections/offshore_regions
+
+collections/states: data/_input/geo/states.csv
+	$(tito) -r csv --map 'd => {{id: d.abbr, title: d.name, FIPS: d.FIPS}}' $^ \
+		| $(node_bin)to-jekyll-collection --format ndjson -i /dev/stdin -o _states
+
+collections/offshore_areas: data/_input/geo/offshore/areas.tsv
+	$(tito) -r tsv --map 'd => {{id: d.id, title: d.name, region: d.region.toLowerCase(), permalink: ["/offshore", d.region.toLowerCase(), d.id, ""].join("/")}}' $^ \
+		| $(node_bin)to-jekyll-collection --format ndjson -i /dev/stdin -o _offshore_areas
+
+collections/offshore_regions: data/_input/geo/offshore/regions.tsv
+	$(tito) -r tsv --map 'd => {{id: d.id, title: d.region}}' $^ \
+		| $(node_bin)to-jekyll-collection --format ndjson -i /dev/stdin -o _offshore_regions
+
 site-data: \
 	data/jobs \
 	data/revenue \

diff --git a/_config.yml b/_config.yml
@@ -55,18 +55,26 @@ collections:
   case-studies:
     output: true
     permalink: /case-studies/:path/
+  downloads:
+    output: true
+    permalink: /downloads/:path/
   explore:
     output: true
     permalink: /explore/:path/
+  federal-revenue-by-company:
+    output: true
+    permalink: /explore/federal-revenue-by-company/:path/
   how-it-works:
     output: true
     permalink: /how-it-works/:path/
-  downloads:
+  offshore_areas:
+    output: false
+  offshore_regions:
+    output: false
+    permalink: /offshore/:path/
+  states:
     output: true
-    permalink: /downloads/:path/
-  federal-revenue-by-company:
-    output: true
-    permalink: /explore/federal-revenue-by-company/:path/
+    permalink: /states/:path/
 
 defaults:
   - scope:
@@ -75,14 +83,19 @@ defaults:
     values:
       layout: federal-revenue-by-company
 
-page_gen:
-  - data: 'states'
-    template: 'state-page'
-    name: 'id'
-    dir: 'states'
-    extension: 'html'
+  - scope:
+      path: ''
+      collection: states
+    values:
+      layout: state-page
+      offshore: false
 
-page_gen_dirs: true
+  - scope:
+      path: ''
+      collection: offshore_regions
+    values:
+      layout: state-page
+      offshore: true
 
 shruggie:
   - d8394cf27efbf8ae2f96ee12788eb257f4358a42

diff --git a/_layouts/state-page.html b/_layouts/state-page.html
@@ -21,8 +21,8 @@
     title: Disbursements
 ---
 
-{% assign state_name = page.data.name %}
-{% assign state_id = page.data.id %}
+{% assign state_name = page.title %}
+{% assign state_id = page.id %}
 {% assign year = '2013' %}
 {% assign oilgas = 'Oil & Gas (Non-Royalty)' %}
 {% assign commodity_names = site.data.commodity_names %}

diff --git a/_offshore_areas/ALA.md b/_offshore_areas/ALA.md
@@ -0,0 +1,6 @@
+---
+id: ALA
+title: Aleutian Arc
+region: alaska
+permalink: /offshore/alaska/ALA/
+---
diff --git a/_offshore_areas/ALB.md b/_offshore_areas/ALB.md
@@ -0,0 +1,6 @@
+---
+id: ALB
+title: Aleutian Basin
+region: alaska
+permalink: /offshore/alaska/ALB/
+---
diff --git a/_offshore_areas/BFT.md b/_offshore_areas/BFT.md
@@ -0,0 +1,6 @@
+---
+id: BFT
+title: Beaufort Sea
+region: alaska
+permalink: /offshore/alaska/BFT/
+---
diff --git a/_offshore_areas/BOW.md b/_offshore_areas/BOW.md
@@ -0,0 +1,6 @@
+---
+id: BOW
+title: Bowers Basin
+region: alaska
+permalink: /offshore/alaska/BOW/
+---
diff --git a/_offshore_areas/CEC.md b/_offshore_areas/CEC.md
@@ -0,0 +1,6 @@
+---
+id: CEC
+title: Central California
+region: pacific
+permalink: /offshore/pacific/CEC/
+---
diff --git a/_offshore_areas/CGM.md b/_offshore_areas/CGM.md
@@ -0,0 +1,6 @@
+---
+id: CGM
+title: Central Gulf of Mexico
+region: gulf
+permalink: /offshore/gulf/CGM/
+---
diff --git a/_offshore_areas/CHU.md b/_offshore_areas/CHU.md
@@ -0,0 +1,6 @@
+---
+id: CHU
+title: Chukchi Sea
+region: alaska
+permalink: /offshore/alaska/CHU/
+---
diff --git a/_offshore_areas/COK.md b/_offshore_areas/COK.md
@@ -0,0 +1,6 @@
+---
+id: COK
+title: Cook Inlet
+region: alaska
+permalink: /offshore/alaska/COK/
+---
diff --git a/_offshore_areas/EGM.md b/_offshore_areas/EGM.md
@@ -0,0 +1,6 @@
+---
+id: EGM
+title: Eastern Gulf of Mexico
+region: gulf
+permalink: /offshore/gulf/EGM/
+---
diff --git a/_offshore_areas/FLS.md b/_offshore_areas/FLS.md
@@ -0,0 +1,6 @@
+---
+id: FLS
+title: Florida Straits
+region: atlantic
+permalink: /offshore/atlantic/FLS/
+---
diff --git a/_offshore_areas/GEO.md b/_offshore_areas/GEO.md
@@ -0,0 +1,6 @@
+---
+id: GEO
+title: St. George Basin
+region: alaska
+permalink: /offshore/alaska/GEO/
+---
diff --git a/_offshore_areas/GOA.md b/_offshore_areas/GOA.md
@@ -0,0 +1,6 @@
+---
+id: GOA
+title: Gulf of Alaska
+region: alaska
+permalink: /offshore/alaska/GOA/
+---
diff --git a/_offshore_areas/HOP.md b/_offshore_areas/HOP.md
@@ -0,0 +1,6 @@
+---
+id: HOP
+title: Hope Basin
+region: alaska
+permalink: /offshore/alaska/HOP/
+---
diff --git a/_offshore_areas/KOD.md b/_offshore_areas/KOD.md
@@ -0,0 +1,6 @@
+---
+id: KOD
+title: Kodiak
+region: alaska
+permalink: /offshore/alaska/KOD/
+---
diff --git a/_offshore_areas/MAT.md b/_offshore_areas/MAT.md
@@ -0,0 +1,6 @@
+---
+id: MAT
+title: St. Matthew-Hall
+region: alaska
+permalink: /offshore/alaska/MAT/
+---
diff --git a/_offshore_areas/MDA.md b/_offshore_areas/MDA.md
@@ -0,0 +1,6 @@
+---
+id: MDA
+title: Mid Atlantic
+region: atlantic
+permalink: /offshore/atlantic/MDA/
+---
diff --git a/_offshore_areas/NAL.md b/_offshore_areas/NAL.md
@@ -0,0 +1,6 @@
+---
+id: NAL
+title: North Aleutian Basin
+region: alaska
+permalink: /offshore/alaska/NAL/
+---
diff --git a/_offshore_areas/NAV.md b/_offshore_areas/NAV.md
@@ -0,0 +1,6 @@
+---
+id: NAV
+title: Navarin Basin
+region: alaska
+permalink: /offshore/alaska/NAV/
+---
diff --git a/_offshore_areas/NOA.md b/_offshore_areas/NOA.md
@@ -0,0 +1,6 @@
+---
+id: NOA
+title: North Atlantic
+region: atlantic
+permalink: /offshore/atlantic/NOA/
+---
diff --git a/_offshore_areas/NOC.md b/_offshore_areas/NOC.md
@@ -0,0 +1,6 @@
+---
+id: NOC
+title: Northern California
+region: pacific
+permalink: /offshore/pacific/NOC/
+---
diff --git a/_offshore_areas/NOR.md b/_offshore_areas/NOR.md
@@ -0,0 +1,6 @@
+---
+id: NOR
+title: Norton Basin
+region: alaska
+permalink: /offshore/alaska/NOR/
+---
diff --git a/_offshore_areas/SHU.md b/_offshore_areas/SHU.md
@@ -0,0 +1,6 @@
+---
+id: SHU
+title: Shumagin
+region: alaska
+permalink: /offshore/alaska/SHU/
+---
diff --git a/_offshore_areas/SOA.md b/_offshore_areas/SOA.md
@@ -0,0 +1,6 @@
+---
+id: SOA
+title: South Atlantic
+region: atlantic
+permalink: /offshore/atlantic/SOA/
+---
diff --git a/_offshore_areas/SOC.md b/_offshore_areas/SOC.md
@@ -0,0 +1,6 @@
+---
+id: SOC
+title: Southern California
+region: pacific
+permalink: /offshore/pacific/SOC/
+---
diff --git a/_offshore_areas/WAO.md b/_offshore_areas/WAO.md
@@ -0,0 +1,6 @@
+---
+id: WAO
+title: Washington-Oregon
+region: pacific
+permalink: /offshore/pacific/WAO/
+---
diff --git a/_offshore_areas/WGM.md b/_offshore_areas/WGM.md
@@ -0,0 +1,6 @@
+---
+id: WGM
+title: Western Gulf of Mexico
+region: gulf
+permalink: /offshore/gulf/WGM/
+---
diff --git a/_offshore_regions/alaska.md b/_offshore_regions/alaska.md
@@ -0,0 +1,4 @@
+---
+id: alaska
+title: Alaska
+---
diff --git a/_offshore_regions/atlantic.md b/_offshore_regions/atlantic.md
@@ -0,0 +1,4 @@
+---
+id: atlantic
+title: Atlantic
+---
diff --git a/_offshore_regions/gulf.md b/_offshore_regions/gulf.md
@@ -0,0 +1,4 @@
+---
+id: gulf
+title: Gulf
+---
diff --git a/_offshore_regions/pacific.md b/_offshore_regions/pacific.md
@@ -0,0 +1,4 @@
+---
+id: pacific
+title: Pacific
+---