-
Notifications
You must be signed in to change notification settings - Fork 9
Direct emissions chart and dashboard items, mapping file, 1990 data #3463
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
6e734ec
Add 1990 emissions to emissions.csv files
kndehaan c4ffe6e
Bump Atlas to quintel/atlas@5504fac
kndehaan f5d7131
Add year column to emissions.csv dummy files
kndehaan 1da2762
Copy nl emissions.csv to nl2016, nl2017 and nl2018
kndehaan 70a50c0
Referencing ETSource issue #3454 on molecule node SGQs
kndehaan 887eda1
Reimport emissions Northern Ireland and GB after CO2 fix
kndehaan 82800e2
Update use attribute to align with mapping config
kndehaan 4617c7e
Add use attribute to molecule nodes
kndehaan 3b4e676
Add sector_label attribute and clean emission groups
kndehaan 29ad0c9
Add sector_label attribute and clean emission groups molecule nodes
kndehaan 7671133
Add sector_mapping csv (mock) and spec to guarantee no bad SECTOR map…
louispt1 a065a34
Update mapping file - remove Klimaattafel mapping
kndehaan 9149259
Indentation style change
kndehaan 95486b6
Add missing sector labels to mapping file
kndehaan 4538798
Validate ipcc_crt_code_agg instead of klimaattafel; fix operator spac…
louispt1 67eb587
Update direct_emissions_csv.yml based on new sector_mapping.csv struc…
louispt1 a2ed0d6
Bump Atlas SHA and remove BOM from sector mapping CSV
louispt1 d01d04a
Refine sector mapping spec checks to be more specific and descriptive.
louispt1 61d07a7
Rename transport and bunkers to national transport and international …
kndehaan 128dea9
Fix GQL spacing
kndehaan 1f6e6b1
Restructure primary emission queries
kndehaan eb27ab7
Direct emissions queries for chart
kndehaan c1d73f3
Add MT query for total GHG emissions
kndehaan 019bfad
Add 1990 emissions to emissions.csv files
kndehaan 26b6c1c
1990 emission queries energy sector
kndehaan 56ae099
Add queries for the direct GHG emmisions per sector
robindesmit-quintel cae8613
Queries for MT test
kndehaan 11bfa2c
Include the Direct total GHG emissions and its reduction relative 1990.
robindesmit-quintel 70390b5
Rewrite 1990 queries
kndehaan 39b5a25
Change unit from mt to MT
kndehaan 8629ae9
Corrections in dashboard items
kndehaan 8e4ad77
Remove unnecessary mechanical turk 1990 emission queries
kndehaan 5d85494
Bump Atlas to quintel/atlas@64b4688
kndehaan e936412
Correct for interactive rebase error
kndehaan ec2c776
Update ghg queries with mapping method
kndehaan 13645c2
Update 1990 queries with mapping
kndehaan 2ef2453
Unit styling change in query
mabijkerk b91c2a0
Rename and restructure 1990 queries
kndehaan 5a55ee9
Expand 1990 total emission queries set
kndehaan 64f5ced
MT queries
kndehaan e209e18
Update queries according to mapping file
kndehaan 46fbb70
Update indirect emissions query
kndehaan 829c3a1
Update LULUCF 1990 emissions query
kndehaan d234034
Remove mechanical turk queries
kndehaan 815daa1
Move total GHG queries to dedicated folder
kndehaan 3a80111
Add CO2 and other GHG queries for start/future year
kndehaan 0d91b82
Bump atlas SHA and update gemfile.lock
louispt1 8249324
Update LULUCF query
kndehaan 3ffbdf6
Update IPCC category description in mapping file
kndehaan 0e8311c
Fix bug in LULUCF query
kndehaan 65fd69a
Clarify LULUCF query docstrings
kndehaan a5203c0
Bump Atlas to quintel/atlas@b2d47a1
kndehaan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| sector_label,use,emissions_sector,emissions_subsector,ipcc_crt_code_agg,ipcc_crt_code,ipcc_crt_category,crt_subcategory_1st_order,ipcc_crt_subcategory_2nd_order,ipcc_crt_subcategory_3rd_order | ||
| energy_electricity_and_heat_production,energetic,Energy,Electricity and heat production,1.A.1,1.A.1.a,Energy,Fuel combustion activities,Energy industries,Public electricity and heat production | ||
| industry_refineries,energetic,Industry,Refineries,1.A.1,1.A.1.b,Energy,Fuel combustion activities,Energy industries,Petroleum refining | ||
| energy_fuels_production,energetic,Energy,Fuels production,1.A.1,1.A.1.c,Energy,Fuel combustion activities,Energy industries,Manufacture of solid fuels and other energy industries | ||
| energy_steel,energetic,Energy,Steel,1.A.1,1.A.1.c,Energy,Fuel combustion activities,Energy industries,Manufacture of solid fuels and other energy industries | ||
| industry_non_specified,energetic,Industry,Non-specified,1.A.2,1.A.2,Energy,Fuel combustion activities,Manufacturing industries and construction,- | ||
| industry_electricity_and_heat_production,energetic,Industry,Electricity and heat production,1.A.2,1.A.2,Energy,Fuel combustion activities,Manufacturing industries and construction,- | ||
| industry_steel,energetic,Industry,Steel,1.A.2,1.A.2.a,Energy,Fuel combustion activities,Manufacturing industries and construction,Iron and steel | ||
| industry_aluminium,energetic,Industry,Aluminium,1.A.2,1.A.2.b,Energy,Fuel combustion activities,Manufacturing industries and construction,Non-ferrous metals | ||
| industry_other_metals,energetic,Industry,Other metals,1.A.2,1.A.2.b,Energy,Fuel combustion activities,Manufacturing industries and construction,Non-ferrous metals | ||
| industry_fertilizers,energetic,Industry,Fertilizers,1.A.2,1.A.2.c,Energy,Fuel combustion activities,Manufacturing industries and construction,Chemicals | ||
| industry_chemicals,energetic,Industry,Chemicals,1.A.2,1.A.2.c,Energy,Fuel combustion activities,Manufacturing industries and construction,Chemicals | ||
| industry_paper,energetic,Industry,Paper,1.A.2,1.A.2.d,Energy,Fuel combustion activities,Manufacturing industries and construction,"Pulp, paper and print" | ||
| industry_food,energetic,Industry,Food,1.A.2,1.A.2.e,Energy,Fuel combustion activities,Manufacturing industries and construction,"Food processing, beverages and tobacco" | ||
| industry_other,energetic,Industry,Other,1.A.2,1.A.2.f-m,Energy,Fuel combustion activities,Manufacturing industries and construction,"Non-metallic minerals, transport equipment, machinery, mining, wood and wood products, construction, textile and leather, non-specified industry" | ||
| transport_non_specified,energetic,National transport,Non-specified,1.A.3,1.A.3,Energy,Fuel combustion activities,Transport,- | ||
| transport_domestic_aviation,energetic,National transport,Domestic aviation,1.A.3,1.A.3.a,Energy,Fuel combustion activities,Transport,Domestic Aviation | ||
| transport_cars,energetic,National transport,Cars,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_motorcycles,energetic,National transport,Motorcycles,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_bicycles,energetic,National transport,Bicycles,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_buses,energetic,National transport,Buses,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_vans,energetic,National transport,Vans,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_trucks,energetic,National transport,Trucks,1.A.3,1.A.3.b,Energy,Fuel combustion activities,Transport,Road Transportation | ||
| transport_trains,energetic,National transport,Trains,1.A.3,1.A.3.c,Energy,Fuel combustion activities,Transport,Railways | ||
| transport_trams_metros,energetic,National transport,Trams and metros,1.A.3,1.A.3.c,Energy,Fuel combustion activities,Transport,Railways | ||
| transport_domestic_navigation,energetic,National transport,Domestic navigation,1.A.3,1.A.3.d,Energy,Fuel combustion activities,Transport,Domestic Navigation | ||
| other_other_transportation,energetic,Other,Other transportation,1.A.3,1.A.3.e,Energy,Fuel combustion activities,Transport,Other transportation | ||
| buildings_non_specified,energetic,Buildings,Non-specified,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional | ||
| buildings_space_heating,energetic,Buildings,Space heating,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional | ||
| buildings_cooling,energetic,Buildings,Cooling,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional | ||
| buildings_appliances,energetic,Buildings,Appliances,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional | ||
| buildings_lighting,energetic,Buildings,Lighting,1.A.4.a,1.A.4.a,Energy,Fuel combustion activities,Other sectors,Commercial/institutional | ||
| households_non_specified,energetic,Households,Non-specified,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_cooking,energetic,Households,Cooking,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_space_heating,energetic,Households,Space heating,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_hot_water,energetic,Households,Hot water,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_cooling,energetic,Households,Cooling,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_appliances,energetic,Households,Appliances,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| households_lighting,energetic,Households,Lighting,1.A.4.b,1.A.4.b,Energy,Fuel combustion activities,Other sectors,Residential | ||
| agriculture_non_specified,energetic,Agriculture,Non-specified,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing | ||
| agriculture_electricity_and_heat_production,energetic,Agriculture,Electricity and heat production,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing | ||
| agriculture_heating,energetic,Agriculture,Heating,1.A.4.c,1.A.4.c,Energy,Fuel combustion activities,Other sectors,Agriculture/forestry/fishing | ||
| other_non_specified,energetic,Other,Non-specified,1.A.5,1.A.5,Energy,Fuel combustion activities,Other,- | ||
| other_heating,energetic,Other,Heating,1.A.5,1.A.5,Energy,Fuel combustion activities,Other,- | ||
| energy_fugitive_emissions,non_energetic,Energy,Fugitive emissions,1.B,1.B excl. 1.B.2.a.iv,Energy,Fugitive emissions from fuels,"Solid fuels, Oil and natural gas and other emissions from energy production",- | ||
| industry_refineries,non_energetic,Industry,Refineries,1.B,1.B.2.a.iv,Energy,Fugitive emissions from fuels,Oil and natural gas and other emissions from energy production,Refining/storage | ||
| energy_ccus,non_energetic,Energy,CCUS,1.C,1.C,Energy,CO2 Transport and storage,-,- | ||
| industry_non_specified,non_energetic,Industry,Non-specified,2,2,Industrial processes and product use,-,-,- | ||
| industry_other,non_energetic,Industry,Other,2,"2.A,D-G",Industrial processes and product use,"Mineral industry, Non-energy products from fuels and solvent use, Electronics industry, Product uses as substitutes for ODS, Other product manufacture and use",-,- | ||
| industry_fertilizers,non_energetic,Industry,Fertilizers,2,2.B.1-2,Industrial processes and product use,Chemical industry,"Ammonia production, Nitric acid production",- | ||
| industry_chemicals,non_energetic,Industry,Chemicals,2,"2.B.3-7,8.b-g,9,10.b",Industrial processes and product use,Chemical industry,"Adipic acid production, Caprolactam, glyoxal and glyoxylic acid production, Carbide production, Titanium dioxide production, Soda ash production, Petrochemical and carbon black production excl. Methanol, Fluorochemical production, Other excl. Hydrogen production",- | ||
| energy_methanol_production,non_energetic,Energy,Methanol production,2,2.B.8.a,Industrial processes and product use,Chemical industry,Petrochemical and carbon black production,Methanol | ||
| energy_hydrogen_production,non_energetic,Energy,Hydrogen production,2,2.B.10.a,Industrial processes and product use,Chemical industry,Other,Hydrogen Production | ||
| industry_steel,non_energetic,Industry,Steel,2,2.C.1,Industrial processes and product use,Metal industry,Iron and steel production,- | ||
| industry_aluminium,non_energetic,Industry,Aluminium,2,2.C.3,Industrial processes and product use,Metal industry,Aluminium production,- | ||
| industry_other_metals,non_energetic,Industry,Other metals,2,"2.C.2,4-7",Industrial processes and product use,Metal industry,"Ferroalloys production, Magnesium production, Lead production, Zinc production, Other",- | ||
| industry_paper,non_energetic,Industry,Paper,2,2.H.1,Industrial processes and product use,Other,Pulp and paper,- | ||
| industry_food,non_energetic,Industry,Food,2,2.H.2,Industrial processes and product use,Other,Food and beverages industry,- | ||
| agriculture_non_specified,non_energetic,Agriculture,Non-specified,3,3,Agriculture,-,-,- | ||
| lulucf_removals,non_energetic,LULUCF,Removals,4,4,"Land Use, Land-Use Change and Forestry",-,-,- | ||
| lulucf_emissions,non_energetic,LULUCF,Emissions,4,4,"Land Use, Land-Use Change and Forestry",-,-,- | ||
| waste_non_specified,non_energetic,Waste,Non-specified,5,5,Waste,-,-,- | ||
| other_indirect_emissions,non_energetic,Other,Indirect emissions,ind_CO2,ind_CO2,Indirect CO2 emissions,-,-,- | ||
| bunkers_international_aviation,energetic,International transport,International aviation,1.D.1,1.D.1.a,Energy,Memo items,International bunkers,International aviation (aviation bunkers) | ||
| bunkers_international_navigation,energetic,International transport,International navigation,1.D.1,1.D.1.b,Energy,Memo items,International bunkers,International navigation (marine bunkers) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this still valid?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's still valid, it gives an example of how we could add a new column to the data export and how this relates to the columns in the mapping file.