diff --git a/downloads/production/fiscal_year_production.xlsx b/downloads/production/fiscal_year_production.xlsx index 8a8f8546c..8f38fabe4 100644 Binary files a/downloads/production/fiscal_year_production.xlsx and b/downloads/production/fiscal_year_production.xlsx differ diff --git a/gatsby-config.js b/gatsby-config.js index 03ec440b7..5480cc1df 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -11,7 +11,7 @@ let config = { siteMetadata: { title: 'Natural Resources Revenue Data', description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.', - version: 'v5.5.7', + version: 'v5.5.8', googleAnalyticsId: GOOGLE_ANALYTICS_ID, }, plugins: [ diff --git a/package-lock.json b/package-lock.json index 06e8c3bfa..ce474af27 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,6 @@ "@babel/types": "^7.7.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", "json5": "^2.1.0", "lodash": "^4.17.13", "resolve": "^1.3.2", @@ -178,55 +177,6 @@ "@babel/types": "^7.4.4" } }, - "@babel/helper-compilation-targets": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.3.tgz", - "integrity": "sha512-JLylPCsFjhLN+6uBSSh3iYdxKdeO9MNmoY96PE/99d8kyBFaXLORtAVhqN6iHa+wtPeqxKLghDOZry0+Aiw9Tw==", - "requires": { - "@babel/compat-data": "^7.8.1", - "browserslist": "^4.8.2", - "invariant": "^2.2.4", - "levenary": "^1.1.0", - "semver": "^5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", - "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", - "requires": { - "caniuse-lite": "^1.0.30001017", - "electron-to-chromium": "^1.3.322", - "node-releases": "^1.1.44" - } - }, - "caniuse-lite": { - "version": "1.0.30001020", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz", - "integrity": "sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA==" - }, - "electron-to-chromium": { - "version": "1.3.333", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.333.tgz", - "integrity": "sha512-7MJfCpa/tmhqYy2lZ1NEbkSxH7q3KiZiepiSs2ayTPAweAjdzGXotij+7OKPPb3OwJD2ZuBKPrA2HIuuSi6ahw==" - }, - "node-releases": { - "version": "1.1.45", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.45.tgz", - "integrity": "sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - } - } - }, "@babel/helper-create-class-features-plugin": { "version": "7.4.4", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz", @@ -666,7 +616,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.7.4.tgz", "integrity": "sha512-j888jpjATLEzOWhKawq46UrpXnCRDbdhBd5io4jgwjJ3+CHHGCRb6PNAVEgs+BXIb+dNRAmnkv36zfB992PRVw==", "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "^7.0.0" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -1637,7 +1587,7 @@ "integrity": "sha512-BBfxVThaPrglqHmKtSdrZJxnbFGJqKdZ5ZvDarj3HsmkteGCXsP1ohrDi5TWoa5JEJFo9S6q6NywqsENZn9rZA==", "requires": { "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.7.4", + "@emotion/hash": "^0.7.1", "@material-ui/types": "^4.1.1", "@material-ui/utils": "^4.7.1", "clsx": "^1.0.2", @@ -4395,6 +4345,13 @@ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "requires": { "mime-db": ">= 1.43.0 < 2" + }, + "dependencies": { + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + } } }, "compression": { @@ -9448,10 +9405,10 @@ } } }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==" + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mute-stream": { "version": "0.0.8", @@ -9512,10 +9469,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "p-limit": "^2.0.0" } }, "p-try": { @@ -10265,6 +10219,27 @@ "requires": { "regenerator-runtime": "^0.13.2" } + }, + "remark-stringify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-5.0.0.tgz", + "integrity": "sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==", + "requires": { + "ccount": "^1.0.0", + "is-alphanumeric": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "longest-streak": "^2.0.1", + "markdown-escapes": "^1.0.0", + "markdown-table": "^1.1.0", + "mdast-util-compact": "^1.0.0", + "parse-entities": "^1.0.2", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "stringify-entities": "^1.0.1", + "unherit": "^1.0.4", + "xtend": "^4.0.1" + } } } }, @@ -10332,11 +10307,6 @@ "globule": "^1.0.0" } }, - "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -10733,26 +10703,6 @@ "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==" }, - "handlebars": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", - "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", - "dev": true, - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -14747,23 +14697,6 @@ } } }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" - } - } - }, "optimize-css-assets-webpack-plugin": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz", @@ -19698,33 +19631,6 @@ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz", "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==" }, - "uglify-js": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz", - "integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==", - "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", diff --git a/plugins/custom-excel-transformer/data-transformers/production-volumes-transformer.js b/plugins/custom-excel-transformer/data-transformers/production-volumes-transformer.js index 1d5127f79..d6c3503ec 100644 --- a/plugins/custom-excel-transformer/data-transformers/production-volumes-transformer.js +++ b/plugins/custom-excel-transformer/data-transformers/production-volumes-transformer.js @@ -142,6 +142,7 @@ const createProductVolumeNodeByProduct = (productVolumeData, type) => { } } + node.OffshorePlanningArea = node.OffshorePlanningArea || '' node.ProductionDate = (node.ProductionYear) ? new Date(node.ProductionYear, getMonthFromString(node.ProductionMonth)) : new Date(node.FiscalYear, 0) diff --git a/src/components/sections/WhatsNew/WhatsNew.js b/src/components/sections/WhatsNew/WhatsNew.js index 9b9783044..cfb723cfb 100644 --- a/src/components/sections/WhatsNew/WhatsNew.js +++ b/src/components/sections/WhatsNew/WhatsNew.js @@ -7,11 +7,10 @@ const WhatsNew = props => (

What's new

-

In our latest release on March 20, 2020, we made the following changes:

+

In our latest release on March 30, 2020, we made the following changes:

Review our full release details.

diff --git a/src/data/gomesa_state_disbursements/AL.yml b/src/data/gomesa_state_disbursements/AL.yml index 2d9a1978c..f7160a436 100644 --- a/src/data/gomesa_state_disbursements/AL.yml +++ b/src/data/gomesa_state_disbursements/AL.yml @@ -1,5 +1,5 @@ -2019: - State: 24476087.60 +2020: + State: 40037409.45 Counties: - Baldwin County: 2751485.44 - Mobile County: 3367536.46 \ No newline at end of file + Baldwin County: 4558744.98 + Mobile County: 5450607.38 diff --git a/src/data/gomesa_state_disbursements/LA.yml b/src/data/gomesa_state_disbursements/LA.yml index 961cc2358..d358656a2 100644 --- a/src/data/gomesa_state_disbursements/LA.yml +++ b/src/data/gomesa_state_disbursements/LA.yml @@ -1,22 +1,22 @@ -2019: - State: 75782553.46 +2020: + State: 124574775.95 Counties: - Assumption Parish: 624301.84 - Calcasieu Parish: 1006346.20 - Cameron Parish: 1294393.87 - Iberia Parish: 993921.56 - Jefferson Parish: 1571308.46 - Lafourche Parish: 980198.20 - Livingston Parish: 783550.00 - Orleans Parish: 1299392.45 - Plaquemines Parish: 1856690.72 - St. Bernard Parish: 892386.94 - St. Charles Parish: 666344.39 - St. James Parish: 582115.69 - St. John the Baptist Parish: 629068.20 - St. Martin Parish: 704743.85 - St. Mary Parish: 833307.13 - St. Tammany Parish: 1030784.21 - Tangipahoa Parish: 752643.60 - Terrebonne Parish: 1450355.84 - Vermilion Parish: 993785.17 \ No newline at end of file + Assumption Parish: 1034102.95 + Calcasieu Parish: 1638988.85 + Cameron Parish: 2092861.04 + Iberia Parish: 1636190.83 + Jefferson Parish: 2583808.57 + Lafourche Parish: 1619484.54 + Livingston Parish: 1295216.14 + Orleans Parish: 2141904.60 + Plaquemines Parish: 3049636.97 + St. Bernard Parish: 1468661.50 + St. Charles Parish: 1105909.81 + St. James Parish: 964994.69 + St. John the Baptist Parish: 1042877.63 + St. Martin Parish: 1160080.96 + St. Mary Parish: 1364113.38 + St. Tammany Parish: 1702328.50 + Tangipahoa Parish: 1246809.43 + Terrebonne Parish: 2377136.75 + Vermilion Parish: 1618586.88 diff --git a/src/data/gomesa_state_disbursements/MS.yml b/src/data/gomesa_state_disbursements/MS.yml index 303518733..faf17d8b0 100644 --- a/src/data/gomesa_state_disbursements/MS.yml +++ b/src/data/gomesa_state_disbursements/MS.yml @@ -1,6 +1,6 @@ -2019: - State: 25379084.76 +2020: + State: 41531180.60 Counties: - Hancock County: 1188862.91 - Harrison County: 2470050.41 - Jackson County: 2685857.87 \ No newline at end of file + Hancock County: 1971125.52 + Harrison County: 4035775.65 + Jackson County: 4375893.97 diff --git a/src/data/gomesa_state_disbursements/TX.yml b/src/data/gomesa_state_disbursements/TX.yml index 2a74af9bd..71eecd4cd 100644 --- a/src/data/gomesa_state_disbursements/TX.yml +++ b/src/data/gomesa_state_disbursements/TX.yml @@ -1,21 +1,21 @@ -2019: - State: 46313471.21 +2020: + State: 76227145.73 Counties: - Aransas County: 466178.75 - Brazoria County: 779380.51 - Calhoun County: 628382.99 - Cameron County: 658510.61 - Chambers County: 406855.52 - Galveston County: 1024591.91 - Harris County: 2263694.49 - Jackson County: 300964.36 - Jefferson County: 794042.37 - Kenedy County: 633309.25 - Kleberg County: 459956.66 - Matagorda County: 901868.30 - Nueces County: 614486.78 - Orange County: 392328.39 - Refugio County: 285845.51 - San Patricio County: 298699.69 - Victoria County: 310203.11 - Willacy County: 359068.63 + Aransas County: 772632.69 + Brazoria County: 1267015.77 + Calhoun County: 1034675.74 + Cameron County: 1111917.29 + Chambers County: 652884.63 + Galveston County: 1662925.78 + Harris County: 3706345.68 + Jackson County: 496817.57 + Jefferson County: 1281692.80 + Kenedy County: 1065791.46 + Kleberg County: 769772.18 + Matagorda County: 1473898.11 + Nueces County: 1018807.82 + Orange County: 630584.03 + Refugio County: 476238.54 + San Patricio County: 500448.31 + Victoria County: 515446.15 + Willacy County: 618891.86 diff --git a/src/markdown/downloads/federal-production.md b/src/markdown/downloads/federal-production.md index 3d208a86a..4a1ab5def 100644 --- a/src/markdown/downloads/federal-production.md +++ b/src/markdown/downloads/federal-production.md @@ -24,10 +24,10 @@ tag:

-

Download fiscal year data (2003-2018): +

Download fiscal year data (2003-2019):

@@ -41,16 +41,6 @@ The dataset currently include data tracked and managed by the Department of the ## About the data -

Why was some solids data withheld?

- -ONRR withheld some solids production information out of an abundance of caution to ensure that there were no violations of the Trade Secrets Act. - -* "W" is displayed in the Production Volume column for those products that reveal proprietary data at the county level. -* All "W" volumes are accounted for in separate line totals where state and county have been "Withheld" (columns C, D and E). - -

Why aren’t national totals equal to the sum of all state totals?

- -In some cases, national totals include amounts that are withheld at the state or county level.

Why is geothermal energy listed so many times?

diff --git a/src/markdown/how-it-works/gomesa.md b/src/markdown/how-it-works/gomesa.md index e5cff8430..c23ea7aee 100644 --- a/src/markdown/how-it-works/gomesa.md +++ b/src/markdown/how-it-works/gomesa.md @@ -37,17 +37,17 @@ The Office of Natural Resources Revenue disburses GOMESA revenue to both state a - - + + - - - - + + + + -
RecipientFY2019Recipient (state and local total)FY2020
Alabama$30,595,109.50
Louisiana$94,728,191.78
Mississippi$31,723,855.95
Texas$57,891,839.04
Alabama$50,046,761.81
Louisiana$155,718,469.97
Mississippi$51,913,975.74
Texas$95,283,932.14
+ ### Land and Water Conservation Fund The act also directs a portion of gulf revenue to the [Land and Water Conservation Fund](/how-it-works/land-and-water-conservation-fund/), which supports preservation, development, and access to outdoor lands for public recreation.