diff --git a/data/hierarchy.txt b/data/hierarchy.txt index 0e0b15beb2..7f5b263f29 100644 --- a/data/hierarchy.txt +++ b/data/hierarchy.txt @@ -25,6 +25,7 @@ Trinidad and Tobago;Q754;tt;en United States Virgin Islands;Q11703;vi;en Argentina;Q414;ar;es Campo de Hielo Sur;Q1031467 + Argentina_Buenos Aires_Buenos Aires;Q1486 Argentina_Buenos Aires_North;Q44754-North Argentina_Buenos Aires_South;Q44754-South Argentina_Patagonia;Q1507 @@ -32,13 +33,16 @@ Argentina;Q414;ar;es Argentina_Mesopotamia;Q1056116 Argentina_Northwest;Q1437320 Argentina_Pampas;Q184382 + Argentina_Santa Fe;Q44823 Armenia;Q399;am;hy Austria;Q40;at;de Austria_Burgenland;Q43210 Austria_Carinthia;Q37985 Austria_Lower Austria_Wien;Q1741 - Austria_Styria;Q41358 - Austria_Upper Austria;Q41967 + Austria_Styria_Graz;Q41358-Q13298 + Austria_Styria_Leoben;Q41358-Q485294 + Austria_Upper Austria_Linz;Q41967-Q41329 + Austria_Upper Austria_Wels;Q41967-Q178582 Austria_Lower Austria_West;Q42497-West Austria_Tyrol;Q42880 Austria_Salzburg;Q43325 @@ -53,6 +57,8 @@ Australia;Q408;au;en Australia_Tasmania;Q34366 Australia_Victoria;Q36687 Australia_Western Australia;Q3206 + Australia_Brisbane;Q34932 + Australia_Sydney;Q3130 Azerbaijan Region;Q227;az;az Nagorno-Karabakh;Q44302 Azerbaijan;Q227;;az @@ -81,6 +87,8 @@ Benin;Q962;bj;fr Bermuda;Q23635;bm;en Bhutan;Q917;bt;dz Bolivia;Q750;bo;es,ay,qu,gn + Bolivia_North;Q750-North + Bolivia_South;Q750-South Bosnia and Herzegovina;Q225;ba;sr Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina;Q11198;;hr,sr,bs Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina;Q194483 @@ -88,16 +96,21 @@ Bosnia and Herzegovina;Q225;ba;sr Botswana;Q963;bw;en,tn Brazil;Q155;br;pt Brazil_Bahia;Q40430 - Brazil_Goias;Q41587 + Brazil_Goias_North;Q41587-North + Brazil_Goias_Brasilia;Q41587-Q2844 Brazil_Mato Grosso Do Sul;Q43319 Brazil_Mato Grosso;Q42824 - Brazil_North Region;Q478465 - Brazil_Northeast Region;Q1136194 + Brazil_North Region_East;Q478465-East + Brazil_North Region_West;Q478465-West + Brazil_Northeast Region_East;Q1136194-East + Brazil_Northeast Region_West;Q1136194-West Brazil_Paraiba;Q38088 - Brazil_Parana;Q15499 + Brazil_Parana_East;Q15499-East + Brazil_Parana_West;Q15499-West Brazil_Rio Grande do Norte;Q43255 Brazil_Santa Catarina;Q41115 - Brazil_South Region;Q1060042 + Brazil_South Region_East;Q1060042-East + Brazil_South Region_West;Q1060042-West Brazil_Southeast Region_Espirito Santo;Q43233 Brazil_Southeast Region_Minas Gerais_Contagem;Q39109-Q271333 Brazil_Southeast Region_Minas Gerais_North;Q39109-North @@ -107,6 +120,8 @@ Brazil;Q155;br;pt Brazil_Southeast Region_Sao Paulo_West;Q175-Q188892 Brunei;Q921;bn;ms Bulgaria;Q219;bg;bg + Bulgaria_East;Q219-East + Bulgaria_West;Q219-West Burkina Faso;Q965;bf;fr Burundi;Q967;bi;fr,rn Cambodia;Q424;kh;km @@ -169,6 +184,7 @@ Canada;Q16;ca;fr,en Canada_Quebec_Quebec;Q2145 Canada_Quebek_Far North;Q176-North Canada_Quebek_Montreal;Q340 + Canada_Quebek_Lachute;Q142250 Canada_Quebek_North;Q141699 Canada_Quebek_Southeast_Rimouski;Q1336 Canada_Quebek_Southeast_Saguenay;Q139229 @@ -176,7 +192,8 @@ Canada;Q16;ca;fr,en Canada_Quebek_West_Rouyn-Noranda;Q141804 Canada_Saskatchewan;Q1989 Canada_Saskatchewan_North;Q1989-North - Canada_Saskatchewan_South;Q1989-South + Canada_Saskatchewan_Saskatoon;Q10566 + Canada_Saskatchewan_Regina;Q2123 Canada_Yukon;Q2009 Canada_Yukon_North;Q2009-North Canada_Yukon_Whitehorse;Q2058 @@ -191,9 +208,13 @@ Colombia;Q739;co;es Comoros;Q970;km;fr,ar Congo-Brazzaville;Q971;cg;fr Congo-Kinshasa;Q974;cd;fr + Congo-Kinshasa_West;Q974-West + Congo-Kinshasa_Kivu;Q1743993 Cook Islands;Q26988;ck;en Costa Rica;Q800;cr;es Croatia;Q224;hr;hr + Croatia_Central;Q224-Centre + Croatia_West;Q224-West Cuba;Q241;cu;es Cyprus;Q229;cy;tr Czech Republic;Q213;cz;cs @@ -224,9 +245,12 @@ Dominican Republic;Q786;do;es East Timor;Q574;tl;pt Chile;Q298;cl;es Campo de Hielo Sur;Q1031467 + Chile_Central;Q298-Centre Chile_North;Q298-North Chile_South;Q298-South Ecuador;Q736;ec;es + Ecuador_East;Q736-East + Ecuador_West;Q736-West Egypt;Q79;eg;ar El Salvador;Q792;sv;es Equatorial Guinea;Q983;gq @@ -239,9 +263,11 @@ Faroe Islands;Q4628;fo;da,fo Federated States of Micronesia;Q702;fm Fiji;Q712;fj;en,fj Finland;Q33;fi;fi,sv - Finland_Western Finland;Q192759 + Finland_Western Finland_Jyvaskyla;Q192759-Q134620 + Finland_Western Finland_Tampere;Q192759-Q40840 Finland_Northern Finland;Q3745730 - Finland_Eastern Finland;Q194073 + Finland_Eastern Finland_North;Q194073-North + Finland_Eastern Finland_South;Q194073-South Finland_Southern Finland_West;Q5712 Finland_Southern Finland_Helsinki;Q188752-Q1757 Finland_Southern Finland_Lappeenranta;Q188752-Q181854 @@ -279,7 +305,8 @@ France;Q142;fr;fr France_Centre-Val de Loire_Loiret;Q12574 France_Champagne-Ardenne;Q14103 France_Corsica;Q14112 - France_Free County;Q16394 + France_Free County_North;Q16394-North + France_Free County_South;Q16394-South France_French Guiana;Q3769;;fr France_Ile-de-France;Q13917 France_Ile-de-France_Essonne;Q3368 @@ -321,7 +348,8 @@ France;Q142;fr;fr France_Nord-Pas-de-Calais_Lille;Q648 France_Nord-Pas-de-Calais_Pas-de-Calais;Q12689 France_Pays de la Loire;Q16994 - France_Pays de la Loire_Loire-Atlantique;Q3068 + France_Pays de la Loire_Loire-Atlantique_Nantes;Q3068-Q12191 + France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire;Q3068-Q152027 France_Pays de la Loire_Maine-et-Loire;Q12584 France_Pays de la Loire_Mayenne;Q12620 France_Pays de la Loire_Sarthe;Q12740 @@ -375,6 +403,7 @@ Germany;Q183;de;de Germany_Free State of Bavaria_Upper Bavaria_East;Q10562-East Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt;Q10562-Q3004 Germany_Free State of Bavaria_Upper Bavaria_Munchen;Q10562-Q1726 + Germany_Free State of Bavaria_Upper Bavaria_South;Q10562-South Germany_Free State of Bavaria_Upper Franconia;Q10554 Germany_Free State of Bavaria_Upper Palatinate;Q10555 Germany_Hamburg_main;Q1055 @@ -386,6 +415,7 @@ Germany;Q183;de;de Germany_Lower Saxony_Bremen_Bremen;Q1209 Germany_Lower Saxony_Bremen_Munster;Q3920 Germany_Lower Saxony_Hannover;Q1715 + Germany_Lower Saxony_Braunschweig;Q2773 Germany_Lower Saxony_Oldenburg;Q2936 Germany_Mecklenburg-Vorpommern;Q1196 Germany_North Rhine-Westphalia;Q1198 @@ -402,10 +432,12 @@ Germany;Q183;de;de Germany_Rhineland-Palatinate_Koblenz;Q1200-Q3104 Germany_Rhineland-Palatinate_South;Q1200-Q1720 Germany_Saarland;Q1201 - Germany_Saxony-Anhalt;Q1206 + Germany_Saxony-Anhalt_Magdeburg;Q1206-Q1733 + Germany_Saxony-Anhalt_Halle;Q1206-Q2814 Germany_Saxony_Dresden;Q1202-Q1731 Germany_Saxony_Leipzig;Q1202-Q2079 - Germany_Schleswig-Holstein;Q1194 + Germany_Schleswig-Holstein_Kiel;Q1194-Q1707 + Germany_Schleswig-Holstein_Flensburg;Q1194-Q3798 Germany_Thuringia;Q1205 Ghana;Q117;gh;en Gibraltar;Q1410;gi;en @@ -441,7 +473,8 @@ India;Q668;in;hi,mr,en,gu,ta,te,bn,as,kn,ml,pa India_Tamil Nadu;Q1445;;ta India_Haryana;Q1174;;hi India_Goa;Q1171 - India_Karnataka;Q1185 + India_Karnataka_North;Q1185-North + India_Karnataka_South;Q1185-South India_Maharashtra;Q1191;;mr India_Telangana;Q677037 India_Delhi;Q1353;;hi,ur,en,pa @@ -473,9 +506,12 @@ Indonesia;Q252;id;id Indonesia_Jawa Timur;Q3586 Indonesia_East;Q252-East Iran;Q794;ir;fa + Iran_East;Q794-East Iran_South;Q794-South Iran_North;Q794-North Iraq;Q796;iq;ar,ku + Iraq_North;Q796-North + Iraq_South;Q796-South Isle of Man;Q9676;im;en,gv Israel Region;Q801;il;he Jerusalem;Q1218 @@ -545,7 +581,8 @@ Italy;Q38;it;it Jamaica;Q766;jm;en Japan;Q17;jp;ja Japan_Chubu Region;Q134638 - Japan_Chubu Region_Aichi;Q80434 + Japan_Chubu Region_Aichi_Nagoya;Q80434-Q11751 + Japan_Chubu Region_Aichi_Toyohashi;Q80434-Q336431 Japan_Chubu Region_Fukui;Q133879 Japan_Chubu Region_Gifu;Q131277 Japan_Chubu Region_Ishikawa;Q131281 @@ -564,6 +601,7 @@ Japan;Q17;jp;ja Japan_Hokkaido Region_East;Q35581-East Japan_Hokkaido Region_North;Q35581-North Japan_Hokkaido Region_West;Q35581-West + Japan_Hokkaido Region_Sapporo;Q37951 Japan_Kanto;Q132480 Japan_Kanto_Chiba;Q80011 Japan_Kanto_Gunma;Q129499 @@ -575,7 +613,8 @@ Japan;Q17;jp;ja Japan_Kinki Region;Q164256 Japan_Kinki Region_Mie;Q128196 Japan_Kinki Region_Nara;Q131287 - Japan_Kinki Region_Osaka;Q122723 + Japan_Kinki Region_Osaka_Osaka;Q35765 + Japan_Kinki Region_Osaka_West;Q122723-West Japan_Kinki Region_Wakayama;Q131314 Japan_Kyushu Region;Q13987 Japan_Kyushu Region_Fukuoka;Q123258 @@ -602,6 +641,8 @@ Japan;Q17;jp;ja Jersey;Q785;je;fr,en Jordan;Q810;jo;ar Kazakhstan;Q232;kz;kk + Kazakhstan_North;Q232-North + Kazakhstan_South;Q232-South Kenya;Q114;ke;en,sw Kingdom of Lesotho;Q1013;;en,st Kiribati;Q710;ki;en @@ -614,6 +655,8 @@ Liberia;Q1014;lr;en Libya;Q1016;ly;ar Liechtenstein;Q347;li;de Lithuania;Q37;lt;lt + Lithuania_East;Q37-East + Lithuania_West;Q37-West Luxembourg;Q32;lu;fr Macedonia;Q221;mk;mk Madagascar;Q1019;mg @@ -626,12 +669,13 @@ Marshall Islands;Q709;mh;en,mh Mauritania;Q1025;mr Mauritius;Q1027;mu Mexico;Q96;mx;es - Mexico_North;Q96-North Mexico_California;Q58731 Mexico_Central_East;Q15282 Mexico_Central_West;Q79920 Mexico_East;Q96-East Mexico_Mexico;Q1489 + Mexico_Chihuahua;Q655 + Mexico_Sonora;Q46422 Mexico_South;Q96-South Moldova;Q217;md;ro Monaco;Q235;mc;fr @@ -647,20 +691,28 @@ Myanmar;Q836;;my Namibia;Q1030;na;en Nauru;Q697;nr;na Nepal;Q837;np;ne - Nepal_West;Q837-West - Nepal_East;Q837-East + Nepal_West;Q28462 + Nepal_Kathmandu;Q3037 + Nepal_Madhyamanchal;Q28579 + Nepal_Purwanchal;Q28576 Nicaragua;Q811;ni;es Niger;Q1032;ne;fr Nigeria;Q1033;ng;en + Nigeria_South;Q1033-South + Nigeria_North;Q1033-North Niue;Q34020;nu;en North Korea;Q423;kp;ko Norway;Q20;no;no Norway_Northern;Q214041 + Norway_Hordaland;Q50625 + Norway_Nordland;Q50630 Norway_Svalbard;Q25231 Norway_Oppland;Q50617 + Norway_Rogaland;Q50624 Norway_Hedmark;Q50616 Norway_Jan Mayen;Q14056 - Norway_Trondelag;Q127676 + Norway_North Trondelag;Q50629 + Norway_South Trondelag;Q50628 Norway_Southern;Q648851 Norway_Western;Q127598 Norway_Central;Q585 @@ -700,9 +752,11 @@ People's Republic of China;Q148;cn;zh China_Xinjiang;Q34800 China_Yunnan;Q43194 China_Zhejiang;Q16967 - Taiwan;Q865 + Taiwan_North;Q865-North + Taiwan_South;Q865-South Peru;Q419;pe Peru_North;Q419-North + Peru_Lima;Q2868 Peru_South;Q419-South Philippines;Q928;ph;en Philippines_Mindanao;Q124873 @@ -729,8 +783,10 @@ Poland;Q36;pl;pl Poland_Opole Voivodeship;Q54171 Poland_Swietokrzyskie Voivodeship;Q54183 Portugal;Q45;pt;pt - Portugal_North;Q45-North + Portugal_Porto;Q36433 Portugal_South;Q45-South + Portugal_Islands;Q7213935 + Portugal_Viseu;Q117676 Qatar;Q846;qa;ar Republic of Kosovo;Q1246;xk;sq,sr Romania;Q218;ro;ro @@ -774,7 +830,8 @@ Russian Federation;Q159;ru;ru Russia_Kostroma Oblast;Q2596 Russia_Krasnodar Krai;Q3680-North Russia_Krasnodar Krai_Adygeya;Q3680,Q3734 - Russia_Krasnoyarsk Krai;Q6563 + Russia_Krasnoyarsk Krai_North;Q6563-North + Russia_Krasnoyarsk Krai_South;Q6563-South Russia_Kurgan Oblast;Q5741 Russia_Kursk Oblast;Q3178 Russia_Leningradskaya Oblast_Karelsky;Q2191-North @@ -782,7 +839,8 @@ Russian Federation;Q159;ru;ru Russia_Lipetsk Oblast;Q3510 Russia_Magadan Oblast;Q7971 Russia_Mari El;Q5446;;ru - Russia_Moscow Oblast;Q1697 + Russia_Moscow Oblast_East;Q1697-East + Russia_Moscow Oblast_West;Q1697-West Russia_Moscow;Q649 Russia_Murmansk Oblast;Q1759 Russia_Nenets Autonomous Okrug;Q2164 @@ -794,12 +852,14 @@ Russian Federation;Q159;ru;ru Russia_Orenburg Oblast;Q5338 Russia_Oryol Oblast;Q3129 Russia_Penza Oblast;Q5545 - Russia_Perm Krai;Q5400 + Russia_Perm Krai_North;Q5400-North + Russia_Perm Krai_South;Q5400-South Russia_Primorsky Krai;Q4341 Russia_Pskov Oblast;Q2218 Russia_Republic of Dagestan;Q5118;;ru,az,av,ce Russia_Republic of Kalmykia;Q3953;;ru - Russia_Republic of Karelia;Q1914;;ru + Russia_Republic of Karelia_North;Q1914-North + Russia_Republic of Karelia_South;Q1914-South Russia_Republic of Mordovia;Q5340;;ru Russia_Rostov Oblast;Q3573 Russia_Ryazan Oblast;Q2753 @@ -810,7 +870,8 @@ Russian Federation;Q159;ru;ru Russia_Saratov Oblast;Q5334 Russia_Smolensk Oblast;Q2347 Russia_Stavropol Krai;Q5207 - Russia_Sverdlovsk Oblast;Q5462 + Russia_Sverdlovsk Oblast_Ekaterinburg;Q5462-Q887 + Russia_Sverdlovsk Oblast_North;Q5462-North Russia_Tambov Oblast;Q3550 Russia_Tatarstan;Q5481;;ru,tt Russia_Tomsk Oblast;Q5884 @@ -826,7 +887,8 @@ Russian Federation;Q159;ru;ru Russia_Voronezh Oblast;Q3447 Russia_Yamalo-Nenets Autonomous Okrug;Q6407 Russia_Yaroslavl Oblast;Q2448 - Russia_Yugra;Q6320 + Russia_Yugra_Khanty;Q6320-Q6329 + Russia_Yugra_Surgut;Q6320-Q183002 Russia_Zabaykalsky Krai;Q6838 Rwanda;Q1037;rw;fr,en,rw Sahrawi Arab Democratic Republic;Q40362;eh @@ -834,6 +896,8 @@ Saint Helena Ascension and Tristan da Cunha;Q192184;sh Samoa;Q683;ws;en,sm San Marino;Q238;;it Saudi Arabia;Q851;sa;ar + Saudi Arabia_South;Q851-South + Saudi Arabia_North;Q851-North Senegal;Q1041;sn;fr Serbia;Q403;rs;sr Seychelles;Q1042;sc;fr,en @@ -849,6 +913,8 @@ Slovakia;Q214;sk;sk Slovakia_Region of Bratislava;Q183498 Slovakia_Region of Zilina;Q184228 Slovenia;Q215;si;sl + Slovenia_East;Q215-East + Slovenia_West;Q215-West Solomon Islands;Q685;sb;en Somalia;Q1045;so;so,ar South Africa;Q258;za;en,zu,xh,af,ve,ss,tn,ts,st,nr @@ -865,13 +931,15 @@ South Georgia and the South Sandwich Islands;Q35086;gs;en South Ossetia;Q23427;;ru,ka,os South Sudan;Q958;ss;en Spain;Q29;es;es - Spain_Andalusia;Q5783 + Spain_Andalusia_Granada;Q5783-Q8810 + Spain_Andalusia_Sevilla;Q5783-Q8717 Spain_Aragon;Q4040 Spain_Balearic Islands;Q5765;;es,ca Spain_Basque Country;Q3995 Spain_Canary Islands;Q5813 Spain_Cantabria;Q3946 - Spain_Castile and Leon;Q5739 + Spain_Castile and Leon_West;Q5739-West + Spain_Castile and Leon_East;Q5739-East Spain_Castile-La Mancha;Q5748 Spain_Catalonia_Provincia de Barcelona;Q81949;;es,ca Spain_Catalonia_Provincia de Girona;Q7194;;es,ca @@ -881,7 +949,8 @@ Spain;Q29;es;es Spain_Community of Madrid;Q5756 Spain_Comunidad Foral de Navarra;Q4018;;es,eu Spain_Extremadura;Q5777 - Spain_Galicia;Q3908 + Spain_Galicia_North;Q3908-North + Spain_Galicia_South;Q3908-South Spain_La Rioja;Q5727 Spain_Melilla;Q5831 Spain_Principado de Asturias;Q3934 @@ -892,20 +961,24 @@ Palestine Region;Q219060;ps;ar Palestine;Q219060;;ar Sri Lanka;Q854;lk;ta,si Sudan;Q1049;sd;en,ar + Sudan_East;Q1049-East + Sudan_West;Q1049-West Suriname;Q730;sr;nl Swaziland;Q1050;sz;en,ss Sweden;Q34;se;fi,yi,sv - Sweden_Malardalen;Mälardalen - Sweden_Ostra Gotaland;Östra Götaland - Sweden_Norra Sverige;Norra Sverige + Sweden_Malardalen;Capital Region + Sweden_Stockholm;Q1754 + Sweden_Ostra Gotaland;Eastern Götaland + Sweden_Norra Sverige;Northern Sweden Sweden_Mellannorrland;Mellannorrland Sweden_Bergslagen;Bergslagen - Sweden_Vastra Gotaland;Västra Götaland - Sweden_Sodra Gotaland;Södra Götaland + Sweden_Vastra Gotaland;Western Götaland + Sweden_Sodra Gotaland;Southern Götaland Switzerland;Q39;ch;fr,de,it,rm Switzerland_Eastern;Q31003 Switzerland_Central;Q30978 - Switzerland_Espace Mittelland;Q30983 + Switzerland_Espace Mittelland_Bern;Q30983-Q70 + Switzerland_Espace Mittelland_East;Q30983-East Switzerland_Ticino;Q12724;;it Switzerland_Northwestern;Q676537 Switzerland_Lake Geneva region;Q27714 @@ -916,6 +989,7 @@ Tajikistan;Q863;tj;ru,tg Tanzania;Q924;tz;en,sw Thailand;Q869;th;th Thailand_North;Q869-North + Thailand_Central;Q869-Centre Thailand_South;Q869-South The Bahamas;Q778;bs;en The Gambia;Q1005;gm;en @@ -950,10 +1024,12 @@ Tunisia;Q948;tn;ar Turkey;Q43;tr;tr Turkey_Mediterranean Region;Q155552 Turkey_Southeastern Anatolia Region;Q155638 - Turkey_Marmara Region;Q155583 + Turkey_Marmara Region_Istanbul;Q155583-Q406 + Turkey_Marmara Region_Bursa;Q155583-Q40738 Turkey_Eastern Anatolia Region;Q155542 Turkey_Black Sea Region;Q155533 - Central Anatolia Region;Q155526 + Turkey_Central Anatolia Region_Ankara;Q155526-Q3640 + Turkey_Central Anatolia Region_Kayseri;Q155526-Q48338 Turkey_Aegean Region;Q155564 Turkmenistan;Q874;tm;tk Turks and Caicos Islands;Q18221;tc @@ -994,7 +1070,8 @@ United Kingdom;Q145;gb;en UK_England_East of England_Norfolk;Q48006-Q23109 UK_England_Greater London;Q23306 UK_England_North East England;Q47983 - UK_England_North West England;Q47967 + UK_England_North West England_Manchester;Q47967-Q18125 + UK_England_North West England_Lancaster;Q47967-Q205905 UK_England_South East_Brighton;Q48015-Q131491 UK_England_South East_Oxford;Q48015-Q34217 UK_England_South West England_Bristol;Q48026-Q23154 @@ -1020,6 +1097,8 @@ United States of America;Q30;us US_Arizona_Phoenix;Q16556 US_Arizona_Tucson;Q18575 US_Arkansas;Q1612;;en + US_Arkansas_North;Q1612-North + US_Arkansas_South;Q1612-South California;Q99;;en US_California_Chico;Q432152 US_California_Bakersfield_Bakersfield;Q49256 @@ -1044,6 +1123,7 @@ United States of America;Q30;us US_Florida_Miami;Q8652 US_Florida_Orlando;Q49233 US_Florida_Tampa;Q49255 + US_Florida_Gainesville;Q487999 US_Georgia;Q1428;;en US_Georgia_Atlanta;Q23556 US_Georgia_Macon;Q219656 @@ -1052,6 +1132,8 @@ United States of America;Q30;us US_Guam;Q16635;;en,ch US_Hawaii;Q782;;en US_Idaho;Q1221;;en + US_Idaho_North;Q1221-North + US_Idaho_South;Q1221-South Illinois;Q1204;;en US_Illinois_South;Q1204-South US_Illinois_Chickago;Q1297 @@ -1060,7 +1142,8 @@ United States of America;Q30;us US_Illinois_Springfield;Q28515 Indiana;Q1415;;en US_Indiana_North;Q1415-North - US_Indiana_South;Q1415-South + US_Indiana_Evansville;Q486459 + US_Indiana_Indianapolis;Q6346 Iowa;Q1546;;en US_Iowa_Des Moines;Q39709 US_Iowa_Waterloo;Q496381 @@ -1068,9 +1151,11 @@ United States of America;Q30;us Kansas;Q1558;;en US_Kansas_East;Q1558-East US_Kansas_West;Q1558-West + US_Kansas_Wichita;Q49266 Kentucky;Q1603;;en US_Kentucky_East;Q1603-East US_Kentucky_West;Q1603-West + US_Kentucky_Louisville;Q43668 Louisiana;Q1588 US_Louisiana_Central;Q1588-West US_Louisiana_New Orleans;Q34404 @@ -1087,24 +1172,35 @@ United States of America;Q30;us Michigan;Q1166 US_Michigan_Detroit;Q12439 US_Michigan_North;Q1166-North - US_Michigan_South;Q1166-South + US_Michigan_Grand Rapids;Q184587 + US_Michigan_Lansing;Q28237 Minnesota;Q1527 US_Minnesota_Rochester;Q486479 US_Minnesota_Minneapolis;Q36091 US_Minnesota_North;Q1527-North US_Minnesota_Saint Cloud;Q736834 US_Mississippi;Q1494;;en + US_Mississippi_Gulfport;Q490587 + US_Mississippi_North;Q1494-North Missouri;Q1581 US_Missouri_East;Q1581-East - US_Missouri_West;Q1581-West + US_Missouri_Springfield;Q135615 + US_Missouri_Kansas;Q41819 + US_Missouri_St Louis;Q38022 US_Montana;Q1212;;en + US_Montana_East;Q1212-East + US_Montana_West;Q1212-West US_Nebraska;Q1553;;en + US_Nebraska_East;Q1553-East + US_Nebraska_West;Q1553-West US_Nevada;Q1227 US_New Hampshire;Q759;;en New Jersey;Q1408;;en US_New Jersey_North;Q1408-North US_New Jersey_South;Q1408-South US_New Mexico;Q1522 + US_New Mexico_Albuquerque;Q34804 + US_New Mexico_Roswell;Q33561 New York;Q1384 US_New York_East;Q1384-East US_New York_New York;Q1384-Q60 @@ -1123,10 +1219,14 @@ United States of America;Q30;us US_North Dakota_Minot;Q487201 Ohio;Q1397 US_Ohio_Cleveland;Q37320 - US_Ohio_Dayton;Q34739 + US_Ohio_Cincinnati;Q43196 + US_Ohio_Columbus;Q16567 + US_Ohio_Toledo;Q49239 Oklahoma;Q1649;;en US_Oklahoma_East;Q1649-East US_Oklahoma_West;Q1649-West + US_Oklahoma_Tulsa;Q44989 + US_Oklahoma_Oklahoma;Q34863 Oregon;Q824 US_Oregon_Eugene;Q171224 US_Oregon_Portland;Q6106 @@ -1139,6 +1239,7 @@ United States of America;Q30;us US_Puerto Rico;Q1183;;es,en US_Rhode Island;Q1387 South Carolina;Q1456;;en + US_South Carolina_Charleston;Q47716 US_South Carolina_Columbia;Q38453 US_South Carolina_Florence;Q597842 US_South Dakota;Q1211;;en @@ -1147,9 +1248,11 @@ United States of America;Q30;us US_Tennessee_West;Q1509-West Texas;Q1439 US_Texas_Austin;Q16559 + US_Texas_Victoria;Q784496 US_Texas_Dallas;Q16557 US_Texas_Houston;Q16555 - US_Texas_Northwest;Q51691 + US_Texas_Amarillo;Q51691 + US_Texas_Lubbock;Q49273 US_Texas_San Antonio;Q975 US_Texas_Southwest;Q16868 US_Texas_Tyler;Q499169 @@ -1157,12 +1260,15 @@ United States of America;Q30;us US_Texas_West;Q128361 US_United States Minor Outlying Islands;Q16645 US_Utah;Q829;;en + US_Utah_South;Q829-South + US_Utah_North;Q829-North US_Vermont;Q16551 Virginia;Q1370;;en US_Virginia_Roanoke;Q501796 - US_Virginia_Chesapeake;Q49222 + US_Virginia_Norfolk;Q49231 US_Virginia_Lynchburg;Q844012 US_Virginia_Richmond;Q43421 + US_Virginia_Alexandria;Q88 Washington;Q1223 US_Washington_Coast;Q199797 US_Washington_Seattle;Q5083 @@ -1171,11 +1277,15 @@ United States of America;Q30;us Wisconsin;Q1537 US_Wisconsin_Milwaukee;Q37836 US_Wisconsin_North;Q122563 + US_Wisconsin_Madison;Q43788 + US_Wisconsin_Eau Claire;Q122563 US_Wyoming;Q1214;;en Uruguay;Q77;uy;es Uzbekistan;Q265;uz;uz,ru Vanuatu;Q686;vu;fr,en,bi Venezuela;Q717;ve;es + Venezuela_North;Q717-North + Venezuela_South;Q717-South Vietnam;Q881;vn;vi Yemen;Q805;ye;ar Zambia;Q953;zm;en diff --git a/data/mwm_names_en.txt b/data/mwm_names_en.txt index 9d3d8209f9..c2d95b4571 100644 --- a/data/mwm_names_en.txt +++ b/data/mwm_names_en.txt @@ -11,6 +11,7 @@ Anguilla = Anguilla Antarctica = Antarctica Antigua and Barbuda = Antigua and Barbuda Argentina = Argentina +Argentina_Buenos Aires_Buenos Aires = Buenos Aires Argentina_Buenos Aires_North = Buenos Aires Province — North Argentina_Buenos Aires_South = Buenos Aires Province — South Argentina_Cuyo = Cuyo @@ -18,14 +19,17 @@ Argentina_Mesopotamia = Mesopotamia Argentina_Northwest = Argentine Northwest Argentina_Pampas = Pampas Argentina_Patagonia = Patagonia +Argentina_Santa Fe = Santa Fe Province Arizona = Arizona Armenia = Armenia Australia = Australia +Australia_Brisbane = Brisbane Australia_Melbourne = Melbourne Australia_New South Wales = New South Wales Australia_Northern Territory = Northern Territory Australia_Queensland = Queensland Australia_South Australia = South Australia +Australia_Sydney = Sydney Australia_Tasmania = Tasmania Australia_Victoria = Victoria Australia_Western Australia = Western Australia @@ -36,8 +40,12 @@ Austria_Lower Austria_West = Lower Austria — West Austria_Lower Austria_Wien = Vienna Austria_Salzburg = Salzburg Austria_Styria = Styria +Austria_Styria_Graz = Styria — Graz +Austria_Styria_Leoben = Styria — Leoben Austria_Tyrol = Tyrol Austria_Upper Austria = Upper Austria +Austria_Upper Austria_Linz = Upper Austria — Linz +Austria_Upper Austria_Wels = Upper Austria — Wels Austria_Vorarlberg = Vorarlberg Azerbaijan = Azerbaijan Azerbaijan Region = Azerbaijan @@ -67,6 +75,8 @@ Benin = Benin Bermuda = Bermuda Bhutan = Bhutan Bolivia = Bolivia +Bolivia_North = Bolivia — North +Bolivia_South = Bolivia — South Bosnia and Herzegovina = Bosnia and Herzegovina Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina = Brčko District Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina = Federation of Bosnia and Herzegovina @@ -75,15 +85,25 @@ Botswana = Botswana Brazil = Brazil Brazil_Bahia = Bahia Brazil_Goias = Goiás +Brazil_Goias_Brasilia = Goiás — Brasília +Brazil_Goias_North = Goiás — North Brazil_Mato Grosso = Mato Grosso Brazil_Mato Grosso Do Sul = Mato Grosso do Sul Brazil_North Region = North Region, Brazil +Brazil_North Region_East = North Region — East +Brazil_North Region_West = North Region — West Brazil_Northeast Region = Northeast Region +Brazil_Northeast Region_East = Northeast Region — East +Brazil_Northeast Region_West = Northeast Region — West Brazil_Paraiba = Paraíba Brazil_Parana = Paraná +Brazil_Parana_East = Paraná — East +Brazil_Parana_West = Paraná — West Brazil_Rio Grande do Norte = Rio Grande do Norte Brazil_Santa Catarina = Santa Catarina Brazil_South Region = Southern Brazil +Brazil_South Region_East = Southern Region — East +Brazil_South Region_West = Southern Region — West Brazil_Southeast Region_Espirito Santo = Espírito Santo Brazil_Southeast Region_Minas Gerais_Contagem = Minas Gerais — Contagem Brazil_Southeast Region_Minas Gerais_North = Minas Gerais — North @@ -95,6 +115,8 @@ British Indian Ocean Territory = British Indian Ocean Territory British Virgin Islands = British Virgin Islands Brunei = Brunei Bulgaria = Bulgaria +Bulgaria_East = Bulgaria — East +Bulgaria_West = Bulgaria — West Burkina Faso = Burkina Faso Burundi = Burundi California = California @@ -151,6 +173,7 @@ Canada_Ontario_Northeastern_S = Greater Sudbury Canada_Ontario_Northeastern_SE = North Bay Canada_Ontario_Northeastern_SW = Sault Ste. Marie Canada_Ontario_Northeastern_W = Wawa +Canada_Ontario_Northeastern_Wawa = Wawa Canada_Ontario_Northern = Thunder Bay Canada_Ontario_Northwestern = Ontario — North Canada_Ontario_Toronto = Toronto @@ -158,6 +181,7 @@ Canada_Prince Edward Island = Prince Edward Island Canada_Quebec = Quebec Canada_Quebec_Quebec = Quebec City Canada_Quebek_Far North = Quebec — North +Canada_Quebek_Lachute = Lachute Canada_Quebek_Montreal = Montreal Canada_Quebek_North = Sept-Îles Canada_Quebek_Southeast_Rimouski = Rimouski @@ -166,6 +190,8 @@ Canada_Quebek_West_Chibougamau = Chibougamau Canada_Quebek_West_Rouyn-Noranda = Rouyn-Noranda Canada_Saskatchewan = Saskatchewan Canada_Saskatchewan_North = Saskatchewan — North +Canada_Saskatchewan_Regina = Regina +Canada_Saskatchewan_Saskatoon = Saskatoon Canada_Saskatchewan_South = Saskatchewan — South Canada_Yukon = Yukon Canada_Yukon_North = Yukon — North @@ -177,6 +203,7 @@ Central African Republic = Central African Republic Central Anatolia Region = Central Anatolia Region Chad = Chad Chile = Chile +Chile_Central = Chile — Centre Chile_North = Chile — North Chile_South = Chile — South China_Anhui = Anhui @@ -215,11 +242,15 @@ Colorado = Colorado Comoros = Comoros Congo-Brazzaville = Republic of the Congo Congo-Kinshasa = Democratic Republic of the Congo +Congo-Kinshasa_Kivu = Kivu +Congo-Kinshasa_West = Congo — West Cook Islands = Cook Islands Costa Rica = Costa Rica Cote dIvoire = Ivory Coast Crimea = Crimean Peninsula Croatia = Croatia +Croatia_Central = Croatia — Centre +Croatia_West = Croatia — West Cuba = Cuba Cyprus = Cyprus Czech Republic = Czech Republic @@ -249,6 +280,8 @@ Dominica = Dominica Dominican Republic = Dominican Republic East Timor = East Timor Ecuador = Ecuador +Ecuador_East = Ecuador — East +Ecuador_West = Ecuador — West Egypt = Egypt El Salvador = El Salvador Equatorial Guinea = Equatorial Guinea @@ -263,11 +296,15 @@ Federated States of Micronesia = Federated States of Micronesia Fiji = Fiji Finland = Finland Finland_Eastern Finland = Eastern Finland +Finland_Eastern Finland_North = Eastern Finland — North +Finland_Eastern Finland_South = Eastern Finland — South Finland_Northern Finland = Northern Finland Finland_Southern Finland_Helsinki = Southern Finland — Helsinki Finland_Southern Finland_Lappeenranta = Southern Finland — Lappeenranta Finland_Southern Finland_West = Southwest Finland Finland_Western Finland = Western Finland +Finland_Western Finland_Jyvaskyla = Western Finland — Jyväskylä +Finland_Western Finland_Tampere = Western Finland — Tampere Florida = Florida France = France France_Alsace = Alsace @@ -304,6 +341,8 @@ France_Centre-Val de Loire_Loiret = Loiret France_Champagne-Ardenne = Champagne-Ardenne France_Corsica = Corsica France_Free County = Franche-Comté +France_Free County_North = Franche-Comté — North +France_Free County_South = Franche-Comté — South France_French Guiana = French Guiana France_Ile-de-France = Île-de-France France_Ile-de-France_Essonne = Essonne @@ -346,6 +385,8 @@ France_Nord-Pas-de-Calais_Nord = Nord France_Nord-Pas-de-Calais_Pas-de-Calais = Pas-de-Calais France_Pays de la Loire = Pays de la Loire France_Pays de la Loire_Loire-Atlantique = Loire-Atlantique +France_Pays de la Loire_Loire-Atlantique_Nantes = Loire-Atlantique — Nantes +France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire = Loire-Atlantique — Saint-Nazaire France_Pays de la Loire_Maine-et-Loire = Maine-et-Loire France_Pays de la Loire_Mayenne = Mayenne France_Pays de la Loire_Sarthe = Sarthe @@ -398,6 +439,7 @@ Germany_Free State of Bavaria_Swabia = Swabia Germany_Free State of Bavaria_Upper Bavaria_East = Upper Bavaria — East Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt = Upper Bavaria — Ingolstadt Germany_Free State of Bavaria_Upper Bavaria_Munchen = Upper Bavaria — Munich +Germany_Free State of Bavaria_Upper Bavaria_South = Upper Bavaria — South Germany_Free State of Bavaria_Upper Franconia = Upper Franconia Germany_Free State of Bavaria_Upper Palatinate = Upper Palatinate Germany_Hamburg_main = Hamburg @@ -406,6 +448,7 @@ Germany_Hesse_Regierungsbezirk Darmstadt = Darmstadt Germany_Hesse_Regierungsbezirk Giessen = Giessen Germany_Hesse_Regierungsbezirk Kassel = Kassel Germany_Lower Saxony = Lower Saxony +Germany_Lower Saxony_Braunschweig = Braunschweig Germany_Lower Saxony_Bremen_Bremen = Bremen Germany_Lower Saxony_Bremen_Munster = Lüneburg Germany_Lower Saxony_Hannover = Hanover @@ -426,9 +469,13 @@ Germany_Rhineland-Palatinate_Koblenz = Rhineland-Palatinate — Koblenz Germany_Rhineland-Palatinate_South = Rhineland-Palatinate — Mainz Germany_Saarland = Saarland Germany_Saxony-Anhalt = Saxony-Anhalt +Germany_Saxony-Anhalt_Halle = Saxony-Anhalt — Halle +Germany_Saxony-Anhalt_Magdeburg = Saxony-Anhalt — Magdeburg Germany_Saxony_Dresden = Saxony — Dresden Germany_Saxony_Leipzig = Saxony — Leipzig Germany_Schleswig-Holstein = Schleswig-Holstein +Germany_Schleswig-Holstein_Flensburg = Schleswig-Holstein — Flensburg +Germany_Schleswig-Holstein_Kiel = Schleswig-Holstein — Kiel Germany_Thuringia = Thuringia Ghana = Ghana Gibraltar = Gibraltar @@ -472,6 +519,8 @@ India_Himachal Pradesh = Himachal Pradesh India_Jammu and Kashmir = Jammu and Kashmir India_Jharkhand = Jharkhand India_Karnataka = Karnataka +India_Karnataka_North = Karnataka — North +India_Karnataka_South = Karnataka — South India_Kerala = Kerala India_Lakshadweep = Lakshadweep India_Madhya Pradesh = Madhya Pradesh @@ -501,9 +550,12 @@ Indonesia_Nusa Tenggara = Lesser Sunda Islands Indonesia_West = Sumatra Iowa = Iowa Iran = Iran +Iran_East = Iran — East Iran_North = Iran — North Iran_South = Iran — South Iraq = Iraq +Iraq_North = Iraq — North +Iraq_South = Iraq — South Ireland = Ireland Ireland_Connacht = Connacht Ireland_Leinster = Leinster @@ -578,6 +630,8 @@ Jamaica = Jamaica Japan = Japan Japan_Chubu Region = Chūbu Region Japan_Chubu Region_Aichi = Aichi Prefecture +Japan_Chubu Region_Aichi_Nagoya = Aichi — Nagoya +Japan_Chubu Region_Aichi_Toyohashi = Aichi — Toyohashi Japan_Chubu Region_Fukui = Fukui Prefecture Japan_Chubu Region_Gifu = Gifu Prefecture Japan_Chubu Region_Ishikawa = Ishikawa Prefecture @@ -595,6 +649,7 @@ Japan_Chugoku Region_Yamaguchi = Yamaguchi Prefecture Japan_Hokkaido Region = Hokkaidō Japan_Hokkaido Region_East = Hokkaidō — East Japan_Hokkaido Region_North = Hokkaidō — North +Japan_Hokkaido Region_Sapporo = Sapporo Japan_Hokkaido Region_West = Hokkaidō — West Japan_Kanto = Kantō Region Japan_Kanto_Chiba = Chiba Prefecture @@ -608,6 +663,8 @@ Japan_Kinki Region = Kansai Region Japan_Kinki Region_Mie = Mie Prefecture Japan_Kinki Region_Nara = Nara Prefecture Japan_Kinki Region_Osaka = Ōsaka Prefecture +Japan_Kinki Region_Osaka_Osaka = Ōsaka +Japan_Kinki Region_Osaka_West = Ōsaka — West Japan_Kinki Region_Wakayama = Wakayama Prefecture Japan_Kyushu Region = Kyushu Japan_Kyushu Region_Fukuoka = Fukuoka Prefecture @@ -636,6 +693,8 @@ Jerusalem = Jerusalem Jordan = Jordan Kansas = Kansas Kazakhstan = Kazakhstan +Kazakhstan_North = Kazakhstan — North +Kazakhstan_South = Kazakhstan — South Kentucky = Kentucky Kenya = Kenya Kingdom of Lesotho = Lesotho @@ -649,6 +708,8 @@ Liberia = Liberia Libya = Libya Liechtenstein = Liechtenstein Lithuania = Lithuania +Lithuania_East = Lithuania — East +Lithuania_West = Lithuania — West Louisiana = Louisiana Luxembourg = Luxembourg Macedonia = Macedonia @@ -668,9 +729,11 @@ Mexico = Mexico Mexico_California = Baja California Mexico_Central_East = Nuevo León Mexico_Central_West = Nayarit +Mexico_Chihuahua = Chihuahua Mexico_East = Mexico — East Mexico_Mexico = Mexico City Mexico_North = Mexico — North +Mexico_Sonora = Sonora Mexico_South = Mexico — South Michigan = Michigan Minnesota = Minnesota @@ -692,6 +755,9 @@ Namibia = Namibia Nauru = Nauru Nepal = Nepal Nepal_East = Nepal — East +Nepal_Kathmandu = Kathmandu +Nepal_Madhyamanchal = Central Region +Nepal_Purwanchal = Eastern Region Nepal_West = Nepal — West Netherlands = Netherlands Netherlands_Drenthe = Drenthe @@ -728,6 +794,8 @@ New Zealand South_Southland = South — Southland Region Nicaragua = Nicaragua Niger = Niger Nigeria = Nigeria +Nigeria_North = Nigeria — North +Nigeria_South = Nigeria — South Niue = Niue North Carolina = North Carolina North Dakota = North Dakota @@ -736,9 +804,14 @@ Norway = Norway Norway_Bouvet Island = Bouvet Island Norway_Central = Oslo Norway_Hedmark = Hedmark +Norway_Hordaland = Hordaland Norway_Jan Mayen = Jan Mayen +Norway_Nordland = Nordland +Norway_North Trondelag = Northern Trøndelag Norway_Northern = Northern Norway Norway_Oppland = Oppland +Norway_Rogaland = Rogaland +Norway_South Trondelag = Southern Trøndelag Norway_Southern = Southern Norway Norway_Svalbard = Svalbard Norway_Trondelag = Trøndelag @@ -749,14 +822,15 @@ Oman = Oman Oregon = Oregon Pakistan = Pakistan Palau = Palau -Palestine = State of Palestine -Palestine Region = State of Palestine +Palestine = Palestine +Palestine Region = Palestine Panama = Panama Papua New Guinea = Papua New Guinea Paraguay = Paraguay Pennsylvania = Pennsylvania People's Republic of China = People's Republic of China Peru = Peru +Peru_Lima = Lima Peru_North = Peru — North Peru_South = Peru — South Philippines = Philippines @@ -784,8 +858,11 @@ Poland_Swietokrzyskie Voivodeship = Świętokrzyskie Voivodeship Poland_Warmian-Masurian Voivodeship = Warmian-Masurian Voivodeship Poland_West Pomeranian Voivodeship = West Pomeranian Voivodeship Portugal = Portugal +Portugal_Islands = Islands of Portugal Portugal_North = Portugal — North +Portugal_Porto = Porto Portugal_South = Portugal — South +Portugal_Viseu = Viseu Qatar = Qatar Republic of Kosovo = Kosovo Romania = Romania @@ -828,6 +905,8 @@ Russia_Kostroma Oblast = Kostroma Oblast Russia_Krasnodar Krai = Krasnodar Krai — North Russia_Krasnodar Krai_Adygeya = Krasnodar Krai, Republic of Adygea Russia_Krasnoyarsk Krai = Krasnoyarsk Krai +Russia_Krasnoyarsk Krai_North = Krasnoyarsk Krai — North +Russia_Krasnoyarsk Krai_South = Krasnoyarsk Krai — South Russia_Kurgan Oblast = Kurgan Oblast Russia_Kursk Oblast = Kursk Oblast Russia_Leningradskaya Oblast_Karelsky = Leningrad Oblast — North @@ -837,6 +916,8 @@ Russia_Magadan Oblast = Magadan Oblast Russia_Mari El = Mari El Republic Russia_Moscow = Moscow Russia_Moscow Oblast = Moscow Oblast +Russia_Moscow Oblast_East = Moscow Oblast — East +Russia_Moscow Oblast_West = Moscow Oblast — West Russia_Murmansk Oblast = Murmansk Oblast Russia_Nenets Autonomous Okrug = Nenets Autonomous Okrug Russia_Nizhny Novgorod Oblast = Nizhny Novgorod Oblast @@ -848,11 +929,15 @@ Russia_Orenburg Oblast = Orenburg Oblast Russia_Oryol Oblast = Oryol Oblast Russia_Penza Oblast = Penza Oblast Russia_Perm Krai = Perm Krai +Russia_Perm Krai_North = Perm Krai — North +Russia_Perm Krai_South = Perm Krai — South Russia_Primorsky Krai = Primorsky Krai Russia_Pskov Oblast = Pskov Oblast Russia_Republic of Dagestan = Republic of Dagestan Russia_Republic of Kalmykia = Republic of Kalmykia Russia_Republic of Karelia = Republic of Karelia +Russia_Republic of Karelia_North = Republic of Karelia — North +Russia_Republic of Karelia_South = Republic of Karelia — South Russia_Republic of Mordovia = Republic of Mordovia Russia_Rostov Oblast = Rostov Oblast Russia_Ryazan Oblast = Ryazan Oblast @@ -864,6 +949,8 @@ Russia_Saratov Oblast = Saratov Oblast Russia_Smolensk Oblast = Smolensk Oblast Russia_Stavropol Krai = Stavropol Krai Russia_Sverdlovsk Oblast = Sverdlovsk Oblast +Russia_Sverdlovsk Oblast_Ekaterinburg = Sverdlovsk Oblast — Yekaterinburg +Russia_Sverdlovsk Oblast_North = Sverdlovsk Oblast — North Russia_Tambov Oblast = Tambov Oblast Russia_Tatarstan = Republic of Tatarstan Russia_Tomsk Oblast = Tomsk Oblast @@ -880,6 +967,8 @@ Russia_Voronezh Oblast = Voronezh Oblast Russia_Yamalo-Nenets Autonomous Okrug = Yamalo-Nenets Autonomous Okrug Russia_Yaroslavl Oblast = Yaroslavl Oblast Russia_Yugra = Khanty-Mansi Autonomous Okrug +Russia_Yugra_Khanty = Yugra — Khanty-Mansiysk +Russia_Yugra_Surgut = Yugra — Surgut Russia_Zabaykalsky Krai = Zabaykalsky Krai Russian Federation = Russia Rwanda = Rwanda @@ -894,6 +983,8 @@ Samoa = Samoa San Marino = San Marino Sao Tome and Principe = Sao Tomé and Príncipe Saudi Arabia = Saudi Arabia +Saudi Arabia_North = Saudi Arabia — North +Saudi Arabia_South = Saudi Arabia — South Senegal = Senegal Serbia = Serbia Seychelles = Seychelles @@ -909,6 +1000,8 @@ Slovakia_Region of Trencin = Trenčín Region Slovakia_Region of Trnava = Trnava Region Slovakia_Region of Zilina = Žilina Region Slovenia = Slovenia +Slovenia_East = Slovenia — East +Slovenia_West = Slovenia — West Solomon Islands = Solomon Islands Somalia = Somalia South Africa = South Africa @@ -930,12 +1023,16 @@ South Ossetia = South Ossetia South Sudan = South Sudan Spain = Spain Spain_Andalusia = Andalusia +Spain_Andalusia_Granada = Andalusia — Granada +Spain_Andalusia_Sevilla = Andalusia — Seville Spain_Aragon = Aragon Spain_Balearic Islands = Balearic Islands Spain_Basque Country = Basque Country Spain_Canary Islands = Canary Islands Spain_Cantabria = Cantabria Spain_Castile and Leon = Castile and León +Spain_Castile and Leon_East = Castile and León — East +Spain_Castile and Leon_West = Castile and León — West Spain_Castile-La Mancha = Castile-La Mancha Spain_Catalonia_Provincia de Barcelona = Barcelona Province Spain_Catalonia_Provincia de Girona = Girona Province @@ -946,6 +1043,8 @@ Spain_Community of Madrid = Community of Madrid Spain_Comunidad Foral de Navarra = Navarre Spain_Extremadura = Extremadura Spain_Galicia = Galicia +Spain_Galicia_North = Galicia — North +Spain_Galicia_South = Galicia — South Spain_La Rioja = La Rioja Spain_Melilla = Melilla Spain_Principado de Asturias = Asturias @@ -953,6 +1052,8 @@ Spain_Region de Murcia = Region of Murcia Spain_Valencian Community = Valencian Country Sri Lanka = Sri Lanka Sudan = Sudan +Sudan_East = Sudan — East +Sudan_West = Sudan — West Suriname = Suriname Swaziland = Swaziland Sweden = Sweden @@ -962,22 +1063,28 @@ Sweden_Mellannorrland = Mellannorrland Sweden_Norra Sverige = Northern Sweden Sweden_Ostra Gotaland = Eastern Götaland Sweden_Sodra Gotaland = Southern Götaland +Sweden_Stockholm = Stockholm Sweden_Vastra Gotaland = Western Götaland Switzerland = Switzerland Switzerland_Central = Central Switzerland Switzerland_Eastern = Eastern Switzerland Switzerland_Espace Mittelland = Espace Mittelland +Switzerland_Espace Mittelland_Bern = Espace Mittelland — Bern +Switzerland_Espace Mittelland_East = Espace Mittelland — East Switzerland_Lake Geneva region = Lake Geneva Region Switzerland_Northwestern = Northwestern Switzerland Switzerland_Ticino = Ticino -Switzerland_Zurich = Zurich Metropolitan Area +Switzerland_Zurich = Zurich Syria = Syria Taiwan = Taiwan +Taiwan_North = Taiwan — North +Taiwan_South = Taiwan — South Tajikistan = Tajikistan Tanzania = Tanzania Tennessee = Tennessee Texas = Texas Thailand = Thailand +Thailand_Central = Thailand — Centre Thailand_North = Thailand — North Thailand_South = Thailand — South The Bahamas = The Bahamas @@ -990,8 +1097,12 @@ Tunisia = Tunisia Turkey = Turkey Turkey_Aegean Region = Aegean Region Turkey_Black Sea Region = Black Sea Region +Turkey_Central Anatolia Region_Ankara = Central Anatolia — Ankara +Turkey_Central Anatolia Region_Kayseri = Central Anatolia — Kayseri Turkey_Eastern Anatolia Region = Eastern Anatolia Region Turkey_Marmara Region = Marmara Region +Turkey_Marmara Region_Bursa = Marmara Region — Bursa +Turkey_Marmara Region_Istanbul = Marmara Region — Istanbul Turkey_Mediterranean Region = Mediterranean Region Turkey_Southeastern Anatolia Region = Southeastern Anatolia Region Turkmenistan = Turkmenistan @@ -1003,6 +1114,8 @@ UK_England_East of England_Norfolk = East of England — Norfolk UK_England_Greater London = Greater London UK_England_North East England = North East England UK_England_North West England = North West England +UK_England_North West England_Lancaster = North West England — Lancaster +UK_England_North West England_Manchester = North West England — Manchester UK_England_South East_Brighton = South East England — Brighton UK_England_South East_Oxford = South East England — Oxford UK_England_South West England_Bristol = South West England — Bristol @@ -1020,6 +1133,8 @@ US_Arizona_Flagstaff = Flagstaff US_Arizona_Phoenix = Phoenix US_Arizona_Tucson = Tucson US_Arkansas = Arkansas +US_Arkansas_North = Arkansas — North +US_Arkansas_South = Arkansas — South US_California_Bakersfield_Bakersfield = Bakersfield US_California_Bakersfield_Lancaster = Lancaster US_California_Chico = Chico @@ -1037,6 +1152,8 @@ US_Colorado_Denver = Denver US_Colorado_South = Colorado — South US_Connecticut = Connecticut US_Delaware = Delaware +US_Florida_Gainesvile = Gainesville +US_Florida_Gainesville = Gainesville US_Florida_Jacksonville = Jacksonville US_Florida_Miami = Miami US_Florida_Orlando = Orlando @@ -1049,11 +1166,15 @@ US_Georgia_South = Georgia — South US_Guam = Guam US_Hawaii = Hawaii US_Idaho = Idaho +US_Idaho_North = Idaho — North +US_Idaho_South = Idaho — South US_Illinois_Chickago = Chicago US_Illinois_Elgin = Elgin US_Illinois_Rockford = Rockford US_Illinois_South = Illinois — South US_Illinois_Springfield = Springfield +US_Indiana_Evansville = Evansville +US_Indiana_Indianapolis = Indianapolis US_Indiana_North = Indiana — North US_Indiana_South = Indiana — South US_Iowa_Des Moines = Des Moines @@ -1061,7 +1182,9 @@ US_Iowa_Waterloo = Waterloo US_Iowa_West = Iowa — West US_Kansas_East = Kansas — East US_Kansas_West = Kansas — West +US_Kansas_Wichita = Wichita US_Kentucky_East = Kentucky — East +US_Kentucky_Louisville = Louisville US_Kentucky_West = Kentucky — West US_Louisiana_Central = Louisiana — West US_Louisiana_New Orleans = New Orleans @@ -1074,6 +1197,8 @@ US_Massachusetts_Plymouth = Plymouth US_Massachusetts_Southeastern = Barnstable US_Massachusetts_West = Springfield US_Michigan_Detroit = Detroit +US_Michigan_Grand Rapids = Grand Rapids +US_Michigan_Lansing = Lansing US_Michigan_North = Michigan — North US_Michigan_South = Michigan — South US_Minnesota_Minneapolis = Minneapolis @@ -1081,15 +1206,26 @@ US_Minnesota_North = Minnesota — North US_Minnesota_Rochester = Rochester US_Minnesota_Saint Cloud = St. Cloud US_Mississippi = Mississippi +US_Mississippi_Gulfport = Gulfport +US_Mississippi_North = Mississippi — North US_Missouri_East = Missouri — East +US_Missouri_Kansas = Kansas City +US_Missouri_Springfield = Springfield +US_Missouri_St Louis = St. Louis US_Missouri_West = Missouri — West US_Montana = Montana +US_Montana_East = Montana — East +US_Montana_West = Montana — West US_Nebraska = Nebraska +US_Nebraska_East = Nebraska — East +US_Nebraska_West = Nebraska — West US_Nevada = Nevada US_New Hampshire = New Hampshire US_New Jersey_North = New Jersey — North US_New Jersey_South = New Jersey — South US_New Mexico = New Mexico +US_New Mexico_Albuquerque = Albuquerque +US_New Mexico_Roswell = Roswell US_New York_East = New York — East US_New York_New York = New York — New York City US_New York_North = New York — North @@ -1103,9 +1239,14 @@ US_North Carolina_Wilson = Wilson US_North Dakota_Bismarck = Bismarck US_North Dakota_East = Fargo US_North Dakota_Minot = Minot +US_Ohio_Cincinnati = Cincinnati US_Ohio_Cleveland = Cleveland +US_Ohio_Columbus = Columbus US_Ohio_Dayton = Dayton +US_Ohio_Toledo = Toledo US_Oklahoma_East = Oklahoma — East +US_Oklahoma_Oklahoma = Oklahoma City +US_Oklahoma_Tulsa = Tulsa US_Oklahoma_West = Oklahoma — West US_Oregon_Eugene = Eugene US_Oregon_Portland = Portland @@ -1116,31 +1257,41 @@ US_Pennsylvania_Reading = Reading US_Pennsylvania_Scranton = Scranton US_Puerto Rico = Puerto Rico US_Rhode Island = Rhode Island +US_South Carolina_Charleston = Charleston US_South Carolina_Columbia = Columbia US_South Carolina_Florence = Florence US_South Dakota = South Dakota US_Tennessee_East = Tennessee — East US_Tennessee_West = Tennessee — West +US_Texas_Amarillo = Amarillo US_Texas_Austin = Austin US_Texas_Dallas = Dallas US_Texas_Houston = Houston +US_Texas_Lubbock = Lubbock US_Texas_Northwest = Amarillo US_Texas_San Antonio = San Antonio US_Texas_Southwest = Laredo US_Texas_Tyler = Tyler +US_Texas_Victoria = Victoria US_Texas_Wako = Waco US_Texas_West = Odessa US_United States Minor Outlying Islands = US Minor Outlying Islands US_Utah = Utah +US_Utah_North = Utah — North +US_Utah_South = Utah — South US_Vermont = Vermont +US_Virginia_Alexandria = Alexandria US_Virginia_Chesapeake = Chesapeake US_Virginia_Lynchburg = Lynchburg +US_Virginia_Norfolk = Norfolk US_Virginia_Richmond = Richmond US_Virginia_Roanoke = Roanoke US_Washington_Coast = Tacoma US_Washington_Seattle = Seattle US_Washington_Yakima = Yakima US_West Virginia = West Virginia +US_Wisconsin_Eau Claire = Eau Claire +US_Wisconsin_Madison = Madison US_Wisconsin_Milwaukee = Milwaukee US_Wisconsin_North = Eau Claire US_Wyoming = Wyoming @@ -1178,6 +1329,8 @@ Uruguay = Uruguay Uzbekistan = Uzbekistan Vanuatu = Vanuatu Venezuela = Venezuela +Venezuela_North = Venezuela — North +Venezuela_South = Venezuela — South Vietnam = Vietnam Virginia = Virginia Wallis and Futuna = Wallis and Futuna diff --git a/data/packed_polygons.bin b/data/packed_polygons.bin index 0244fefe3f..8b3b4878ff 100644 Binary files a/data/packed_polygons.bin and b/data/packed_polygons.bin differ diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index a22ecc114f..9a671c6353 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -272,17 +272,17 @@ if [ "$MODE" == "coast" ]; then fail fi fi - if [ -z "$OSRM_URL-" ]; then - log "OSRM_URL variable not set. World roads will not be calculated." - else - python "$ROADS_SCRIPT" "$INTCOASTSDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log - fi fi done # make a working copy of generated coastlines file if [ -n "$OPT_COAST" ]; then cp "$INTCOASTSDIR"/WorldCoasts.*geom "$INTDIR" cp "$INTCOASTSDIR"/*.csv "$INTDIR" || true + if [ -z "${OSRM_URL-}" ]; then + log "OSRM_URL variable not set. World roads will not be calculated." + else + python "$ROADS_SCRIPT" "$INTCOASTSDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log + fi fi [ -z "$KEEP_INTDIR" ] && rm -r "$INTCOASTSDIR" if [ -n "$OPT_ROUTING" -o -n "$OPT_WORLD" -o -z "$NO_REGIONS" ]; then