From 0fdfb08dcb0a396a659ac523d87d1939f56b90d8 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Thu, 18 Oct 2018 10:57:35 -0700 Subject: [PATCH 01/31] Adds smooth scrolling to gatsby styles --- gatsby-site/src/styles/_reset.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/gatsby-site/src/styles/_reset.scss b/gatsby-site/src/styles/_reset.scss index 2956726df..af4f4c78f 100644 --- a/gatsby-site/src/styles/_reset.scss +++ b/gatsby-site/src/styles/_reset.scss @@ -22,6 +22,7 @@ time, mark, audio, video { font-size: 100%; font: inherit; vertical-align: baseline; + scroll-behavior: smooth; } /* HTML5 display-role reset for older browsers */ From 17474453e610bd0e709a87a5d1ba8b0793a6c241 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 11:54:03 -0700 Subject: [PATCH 02/31] Edits production subheadings, nav items based on user input --- gatsby-site/src/components/locations/NationalAllProduction.js | 2 +- .../src/components/locations/NationalFederalProduction.js | 2 +- gatsby-site/src/pages/Explore/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gatsby-site/src/components/locations/NationalAllProduction.js b/gatsby-site/src/components/locations/NationalAllProduction.js index dd1a02e61..aefeb551f 100644 --- a/gatsby-site/src/components/locations/NationalAllProduction.js +++ b/gatsby-site/src/components/locations/NationalAllProduction.js @@ -25,7 +25,7 @@ const NationalAllProduction = (props) => { return (
- + diff --git a/gatsby-site/src/components/locations/NationalFederalProduction.js b/gatsby-site/src/components/locations/NationalFederalProduction.js index 202432e25..60e091cfb 100644 --- a/gatsby-site/src/components/locations/NationalFederalProduction.js +++ b/gatsby-site/src/components/locations/NationalFederalProduction.js @@ -80,7 +80,7 @@ const NationalFederalProduction = (props) => {
- + diff --git a/gatsby-site/src/pages/Explore/index.js b/gatsby-site/src/pages/Explore/index.js index dd5c7d06f..197eab7f5 100644 --- a/gatsby-site/src/pages/Explore/index.js +++ b/gatsby-site/src/pages/Explore/index.js @@ -35,7 +35,7 @@ const NAV_ITEMS = [ subNavItems: [ { name: "all-production", - title: "Nationwide" + title: "All lands and waters" }, { name: "federal-production", From 8eb145687262dc21a60dec4b2d72e478a583590c Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 14:53:35 -0700 Subject: [PATCH 03/31] Replaces data and docs icon with updated style --- gatsby-site/src/components/layouts/DataAndDocs.js | 2 +- gatsby-site/src/img/svg/icon-data-and-docs-circle.svg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 gatsby-site/src/img/svg/icon-data-and-docs-circle.svg diff --git a/gatsby-site/src/components/layouts/DataAndDocs.js b/gatsby-site/src/components/layouts/DataAndDocs.js index 2c354362b..1cf9007ba 100644 --- a/gatsby-site/src/components/layouts/DataAndDocs.js +++ b/gatsby-site/src/components/layouts/DataAndDocs.js @@ -1,5 +1,5 @@ import React from 'react'; -import DataAndDocIcon from '-!svg-react-loader!../../img/svg/icon-data-docs.svg'; +import DataAndDocIcon from '-!svg-react-loader!../../img/svg/icon-data-and-docs-circle.svg'; const DataAndDocs = (props) => ( diff --git a/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg b/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg new file mode 100644 index 000000000..2c3cffe85 --- /dev/null +++ b/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file From add90bbb4ec4dff1f67c9999a6df200f68c58e3a Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 15:28:13 -0700 Subject: [PATCH 04/31] Replaces 'data' with 'downloads' and changes icon to circle for explore data --- gatsby-site/src/components/layouts/DataAndDocs.js | 2 +- gatsby-site/src/img/svg/icon-data-and-docs-circle.svg | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gatsby-site/src/components/layouts/DataAndDocs.js b/gatsby-site/src/components/layouts/DataAndDocs.js index 1cf9007ba..94698aa38 100644 --- a/gatsby-site/src/components/layouts/DataAndDocs.js +++ b/gatsby-site/src/components/layouts/DataAndDocs.js @@ -5,7 +5,7 @@ const DataAndDocs = (props) => ( {props.children === undefined ? - 'Data and documentation' : + 'Downloads and documentation' : props.children} ); diff --git a/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg b/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg index 2c3cffe85..b4778f7a6 100644 --- a/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg +++ b/gatsby-site/src/img/svg/icon-data-and-docs-circle.svg @@ -1 +1,7 @@ - \ No newline at end of file + + \ No newline at end of file From a19941c651254b938708cb0cf00c45ed384ca454 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 15:57:04 -0700 Subject: [PATCH 05/31] Replaces 'data' with 'downloads' and replaces icon with circle version --- _includes/data_and_docs.html | 4 ++-- _includes/svg/icon-data-and-docs-circle.svg | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 _includes/svg/icon-data-and-docs-circle.svg diff --git a/_includes/data_and_docs.html b/_includes/data_and_docs.html index 751463e62..f2b57fe0d 100644 --- a/_includes/data_and_docs.html +++ b/_includes/data_and_docs.html @@ -1,2 +1,2 @@ -{% assign content = include.content | default:'Data and documentation' %} -{% include svg/icon-data-docs.svg %}{{ content }} +{% assign content = include.content | default:'Downloads and documentation' %} +{% include svg/icon-data-and-docs-circle.svg %}{{ content }} diff --git a/_includes/svg/icon-data-and-docs-circle.svg b/_includes/svg/icon-data-and-docs-circle.svg new file mode 100644 index 000000000..b4778f7a6 --- /dev/null +++ b/_includes/svg/icon-data-and-docs-circle.svg @@ -0,0 +1,7 @@ + + \ No newline at end of file From 10d62512b11132515a0f0a49c40e9996a9d6e5f7 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 16:12:47 -0700 Subject: [PATCH 06/31] Adds padding between commodity icons --- gatsby-site/src/components/locations/RevenueTypeTable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gatsby-site/src/components/locations/RevenueTypeTable.js b/gatsby-site/src/components/locations/RevenueTypeTable.js index d89164c1a..1ad1b6135 100644 --- a/gatsby-site/src/components/locations/RevenueTypeTable.js +++ b/gatsby-site/src/components/locations/RevenueTypeTable.js @@ -312,10 +312,10 @@ const RevenueTypeTable = (props) => { All commodities - { oilGasExists && } - { coalExists && } - { geothermalExists && } - { windExists && } + { oilGasExists && } + { coalExists && } + { geothermalExists && } + { windExists && } From adf2e16a94f9baad8b4d6fa682561457d5977441 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Fri, 19 Oct 2018 16:44:03 -0700 Subject: [PATCH 07/31] Edits 'American Indian' to 'Native American' according to our content guidance and federal law --- gatsby-site/src/data/fund_names.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gatsby-site/src/data/fund_names.yml b/gatsby-site/src/data/fund_names.yml index ebe62a006..5e7481bc5 100644 --- a/gatsby-site/src/data/fund_names.yml +++ b/gatsby-site/src/data/fund_names.yml @@ -20,8 +20,8 @@ Historic Preservation: name: How this fund works to: /how-it-works/historic-preservation-fund/ American Indian Tribes: - name: American Indian tribes and individuals - description: ONRR disburses 100% of revenue collected from resource extraction on American Indian lands back to the Indian tribes and individual Indian landowners. + name: Native American tribes and individuals + description: ONRR disburses 100% of revenue collected from resource extraction on Native American lands back to tribes, nations, and individuals. Other: name: Other funds description: Some funds are directed back to federal agencies that administer these lands to help cover operational costs. The Ultra-Deepwater Research Program and the Mescal Settlement Agreement also receive $50 million each. From fbd9c905ab1026596dbafd508ec3fdd63545729b Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 23 Oct 2018 14:43:07 -0400 Subject: [PATCH 08/31] Updates dat --- .../data-graphql/federal_disbursements.xlsx | Bin 11578 -> 10395 bytes .../src/store/reducers/disbursements.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gatsby-site/src/data-graphql/federal_disbursements.xlsx b/gatsby-site/src/data-graphql/federal_disbursements.xlsx index f594db90fd218af88137aa4cab67e175b835586e..4e1d280d23857958c3063cc6372f779f29bd2f38 100644 GIT binary patch delta 5753 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 delta 6868 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 QtneRx_6KV6j_Z&1U)wv0m;e9( diff --git a/gatsby-site/src/store/reducers/disbursements.js b/gatsby-site/src/store/reducers/disbursements.js index 40b539a8c..e85ab9e93 100644 --- a/gatsby-site/src/store/reducers/disbursements.js +++ b/gatsby-site/src/store/reducers/disbursements.js @@ -6,8 +6,8 @@ import lazy from 'lazy.js'; // Initial state is used for the pattern library and seeding any additional data const initialState = { - year: 2017, - years: [2017], + year: 2018, + years: [2018], disbursements: { 2017: { year: "2017", From aa85763610f3229b42c15028bedcceb2301c4d8d Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 23 Oct 2018 15:43:33 -0400 Subject: [PATCH 09/31] Adds math max to reducer to point to most recent year by default --- gatsby-site/src/store/reducers/disbursements.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gatsby-site/src/store/reducers/disbursements.js b/gatsby-site/src/store/reducers/disbursements.js index e85ab9e93..284accff9 100644 --- a/gatsby-site/src/store/reducers/disbursements.js +++ b/gatsby-site/src/store/reducers/disbursements.js @@ -6,8 +6,7 @@ import lazy from 'lazy.js'; // Initial state is used for the pattern library and seeding any additional data const initialState = { - year: 2018, - years: [2018], + disbursements: { 2017: { year: "2017", @@ -54,6 +53,7 @@ const hydrateDisbursements = (data, year, fundInfo) => { let newState = {}; let sortedByYear = lazy(data).sortBy("Year", true).toArray(); newState.years = lazy(utils.range(parseInt(sortedByYear[sortedByYear.length-1].Year), parseInt(sortedByYear[0].Year))).sort(null,true).toArray(); + newState.year = Math.max(...newState.years); let fundSortOrder = {}; newState.disbursements = {}; From c080fdff681a75a265d5d4b83a4f741fccd82e0d Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 23 Oct 2018 15:48:40 -0400 Subject: [PATCH 10/31] Updates line for LWCF to repair query --- .../data-graphql/federal_disbursements.xlsx | Bin 10395 -> 10388 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gatsby-site/src/data-graphql/federal_disbursements.xlsx b/gatsby-site/src/data-graphql/federal_disbursements.xlsx index 4e1d280d23857958c3063cc6372f779f29bd2f38..f8a8fd0605bf32e306de6bee83670e570b084cca 100644 GIT binary patch delta 3320 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 delta 3321 zcmVxtN{~ zwPLYY+BzU)dIzjW`QbszEGlx5GhK-^*T!&Bfw!E51~6XMfxMNt(#CK@U`wt5#MkD0 ze=xW*-a6E(2rWv~y@E34RHCKUpoTr#q9a-Pps5dJ>Y7&rvwpLux-JgN&>)Tt^; z*FS#SZf0NG{bAkhZsx42=d*UV>YmoSmz()tfByVKGoKy$2~eS{Cj(t|9JcF ze_elc`!9#rw(VyiVRyKhzxMsx)naj2y|&xsq3Yh+9gIA8`|YxakNcO!;cee8pWH>; z&4Smpe_m{t>)qT-xY}PLqkDc{uiA%h^}cO)y%(}?H_IOEKfJEr4o7L*)g|J#%l()4 zw;xvB_6R-VUSxL!ct+|>XM}O}={?mG&nW_v7tlkfOxBdJQ7GhYBtEcY|?O_Fh z0LE4z0GwZS8*m%`pKaF=(Hs_X`OW?Q@Cv!8SZ&2g>d}yJwZ9JhbJxM|a2?Z?5WE&_ zFx1-^X@rhV~)t{!rtL$(Kj%#cO&6O!U%3kU_3&&aKamGH0w zQx0Gz#-W6{IGS9y>mL$5lEaoZ5J@8}%t~n3fhiBBi8zR$mmuL{uDCE&eN5@L;5vt=QWbMF|1DLGy9UVlF_IoKl>yx5}e?p3h!g=U1UEX@hN@o;Fn6mLg z;OZIWug<8?`QlK8e{wONH}Mj(c3^5La1EW4T@XQL9f=yNYHO;f4VB(oOSqb6Wi(oW z={h=ypv_N8X{dm>u@xU{-j$Fv&x&Z|z?mvKFM)y#+Ji(7G=6z)tC|Ov9%;q!5}I~k zDw3vYI*6bhiFq38IIgv->?tcrVo8+nv;#*DWXaH77?1f4fAu3h)l+#!qNQn|1~Luj z)d(+$5`uPM$^lQU6hQ|Oqys5IYi@xXcqPbwq$nY12d4bM1fA1E5JCEp@N=V8%^OIX zM!MQ1{48SPgqA!CB+SowUowcG=q=HrbS;@?N>y;WH~fsnQwdFrm_X0@foVD~Ac6?e zk64R^Lmtg*e_7dZ$Z!&vZtN1878y;W^*BS*dBPWDkdDM^SY6xNG>siwh!T<(Sw)Q; zz$A_Gj39$_AnA1rh$mJ{HNp*|gr*&s+R>P%(T<+(cPCn)yQECrC^$T%?@T3ZEi$%7 z3vmHk2N?;;kY^88B3yk*JyIQ^FG+1xL>r zJtO-ue?8}0*y&5#7t}z9pgYxNP=0uBxD!JA}l|vK2@Bq%` z$Nd=-qdCV+oD-STH!D)QiA0MwaMa&u=)8n# zbL{R}Lc}s7Vzds^z3m`^^dsqQGX@PLZS_QNe_NK&ume-;apoX8Pfddi(vhTS1`-ek zn0TbtQ6)U=z=Q)~Jh_SH{fmI197xoF{RU_Z&Kb@ZYpR5Y9hhA1wb4R&44IlHdRPq)=2>W8*s)kDA!L=+&H1Jd<5UACK*)?D ze^H~gZMbb@Wf*y4rAnCDfvL5?%$&1b5J5W)O>kg~k=`9*OC2A&;RaHXR4je@ivL6$6o~#BDf28>_VK-JZLq~6#^o}a z{gkG4W0V$fYdXIXbO}#8FyTNLr#3=>Q1hQ^G4Q}Ghnvz!{Ob~$c3{eWOw;ID&uN-Y zw6L0UC9G6q^It;GI;)oR_z&Y$zal`WG$YZ%v|#Y8j@GL z<5YqgAY?X?s4-e7V{2Af`oV2of5OHNOs&NQee58E_9Q8w;R$Fs5P>IeYckb_cc}{A z0Lc2-Xj@F5Iy-%7Lk9J+113B{3`aX!!mCX1K9l>&pTPC6iusq3-j*-zf0z50_3kj+ zz-wQ_3sVqA`|xJj@He~==Dvl!_t^FDy4CU1E4;PW!s|(O1tIm^b^YYjlaT`yvsojw z0|}%`D;6mM001_V7AI2ybdzc)KmjaBL)Q~00000 D5W_Ii From f860f84cd86d8d5d9d39503422b5bc8967380a76 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 23 Oct 2018 19:33:09 -0400 Subject: [PATCH 11/31] Corrects one data value and adds punctuation to disbursements sentence --- .../sections/NationalDisbursements.js | 2 +- .../data-graphql/federal_disbursements.xlsx | Bin 10388 -> 11434 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/components/sections/NationalDisbursements.js b/gatsby-site/src/components/sections/NationalDisbursements.js index 2b898e85d..c9770146a 100644 --- a/gatsby-site/src/components/sections/NationalDisbursements.js +++ b/gatsby-site/src/components/sections/NationalDisbursements.js @@ -79,7 +79,7 @@ class NationalDisbursements extends React.Component{ {((this.state.disbursements !== undefined) && (disbursementsForYear !== undefined)) && - {" "}In {this.state.year}, ONRR disbursed a total of {utils.formatToDollarInt(disbursementsForYear.total)} + {" "}In {this.state.year}, ONRR disbursed a total of {utils.formatToDollarInt(disbursementsForYear.total)}. }

diff --git a/gatsby-site/src/data-graphql/federal_disbursements.xlsx b/gatsby-site/src/data-graphql/federal_disbursements.xlsx index f8a8fd0605bf32e306de6bee83670e570b084cca..3ec4b52ca86294a049fbd93d23d2b7b7b2ac7e84 100644 GIT binary patch delta 5330 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 B$jkr$ delta 4373 zcmZ8lcTf}FvJNeV7CKTw=)HyBi=j)e(xfWAM0yb;7SkZ-_FkLZjDX0DU*pl5ivag2mk>908W6*Ua^M*0RWIe z+{DC1h|Hca8h}x2o#>uxY>M7qdZ`YQ!N-iy3Yn_*4x)!^TQ)HI zd(b*yCat-4>vkQB2Lq$(W%kwAG|yT zBOMMlMD>W1xgwVsLmZx)a9W!Sx|p>G{K?gS6DZIoHRt3?_yrc1(G6anTmg2zk%Jma zv%IWMI;^oB&hQrQd1(JIqDLSt`OxG~hb)7Kqo`epdNgOu%x8d!cXBghy`XX?8jedg0V#y_`Hz@%Yuz9i>Rz^jEtldq1DuP{V7(5rOHK_D_| zisXe55dc6$1^`fA2O-QyJTNHS=YF7An6J;E)rx;1jQY{D<|~5V#lOlq^|?yD3b-s6 zuzL84ZWh>JO;hFr#Tn15vq>N=R{HKoD?4aR)aR9`(34`ru=iGPBRF1SVsu880yDM3 z_yWc!KvCWLIOdluvEga?t2}VK8Dwel=|yLwshzgpCzJp=M;INZ#q6m6L4l8<&{9!i z0V2#CWaCU?Zlh=@N;=8fUG0+gqr<$iKf4_4YJ&tdv<{Q!#W4JbA1OK%PnRh$HNK z$d$q5eU`5GT?Q;se2*LS#P`}yC+RN8yka^mAADA}rOJyQ(lUa$#gKZANv4`)wQW_t zgWRdG3lS7_TiEpAC(9+(V=2p$B7^is!{ z0=0OIom`GKI(;b>S2>o_kexOs@pI1y?WU--Ss@!RusLU-M>fWKA<#WZLz|2wJg3=y zw~|)oyb>-rZ4TL@&y8`#>Pz65exQI)9Fj6@HN+vJb>+o}szyuBr%a0cet>nNA9SHX zw^Z3&*+sHNxKozDbM!EDo_pSHjUAG+G^;LDh9eF=FklSWQ4V9qcIJmSH23<~+f zWnC*8;ojCTZ`E3|r#$gij9D~XOOcLRewgK>cQvFDcow*?UtZf2dZTiourpa>`$){% zTa+gXrMb;LA~1HSX$LXx?YURcxzHPQ~HjZS+*!!!-m34C^Dej>SVucQ#F5-B+( z6)CGih2z;jp9^}~11j~wxX2ywUObk{XjEEy>v(pF_iB=_Lpm(tf0+dP z#|4#d0@$2Qp*&UC|cqeIB@qu*@=Jv|cb z_H6gh#Pd(_5iLK!%Yly3ZAdMc^vS#!j*w^B;Vk^r7a6(SeNuSTaN(<_)aBn-`XdyN zJ!{J!Fk7YSdEw{~c`~qm9Pu-Jd6os+TfgYDqPp@H>2il^K`}w+yxUI={G`YI;@8jg zklBVm$E1uAs=J-7j*H(e-z@vAx>SFYYOP4WdopzQ5BXy+_vbx>f;Py8KS!UALAg## zS5F)SjYHb?(`CV;r}OayZKoep#aHAmqFR5i{HaEg=-=bzMYn8uJ%U_xpPd@BK6I;* zgf&K}9WEaq=vaeVp?8c|*cS%K2nkZ^)dBK7-(^>2&y^M%ILj17Hh&dfU2zN0m(8#o zku>S(@Bcz@%5RIKu6`onSYggE(Y#mEJpnY*XJbg~*!L1{7Vb5ocAUdJI`j;v5->abwdZ?b zOf^mhUc+^6#}ARKd4#iUPhlz)=FxQ2**h8xZ*Px<6P*OJxgZBgazpJ|&cOO@)N%1* zML}^&#_A?w6qc}Z=dJc?<7B3xE>YOBGwJLAB4}67Z|j5rJ`de-N^Qbsx($YGy-Z7< zACD&8?QSeoXt_@V&ri?j6}c^e$ zIK(6%liSz(Esi8AYmJjxM$AYBU!ii)>g@wRxAzLRDiSaONxJVet;TQX%|E$8o;m+4 zFt8wGrJQ2sl2b*_kUJ-*z_hyYu^Sd8Nz_R%xJ6UfMiu6YbF-d;NM-Nfdcn>law-WApBOn&s-`hK+hR!^<0#>RTIJKR^> zudxeNr;=wIUsNa6put>0r18>?5`FvDjubrjA4>oS|89^*IcVlGp+-v-v!Cr!hD3xI zVkaWS^>&I#%#7xL!#C#wpY}$StA0z?U>F|?`!c9My6~j>`Kb4H3eE(WAEFsiS5sdN z3|No!Cbc=JNSl1>)RCc0)BM|1lv0LT?)ADWzLPdhl+dy($ukfu99xYOhzd}z=3*IUP z&7>z_SnIvMsDG56`7Gw_AyHwpJ?@^FEfutouSrASr)8Vnz&mSDO=g5VU2+#Gxt(B3 zA$VBCu3%cpK%B&J!Q|D1m@E$$6;A#}QQ4jx8bWHCjH-HdG@7XR?$m^MXT*fO*4wTS z+vK`y(m%r`SS@un)fluO_*Zn(S9a?1O|~^Oe$>3u_`VNulb(u;)3cO6bjh1@v#VK2 zM&b`st5Nk@{U7Jy_Q>9k0^D5f&G(sioLeMlWu@;KH1qTNh-NW{ZH?ta!?Z)f>69mw zxK!W)_4l4@)AHN&e}o#K=+n&Yz5KLwAB8S%PQDRY}i zy{|@9Dw2Vp(M3$+rgjvBzjXDtp)*5Hsn?$!B*b zm_zQGf@oqC0UxwF*n*TQ66UOyrX%-WT271Nt9k_xC#UX;m`1#@Hs@8w^<@(&P`MlT z5`#RiGGcil;-CqULXW9hTE%0h@pP&9>3R4j74pgbIQay+>bqdqUHE~`Uf zc~;&i#EDu1OP>j?_Z{%%7AC5^b16k@!TX_(uZnr38b{CB%&j3a?BV9*Xz;#R2;)nI zE&Cn=l^ZWrVWw@39XCWcC1>Ucta;1yeUdl2Uk$?G(?58)k_6sW!MUWUVDG?}ggk@! zk;XO4Yx4Q^Tyf*2Trza?HA0*|R8UPbx2yaGg?f2Y;5GLqR$-P;v#iyO7Nn+;u=_}( z51xd{T)GFYWgk;bZF{?S&W)yd4e)&^B6%Y`G0FryXiK3SG_lqo{gNQ)-;nu(l37hQ zPiL8Lx2>y(w|Y>e!Dix>tVqC!ppiQ0I>~JF7%8B65bw5a+JIvxuRjOakbSmBvvg2ohUTU!NyeMOa`6Vuu2zGCuP{JNWRW_^9TQ+E~{eP zdRL|7&+1YIR+3I9y}*4YLVn}rspHpW8X2QtkhrHv zvm;?E;OcE<^JmTXE_?)PAUaG^?~{EilGbv1pGmqXv3H|YCf|F2)sn=YfTtek<7mLH z92xaMhi~^DH;|n>Zk8>qcr1ww9I^DxLNAulCd^r+EA#O6L(i+urJlOb_<5kiWxxx= zTM+!u3&|6?E&qw<+b3Ye_yE;GhE8PwzkvLikzWA9ODTqJt?Oj9y{uYiT z%1!WX=~v2JG6YD!6y^mmb`MTZ%%2p>sj!&z?uK6TZjaoqTQPg?TGYX&0{@UtEz2Rn z4YTL++_(yDpaLcW=vP>U)!QuyToIC4X$A0n-htNoxcKn9ija$>);<+9qlAlRDkcP~@inLrR{hm!ziDZJWqwG#jjmh=x7Gj6(NpuK>zH z5)Gu^UL`dY{JjT6j9*1!jMEBgz{ROjY(eSsX1D=N_tBAw&!ViaPPg`9<>uGRy(V^< z>Lb59gou_!!zu@QPna7$#s`-D|L^+T m0Kh$eSCasLM4-4c0`a%EHqj@!CJO+NUGK-&jxKrs-u?xvwfUR? From 493a00c8dd35a553667dc49fc30c92fadcc18ad9 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 24 Oct 2018 07:06:34 -0400 Subject: [PATCH 12/31] Adds back in year selector, increments to 2018 --- gatsby-site/src/store/reducers/disbursements.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gatsby-site/src/store/reducers/disbursements.js b/gatsby-site/src/store/reducers/disbursements.js index 284accff9..ae6a3b2d1 100644 --- a/gatsby-site/src/store/reducers/disbursements.js +++ b/gatsby-site/src/store/reducers/disbursements.js @@ -6,7 +6,8 @@ import lazy from 'lazy.js'; // Initial state is used for the pattern library and seeding any additional data const initialState = { - + year: 2018, + years: [2018], disbursements: { 2017: { year: "2017", From df12e5fca9f2798461fca800081f0f410d5e629f Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 24 Oct 2018 07:12:44 -0400 Subject: [PATCH 13/31] Increments another default year state --- gatsby-site/src/store/reducers/disbursements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/store/reducers/disbursements.js b/gatsby-site/src/store/reducers/disbursements.js index ae6a3b2d1..49ce0e9d6 100644 --- a/gatsby-site/src/store/reducers/disbursements.js +++ b/gatsby-site/src/store/reducers/disbursements.js @@ -10,7 +10,7 @@ const initialState = { years: [2018], disbursements: { 2017: { - year: "2017", + year: "2018", total: 10000, highestFundValue: 10000, disbursements: [{ From ffca531a5a3cf28bf81dfd53be6085f8dc575dad Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 24 Oct 2018 12:02:09 -0400 Subject: [PATCH 14/31] Adds Congressional appropriations for LWCF and HPF --- gatsby-site/src/data/funded_by_congress.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gatsby-site/src/data/funded_by_congress.yml b/gatsby-site/src/data/funded_by_congress.yml index 65f70603f..09cb69ce1 100644 --- a/gatsby-site/src/data/funded_by_congress.yml +++ b/gatsby-site/src/data/funded_by_congress.yml @@ -1,3 +1,6 @@ +2018: + Land & Water Conservation: 355797000 + Historic Preservation: 80361000 2017: Land & Water Conservation: 449144000 Historic Preservation: 80900000 From a83acffc19b0f5e69d221ace7e59b7659d807039 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 24 Oct 2018 15:27:50 -0400 Subject: [PATCH 15/31] Fills in appropriated HPF amounts for past years --- gatsby-site/src/data/funded_by_congress.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gatsby-site/src/data/funded_by_congress.yml b/gatsby-site/src/data/funded_by_congress.yml index 09cb69ce1..235ac7fb7 100644 --- a/gatsby-site/src/data/funded_by_congress.yml +++ b/gatsby-site/src/data/funded_by_congress.yml @@ -6,7 +6,10 @@ Historic Preservation: 80900000 2016: Land & Water Conservation: 450000000 + Historic Preservation: 89910000 2015: Land & Water Conservation: 306141000 + Historic Preservation: 56410000 2014: - Land & Water Conservation: 306043000 \ No newline at end of file + Land & Water Conservation: + Historic Preservation: 56410000 \ No newline at end of file From 18b4bb46a8eab39c16dc420d5a1a9edf7ad2cbc5 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 24 Oct 2018 15:34:53 -0400 Subject: [PATCH 16/31] Fills in missing data points for Congressional appropriation --- gatsby-site/src/data/funded_by_congress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/data/funded_by_congress.yml b/gatsby-site/src/data/funded_by_congress.yml index 235ac7fb7..944c89549 100644 --- a/gatsby-site/src/data/funded_by_congress.yml +++ b/gatsby-site/src/data/funded_by_congress.yml @@ -11,5 +11,5 @@ Land & Water Conservation: 306141000 Historic Preservation: 56410000 2014: - Land & Water Conservation: + Land & Water Conservation: 306043000 Historic Preservation: 56410000 \ No newline at end of file From a6ab5738670c66670221478aa06748080a1cb6b0 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Mon, 29 Oct 2018 12:46:50 -0700 Subject: [PATCH 17/31] Corrects LWCF appropriations numbers --- gatsby-site/src/data/funded_by_congress.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gatsby-site/src/data/funded_by_congress.yml b/gatsby-site/src/data/funded_by_congress.yml index 944c89549..84c7d24c6 100644 --- a/gatsby-site/src/data/funded_by_congress.yml +++ b/gatsby-site/src/data/funded_by_congress.yml @@ -1,8 +1,8 @@ 2018: - Land & Water Conservation: 355797000 + Land & Water Conservation: 397202000 Historic Preservation: 80361000 2017: - Land & Water Conservation: 449144000 + Land & Water Conservation: 400000000 Historic Preservation: 80900000 2016: Land & Water Conservation: 450000000 From 3490fe7ebe8b651a5a36a2f8b027f7070968c911 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Mon, 29 Oct 2018 13:49:10 -0700 Subject: [PATCH 18/31] Updates 2018 appropriation based on JM findings --- gatsby-site/src/data/funded_by_congress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/data/funded_by_congress.yml b/gatsby-site/src/data/funded_by_congress.yml index 84c7d24c6..56a599741 100644 --- a/gatsby-site/src/data/funded_by_congress.yml +++ b/gatsby-site/src/data/funded_by_congress.yml @@ -1,5 +1,5 @@ 2018: - Land & Water Conservation: 397202000 + Land & Water Conservation: 425000000 Historic Preservation: 80361000 2017: Land & Water Conservation: 400000000 From 51c6ee4d9b87f19e2aaa5bbe94803861103cae80 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 30 Oct 2018 07:51:52 -0700 Subject: [PATCH 19/31] Adds download file for funds data by state and county --- _downloads/disbursements.md | 6 +++--- .../disbursements_FY2003-2018_by_type.xlsx | Bin 0 -> 80825 bytes 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 downloads/disbursements_FY2003-2018_by_type.xlsx diff --git a/_downloads/disbursements.md b/_downloads/disbursements.md index e4b8de71d..7929bb707 100644 --- a/_downloads/disbursements.md +++ b/_downloads/disbursements.md @@ -25,7 +25,7 @@ selector: list breadcrumb: - title: Downloads permalink: /downloads/ -description: "The amount of money earned from extraction of natural resources on federal lands that is disbursed to various legislated funds. Our fund overview dataset is from the Office of Natural Resources Revenue, which is part of the Department of the Interior. In addition, we have more detailed datasets on two of the funds: Land and Water Conservation Fund (LWCF) and National Historic Preservation Act (NHPA)." +description: "The amount of money earned from extraction of natural resources on federal lands that is disbursed to various legislated funds. Our fund overview dataset is from the Office of Natural Resources Revenue, which is part of the Department of the Interior." tag: - Data - Downloads @@ -33,12 +33,12 @@ tag: - Disbursements --- -> The amount of money earned from extraction of natural resources on federal lands that is disbursed to various legislated funds. Our fund overview dataset is from the [Office of Natural Resources Revenue](http://www.onrr.gov/), which is part of the Department of the Interior. In addition, we have more detailed datasets on two of the funds: [Land and Water Conservation Fund](https://www.doi.gov/lwcf) (LWCF) and [National Historic Preservation Act](https://www.nps.gov/subjects/historicpreservation/national-historic-preservation-act.htm) (NHPA). +> {{ page.description }} Download fiscal year data: