From b16ae63b5faf98becb6db9dd9419055e45fa476e Mon Sep 17 00:00:00 2001 From: Daniel Huppmann Date: Mon, 28 Aug 2023 09:08:29 +0200 Subject: [PATCH] Remove `map_regions()` and default mappings csv (#773) * Remove `map_regions()` and default mappings csv * Add reference to the nomenclature package * Add to release notes --- RELEASE_NOTES.md | 5 +- docs/conf.py | 1 + pyam/core.py | 102 +-------- pyam/region_mappings/default_mapping.csv | 252 ----------------------- pyam/run_control.py | 3 - tests/test_core.py | 121 ----------- 6 files changed, 16 insertions(+), 468 deletions(-) delete mode 100755 pyam/region_mappings/default_mapping.csv diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 04ddcc19a..2c1ae36e3 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -29,9 +29,12 @@ approach to exposing pyam-internals at the package level, requiring a more expli import of these methods. For example, use `pyam.utils.to_list()` instead of `pyam.to_list()`. -## Individual updates +PR [#773](https://github.com/IAMconsortium/pyam/pull/773) removed the `map_regions()` +method. This feature is now implemented via the **nomenclature.RegionProcessor** class. +## Individual updates +- [#773](https://github.com/IAMconsortium/pyam/pull/773) Remove `map_regions()` and default mappings csv - [#772](https://github.com/IAMconsortium/pyam/pull/772) Show all missing rows for `require_data()` - [#771](https://github.com/IAMconsortium/pyam/pull/771) Refactor to start a separate validation module - [#766](https://github.com/IAMconsortium/pyam/pull/766) Use **ixmp4** for credentials to access a Scenario Explorer database diff --git a/docs/conf.py b/docs/conf.py index 598d6d531..ce6cfd890 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -328,6 +328,7 @@ "plotly": ("https://plotly.com/python-api-reference/", None), "pandas_datareader": ("https://pandas-datareader.readthedocs.io/en/stable", None), "unfccc_di_api": ("https://unfccc-di-api.readthedocs.io/en/stable", None), + "nomenclature": ("https://nomenclature-iamc.readthedocs.io/en/stable", None), } # Set up the plotting gallery with plotly scraper diff --git a/pyam/core.py b/pyam/core.py index 3f38a365b..1ced3f17c 100755 --- a/pyam/core.py +++ b/pyam/core.py @@ -1543,6 +1543,14 @@ def aggregate_region( -------- add : Add timeseries data items `a` and `b` along an `axis` aggregate : Aggregate timeseries data along the `variable` hierarchy. + nomenclature.RegionProcessor : Processing of model-specific region-mappings. + + Notes + ----- + The :class:`nomenclature-iamc` package supports structured processing + of many-to-many-region mappings. Read the `user guide`_ for more information. + + .. _`user guide` : https://nomenclature-iamc.readthedocs.io/en/stable/user_guide.html """ _df = _aggregate_region( @@ -2564,98 +2572,10 @@ def map_regions( remove_duplicates=False, inplace=False, ): - """Plot regional data for a single model, scenario, variable, and year - - see pyam.plotting.region_plot() for all available options - - Parameters - ---------- - map_col : str - The column used to map new regions to. Common examples include - iso and 5_region. - agg : str, optional - Perform a data aggregation. Options include: sum. - copy_col : str, optional - Copy the existing region data into a new column for later use. - fname : str, optional - Use a non-default region mapping file - region_col : string, optional - Use a non-default column name for regions to map from. - remove_duplicates : bool, optional - If there are duplicates in the mapping from one regional level to - another, then remove these duplicates by counting the most common - mapped value. - This option is most useful when mapping from high resolution - (e.g., model regions) to low resolution (e.g., 5_region). - inplace : bool, optional - if True, do operation inplace and return None - """ - fname = fname or run_control()["region_mapping"]["default"] - mapping = read_pandas(Path(fname)).rename(str.lower, axis="columns") - map_col = map_col.lower() - - ret = self.copy() if not inplace else self - _df = ret.data - columns_orderd = _df.columns - - # merge data - dfs = [] - for model in self.model: - df = _df[_df["model"] == model] - _col = region_col or "{}.REGION".format(model) - _map = mapping.rename(columns={_col.lower(): "region"}) - _map = _map[["region", map_col]].dropna().drop_duplicates() - _map = _map[_map["region"].isin(_df["region"])] - if remove_duplicates and _map["region"].duplicated().any(): - # find duplicates - where_dup = _map["region"].duplicated(keep=False) - dups = _map[where_dup] - logger.warning( - """ - Duplicate entries found for the following regions. - Mapping will occur only for the most common instance. - {}""".format( - dups["region"].unique() - ) - ) - # get non duplicates - _map = _map[~where_dup] - # order duplicates by the count frequency - dups = ( - dups.groupby(["region", map_col]) - .size() - .reset_index(name="count") - .sort_values(by="count", ascending=False) - .drop("count", axis=1) - ) - # take top occurance - dups = dups[~dups["region"].duplicated(keep="first")] - # combine them back - _map = pd.concat([_map, dups]) - if copy_col is not None: - df[copy_col] = df["region"] - - df = ( - df.merge(_map, on="region") - .drop("region", axis=1) - .rename(columns={map_col: "region"}) - ) - dfs.append(df) - df = pd.concat(dfs) - - # perform aggregations - if agg == "sum": - df = df.groupby(self.dimensions).sum().reset_index() - - df = ( - df.reindex(columns=columns_orderd) - .sort_values(SORT_IDX) - .reset_index(drop=True) + # TODO: deprecated, remove for release >= 2.1 + raise DeprecationWarning( + "This method was removed. Please use `aggregate_region()` instead." ) - ret._data = df.set_index(self.dimensions).value - - if not inplace: - return ret def _meta_idx(data): diff --git a/pyam/region_mappings/default_mapping.csv b/pyam/region_mappings/default_mapping.csv deleted file mode 100755 index 1c7857483..000000000 --- a/pyam/region_mappings/default_mapping.csv +++ /dev/null @@ -1,252 +0,0 @@ -ISO,Country,R5_region,AIM/CGE.REGION,AIM/CGE.NAME,GCAM4.REGION,GCAM4.NAME,IMAGE.REGION,IMAGE.NAME,MESSAGE-GLOBIOM.REGION,MESSAGE-GLOBIOM.NAME,REMIND-MAGPIE.REGION,REMIND-MAGPIE.NAME -ATG,Antigua and Barbuda,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -DZA,Algeria,R5MAF,XNF,North Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,MEA,Middle East and North Africa,MEA,Middle East and North Africa -AZE,Azerbaijan,R5REF,CIS,Former USSR,Central Asia,Central Asia,RUS,Russia,FSU,Former Soviet Union,MEA,Middle East and North Africa -ALB,Albania,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -ARM,Armenia,R5REF,CIS,Former USSR,Central Asia,Central Asia,RUS,Russia,FSU,Former Soviet Union,MEA,Middle East and North Africa -AGO,Angola,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -ASM,American Samoa,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -ARG,Argentina,R5LAM,XLM,Rest of Brazil,Argentina,Argentina,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -AUS,Australia,R5OECD,XOC,New Zealand and Australia,Australia_NZ,Australia_NZ,OCE,Oceania,PAO,Pacific OECD,ROW,rest of the World -BHR,Bahrain,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -BRB,Barbados,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BMU,Bermuda,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BHS,Bahamas,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BGD,Bangladesh,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -BLZ,Belize,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BIH,Bosnia and Herzegovina,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -BOL,Bolivia,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -MMR,Burma,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -BEN,Benin,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SLB,Solomon Islands,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -BRA,Brazil,R5LAM,BRA,Brazil,Brazil,Brazil,BRA,Brazil,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BGR,Bulgaria,R5OECD,XER,Rest of Europe,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -BRN,Brunei Darussalam,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -CAN,Canada,R5OECD,CAN,Canada,Canada,Canada,CAN,Canada,NAM,North America,ROW,rest of the World -KHM,Cambodia,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,CPA,Centrally Planned Asia and China,OAS,other Asia -LKA,Sri Lanka,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -COG,Congo,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -COD,Democratic Republic of the Congo,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -BDI,Burundi,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -CHN,China,R5ASIA,CHN,China,China,China,CHN,China,CPA,Centrally Planned Asia and China,CHN,China -AFG,Afghanistan,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -BTN,Bhutan,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -CHL,Chile,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -CYM,Cayman Islands,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -CMR,Cameroon,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -TCD,Chad,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -COM,Comoros,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -COL,Colombia,R5LAM,XLM,Rest of Brazil,Colombia,Colombia,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -CRI,Costa Rica,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -CAF,Central African Republic,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -CUB,Cuba,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -CPV,Cape Verde,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -COK,Cook Islands,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -CYP,Cyprus,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,WEU,Western Europe,EUR,EU 27 -DNK,Denmark,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -DJI,Djibouti,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -DMA,Dominica,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -DOM,Dominican Republic,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -ECU,Ecuador,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -EGY,Egypt,R5MAF,XNF,North Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,MEA,Middle East and North Africa,MEA,Middle East and North Africa -IRL,Ireland,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -GNQ,Equatorial Guinea,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -EST,Estonia,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -ERI,Eritrea,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SLV,El Salvador,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -ETH,Ethiopia,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -AUT,Austria,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -CZE,Czech Republic,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -GUF,French Guiana,R5LAM,XLM,Rest of Brazil,South America_Northern,South America_Northern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -FIN,Finland,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -FJI,Fiji,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -FLK,Falkland Islands (Malvinas),R5LAM,XLM,Rest of Brazil,EU-15,EU-15,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -FSM,"Micronesia, Federated States of",R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -PYF,French Polynesia,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -FRA,France,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -GMB,Gambia,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -GAB,Gabon,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -GEO,Georgia,R5REF,CIS,Former USSR,Central Asia,Central Asia,RUS,Russia,FSU,Former Soviet Union,MEA,Middle East and North Africa -GHA,Ghana,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -GRD,Grenada,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -GRL,Greenland,R5OECD,XLM,Rest of Brazil,EU-15,EU-15,RSAF,Rest S. Africa,WEU,Western Europe,EUR,EU 27 -DEU,Germany,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -GUM,Guam,R5OECD,XSA,Rest of Asia,Southeast Asia,Southeast Asia,USA,USA,NAM,North America,OAS,other Asia -GRC,Greece,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -GTM,Guatemala,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -GIN,Guinea,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -GUY,Guyana,R5LAM,XLM,Rest of Brazil,South America_Northern,South America_Northern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -HTI,Haiti,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -HND,Honduras,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -HRV,Croatia,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -HUN,Hungary,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -ISL,Iceland,R5OECD,XER,Rest of Europe,European Free Trade Association,European Free Trade Association,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -IND,India,R5ASIA,IND,India,India,India,INDIA,India,SAS,South Asia,IND,India -IRN,Iran (Islamic Republic of),R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -ISR,Israel,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -ITA,Italy,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -CIV,Cote dIvoire,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -IRQ,Iraq,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -JPN,Japan,R5OECD,JPN,Japan,Japan,Japan,JAP,Japan,PAO,Pacific OECD,JPN,Japan -JAM,Jamaica,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -JOR,Jordan,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -KEN,Kenya,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -KGZ,Kyrgyzstan,R5REF,CIS,Former USSR,Central Asia,Central Asia,STAN,Kazakhstan region,FSU,Former Soviet Union,MEA,Middle East and North Africa -PRK,"Korea, Democratic Peoples Republic of",R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,KOR,Korea,CPA,Centrally Planned Asia and China,OAS,other Asia -KIR,Kiribati,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -KOR,"Korea, Republic of",R5ASIA,XSE,Rest of East and South East Asia,South Korea,South Korea,KOR,Korea,PAS,Other Pacific Asia,OAS,other Asia -KWT,Kuwait,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -KAZ,Kazakhstan,R5REF,CIS,Former USSR,Central Asia,Central Asia,STAN,Kazakhstan region,FSU,Former Soviet Union,MEA,Middle East and North Africa -LAO,Lao Peoples Democratic Republic,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,CPA,Centrally Planned Asia and China,OAS,other Asia -LBN,Lebanon,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -LVA,Latvia,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -BLR,Belarus,R5REF,CIS,Former USSR,Central Asia,Central Asia,UKR,Ukraine region,FSU,Former Soviet Union,ROW,rest of the World -LTU,Lithuania,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -LBR,Liberia,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SVK,Slovakia,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -LIE,Liechtenstein,R5OECD,XER,Rest of Europe,European Free Trade Association,European Free Trade Association,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -LBY,Libyan Arab Jamahiriya,R5MAF,XNF,North Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,MEA,Middle East and North Africa,MEA,Middle East and North Africa -MDG,Madagascar,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -MTQ,Martinique,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -MNG,Mongolia,R5ASIA,XSE,Rest of East and South East Asia,Central Asia,Central Asia,CHN,China,CPA,Centrally Planned Asia and China,OAS,other Asia -MSR,Montserrat,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -MKD,The former Yugoslav Republic of Macedonia,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -MLI,Mali,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -MAR,Morocco,R5MAF,XNF,North Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,MEA,Middle East and North Africa,MEA,Middle East and North Africa -MUS,Mauritius,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -MRT,Mauritania,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -MLT,Malta,R5OECD,XE25,EU,EU-12,EU-12,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -OMN,Oman,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -MDV,Maldives,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -MEX,Mexico,R5LAM,XLM,Rest of Brazil,Mexico,Mexico,MEX,Mexico,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -MYS,Malaysia,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -MOZ,Mozambique,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -MWI,Malawi,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -NCL,New Caledonia,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -NIU,Niue,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -NER,Niger,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -ABW,Aruba,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -AIA,Anguilla,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -BEL,Belgium,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -HKG,Hong Kong,R5ASIA,CHN,China,China,China,CHN,China,CPA,Centrally Planned Asia and China,CHN,China -MNP,Northern Mariana Islands,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,,,PAS,Other Pacific Asia,OAS,other Asia -FRO,Faroe Islands,R5OECD,XER,Rest of Europe,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -AND,Andorra,R5OECD,XER,Rest of Europe,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -GIB,Gibraltar,R5OECD,XER,Rest of Europe,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -IMN,Isle of Man,R5OECD,XER,Rest of Europe,EU-15,EU-15,,,WEU,Western Europe,EUR,EU 27 -LUX,Luxembourg,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -MAC,Macau,R5ASIA,XSE,Rest of East and South East Asia,China,China,CHN,China,CPA,Centrally Planned Asia and China,CHN,China -MCO,Monaco,R5OECD,XER,Rest of Europe,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -PSE,Palestine,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -MNE,Montenegro,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -MYT,Mayotte,R5OECD,XAF,Other Africa,Southeast Asia,Southeast Asia,,,WEU,Western Europe,AFR,Sub-saharan Africa -ALA,�land Islands,R5OECD,XER,Rest of Europe,,,,,WEU,Western Europe,EUR,EU 27 -NFK,Norfolk Island,R5OECD,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,WEU,Western Europe,OAS,other Asia -CCK,Cocos (Keeling) Islands,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,,,PAS,Other Pacific Asia,OAS,other Asia -ATA,Antarctica,,,,,,,,,,ROW,rest of the World -BVT,Bouvet Island,,,,,,,,,,ROW,rest of the World -ATF,French Southern and Antarctic Lands,,,,,,,,,,OAS,other Asia -HMD,Heard Island and McDonald Islands,R5OECD,XSA,Rest of Asia,,,,,PAO,Pacific OECD,ROW,rest of the World -IOT,British Indian Ocean Territory,R5OECD,XSA,Rest of Asia,,,,,WEU,Western Europe,OAS,other Asia -CXR,Christmas Island,R5OECD,XSA,Rest of Asia,Southeast Asia,Southeast Asia,,,PAO,Pacific OECD,OAS,other Asia -CUW,Curacao,R5LAM,,,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,,,LAM,Latin America and the Caribbean -UMI,United States Minor Outlying Islands,R5OECD,XSA,Rest of Asia,,,,,NAM,North America,OAS,other Asia -VUT,Vanuatu,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -NGA,Nigeria,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -NLD,Netherlands,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -NOR,Norway,R5OECD,XER,Rest of Europe,European Free Trade Association,European Free Trade Association,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -NPL,Nepal,R5ASIA,XSA,Rest of Asia,South Asia,South Asia,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -NRU,Nauru,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,ROW,rest of the World -SUR,Suriname,R5LAM,XLM,Rest of Brazil,South America_Northern,South America_Northern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -NIC,Nicaragua,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -NZL,New Zealand,R5OECD,XOC,New Zealand and Australia,Australia_NZ,Australia_NZ,OCE,Oceania,PAO,Pacific OECD,ROW,rest of the World -PRY,Paraguay,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -PER,Peru,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -PAK,Pakistan,R5ASIA,XSA,Rest of Asia,Pakistan,Pakistan,RSAS,Rest S. Asia,SAS,South Asia,OAS,other Asia -POL,Poland,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -PAN,Panama,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -PRT,Portugal,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -PNG,Papua New Guinea,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,INDO,Indonesia,PAS,Other Pacific Asia,OAS,other Asia -GNB,Guinea-Bissau,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -QAT,Qatar,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -REU,Reunion,R5OECD,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,WEU,Western Europe,AFR,Sub-saharan Africa -ROU,Romania,R5OECD,XER,Rest of Europe,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -MDA,Republic of Moldova,R5REF,CIS,Former USSR,Central Asia,Central Asia,UKR,Ukraine region,FSU,Former Soviet Union,ROW,rest of the World -PHL,Philippines,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -PRI,Puerto Rico,R5OECD,XLM,Rest of Brazil,USA,USA,RCAM,Rest C. America,NAM,North America,USA,United States of America -RUS,Russia,R5REF,CIS,Former USSR,Russia,Russia,RUS,Russia,FSU,Former Soviet Union,RUS,Russia -RWA,Rwanda,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SAU,Saudi Arabia,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -KNA,Saint Kitts and Nevis,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -SYC,Seychelles,R5MAF,XAF,Other Africa,Southeast Asia,Southeast Asia,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -ZAF,South Africa,R5MAF,XAF,Other Africa,South Africa,South Africa,SAF,South Africa,AFR,Sub-saharan Africa,ROW,rest of the World -LSO,Lesotho,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -BWA,Botswana,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SEN,Senegal,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SVN,Slovenia,R5OECD,XE25,EU,EU-12,EU-12,CEU,C. Europe,EEU,Eastern Europe,EUR,EU 27 -SLE,Sierra Leone,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -SGP,Singapore,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -SOM,Somalia,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -ESP,Spain,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -LCA,Saint Lucia,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -SDN,Sudan,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,MEA,Middle East and North Africa,AFR,Sub-saharan Africa -SSD,South Sudan,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,MEA,Middle East and North Africa,AFR,Sub-saharan Africa -SXM,Sint Marteen,R5LAM,,,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,,,LAM,Latin America and the Caribbean -SWE,Sweden,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -SYR,Syrian Arab Republic,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -CHE,Switzerland,R5OECD,XER,Rest of Europe,European Free Trade Association,European Free Trade Association,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -TTO,Trinidad and Tobago,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -THA,Thailand,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -TJK,Tajikistan,R5REF,CIS,Former USSR,Central Asia,Central Asia,STAN,Kazakhstan region,FSU,Former Soviet Union,MEA,Middle East and North Africa -TKL,Tokelau,R5OECD,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAO,Pacific OECD,OAS,other Asia -TON,Tonga,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -TGO,Togo,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -STP,Sao Tome and Principe,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -TUN,Tunisia,R5MAF,XNF,North Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,MEA,Middle East and North Africa,MEA,Middle East and North Africa -TUR,Turkey,R5OECD,TUR,Turkey,Europe_Non_EU,Europe_Non_EU,TUR,Turkey,WEU,Western Europe,ROW,rest of the World -TUV,Tuvalu,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -TKM,Turkmenistan,R5REF,CIS,Former USSR,Central Asia,Central Asia,STAN,Kazakhstan region,FSU,Former Soviet Union,MEA,Middle East and North Africa -TZA,United Republic of Tanzania,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -UGA,Uganda,R5MAF,XAF,Other Africa,Africa_Eastern,Africa_Eastern,EAF,E. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -GBR,United Kingdom,R5OECD,XE25,EU,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,EUR,EU 27 -UKR,Ukraine,R5REF,CIS,Former USSR,Central Asia,Central Asia,UKR,Ukraine region,FSU,Former Soviet Union,ROW,rest of the World -USA,United States,R5OECD,USA,USA,USA,USA,USA,USA,NAM,North America,USA,United States of America -BFA,Burkina Faso,R5MAF,XAF,Other Africa,Africa_Western,Africa_Western,WAF,W. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -URY,Uruguay,R5LAM,XLM,Rest of Brazil,South America_Southern,South America_Southern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -UZB,Uzbekistan,R5REF,CIS,Former USSR,Central Asia,Central Asia,STAN,Kazakhstan region,FSU,Former Soviet Union,MEA,Middle East and North Africa -VCT,Saint Vincent and the Grenadines,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -VEN,Venezuela,R5LAM,XLM,Rest of Brazil,South America_Northern,South America_Northern,RSAM,Rest S. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -VGB,British Virgin Islands,R5OECD,XLM,Rest of Brazil,EU-15,EU-15,RCAM,Rest C. America,WEU,Western Europe,LAM,Latin America and the Caribbean -VNM,Viet Nam,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,CPA,Centrally Planned Asia and China,OAS,other Asia -VIR,United States Virgin Islands,R5OECD,XLM,Rest of Brazil,USA,USA,RCAM,Rest C. America,NAM,North America,LAM,Latin America and the Caribbean -NAM,Namibia,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -WLF,Wallis and Futuna Islands,R5OECD,XSA,Rest of Asia,EU-15,EU-15,OCE,Oceania,WEU,Western Europe,OAS,other Asia -WSM,Samoa,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -SWZ,Swaziland,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -YEM,Yemen,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -ZMB,Zambia,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -ZWE,Zimbabwe,R5MAF,XAF,Other Africa,Africa_Southern,Africa_Southern,RSAF,Rest S. Africa,AFR,Sub-saharan Africa,AFR,Sub-saharan Africa -IDN,Indonesia,R5ASIA,XSE,Rest of East and South East Asia,Indonesia,Indonesia,INDO,Indonesia,PAS,Other Pacific Asia,OAS,other Asia -GLP,Guadeloupe,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -ANT,Netherlands Antilles,R5LAM,XLM,Rest of Brazil,Central America and Caribbean,Central America and Caribbean,RCAM,Rest C. America,LAM,Latin America and the Caribbean,, -ARE,United Arab Emirates,R5MAF,XME,Middle East,Middle East,Middle East,ME,Middle East,MEA,Middle East and North Africa,MEA,Middle East and North Africa -TLS,Timor-Leste,R5ASIA,XSE,Rest of East and South East Asia,Southeast Asia,Southeast Asia,SEAS,SE. Asia,PAS,Other Pacific Asia,OAS,other Asia -PCN,Pitcairn Islands,R5OECD,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,WEU,Western Europe,OAS,other Asia -PLW,Palau,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -MHL,Marshall Islands,R5ASIA,XSA,Rest of Asia,Southeast Asia,Southeast Asia,OCE,Oceania,PAS,Other Pacific Asia,OAS,other Asia -SPM,Saint Pierre and Miquelon,R5OECD,XLM,Rest of Brazil,EU-15,EU-15,USA,USA,WEU,Western Europe,ROW,rest of the World -SHN,Saint Helena,R5OECD,XAF,Other Africa,EU-15,EU-15,WAF,W. Africa,WEU,Western Europe,AFR,Sub-saharan Africa -SMR,San Marino,R5OECD,XER,Rest of Europe,EU-15,EU-15,WEU,W. Europe,WEU,Western Europe,ROW,rest of the World -TCA,Turks and Caicos Islands,R5LAM,XLM,Rest of Brazil,EU-15,EU-15,RCAM,Rest C. America,LAM,Latin America and the Caribbean,LAM,Latin America and the Caribbean -ESH,Western Sahara,R5MAF,XAF,Other Africa,Africa_Northern,Africa_Northern,NAF,N. Africa,AFR,Sub-saharan Africa,MEA,Middle East and North Africa -SRB,Serbia,R5OECD,XER,Rest of Europe,Europe_Non_EU,Europe_Non_EU,CEU,C. Europe,EEU,Eastern Europe,ROW,rest of the World -SRB (KOSOVO),Serbia (Kosovo),R5OECD,,,,,,,,,, -VAT,Holy See (Vatican City),R5OECD,XER,Rest of Europe,EU-15,EU-15,,,WEU,Western Europe,ROW,rest of the World -SJM,Svalbard,R5OECD,XER,Rest of Europe,European Free Trade Association,European Free Trade Association,,,WEU,Western Europe,ROW,rest of the World -MAF,Saint Martin,R5OECD,XLM,Rest of Brazil,,,,,WEU,Western Europe,ROW,rest of the World -BLM,Saint Barthelemy,R5OECD,XLM,Rest of Brazil,,,,,WEU,Western Europe,LAM,Latin America and the Caribbean -GGY,Guernsey,R5OECD,XER,Rest of Europe,,,,,WEU,Western Europe,ROW,rest of the World -JEY,Jersey,R5OECD,XER,Rest of Europe,,,,,WEU,Western Europe,EUR,EU 27 -SGS,South Georgia South Sandwich Islands,R5OECD,XLM,Rest of Brazil,,,,,WEU,Western Europe,ROW,rest of the World -TWN,Taiwan,R5ASIA,XSE,Rest of East and South East Asia,Taiwan,Taiwan,CHN,China,PAS,Other Pacific Asia,OAS,other Asia -BES,,,,,,,,,,,LAM,Latin America and the Caribbean diff --git a/pyam/run_control.py b/pyam/run_control.py index 2c047137e..d31113ad1 100644 --- a/pyam/run_control.py +++ b/pyam/run_control.py @@ -19,9 +19,6 @@ "marker": {}, "linestyle": {}, "order": {}, - "region_mapping": { - "default": _REG_MAP_PATH("default_mapping.csv"), - }, } diff --git a/tests/test_core.py b/tests/test_core.py index f10b2a08b..bec7093c5 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -642,127 +642,6 @@ def test_filter_by_int(test_df): assert obs.scenario == ["scen_a"] -def _r5_regions_exp(df): - df = df.filter(region="World", keep=False) - data = df.data - data["region"] = "R5MAF" - return sort_data(data, df.dimensions) - - -def test_map_regions_r5(reg_df): - obs = reg_df.map_regions("r5_region").data - exp = _r5_regions_exp(reg_df) - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_map_regions_r5_region_col(reg_df): - df = reg_df.filter(model="MESSAGE-GLOBIOM") - obs = df.map_regions("r5_region", region_col="MESSAGE-GLOBIOM.REGION").data - exp = _r5_regions_exp(df) - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_map_regions_r5_inplace(reg_df): - exp = _r5_regions_exp(reg_df) - reg_df.map_regions("r5_region", inplace=True) - obs = reg_df.data - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_map_regions_r5_agg(reg_df): - columns = reg_df.data.columns - obs = reg_df.map_regions("r5_region", agg="sum").data - - exp = _r5_regions_exp(reg_df) - grp = list(columns) - grp.remove("value") - exp = exp.groupby(grp).sum().reset_index() - exp = exp[columns] - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_48a(): - # tests fix for #48 mapping many->few - df = IamDataFrame( - pd.DataFrame( - [ - ["model", "scen", "SSD", "var", "unit", 1, 6], - ["model", "scen", "SDN", "var", "unit", 2, 7], - ["model", "scen1", "SSD", "var", "unit", 2, 7], - ["model", "scen1", "SDN", "var", "unit", 2, 7], - ], - columns=["model", "scenario", "region", "variable", "unit", 2005, 2010], - ) - ) - - exp = _r5_regions_exp(df) - columns = df.data.columns - grp = list(columns) - grp.remove("value") - exp = exp.groupby(grp).sum().reset_index() - exp = exp[columns] - - obs = df.map_regions("r5_region", region_col="iso", agg="sum").data - - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_48b(): - # tests fix for #48 mapping few->many - - exp = IamDataFrame( - pd.DataFrame( - [ - ["model", "scen", "SSD", "var", "unit", 1, 6], - ["model", "scen", "SDN", "var", "unit", 1, 6], - ["model", "scen1", "SSD", "var", "unit", 2, 7], - ["model", "scen1", "SDN", "var", "unit", 2, 7], - ], - columns=["model", "scenario", "region", "variable", "unit", 2005, 2010], - ) - ).data - - df = IamDataFrame( - pd.DataFrame( - [ - ["model", "scen", "R5MAF", "var", "unit", 1, 6], - ["model", "scen1", "R5MAF", "var", "unit", 2, 7], - ], - columns=["model", "scenario", "region", "variable", "unit", 2005, 2010], - ) - ) - obs = df.map_regions("iso", region_col="r5_region").data - obs = sort_data(obs[obs.region.isin(["SSD", "SDN"])], df.dimensions) - - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - -def test_48c(): - # tests fix for #48 mapping few->many, dropping duplicates - - exp = IamDataFrame( - pd.DataFrame( - [ - ["model", "scen", "AGO", "var", "unit", 1, 6], - ["model", "scen1", "AGO", "var", "unit", 2, 7], - ], - columns=["model", "scenario", "region", "variable", "unit", 2005, 2010], - ) - ).data.reset_index(drop=True) - - df = IamDataFrame( - pd.DataFrame( - [ - ["model", "scen", "R5MAF", "var", "unit", 1, 6], - ["model", "scen1", "R5MAF", "var", "unit", 2, 7], - ], - columns=["model", "scenario", "region", "variable", "unit", 2005, 2010], - ) - ) - obs = df.map_regions("iso", region_col="r5_region", remove_duplicates=True).data - pd.testing.assert_frame_equal(obs, exp, check_index_type=False) - - def test_pd_filter_by_meta(test_df): data = df_filter_by_meta_matching_idx.set_index(["model", "region"])