소스 검색

Tables 3.B.(a) and (b) in crt1 specification

Johannes Gütschow 3 달 전
부모
커밋
25fb5c9692
1개의 변경된 파일291개의 추가작업 그리고 60개의 파일을 삭제
  1. 291 60
      src/unfccc_ghg_data/unfccc_crf_reader/crf_specifications/crt1_specification.py

+ 291 - 60
src/unfccc_ghg_data/unfccc_crf_reader/crf_specifications/crt1_specification.py

@@ -2038,7 +2038,6 @@ CRT1 = {
             ["3.A.4.f. Mules and asses", ["3.A.4.f"], 1],
             ["3.A.4.f. Mules and asses", ["3.A.4.f"], 1],
             ["3.A.4.g. Poultry", ["3.A.4.g"], 1],
             ["3.A.4.g. Poultry", ["3.A.4.g"], 1],
             ["3.A.4.h. Other", ["3.A.4.h"], 1],
             ["3.A.4.h. Other", ["3.A.4.h"], 1],
-            ["Drop-down list:", ["\\IGNORE"], 2],
             ["3.A.4.h.i. Rabbit", ["3.A.4.h.i"], 2],
             ["3.A.4.h.i. Rabbit", ["3.A.4.h.i"], 2],
             ["3.A.4.h.ii. Reindeer", ["3.A.4.h.ii"], 2],
             ["3.A.4.h.ii. Reindeer", ["3.A.4.h.ii"], 2],
             ["3.A.4.h.iii. Ostrich", ["3.A.4.h.iii"], 2],
             ["3.A.4.h.iii. Ostrich", ["3.A.4.h.iii"], 2],
@@ -2056,7 +2055,7 @@ CRT1 = {
             ["Broilers", ["3.A.4.h.v.6"], 3],
             ["Broilers", ["3.A.4.h.v.6"], 3],
             # AUS
             # AUS
             ["3.A.4. Other livestock (4)", ["3.A.4"], 0],
             ["3.A.4. Other livestock (4)", ["3.A.4"], 0],
-            ["Drop down list:", ["\\IGNORE"], 1],
+            ["Drop-down list:", ["\\IGNORE"], 1],
             ["3.A.4.a. Buffalo", ["3.A.4.a"], 1],
             ["3.A.4.a. Buffalo", ["3.A.4.a"], 1],
             ["3.A.4.b. Camels", ["3.A.4.b"], 1],
             ["3.A.4.b. Camels", ["3.A.4.b"], 1],
             ["3.A.4.c. Deer", ["3.A.4.c"], 1],
             ["3.A.4.c. Deer", ["3.A.4.c"], 1],
@@ -2065,6 +2064,7 @@ CRT1 = {
             ["3.A.4.f. Mules and asses", ["3.A.4.f"], 1],
             ["3.A.4.f. Mules and asses", ["3.A.4.f"], 1],
             ["3.A.4.g. Poultry", ["3.A.4.g"], 1],
             ["3.A.4.g. Poultry", ["3.A.4.g"], 1],
             ["3.A.4.h. Other", ["3.A.4.h"], 1],
             ["3.A.4.h. Other", ["3.A.4.h"], 1],
+            ["Drop down list:", ["\\IGNORE"], 2],
             ["3.A.4.h.i. Rabbit", ["3.A.4.h.i"], 2],
             ["3.A.4.h.i. Rabbit", ["3.A.4.h.i"], 2],
             ["3.A.4.h.ii. Reindeer", ["3.A.4.h.ii"], 2],
             ["3.A.4.h.ii. Reindeer", ["3.A.4.h.ii"], 2],
             ["3.A.4.h.iii. Ostrich", ["3.A.4.h.iii"], 2],
             ["3.A.4.h.iii. Ostrich", ["3.A.4.h.iii"], 2],
@@ -2095,47 +2095,188 @@ CRT1 = {
                 "ACTIVITY DATA AND OTHER RELATED INFORMATION CH4 producing potential (Bo) (2) (average) Warm",
                 "ACTIVITY DATA AND OTHER RELATED INFORMATION CH4 producing potential (Bo) (2) (average) Warm",
                 "IMPLIED EMISSION FACTORS CH4 producing potential (Bo) (2) (average) CH4",
                 "IMPLIED EMISSION FACTORS CH4 producing potential (Bo) (2) (average) CH4",
             ],
             ],
-            "stop_cats": ["", "nan"],
+            "stop_cats": [
+                "",
+                "nan",
+                "(1) Climate regions are defined in terms of annual average temperature as "
+                "follows: cool = less than 15 °C; temperate = 15–25 °C inclusive; and warm "  # noqa: RUF001
+                "= higher than 25 °C (see table 10.17, chap. 10, vol. 4 of the 2006 IPCC "
+                "Guidelines).",
+            ],
             "unit_info": unit_info["default"],
             "unit_info": unit_info["default"],
         },
         },
         "sector_mapping": [
         "sector_mapping": [
             ["3.B.1. Cattle", ["3.B.1"], 0],
             ["3.B.1. Cattle", ["3.B.1"], 0],
             ["Option A:", ["\\IGNORE"], 1],
             ["Option A:", ["\\IGNORE"], 1],
-            ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 2],
-            ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 2],
+            # AUS
+            ["\\C-AUS\\ 3.B.1.a. Dairy cattle", ["\\IGNORE"], 2],
+            ["\\C-AUS\\ 3.B.1.b. Non-dairy cattle", ["\\IGNORE"], 2],
+            # other countries
+            ["\\C!-AUS\\ 3.B.1.a. Dairy cattle", ["3.B.1.A.a"], 2],
+            ["\\C!-AUS\\ 3.B.1.b. Non-dairy cattle", ["3.B.1.A.b"], 2],
             ["Option B (country-specific): (3)", ["\\IGNORE"], 1],
             ["Option B (country-specific): (3)", ["\\IGNORE"], 1],
-            ["3.B.1.a. Other", ["\\IGNORE"], 2],
+            ["3.B.1.a. Other", ["3.B.1.B"], 2],
             ["Drop down list:", ["\\IGNORE"], 3],
             ["Drop down list:", ["\\IGNORE"], 3],
-            ["3.B.1.a.i. Mature dairy cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.ii. Other mature cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.iii. Growing cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.C"], 3],
-            ["Dairy Cattle", ["3.B.1.C-AUS-a"], 4],
-            ["Beef Cattle - Pasture", ["3.B.1.C-AUS-b"], 4],
-            ["Beef Cattle - Feedlot", ["3.B.1.C-AUS-c"], 4],
+            ["3.B.1.a.i. Mature dairy cattle", ["3.B.1.B.a"], 3],
+            ["3.B.1.a.ii. Other mature cattle", ["3.B.1.B.b"], 3],
+            ["3.B.1.a.iii. Growing cattle", ["3.B.1.B.c"], 3],
+            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.B.d"], 3],
+            # AUS
+            ["\\C-AUS\\ Dairy Cattle", ["3.B.1.B.d.AUS-i"], 4],
+            ["\\C-AUS\\ Beef Cattle - Pasture", ["3.B.1.B.d.AUS-ii"], 4],
+            ["\\C-AUS\\ Beef Cattle - Feedlot", ["3.B.1.C.d.AUS-iii"], 4],
+            # MLT
+            ["\\C-MLT\\ Bulls", ["3.B.1.B.d.MLT-i"], 4],
+            ["\\C-MLT\\ Calves", ["3.B.1.B.d.MLT-ii"], 4],
+            # POL
+            ["\\C-POL\\ Bulls (older than 2 years)", ["3.B.1.B.d.POL-i"], 4],
+            [
+                "\\C-POL\\ Non-dairy Heifers (older than 2 years)",
+                ["3.B.1.B.d.POL-ii"],
+                4,
+            ],
+            [
+                "\\C-POL\\ Non-dairy Young Cattle (younger than 1 year)",
+                ["3.B.1.C.d.POL-iii"],
+                4,
+            ],
+            ["\\C-POL\\ Non-dairy Young Cattle (1-2 years)", ["3.B.1.C.d.POL-iv"], 4],
+            ["\\C-POL\\ Dairy Cattle", ["3.B.1.C.d.POL-v"], 4],
+            ["\\C-POL\\ Non-dairy Cattle", ["3.B.1.C.d.POL-vi"], 4],
+            # SVN
+            ["\\C-SVN\\ Non-dairy cattle", ["3.B.1.B.d.SVN-i"], 4],
+            ["\\C-SVN\\ Other cows", ["3.B.1.B.d.SVN-ii"], 4],
             ["3.B.2. Sheep", ["3.B.2"], 0],
             ["3.B.2. Sheep", ["3.B.2"], 0],
-            ["3.B.2.a. Other (please specify)", ["\\IGNORE"], 1],
+            ["3.B.2.a. Other (please specify)", ["3.B.2.a"], 1],
+            # AUS, ITA
             ["Sheep", ["\\IGNORE"], 2],
             ["Sheep", ["\\IGNORE"], 2],
+            # ITA, NLD
+            ["Sheep (2)", ["\\IGNORE"], 2],
+            # NLD
+            ["Sheep (8)", ["\\IGNORE"], 2],
+            # GUY, MDV
+            ["All sheep [IPCC Software 3.A.2.c]", ["\\IGNORE"], 2],
+            # SGP
+            ["NA", ["\\IGNORE"], 2],
+            # MLT
+            ["\\C-MLT\\ Growing Lambs", ["3.B.2.a.MLT-i"], 2],
+            ["\\C-MLT\\ Other Mature Ewes", ["3.B.2.a.MLT-ii"], 2],
+            ["\\C-MLT\\ Mature Ewes", ["3.B.2.a.MLT-iii"], 2],
+            # TUR
+            ["\\C-TUR\\ Domestic sheep", ["3.B.2.a.TUR-i"], 2],
+            ["\\C-TUR\\ Merino sheep", ["3.B.2.a.TUR-ii"], 2],
             ["3.B.3. Swine", ["3.B.3"], 0],
             ["3.B.3. Swine", ["3.B.3"], 0],
-            ["3.B.3.a. Other (please specify)", ["\\IGNORE"], 1],
+            ["3.B.3.a. Other (please specify)", ["3.B.3.a"], 1],
+            # AUS, ITA
             ["Swine", ["\\IGNORE"], 2],
             ["Swine", ["\\IGNORE"], 2],
+            # ITA, NLD
+            ["Swine (3)", ["\\IGNORE"], 2],
+            # NLD
+            ["Swine (7)", ["\\IGNORE"], 2],
+            # GUY, MDV
+            ["All swine [IPCC Software 3.A.2.h]", ["\\IGNORE"], 2],
+            # SGP
+            ["NA", ["\\IGNORE"], 2],
+            # ESP
+            ["\\C-ESP\\ White swine (finishing/fattening pigs)", ["3.B.3.a.ESP-i"], 2],
+            ["\\C-ESP\\ White swine (sows)", ["3.B.3.a.ESP-ii"], 2],
+            [
+                "\\C-ESP\\ Iberian swine (finishing/fattening pigs)",
+                ["3.B.3.a.ESP-iii"],
+                2,
+            ],
+            ["\\C-ESP\\ Iberian swine (sows)", ["3.B.3.a.ESP-iv"], 2],
+            # MLT
+            ["\\C-MLT\\ Breeding boars", ["3.B.3.a.MLT-i"], 2],
+            ["\\C-MLT\\ Breeding females - gilts", ["3.B.3.a.MLT-ii"], 2],
+            ["\\C-MLT\\ Breeding female - sows", ["3.B.3.a.MLT-iii"], 2],
+            ["\\C-MLT\\ Fattening pigs more than 50kg", ["3.B.3.a.MLT-iv"], 2],
+            ["\\C-MLT\\ Young pigs 20-50kg", ["3.B.3.a.MLT-v"], 2],
+            ["\\C-MLT\\ Piglets less than 20kg", ["3.B.3.a.MLT-vi"], 2],
+            # NZL
+            ["\\C-NZL\\ Pigs", ["\\IGNORE"], 2],
+            # most countries
             ["3.B.4. Other livestock (4)", ["3.B.4"], 0],
             ["3.B.4. Other livestock (4)", ["3.B.4"], 0],
-            ["Drop-down list:", ["\\IGNORE"], 1],
-            ["3.B.4.a. Buffalo", ["3.B.4.a"], 2],
-            ["3.B.4.b. Camels", ["3.B.4.b"], 2],
-            ["3.B.4.c. Deer", ["3.B.4.c"], 2],
-            ["3.B.4.d. Goats", ["3.B.4.d"], 2],
-            ["3.B.4.e. Horses", ["3.B.4.e"], 2],
-            ["3.B.4.f. Mules and Asses", ["3.B.4.f"], 2],
-            ["3.B.4.g. Poultry", ["3.B.4.g"], 2],
-            ["3.B.4.h. Other", ["3.B.4.h"], 2],
-            ["Drop-down list:", ["\\IGNORE"], 3],
-            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 3],
-            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 3],
-            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 3],
-            ["3.B.4.h.iv. Fur-bearing animals (5)", ["3.B.4.h.iv"], 3],
-            ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 3],
-            ["Alpacas", ["\\IGNORE"], 4],
+            ["Drop-down list:", ["\\IGNORE"], 1],  # AUS
+            ["3.B.4.a. Buffalo", ["3.B.4.a"], 1],
+            ["3.B.4.b. Camels", ["3.B.4.b"], 1],
+            ["3.B.4.c. Deer", ["3.B.4.c"], 1],
+            ["3.B.4.d. Goats", ["3.B.4.d"], 1],
+            ["3.B.4.e. Horses", ["3.B.4.e"], 1],
+            ["3.B.4.f. Mules and Asses", ["3.B.4.f"], 1],
+            ["3.B.4.g. Poultry", ["3.B.4.g"], 1],
+            ["3.B.4.h. Other", ["3.B.4.h"], 1],
+            ["Drop-down list:", ["\\IGNORE"], 2],
+            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 2],
+            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 2],
+            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 2],
+            ["3.B.4.h.iv. Fur-bearing animals (5)", ["3.B.4.h.iv"], 2],
+            ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 2],
+            # GUY
+            ["Alpacas [IPCC Software 3.A.2.j]", ["3.B.4.h.v.1"], 3],
+            ["Llamas [IPCC Software 3.A.2.j]", ["3.B.4.h.v.2"], 3],
+            ["All other species [IPCC Software 3.A.2.j]", ["3.B.4.h.v.10"], 3],
+            # SGP
+            ["Quail", ["3.B.4.h.v.3"], 3],
+            # ESP
+            ["Ducks and other poultry", ["3.B.4.h.v.4"], 3],
+            ["Turkeys", ["3.B.4.h.v.5"], 3],
+            ["Broilers", ["3.B.4.h.v.6"], 3],
+            # AUS
+            ["Alpacas", ["3.B.4.h.v.i"], 3],
+            # ["3.B.4. Other livestock (4)", ["3.B.4"], 0],
+            # ["Drop down list:", ["\\IGNORE"], 1],
+            # ["3.B.4.a. Buffalo", ["3.B.4.a"], 1],
+            # ["3.B.4.b. Camels", ["3.B.4.b"], 1],
+            # ["3.B.4.c. Deer", ["3.B.4.c"], 1],
+            # ["3.B.4.d. Goats", ["3.B.4.d"], 1],
+            # ["3.B.4.e. Horses", ["3.B.4.e"], 1],
+            # ["3.B.4.f. Mules and asses", ["3.B.4.f"], 1],
+            # ["3.B.4.g. Poultry", ["3.B.4.g"], 1],
+            # ["3.B.4.h. Other", ["3.B.4.h"], 1],
+            # ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 2],
+            # ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 2],
+            # ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 2],
+            # ["3.B.4.h.iv. Fur-bearing animals (5)", ["3.B.4.h.iv"], 2],
+            # ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 2],
+            # ["Alpacas", ["3.B.4.h.v.i"], 3],
+            # ["3.B.1. Cattle", ["3.B.1"], 0],
+            # ["Option A:", ["\\IGNORE"], 1],
+            # ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 2],
+            # ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 2],
+            # ["Option B (country-specific): (3)", ["\\IGNORE"], 1],
+            # ["3.B.1.a. Other", ["\\IGNORE"], 2],
+            # ["Drop down list:", ["\\IGNORE"], 3],
+            # ["3.B.1.a.i. Mature dairy cattle", ["\\IGNORE"], 3],
+            # ["3.B.1.a.ii. Other mature cattle", ["\\IGNORE"], 3],
+            # ["3.B.1.a.iii. Growing cattle", ["\\IGNORE"], 3],
+            # ["3.B.1.a.iv. Other (please specify)", ["3.B.1.C"], 3],
+            # ["Dairy Cattle", ["3.B.1.C-AUS-a"], 4],
+            # ["Beef Cattle - Pasture", ["3.B.1.C-AUS-b"], 4],
+            # ["Beef Cattle - Feedlot", ["3.B.1.C-AUS-c"], 4],
+            # ["3.B.2. Sheep", ["3.B.2"], 0],
+            # ["3.B.2.a. Other (please specify)", ["\\IGNORE"], 1],
+            # ["Sheep", ["\\IGNORE"], 2],
+            # ["3.B.3. Swine", ["3.B.3"], 0],
+            # ["3.B.3.a. Other (please specify)", ["\\IGNORE"], 1],
+            # ["Swine", ["\\IGNORE"], 2],
+            # ["3.B.4. Other livestock (4)", ["3.B.4"], 0],
+            # ["Drop-down list:", ["\\IGNORE"], 1],
+            # ["3.B.4.a. Buffalo", ["3.B.4.a"], 2],
+            # ["3.B.4.b. Camels", ["3.B.4.b"], 2],
+            # ["3.B.4.c. Deer", ["3.B.4.c"], 2],
+            # ["3.B.4.d. Goats", ["3.B.4.d"], 2],
+            # ["3.B.4.e. Horses", ["3.B.4.e"], 2],
+            # ["3.B.4.f. Mules and Asses", ["3.B.4.f"], 2],
+            # ["3.B.4.g. Poultry", ["3.B.4.g"], 2],
+            # ["3.B.4.h. Other", ["3.B.4.h"], 2],
+            # ["Drop-down list:", ["\\IGNORE"], 3],
+            # ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 3],
+            # ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 3],
+            # ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 3],
+            # ["3.B.4.h.iv. Fur-bearing animals (5)", ["3.B.4.h.iv"], 3],
+            # ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 3],
+            # ["Alpacas", ["\\IGNORE"], 4],
         ],
         ],
         "entity_mapping": {
         "entity_mapping": {
             "EMISSIONS CH4 producing potential (Bo) (2) (average) CH4": "CH4"
             "EMISSIONS CH4 producing potential (Bo) (2) (average) CH4": "CH4"
@@ -2196,47 +2337,137 @@ CRT1 = {
                 "EMISSIONS N2O Indirect Atmospheric deposition",
                 "EMISSIONS N2O Indirect Atmospheric deposition",
                 "EMISSIONS N2O Indirect Nitrogen leaching and run-off",
                 "EMISSIONS N2O Indirect Nitrogen leaching and run-off",
             ],
             ],
-            "stop_cats": ["", "nan", "3.B.5. Indirect N2O emissions"],
+            "stop_cats": [
+                "",
+                "nan",
+                "(1) Direct and indirect N2O emissions associated with the manure "
+                "deposited on agricultural soils or pasture, range and paddock systems "
+                "are included under N2O emissions from managed soils (see table "
+                "3(III).D-E).",
+                "3.B.5. Indirect N2O emissions",
+                "Total N handled per MMS (kg N/year)",
+            ],
             "unit_info": unit_info["default"],
             "unit_info": unit_info["default"],
         },
         },
         "sector_mapping": [
         "sector_mapping": [
             ["3.B.1. Cattle", ["3.B.1"], 0],
             ["3.B.1. Cattle", ["3.B.1"], 0],
             ["Option A:", ["\\IGNORE"], 1],
             ["Option A:", ["\\IGNORE"], 1],
-            ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 2],
-            ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 2],
+            # AUS
+            ["\\C-AUS\\ 3.B.1.a. Dairy cattle", ["\\IGNORE"], 2],
+            ["\\C-AUS\\ 3.B.1.b. Non-dairy cattle", ["\\IGNORE"], 2],
+            # other countries
+            ["\\C!-AUS\\ 3.B.1.a. Dairy cattle", ["3.B.1.A.a"], 2],
+            ["\\C!-AUS\\ 3.B.1.b. Non-dairy cattle", ["3.B.1.A.b"], 2],
             ["Option B (country-specific): (5)", ["\\IGNORE"], 1],
             ["Option B (country-specific): (5)", ["\\IGNORE"], 1],
-            ["3.B.1.a. Other", ["\\IGNORE"], 2],
+            ["3.B.1.a. Other", ["3.B.1.B"], 2],
             ["Drop-down list", ["\\IGNORE"], 3],
             ["Drop-down list", ["\\IGNORE"], 3],
-            ["3.B.1.a.i. Mature dairy cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.ii. Other mature cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.iii. Growing cattle", ["\\IGNORE"], 3],
-            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.C"], 3],
-            ["Dairy Cattle", ["3.B.1.C-AUS-a"], 4],
-            ["Beef Cattle - Pasture", ["3.B.1.C-AUS-b"], 4],
-            ["Beef Cattle - Feedlot", ["3.B.1.C-AUS-c"], 4],
+            ["3.B.1.a.i. Mature dairy cattle", ["3.B.1.B.a"], 3],
+            ["3.B.1.a.ii. Other mature cattle", ["3.B.1.B.b"], 3],
+            ["3.B.1.a.iii. Growing cattle", ["3.B.1.B.c"], 3],
+            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.B.d"], 3],
+            # AUS
+            ["\\C-AUS\\ Dairy Cattle", ["3.B.1.B.d.AUS-i"], 4],
+            ["\\C-AUS\\ Beef Cattle - Pasture", ["3.B.1.B.d.AUS-ii"], 4],
+            ["\\C-AUS\\ Beef Cattle - Feedlot", ["3.B.1.C.d.AUS-iii"], 4],
+            # MLT
+            ["\\C-MLT\\ Bulls", ["3.B.1.B.d.MLT-i"], 4],
+            ["\\C-MLT\\ Calves", ["3.B.1.B.d.MLT-ii"], 4],
+            # POL
+            ["\\C-POL\\ Bulls (older than 2 years)", ["3.B.1.B.d.POL-i"], 4],
+            [
+                "\\C-POL\\ Non-dairy Heifers (older than 2 years)",
+                ["3.B.1.B.d.POL-ii"],
+                4,
+            ],
+            [
+                "\\C-POL\\ Non-dairy Young Cattle (younger than 1 year)",
+                ["3.B.1.C.d.POL-iii"],
+                4,
+            ],
+            ["\\C-POL\\ Non-dairy Young Cattle (1-2 years)", ["3.B.1.C.d.POL-iv"], 4],
+            ["\\C-POL\\ Dairy Cattle", ["3.B.1.C.d.POL-v"], 4],
+            ["\\C-POL\\ Non-dairy Cattle", ["3.B.1.C.d.POL-vi"], 4],
+            # SVN
+            ["\\C-SVN\\ Non-dairy cattle", ["3.B.1.B.d.SVN-i"], 4],
+            ["\\C-SVN\\ Other cows", ["3.B.1.B.d.SVN-ii"], 4],
             ["3.B.2. Sheep", ["3.B.2"], 0],
             ["3.B.2. Sheep", ["3.B.2"], 0],
-            ["3.B.2.a. Other (please specify)", ["\\IGNORE"], 1],
+            ["3.B.2.a. Other (please specify)", ["3.B.2.a"], 1],
+            # AUS, ITA
             ["Sheep", ["\\IGNORE"], 2],
             ["Sheep", ["\\IGNORE"], 2],
+            # ITA, NLD
+            ["Sheep (3)", ["\\IGNORE"], 2],
+            # NLD
+            ["Sheep (8)", ["\\IGNORE"], 2],
+            # GUY, MDV
+            ["All sheep [IPCC Software 3.A.2.c]", ["\\IGNORE"], 2],
+            # SGP
+            ["NA", ["\\IGNORE"], 2],
+            # MLT
+            ["\\C-MLT\\ Growing Lambs", ["3.B.2.a.MLT-i"], 2],
+            ["\\C-MLT\\ Other Mature Ewes", ["3.B.2.a.MLT-ii"], 2],
+            ["\\C-MLT\\ Mature Ewes", ["3.B.2.a.MLT-iii"], 2],
+            # TUR
+            ["\\C-TUR\\ Domestic sheep", ["3.B.2.a.TUR-i"], 2],
+            ["\\C-TUR\\ Merino sheep", ["3.B.2.a.TUR-ii"], 2],
             ["3.B.3. Swine", ["3.B.3"], 0],
             ["3.B.3. Swine", ["3.B.3"], 0],
-            ["3.B.3.a. Other (please specify)", ["\\IGNORE"], 1],
+            ["3.B.3.a. Other (please specify)", ["3.B.3.a"], 1],
+            # AUS, ITA
             ["Swine", ["\\IGNORE"], 2],
             ["Swine", ["\\IGNORE"], 2],
+            # ITA, NLD
+            ["Swine (2)", ["\\IGNORE"], 2],
+            # NLD
+            ["Swine (7)", ["\\IGNORE"], 2],
+            # GUY, MDV
+            ["All swine [IPCC Software 3.A.2.h]", ["\\IGNORE"], 2],
+            # SGP
+            ["NA", ["\\IGNORE"], 2],
+            # ESP
+            ["\\C-ESP\\ White swine (finishing/fattening pigs)", ["3.B.3.a.ESP-i"], 2],
+            ["\\C-ESP\\ White swine (sows)", ["3.B.3.a.ESP-ii"], 2],
+            [
+                "\\C-ESP\\ Iberian swine (finishing/fattening pigs)",
+                ["3.B.3.a.ESP-iii"],
+                2,
+            ],
+            ["\\C-ESP\\ Iberian swine (sows)", ["3.B.3.a.ESP-iv"], 2],
+            # MLT
+            ["\\C-MLT\\ Breeding boars", ["3.B.3.a.MLT-i"], 2],
+            ["\\C-MLT\\ Breeding females - gilts", ["3.B.3.a.MLT-ii"], 2],
+            ["\\C-MLT\\ Breeding female - sows", ["3.B.3.a.MLT-iii"], 2],
+            ["\\C-MLT\\ Fattening pigs more than 50kg", ["3.B.3.a.MLT-iv"], 2],
+            ["\\C-MLT\\ Young pigs 20-50kg", ["3.B.3.a.MLT-v"], 2],
+            ["\\C-MLT\\ Piglets less than 20kg", ["3.B.3.a.MLT-vi"], 2],
+            # NZL
+            ["\\C-NZL\\ Pigs", ["\\IGNORE"], 2],
+            # most countries
             ["3.B.4. Other livestock (6)", ["3.B.4"], 0],
             ["3.B.4. Other livestock (6)", ["3.B.4"], 0],
-            ["Drop-down list", ["\\IGNORE"], 1],
-            ["3.B.4.a. Buffalo", ["3.B.4.a"], 2],
-            ["3.B.4.b. Camels", ["3.B.4.b"], 2],
-            ["3.B.4.c. Deer", ["3.B.4.c"], 2],
-            ["3.B.4.d. Goats", ["3.B.4.d"], 2],
-            ["3.B.4.e. Horses", ["3.B.4.e"], 2],
-            ["3.B.4.f. Mules and asses", ["3.B.4.f"], 2],
-            ["3.B.4.g. Poultry", ["3.B.4.g"], 2],
-            ["3.B.4.h. Other", ["3.B.4.h"], 2],
-            ["Drop-down list:", ["\\IGNORE"], 3],
-            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 3],
-            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 3],
-            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 3],
-            ["3.B.4.h.iv Fur-bearing animals (7)", ["3.B.4.h.iv"], 3],
-            ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 3],
-            ["Alpacas", ["\\IGNORE"], 4],
+            ["Drop down list", ["\\IGNORE"], 1],  # AUS
+            ["3.B.4.a. Buffalo", ["3.B.4.a"], 1],
+            ["3.B.4.b. Camels", ["3.B.4.b"], 1],
+            ["3.B.4.c. Deer", ["3.B.4.c"], 1],
+            ["3.B.4.d. Goats", ["3.B.4.d"], 1],
+            ["3.B.4.e. Horses", ["3.B.4.e"], 1],
+            ["3.B.4.f. Mules and asses", ["3.B.4.f"], 1],
+            ["3.B.4.g. Poultry", ["3.B.4.g"], 1],
+            ["3.B.4.h. Other", ["3.B.4.h"], 1],
+            ["Drop-down list:", ["\\IGNORE"], 2],  # AUS
+            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 2],
+            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 2],
+            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 2],
+            ["3.B.4.h.iv Fur-bearing animals (7)", ["3.B.4.h.iv"], 2],
+            ["3.B.4.h.v. Other (please specify)", ["3.B.4.h.v"], 2],
+            # GUY
+            ["Alpacas [IPCC Software 3.A.2.j]", ["3.B.4.h.v.1"], 3],
+            ["Llamas [IPCC Software 3.A.2.j]", ["3.B.4.h.v.2"], 3],
+            ["All other species [IPCC Software 3.A.2.j]", ["3.B.4.h.v.10"], 3],
+            # SGP
+            ["Quail", ["3.B.4.h.v.3"], 3],
+            # ESP
+            ["Ducks and other poultry", ["3.B.4.h.v.4"], 3],
+            ["Turkeys", ["3.B.4.h.v.5"], 3],
+            ["Broilers", ["3.B.4.h.v.6"], 3],
+            # AUS
+            ["Alpacas", ["3.B.4.h.v.i"], 3],
         ],
         ],
         "entity_mapping": {
         "entity_mapping": {
             "EMISSIONS N2O Direct Nitrogen leaching and run-off": "N2O",
             "EMISSIONS N2O Direct Nitrogen leaching and run-off": "N2O",