From 7e5ed2d852e46b3e2aed5f370e955ed98a2bb5e7 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 27 Apr 2016 14:08:01 +0300 Subject: [PATCH 01/87] [downloader] Send http download errors into Alohalytics --- 3party/Alohalytics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3party/Alohalytics b/3party/Alohalytics index 5c46d5b4c7..6fc3b425c3 160000 --- a/3party/Alohalytics +++ b/3party/Alohalytics @@ -1 +1 @@ -Subproject commit 5c46d5b4c7fc6f24fa01076be1ce55a824a2b5e8 +Subproject commit 6fc3b425c324855b3a8bfdce706bdb32b1947cee From 64b7d04a2d95f8a6953b00e51a8c7e5b06ec4b3a Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 28 Apr 2016 13:40:08 +0300 Subject: [PATCH 02/87] Fixed recovering of follow-and-rotate mode in routing --- drape_frontend/animation_system.cpp | 1 - drape_frontend/animation_system.hpp | 2 +- drape_frontend/kinetic_scroller.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp index 46d3b00dd6..49fd982f19 100644 --- a/drape_frontend/animation_system.cpp +++ b/drape_frontend/animation_system.cpp @@ -1020,7 +1020,6 @@ void AnimationSystem::CombineAnimation(drape_ptr animation) return; } } - PushAnimation(move(animation)); } diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp index 32c9306258..00796f3f2e 100644 --- a/drape_frontend/animation_system.hpp +++ b/drape_frontend/animation_system.hpp @@ -136,7 +136,7 @@ public: bool CouldBeInterrupted() const { return m_couldBeInterrupted; } bool CouldBeBlendedWith(Animation const & animation) const; - + void SetInterruptedOnCombine(bool enable) { m_interruptedOnCombine = enable; } bool GetInterruptedOnCombine() const { return m_interruptedOnCombine; } diff --git a/drape_frontend/kinetic_scroller.cpp b/drape_frontend/kinetic_scroller.cpp index f54f82510d..9a0edd14ff 100644 --- a/drape_frontend/kinetic_scroller.cpp +++ b/drape_frontend/kinetic_scroller.cpp @@ -38,7 +38,6 @@ public: , m_elapsedTime(0.0) { SetInterruptedOnCombine(true); - m_objects.insert(Animation::MapPlane); m_properties.insert(Animation::Position); } From aac681e5307e6f5c98f1c14c5017854644a23910 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 27 Apr 2016 17:38:07 +0300 Subject: [PATCH 03/87] [downloader] Refactor logic for disable downloading on cellular network and retry download on lost connection --- storage/downloading_policy.cpp | 4 ++-- storage/downloading_policy.hpp | 6 ++---- storage/storage.hpp | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/storage/downloading_policy.cpp b/storage/downloading_policy.cpp index a51567f178..6903a778d1 100644 --- a/storage/downloading_policy.cpp +++ b/storage/downloading_policy.cpp @@ -8,8 +8,8 @@ bool StorageDownloadingPolicy::IsDownloadingAllowed() const !IsCellularDownloadEnabled()); } -void StorageDownloadingPolicy::ScheduleRetry( - storage::TCountriesSet const & failedCountries, TProcessFunc const & func) +void StorageDownloadingPolicy::ScheduleRetry(storage::TCountriesSet const & failedCountries, + TProcessFunc const & func) { if (IsDownloadingAllowed() && !failedCountries.empty() && m_autoRetryCounter > 0) { diff --git a/storage/downloading_policy.hpp b/storage/downloading_policy.hpp index 1322ecb345..9b72c56941 100644 --- a/storage/downloading_policy.hpp +++ b/storage/downloading_policy.hpp @@ -11,7 +11,6 @@ class DownloadingPolicy { public: using TProcessFunc = function; - virtual bool IsDownloadingAllowed() const { return true; } virtual void ScheduleRetry(storage::TCountriesSet const &, TProcessFunc const &) {} }; @@ -19,14 +18,13 @@ public: class StorageDownloadingPolicy : public DownloadingPolicy { bool m_cellularDownloadEnabled = false; - static size_t constexpr kAutoRetryCounterMax = 3; size_t m_autoRetryCounter = kAutoRetryCounterMax; my::DeferredTask m_autoRetryWorker; - + public: StorageDownloadingPolicy() : m_autoRetryWorker(seconds(20)) {} - + inline void EnableCellularDownload(bool value) { m_cellularDownloadEnabled = value; } inline bool IsCellularDownloadEnabled() const { return m_cellularDownloadEnabled; } inline bool IsAutoRetryDownloadFailed() const { return m_autoRetryCounter == 0; } diff --git a/storage/storage.hpp b/storage/storage.hpp index f22381cefc..4201552ee6 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -187,7 +187,6 @@ private: DownloadingPolicy m_defaultDownloadingPolicy; DownloadingPolicy * m_downloadingPolicy = &m_defaultDownloadingPolicy; - /// @name Communicate with GUI //@{ @@ -289,7 +288,7 @@ public: unique_ptr mapDownloaderForTesting); void Init(TUpdateCallback const & didDownload, TDeleteCallback const & willDelete); - + inline void SetDownloadingPolicy(DownloadingPolicy * policy) { m_downloadingPolicy = policy; } /// @name Interface with clients (Android/iOS). From ba02c77bfd6b6315ff860407cd8ffc40e63c0e1f Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 28 Apr 2016 19:55:30 +0300 Subject: [PATCH 04/87] [planet] New data from 26.04.2016 --- data/countries.txt | 17032 +++++++++++++++++++++---------------------- 1 file changed, 8516 insertions(+), 8516 deletions(-) diff --git a/data/countries.txt b/data/countries.txt index 85110605b5..74debc3883 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,2436 +1,2436 @@ { - "id": "Countries", - "v": 160426, + "id": "Countries", + "v": 160426, "g": [ { - "id": "Abkhazia", - "s": 4557239, + "id": "Abkhazia", + "s": 4557239, "affiliations": [ - "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", - "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", + "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", + "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" - ], + ], "old": [ "Georgia" ] - }, + }, { - "id": "Afghanistan", - "s": 23033678, + "id": "Afghanistan", + "s": 23033678, "affiliations": [ - "Badakhshan", - "Badghis", - "Balkh", - "Baghlan", - "Bamyan", - "Daykundi", - "Farah", - "Faryab", - "Ghazni", - "Helmand", - "Herat", - "Jowzjan", - "Kabul", - "Kandahar", - "Logar", - "Kapisa", - "Khost", - "Kunar", - "Kunduz", - "Laghman", - "Nimruz", - "Nuristan", - "Nangarhar", - "Or\u016bzg\u0101n", - "Paktia", - "Paktika", - "Panjshir", - "Parwan", - "Samangan", - "Sar-e Pol", - "Takhar", - "Wardak", - "Zabul", - "\u0648\u0644\u0627\u06cc\u062a \u063a\u0648\u0631", + "Badakhshan", + "Badghis", + "Balkh", + "Baghlan", + "Bamyan", + "Daykundi", + "Farah", + "Faryab", + "Ghazni", + "Helmand", + "Herat", + "Jowzjan", + "Kabul", + "Kandahar", + "Logar", + "Kapisa", + "Khost", + "Kunar", + "Kunduz", + "Laghman", + "Nimruz", + "Nuristan", + "Nangarhar", + "Or\u016bzg\u0101n", + "Paktia", + "Paktika", + "Panjshir", + "Parwan", + "Samangan", + "Sar-e Pol", + "Takhar", + "Wardak", + "Zabul", + "\u0648\u0644\u0627\u06cc\u062a \u063a\u0648\u0631", "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" - ], + ], "old": [ "Afghanistan" ] - }, + }, { - "id": "Albania", - "s": 14593969, + "id": "Albania", + "s": 14593969, "affiliations": [ "Shqip\u00ebria" - ], + ], "old": [ "Albania" ] - }, + }, { - "id": "Algeria", + "id": "Algeria", "g": [ { - "id": "Algeria_Central", - "s": 26047759, + "id": "Algeria_Central", + "s": 26047759, "affiliations": [ - "Adrar \u2d30\u2d37\u2d54\u2d30\u2d54 \u0623\u062f\u0631\u0627\u0631", - "Illizi \u2d49\u2d4d\u2d4d\u2d49\u2d63\u2d49 \u0625\u0644\u0640\u064a\u0640\u0632\u064a", - "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631", - "Batna - \u0628\u0627\u062a\u0646\u0629", - "Biskra - \u0628\u0633\u0643\u0631\u0629", - "B\u00e9char \u2d31\u2d5b\u2d30\u2d54 \u0628\u0634\u0627\u0631", - "Djelfa - \u0627\u0644\u062c\u0644\u0641\u0629", - "El Bayadh - \u0627\u0644\u0628\u064a\u0636", - "El Oued \u2d4d\u2d61\u2d30\u2d37 \u0627\u0644\u0648\u0627\u062f\u064a", - "Gharda\u00efa \u2d5c\u2d30\u2d56\u2d54\u2d37\u2d30\u2d62\u2d5c \u063a\u0631\u062f\u0627\u064a\u0629", - "Khenchela - \u062e\u0646\u0634\u0644\u0629", - "Laghouat - \u0627\u0644\u0623\u063a\u0648\u0627\u0637", - "M'Sila - \u0627\u0644\u0645\u0633\u064a\u0644\u0629", - "Na\u00e2ma - \u0627\u0644\u0646\u0639\u0627\u0645\u0629", - "Ouargla - \u0648\u0631\u0642\u0644\u0629", - "Tamanrasset \u2d5c\u2d30\u2d4e\u2d30\u2d4f\u2d56\u2d30\u2d59\u2d3b\u2d5c \u062a\u0645\u0646\u0631\u0627\u0633\u062a", - "Tindouf \u2d5c\u2d49\u2d4f\u2d37\u2d53\u2d3c \u062a\u0646\u062f\u0648\u0641", + "Adrar \u2d30\u2d37\u2d54\u2d30\u2d54 \u0623\u062f\u0631\u0627\u0631", + "Illizi \u2d49\u2d4d\u2d4d\u2d49\u2d63\u2d49 \u0625\u0644\u0640\u064a\u0640\u0632\u064a", + "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631", + "Batna - \u0628\u0627\u062a\u0646\u0629", + "Biskra - \u0628\u0633\u0643\u0631\u0629", + "B\u00e9char \u2d31\u2d5b\u2d30\u2d54 \u0628\u0634\u0627\u0631", + "Djelfa - \u0627\u0644\u062c\u0644\u0641\u0629", + "El Bayadh - \u0627\u0644\u0628\u064a\u0636", + "El Oued \u2d4d\u2d61\u2d30\u2d37 \u0627\u0644\u0648\u0627\u062f\u064a", + "Gharda\u00efa \u2d5c\u2d30\u2d56\u2d54\u2d37\u2d30\u2d62\u2d5c \u063a\u0631\u062f\u0627\u064a\u0629", + "Khenchela - \u062e\u0646\u0634\u0644\u0629", + "Laghouat - \u0627\u0644\u0623\u063a\u0648\u0627\u0637", + "M'Sila - \u0627\u0644\u0645\u0633\u064a\u0644\u0629", + "Na\u00e2ma - \u0627\u0644\u0646\u0639\u0627\u0645\u0629", + "Ouargla - \u0648\u0631\u0642\u0644\u0629", + "Tamanrasset \u2d5c\u2d30\u2d4e\u2d30\u2d4f\u2d56\u2d30\u2d59\u2d3b\u2d5c \u062a\u0645\u0646\u0631\u0627\u0633\u062a", + "Tindouf \u2d5c\u2d49\u2d4f\u2d37\u2d53\u2d3c \u062a\u0646\u062f\u0648\u0641", "T\u00e9bessa - \u062a\u0628\u0633\u0629" - ], + ], "old": [ "Algeria" ] - }, + }, { - "id": "Algeria_Coast", - "s": 71336718, + "id": "Algeria_Coast", + "s": 71336718, "affiliations": [ - "Alger - \u0627\u0644\u062c\u0632\u0627\u0626\u0631", - "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631", - "Annaba - \u0639\u0646\u0627\u0628\u0629\u200e", - "A\u00efn Defla - \u0639\u064a\u0646 \u0627\u0644\u062f\u0641\u0644\u0649", - "A\u00efn T\u00e9mouchent - \u0639\u064a\u0646 \u062a\u0645\u0648\u0634\u0646\u062a", - "Blida - \u0627\u0644\u0628\u0644\u064a\u062f\u0629", - "Bordj Bou Arreridj\u200e - \u0628\u0631\u062c \u0628\u0648\u0639\u0631\u064a\u0631\u064a\u062c\u200e", - "Bouira - \u0627\u0644\u0628\u0648\u064a\u0631\u0629", - "Boumerd\u00e8s - \u0628\u0648\u0645\u0631\u062f\u0627\u0633", - "B\u00e9ja\u00efa", - "Mascara - \u0645\u0639\u0633\u0643\u0631", - "Chlef - \u0627\u0644\u0634\u0644\u0641\u200e", - "Constantine - \u0642\u0633\u0646\u0637\u064a\u0646\u0629", - "Jijel - \u062c\u064a\u062c\u0644", - "El Tarf - \u0627\u0644\u0640\u0640\u0637\u0627\u0631\u0641", - "Guelma - \u06a4\u0627\u0644\u0645\u0629", - "Mila - \u0645\u064a\u0644\u0629", - "Mostaganem - \u0645\u0633\u062a\u063a\u0627\u0646\u0645", - "M\u00e9d\u00e9a - \u0627\u0644\u0645\u062f\u064a\u0629", - "Oran - \u0648\u0647\u0631\u0627\u0646", - "Oum El Bouaghi - \u0623\u0645 \u0627\u0644\u0640\u0628\u0640\u0648\u0627\u0642\u064a", - "Relizane - \u063a\u0644\u064a\u0632\u0627\u0646", - "Sa\u00efda - \u0633\u0639\u064a\u062f\u0629", - "Sidi Bel Abb\u00e8s - \u0633\u064a\u062f\u064a \u0628\u0644\u0639\u0628\u0627\u0633", - "Skikda - \u0633\u0643\u064a\u0643\u062f\u0629", - "Souk Ahras - \u0633\u0648\u0642 \u0623\u0647\u0631\u0627\u0633", - "S\u00e9tif - \u0633\u0637\u064a\u0641\u200e", - "Tiaret - \u062a\u064a\u0627\u0631\u062a", - "Tipaza - \u062a\u064a\u0628\u0627\u0632\u0629", - "Tissemsilt - \u062a\u0633\u0645\u0633\u064a\u0644\u062a", - "Tizi Ouzou - \u2d5c\u2d49\u2d63\u2d49 \u2d53\u2d63\u2d63\u2d53 - \u062a\u064a\u0632\u064a \u0648\u0632\u0648", + "Alger - \u0627\u0644\u062c\u0632\u0627\u0626\u0631", + "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631", + "Annaba - \u0639\u0646\u0627\u0628\u0629\u200e", + "A\u00efn Defla - \u0639\u064a\u0646 \u0627\u0644\u062f\u0641\u0644\u0649", + "A\u00efn T\u00e9mouchent - \u0639\u064a\u0646 \u062a\u0645\u0648\u0634\u0646\u062a", + "Blida - \u0627\u0644\u0628\u0644\u064a\u062f\u0629", + "Bordj Bou Arreridj\u200e - \u0628\u0631\u062c \u0628\u0648\u0639\u0631\u064a\u0631\u064a\u062c\u200e", + "Bouira - \u0627\u0644\u0628\u0648\u064a\u0631\u0629", + "Boumerd\u00e8s - \u0628\u0648\u0645\u0631\u062f\u0627\u0633", + "B\u00e9ja\u00efa", + "Mascara - \u0645\u0639\u0633\u0643\u0631", + "Chlef - \u0627\u0644\u0634\u0644\u0641\u200e", + "Constantine - \u0642\u0633\u0646\u0637\u064a\u0646\u0629", + "Jijel - \u062c\u064a\u062c\u0644", + "El Tarf - \u0627\u0644\u0640\u0640\u0637\u0627\u0631\u0641", + "Guelma - \u06a4\u0627\u0644\u0645\u0629", + "Mila - \u0645\u064a\u0644\u0629", + "Mostaganem - \u0645\u0633\u062a\u063a\u0627\u0646\u0645", + "M\u00e9d\u00e9a - \u0627\u0644\u0645\u062f\u064a\u0629", + "Oran - \u0648\u0647\u0631\u0627\u0646", + "Oum El Bouaghi - \u0623\u0645 \u0627\u0644\u0640\u0628\u0640\u0648\u0627\u0642\u064a", + "Relizane - \u063a\u0644\u064a\u0632\u0627\u0646", + "Sa\u00efda - \u0633\u0639\u064a\u062f\u0629", + "Sidi Bel Abb\u00e8s - \u0633\u064a\u062f\u064a \u0628\u0644\u0639\u0628\u0627\u0633", + "Skikda - \u0633\u0643\u064a\u0643\u062f\u0629", + "Souk Ahras - \u0633\u0648\u0642 \u0623\u0647\u0631\u0627\u0633", + "S\u00e9tif - \u0633\u0637\u064a\u0641\u200e", + "Tiaret - \u062a\u064a\u0627\u0631\u062a", + "Tipaza - \u062a\u064a\u0628\u0627\u0632\u0629", + "Tissemsilt - \u062a\u0633\u0645\u0633\u064a\u0644\u062a", + "Tizi Ouzou - \u2d5c\u2d49\u2d63\u2d49 \u2d53\u2d63\u2d63\u2d53 - \u062a\u064a\u0632\u064a \u0648\u0632\u0648", "Tlemcen - \u062a\u0644\u0645\u0633\u0627\u0646" - ], + ], "old": [ "Algeria" ] } ] - }, + }, { - "id": "Andorra", - "s": 864557, + "id": "Andorra", + "s": 864557, "affiliations": [ "Andorra" - ], + ], "old": [ "Andorra" ] - }, + }, { - "id": "Angola", - "s": 17321019, + "id": "Angola", + "s": 17321019, "affiliations": [ - "Angola", - "Bengo", - "Benguela", - "Bi\u00e9", - "Cabinda", - "Cuando Cubango", - "Cuanza Norte", - "Cuanza Sul", - "Cunene", - "U\u00edge", - "Huambo", - "Hu\u00edla", - "Luanda", - "Lunda Norte", - "Lunda Sul", - "Malanje", - "Moxico", - "Namibe", + "Angola", + "Bengo", + "Benguela", + "Bi\u00e9", + "Cabinda", + "Cuando Cubango", + "Cuanza Norte", + "Cuanza Sul", + "Cunene", + "U\u00edge", + "Huambo", + "Hu\u00edla", + "Luanda", + "Lunda Norte", + "Lunda Sul", + "Malanje", + "Moxico", + "Namibe", "Zaire" - ], + ], "old": [ "Angola" ] - }, + }, { - "id": "Anguilla", - "s": 415976, + "id": "Anguilla", + "s": 415976, "affiliations": [ "Anguilla" - ], + ], "old": [ "Anguilla" ] - }, + }, { - "id": "Antigua and Barbuda", - "s": 1203036, + "id": "Antigua and Barbuda", + "s": 1203036, "affiliations": [ - "Antigua and Barbuda", + "Antigua and Barbuda", "Montserrat" - ], + ], "old": [ "Antigua and Barbuda" ] - }, + }, { - "id": "Barbados", - "s": 1606937, + "id": "Barbados", + "s": 1606937, "affiliations": [ "Barbados" - ], + ], "old": [ "Barbados" ] - }, + }, { - "id": "British Virgin Islands", - "s": 423483, + "id": "British Virgin Islands", + "s": 423483, "affiliations": [ "British Virgin Islands" - ], + ], "old": [ "British Virgin Islands" ] - }, + }, { - "id": "Caribisch Nederland", - "s": 4717765, + "id": "Caribisch Nederland", + "s": 4717765, "affiliations": [ - "Caribisch Nederland", - "Nederland", + "Caribisch Nederland", + "Nederland", "Venezuela" - ], + ], "old": [ - "Netherlands Antilles", - "Aruba", + "Netherlands Antilles", + "Aruba", "Curacao" ] - }, + }, { - "id": "Dominica", - "s": 1637834, + "id": "Dominica", + "s": 1637834, "affiliations": [ - "Dominica", - "Saint Andrew Parish", - "Saint David Parish", - "Saint Luke Parish", - "Saint Mark Parish", - "Saint Patrick Parish", - "Saint Paul Parish", - "Saint George Parish", - "Saint John Parish", - "Saint Joseph Parish", + "Dominica", + "Saint Andrew Parish", + "Saint David Parish", + "Saint Luke Parish", + "Saint Mark Parish", + "Saint Patrick Parish", + "Saint Paul Parish", + "Saint George Parish", + "Saint John Parish", + "Saint Joseph Parish", "Saint Peter Parish" - ], + ], "old": [ "Dominica" ] - }, + }, { - "id": "Grenada", - "s": 573145, + "id": "Grenada", + "s": 573145, "affiliations": [ "Grenada" - ], + ], "old": [ "Grenada" ] - }, + }, { - "id": "Guadeloupe", - "s": 11397058, + "id": "Guadeloupe", + "s": 11397058, "affiliations": [ - "France", - "Guadeloupe", + "France", + "Guadeloupe", "Montserrat" - ], + ], "old": [ "Guadeloupe" ] - }, + }, { - "id": "Martinique", - "s": 9366980, + "id": "Martinique", + "s": 9366980, "affiliations": [ - "France", - "Martinique", + "France", + "Martinique", "Saint Lucia" - ], + ], "old": [ "Martinique" ] - }, + }, { - "id": "Montserrat", - "s": 195163, + "id": "Montserrat", + "s": 195163, "affiliations": [ "Montserrat" - ], + ], "old": [ "Montserrat" ] - }, + }, { - "id": "Saint Barthelemy", - "s": 232225, + "id": "Saint Barthelemy", + "s": 232225, "affiliations": [ "France" - ], + ], "old": [ "Saint Barthelemy" ] - }, + }, { - "id": "Saint Kitts and Nevis", - "s": 539903, + "id": "Saint Kitts and Nevis", + "s": 539903, "affiliations": [ "Saint Kitts and Nevis" - ], + ], "old": [ "Saint Kitts and Nevis" ] - }, + }, { - "id": "Saint Lucia", - "s": 1383906, + "id": "Saint Lucia", + "s": 1383906, "affiliations": [ - "Saint Lucia", + "Saint Lucia", "Saint Vincent and the Grenadines" - ], + ], "old": [ "Saint Lucia" ] - }, + }, { - "id": "Saint Martin", - "s": 1249851, + "id": "Saint Martin", + "s": 1249851, "affiliations": [ - "Anguilla", - "France", + "Anguilla", + "France", "Nederland" - ], + ], "old": [ "Saint Martin" ] - }, + }, { - "id": "Saint Vincent and the Grenadines", - "s": 447726, + "id": "Saint Vincent and the Grenadines", + "s": 447726, "affiliations": [ "Saint Vincent and the Grenadines" - ], + ], "old": [ "Saint Vincent and the Grenadines" ] - }, + }, { - "id": "Trinidad and Tobago", - "s": 10440063, + "id": "Trinidad and Tobago", + "s": 10440063, "affiliations": [ "Trinidad and Tobago" - ], + ], "old": [ "Trinidad and Tobago" ] - }, + }, { - "id": "United States Virgin Islands", - "s": 1365840, + "id": "United States Virgin Islands", + "s": 1365840, "affiliations": [ - "British Virgin Islands", - "Puerto Rico", - "United States Virgin Islands", + "British Virgin Islands", + "Puerto Rico", + "United States Virgin Islands", "United States of America" - ], + ], "old": [ "United States Virgin Islands" ] - }, + }, { - "id": "Argentina", + "id": "Argentina", "g": [ { - "id": "Campo de Hielo Sur", - "s": 637074, + "id": "Campo de Hielo Sur", + "s": 637074, "affiliations": [ "Acuerdo de Campos de Hielo" ] - }, + }, { - "id": "Argentina_Buenos Aires_Buenos Aires", - "s": 56744557, + "id": "Argentina_Buenos Aires_Buenos Aires", + "s": 56744557, "affiliations": [ - "Argentina", - "Ciudad Aut\u00f3noma de Buenos Aires", + "Argentina", + "Ciudad Aut\u00f3noma de Buenos Aires", "Buenos Aires" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Buenos Aires_North", - "s": 19270957, + "id": "Argentina_Buenos Aires_North", + "s": 19270957, "affiliations": [ - "Argentina", + "Argentina", "Buenos Aires" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Buenos Aires_South", - "s": 22985613, + "id": "Argentina_Buenos Aires_South", + "s": 22985613, "affiliations": [ - "Argentina", + "Argentina", "Buenos Aires" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Patagonia", - "s": 33194030, + "id": "Argentina_Patagonia", + "s": 33194030, "affiliations": [ - "Argentina", - "Chubut", - "R\u00edo Negro", - "Neuqu\u00e9n", - "Santa Cruz", + "Argentina", + "Chubut", + "R\u00edo Negro", + "Neuqu\u00e9n", + "Santa Cruz", "Tierra del Fuego" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Cuyo", - "s": 19107321, + "id": "Argentina_Cuyo", + "s": 19107321, "affiliations": [ - "Argentina", - "La Rioja", - "Mendoza", - "San Juan", + "Argentina", + "La Rioja", + "Mendoza", + "San Juan", "San Luis" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Mesopotamia", - "s": 37613878, + "id": "Argentina_Mesopotamia", + "s": 37613878, "affiliations": [ - "Argentina", - "Corrientes", - "Entre R\u00edos", - "Isla San Mart\u00edn", - "Isla Apip\u00e9 Chica", - "Isla Entre R\u00edos", - "Isla Los Patos", - "Isla Progreso", - "Isla Rivadavia", - "Islas Apip\u00e9", - "Itap\u00faa", + "Argentina", + "Corrientes", + "Entre R\u00edos", + "Isla San Mart\u00edn", + "Isla Apip\u00e9 Chica", + "Isla Entre R\u00edos", + "Isla Los Patos", + "Isla Progreso", + "Isla Rivadavia", + "Islas Apip\u00e9", + "Itap\u00faa", "Misiones" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Northwest", - "s": 41946175, + "id": "Argentina_Northwest", + "s": 41946175, "affiliations": [ - "Chaco", - "Argentina", - "Catamarca", - "Formosa", - "Jujuy", - "Salta", - "Santiago del Estero", + "Chaco", + "Argentina", + "Catamarca", + "Formosa", + "Jujuy", + "Salta", + "Santiago del Estero", "Tucum\u00e1n" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Pampas", - "s": 35077347, + "id": "Argentina_Pampas", + "s": 35077347, "affiliations": [ - "Argentina", - "C\u00f3rdoba", + "Argentina", + "C\u00f3rdoba", "La Pampa" - ], + ], "old": [ "Argentina" ] - }, + }, { - "id": "Argentina_Santa Fe", - "s": 25395033, + "id": "Argentina_Santa Fe", + "s": 25395033, "affiliations": [ - "Argentina", + "Argentina", "Santa Fe" - ], + ], "old": [ "Argentina" ] } ] - }, + }, { - "id": "Armenia", - "s": 13850933, + "id": "Armenia", + "s": 13850933, "affiliations": [ - "Border Azerbaijan - Armenia (Enclave AZE)", - "Qazax rayonu", - "\u053c\u0578\u057c\u056b", - "\u0535\u0580\u0587\u0561\u0576", - "\u0547\u056b\u0580\u0561\u056f", - "\u054e\u0561\u0575\u0578\u0581 \u0541\u0578\u0580", - "\u053f\u0578\u057f\u0561\u0575\u0584", - "\u054f\u0561\u057e\u0578\u0582\u0577", - "\u0531\u0580\u0561\u0580\u0561\u057f", - "\u0531\u0580\u0574\u0561\u057e\u056b\u0580", - "\u054d\u0575\u0578\u0582\u0576\u056b\u0584", - "\u0540\u0561\u0575\u0561\u057d\u057f\u0561\u0576", - "\u0531\u0580\u0561\u0563\u0561\u056e\u0578\u057f\u0576\u056b \u0574\u0561\u0580\u0566", + "Border Azerbaijan - Armenia (Enclave AZE)", + "Qazax rayonu", + "\u053c\u0578\u057c\u056b", + "\u0535\u0580\u0587\u0561\u0576", + "\u0547\u056b\u0580\u0561\u056f", + "\u054e\u0561\u0575\u0578\u0581 \u0541\u0578\u0580", + "\u053f\u0578\u057f\u0561\u0575\u0584", + "\u054f\u0561\u057e\u0578\u0582\u0577", + "\u0531\u0580\u0561\u0580\u0561\u057f", + "\u0531\u0580\u0574\u0561\u057e\u056b\u0580", + "\u054d\u0575\u0578\u0582\u0576\u056b\u0584", + "\u0540\u0561\u0575\u0561\u057d\u057f\u0561\u0576", + "\u0531\u0580\u0561\u0563\u0561\u056e\u0578\u057f\u0576\u056b \u0574\u0561\u0580\u0566", "\u0533\u0565\u0572\u0561\u0580\u0584\u0578\u0582\u0576\u056b\u0584" - ], + ], "old": [ "Armenia" ] - }, + }, { - "id": "Austria", + "id": "Austria", "g": [ { - "id": "Austria_Burgenland", - "s": 11193936, + "id": "Austria_Burgenland", + "s": 11193936, "affiliations": [ - "Burgenland", + "Burgenland", "\u00d6sterreich" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Carinthia", - "s": 29908433, + "id": "Austria_Carinthia", + "s": 29908433, "affiliations": [ - "K\u00e4rnten", + "K\u00e4rnten", "\u00d6sterreich" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Lower Austria_Wien", - "s": 52351391, + "id": "Austria_Lower Austria_Wien", + "s": 52351391, "affiliations": [ - "\u00d6sterreich", - "Nieder\u00f6sterreich", + "\u00d6sterreich", + "Nieder\u00f6sterreich", "Wien" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Styria_Graz", - "s": 42779807, + "id": "Austria_Styria_Graz", + "s": 42779807, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Steiermark" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Styria_Leoben", - "s": 23320427, + "id": "Austria_Styria_Leoben", + "s": 23320427, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Steiermark" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Upper Austria_Linz", - "s": 32202095, + "id": "Austria_Upper Austria_Linz", + "s": 32202095, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Ober\u00f6sterreich" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Upper Austria_Wels", - "s": 40630523, + "id": "Austria_Upper Austria_Wels", + "s": 40630523, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Ober\u00f6sterreich" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Lower Austria_West", - "s": 39319604, + "id": "Austria_Lower Austria_West", + "s": 39319604, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Nieder\u00f6sterreich" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Tyrol", - "s": 45312247, + "id": "Austria_Tyrol", + "s": 45312247, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Tirol" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Salzburg", - "s": 28178308, + "id": "Austria_Salzburg", + "s": 28178308, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Salzburg" - ], + ], "old": [ "Austria" ] - }, + }, { - "id": "Austria_Vorarlberg", - "s": 16436924, + "id": "Austria_Vorarlberg", + "s": 16436924, "affiliations": [ - "\u00d6sterreich", + "\u00d6sterreich", "Vorarlberg" - ], + ], "old": [ "Austria" ] } ] - }, + }, { - "id": "Australia", + "id": "Australia", "g": [ { - "id": "Willis Island", - "s": 77281, + "id": "Willis Island", + "s": 77281, "affiliations": [ - "Australia", - "Coral Sea Islands Territory", + "Australia", + "Coral Sea Islands Territory", "Willis Island" ] - }, + }, { - "id": "Australia_Melbourne", - "s": 47678369, + "id": "Australia_Melbourne", + "s": 47678369, "affiliations": [ - "Australia", + "Australia", "Victoria" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_New South Wales", - "s": 26034074, + "id": "Australia_New South Wales", + "s": 26034074, "affiliations": [ - "Australia", - "Coral Sea Islands Territory", - "New South Wales", + "Australia", + "Coral Sea Islands Territory", + "New South Wales", "Norfolk Island" - ], + ], "old": [ - "Australia", + "Australia", "Norfolk Island" ] - }, + }, { - "id": "Australia_Northern Territory", - "s": 6896014, + "id": "Australia_Northern Territory", + "s": 6896014, "affiliations": [ - "Australia", + "Australia", "Northern Territory" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_Queensland", - "s": 20985483, + "id": "Australia_Queensland", + "s": 20985483, "affiliations": [ - "Australia", - "Coral Sea Islands Territory", + "Australia", + "Coral Sea Islands Territory", "Queensland" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_South Australia", - "s": 34238500, + "id": "Australia_South Australia", + "s": 34238500, "affiliations": [ - "Australia", + "Australia", "South Australia" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_Tasmania", - "s": 16376711, + "id": "Australia_Tasmania", + "s": 16376711, "affiliations": [ - "Australia", + "Australia", "Tasmania" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_Victoria", - "s": 35479735, + "id": "Australia_Victoria", + "s": 35479735, "affiliations": [ - "Australia", + "Australia", "Victoria" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_Western Australia", - "s": 43191530, + "id": "Australia_Western Australia", + "s": 43191530, "affiliations": [ - "Ashmore and Cartier Islands", - "Christmas Island", - "Australia", - "Cocos (Keeling) Islands", + "Ashmore and Cartier Islands", + "Christmas Island", + "Australia", + "Cocos (Keeling) Islands", "Western Australia" - ], + ], "old": [ - "Cocos Islands", - "Australia", + "Cocos Islands", + "Australia", "Christmas Island" ] - }, + }, { - "id": "Australia_Brisbane", - "s": 37141762, + "id": "Australia_Brisbane", + "s": 37141762, "affiliations": [ - "Australia", - "Coral Sea Islands Territory", - "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)", + "Australia", + "Coral Sea Islands Territory", + "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)", "Queensland" - ], + ], "old": [ "Australia" ] - }, + }, { - "id": "Australia_Sydney", - "s": 50072602, + "id": "Australia_Sydney", + "s": 50072602, "affiliations": [ - "Australia", - "Australian Capital Territory", - "Jervis Bay Territory", + "Australia", + "Australian Capital Territory", + "Jervis Bay Territory", "New South Wales" - ], + ], "old": [ "Australia" ] } ] - }, + }, { - "id": "Nagorno-Karabakh", - "s": 2004950, + "id": "Nagorno-Karabakh", + "s": 2004950, "affiliations": [ - "Az\u0259rbaycan", - "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", - "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)", - "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)", - "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)", - "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)", - "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576", - "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", + "Az\u0259rbaycan", + "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", + "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)", + "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)", + "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)", + "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)", + "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576", + "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", "\u054d\u057f\u0565\u0583\u0561\u0576\u0561\u056f\u0565\u0580\u057f (Stepanakert - Khankendi)" - ], + ], "old": [ "Azerbaijan" ] - }, + }, { - "id": "Azerbaijan Region", + "id": "Azerbaijan Region", "g": [ { - "id": "Nagorno-Karabakh", - "s": 2004950, + "id": "Nagorno-Karabakh", + "s": 2004950, "affiliations": [ - "Az\u0259rbaycan", - "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", - "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)", - "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)", - "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)", - "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)", - "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576", - "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", + "Az\u0259rbaycan", + "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", + "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)", + "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)", + "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)", + "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)", + "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576", + "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", "\u054d\u057f\u0565\u0583\u0561\u0576\u0561\u056f\u0565\u0580\u057f (Stepanakert - Khankendi)" - ], + ], "old": [ "Azerbaijan" ] - }, + }, { - "id": "Azerbaijan", - "s": 24766322, + "id": "Azerbaijan", + "s": 24766322, "affiliations": [ - "Ab\u015feron rayonu", - "A\u011fcab\u0259di rayonu", - "A\u011fdam rayonu", - "Astara rayonu", - "Az\u0259rbaycan", - "A\u011fda\u015f rayonu", - "A\u011fstafa rayonu", - "A\u011fsu rayonu", - "Bak\u0131 \u0130nzibati \u018frazisi", - "Balak\u0259n rayonu", - "Bab\u0259k rayonu", - "Beyl\u0259qan rayonu", - "Bil\u0259suvar rayonu", - "B\u0259rd\u0259 rayonu", - "Da\u015fk\u0259s\u0259n rayonu", - "Culfa rayonu", - "C\u0259lilabad rayonu", - "T\u0259rt\u0259r rayonu", - "G\u00f6yg\u00f6l rayonu", - "G\u00f6y\u00e7ay rayonu", - "F\u00fczuli rayonu", - "Goranboy rayonu", - "Zaqatala rayonu", - "G\u0259d\u0259b\u0259y rayonu", - "G\u0259nc\u0259 \u0130nzibati \u018frazisi", - "Hac\u0131qabul rayonu", - "K\u0259ng\u0259rli rayonu", - "K\u00fcrd\u0259mir rayonu", - "Lerik rayonu", - "L\u0259nk\u0259ran rayonu", - "L\u0259nk\u0259ran \u0130nzibati \u018frazisi", - "Neft\u00e7ala rayonu", - "Masall\u0131 rayonu", - "Ming\u0259\u00e7evir \u0130nzibati \u018frazisi", - "Naftalan \u0130nzibati \u018frazisi", - "Nax\u00e7\u0131van", - "Nax\u00e7\u0131van \u0130nzibati \u018frazisi", - "Ordubad rayonu", - "O\u011fuz rayonu", - "Qax rayonu", - "Qazax rayonu", - "Qobustan rayonu", - "Quba rayonu", - "Qusar rayonu", - "Q\u0259b\u0259l\u0259 rayonu", - "Saatl\u0131 rayonu", - "Sabirabad rayonu", - "Salyan rayonu", - "Samux rayonu", - "Siy\u0259z\u0259n rayonu", - "Sumqay\u0131t \u0130nzibati \u018frazisi", - "S\u0259d\u0259r\u0259k rayonu", - "Tovuz rayonu", - "Ucar rayonu", - "X\u0131z\u0131 rayonu", - "Yevlax rayonu", - "Xa\u00e7maz rayonu", - "Xocav\u0259nd rayonu", - "Yevlax \u0130nzibati \u018frazisi", - "Yard\u0131ml\u0131 rayonu", - "Z\u0259rdab rayonu", - "\u015eabran rayonu", - "\u015eahbuz rayonu", - "\u015eamax\u0131 rayonu", - "\u015eirvan \u0130nzibati \u018frazisi", - "\u0130mi\u015fli rayonu", - "\u0130smay\u0131ll\u0131 rayonu", - "\u015e\u0259ki rayonu", - "\u015e\u0259ki \u0130nzibati \u018frazisi", - "\u015e\u0259mkir rayonu", + "Ab\u015feron rayonu", + "A\u011fcab\u0259di rayonu", + "A\u011fdam rayonu", + "Astara rayonu", + "Az\u0259rbaycan", + "A\u011fda\u015f rayonu", + "A\u011fstafa rayonu", + "A\u011fsu rayonu", + "Bak\u0131 \u0130nzibati \u018frazisi", + "Balak\u0259n rayonu", + "Bab\u0259k rayonu", + "Beyl\u0259qan rayonu", + "Bil\u0259suvar rayonu", + "B\u0259rd\u0259 rayonu", + "Da\u015fk\u0259s\u0259n rayonu", + "Culfa rayonu", + "C\u0259lilabad rayonu", + "T\u0259rt\u0259r rayonu", + "G\u00f6yg\u00f6l rayonu", + "G\u00f6y\u00e7ay rayonu", + "F\u00fczuli rayonu", + "Goranboy rayonu", + "Zaqatala rayonu", + "G\u0259d\u0259b\u0259y rayonu", + "G\u0259nc\u0259 \u0130nzibati \u018frazisi", + "Hac\u0131qabul rayonu", + "K\u0259ng\u0259rli rayonu", + "K\u00fcrd\u0259mir rayonu", + "Lerik rayonu", + "L\u0259nk\u0259ran rayonu", + "L\u0259nk\u0259ran \u0130nzibati \u018frazisi", + "Neft\u00e7ala rayonu", + "Masall\u0131 rayonu", + "Ming\u0259\u00e7evir \u0130nzibati \u018frazisi", + "Naftalan \u0130nzibati \u018frazisi", + "Nax\u00e7\u0131van", + "Nax\u00e7\u0131van \u0130nzibati \u018frazisi", + "Ordubad rayonu", + "O\u011fuz rayonu", + "Qax rayonu", + "Qazax rayonu", + "Qobustan rayonu", + "Quba rayonu", + "Qusar rayonu", + "Q\u0259b\u0259l\u0259 rayonu", + "Saatl\u0131 rayonu", + "Sabirabad rayonu", + "Salyan rayonu", + "Samux rayonu", + "Siy\u0259z\u0259n rayonu", + "Sumqay\u0131t \u0130nzibati \u018frazisi", + "S\u0259d\u0259r\u0259k rayonu", + "Tovuz rayonu", + "Ucar rayonu", + "X\u0131z\u0131 rayonu", + "Yevlax rayonu", + "Xa\u00e7maz rayonu", + "Xocav\u0259nd rayonu", + "Yevlax \u0130nzibati \u018frazisi", + "Yard\u0131ml\u0131 rayonu", + "Z\u0259rdab rayonu", + "\u015eabran rayonu", + "\u015eahbuz rayonu", + "\u015eamax\u0131 rayonu", + "\u015eirvan \u0130nzibati \u018frazisi", + "\u0130mi\u015fli rayonu", + "\u0130smay\u0131ll\u0131 rayonu", + "\u015e\u0259ki rayonu", + "\u015e\u0259ki \u0130nzibati \u018frazisi", + "\u015e\u0259mkir rayonu", "\u015e\u0259rur rayonu" - ], + ], "old": [ "Azerbaijan" ] } ] - }, + }, { - "id": "Bahrain", - "s": 3922714, + "id": "Bahrain", + "s": 3922714, "affiliations": [ - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u062d\u0631\u0642", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0639\u0627\u0635\u0645\u0629", - "\u200f\u0627\u0644\u0628\u062d\u0631\u064a\u0646\u200e", - "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0648\u0633\u0637\u0649", - "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u0646\u0648\u0628\u064a\u0629", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u062d\u0631\u0642", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0639\u0627\u0635\u0645\u0629", + "\u200f\u0627\u0644\u0628\u062d\u0631\u064a\u0646\u200e", + "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0648\u0633\u0637\u0649", + "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u0646\u0648\u0628\u064a\u0629", "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0634\u0645\u0627\u0644\u064a\u0629" - ], + ], "old": [ "Bahrain" ] - }, + }, { - "id": "Bangladesh", - "s": 17082940, + "id": "Bangladesh", + "s": 17082940, "affiliations": [ - "Border India - Bangladesh", - "\u09b0\u09be\u099c\u09b6\u09be\u09b9\u09c0 \u09ac\u09bf\u09ad\u09be\u0997", - "\u09a2\u09be\u0995\u09be \u09ac\u09bf\u09ad\u09be\u0997", - "\u0996\u09c1\u09b2\u09a8\u09be \u09ac\u09bf\u09ad\u09be\u0997", - "\u09b0\u0982\u09aa\u09c1\u09b0 \u09ac\u09bf\u09ad\u09be\u0997", - "\u09b8\u09bf\u09b2\u09c7\u099f \u09ac\u09bf\u09ad\u09be\u0997", - "\u09ac\u09b0\u09bf\u09b6\u09be\u09b2 \u09ac\u09bf\u09ad\u09be\u0997", - "\u09ac\u09be\u0982\u09b2\u09be\u09a6\u09c7\u09b6", + "Border India - Bangladesh", + "\u09b0\u09be\u099c\u09b6\u09be\u09b9\u09c0 \u09ac\u09bf\u09ad\u09be\u0997", + "\u09a2\u09be\u0995\u09be \u09ac\u09bf\u09ad\u09be\u0997", + "\u0996\u09c1\u09b2\u09a8\u09be \u09ac\u09bf\u09ad\u09be\u0997", + "\u09b0\u0982\u09aa\u09c1\u09b0 \u09ac\u09bf\u09ad\u09be\u0997", + "\u09b8\u09bf\u09b2\u09c7\u099f \u09ac\u09bf\u09ad\u09be\u0997", + "\u09ac\u09b0\u09bf\u09b6\u09be\u09b2 \u09ac\u09bf\u09ad\u09be\u0997", + "\u09ac\u09be\u0982\u09b2\u09be\u09a6\u09c7\u09b6", "\u099a\u099f\u09cd\u099f\u0997\u09cd\u09b0\u09be\u09ae \u09ac\u09bf\u09ad\u09be\u0997" - ], + ], "old": [ "Bangladesh" ] - }, + }, { - "id": "Belarus", + "id": "Belarus", "g": [ { - "id": "Belarus_Vitebsk Region", - "s": 32344099, + "id": "Belarus_Vitebsk Region", + "s": 32344099, "affiliations": [ - "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", + "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Belarus" ] - }, + }, { - "id": "Belarus_Hrodna Region", - "s": 19988682, + "id": "Belarus_Hrodna Region", + "s": 19988682, "affiliations": [ - "\u0413\u0440\u043e\u0434\u043d\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0413\u0440\u043e\u0434\u043d\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" - ], + ], "old": [ "Belarus" ] - }, + }, { - "id": "Belarus_Brest Region", - "s": 14987806, + "id": "Belarus_Brest Region", + "s": 14987806, "affiliations": [ - "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", + "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Belarus" ] - }, + }, { - "id": "Belarus_Homiel Region", - "s": 22496225, + "id": "Belarus_Homiel Region", + "s": 22496225, "affiliations": [ - "\u0413\u043e\u043c\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0413\u043e\u043c\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" - ], + ], "old": [ "Belarus" ] - }, + }, { - "id": "Belarus_Maglieu Region", - "s": 18853539, + "id": "Belarus_Maglieu Region", + "s": 18853539, "affiliations": [ - "\u041c\u043e\u0433\u0438\u043b\u0451\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041c\u043e\u0433\u0438\u043b\u0451\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" - ], + ], "old": [ "Belarus" ] - }, + }, { - "id": "Belarus_Minsk Region", - "s": 36518181, + "id": "Belarus_Minsk Region", + "s": 36518181, "affiliations": [ - "\u0413\u043e\u043b\u044c\u0444-\u043a\u043b\u0443\u0431", - "\u041c\u0438\u043d\u0441\u043a", - "\u041c\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", - "\u041a\u043e\u043b\u043e\u0434\u0438\u0449\u0438", + "\u0413\u043e\u043b\u044c\u0444-\u043a\u043b\u0443\u0431", + "\u041c\u0438\u043d\u0441\u043a", + "\u041c\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", + "\u041a\u043e\u043b\u043e\u0434\u0438\u0449\u0438", "\u041d\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0430\u044d\u0440\u043e\u043f\u043e\u0440\u0442 \"\u041c\u0438\u043d\u0441\u043a\"" - ], + ], "old": [ "Belarus" ] } ] - }, + }, { - "id": "Belgium", + "id": "Belgium", "g": [ { - "id": "Belgium_West Flanders", - "s": 28132608, + "id": "Belgium_West Flanders", + "s": 28132608, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" - ], + ], "old": [ - "Belgium", + "Belgium", "UK_England" ] - }, + }, { - "id": "Belgium_Antwerp", - "s": 37090962, + "id": "Belgium_Antwerp", + "s": 37090962, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", - "Nederland - Belgique / Belgi\u00eb / Belgien", + "Belgi\u00eb - Belgique - Belgien", + "Nederland - Belgique / Belgi\u00eb / Belgien", "Vlaanderen" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_East Flanders", - "s": 26890547, + "id": "Belgium_East Flanders", + "s": 26890547, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Hainaut", - "s": 18870729, + "id": "Belgium_Hainaut", + "s": 18870729, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Wallonie" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Walloon Brabant", - "s": 5894868, + "id": "Belgium_Walloon Brabant", + "s": 5894868, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Wallonie" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Namur", - "s": 9892212, + "id": "Belgium_Namur", + "s": 9892212, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Wallonie" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Limburg", - "s": 24394606, + "id": "Belgium_Limburg", + "s": 24394606, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Luxembourg", - "s": 9351705, + "id": "Belgium_Luxembourg", + "s": 9351705, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Wallonie" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Flemish Brabant", - "s": 38816453, + "id": "Belgium_Flemish Brabant", + "s": 38816453, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", - "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", + "Belgi\u00eb - Belgique - Belgien", + "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", "Vlaanderen" - ], + ], "old": [ "Belgium" ] - }, + }, { - "id": "Belgium_Liege", - "s": 25636045, + "id": "Belgium_Liege", + "s": 25636045, "affiliations": [ - "Belgi\u00eb - Belgique - Belgien", + "Belgi\u00eb - Belgique - Belgien", "Wallonie" - ], + ], "old": [ "Belgium" ] } ] - }, + }, { - "id": "Belize", - "s": 3658074, + "id": "Belize", + "s": 3658074, "affiliations": [ - "Belize District", - "Belize", - "Cayo", - "Cort\u00e9s", - "Corozal", - "Honduras", - "Orange Walk", - "Stann Creek", + "Belize District", + "Belize", + "Cayo", + "Cort\u00e9s", + "Corozal", + "Honduras", + "Orange Walk", + "Stann Creek", "Toledo" - ], + ], "old": [ "Belize" ] - }, + }, { - "id": "Benin", - "s": 13914735, + "id": "Benin", + "s": 13914735, "affiliations": [ - "Alibori", - "Atakora", - "Atlantique", - "Borgou", - "B\u00e9nin", - "Collines", - "Donga", - "Littoral", - "Kouffo", - "Mono", - "Ou\u00e9m\u00e9", - "Plateau", + "Alibori", + "Atakora", + "Atlantique", + "Borgou", + "B\u00e9nin", + "Collines", + "Donga", + "Littoral", + "Kouffo", + "Mono", + "Ou\u00e9m\u00e9", + "Plateau", "Zou" - ], + ], "old": [ "Benin" ] - }, + }, { - "id": "Bermuda", - "s": 654049, + "id": "Bermuda", + "s": 654049, "affiliations": [ "Bermuda" - ], + ], "old": [ "Bermuda" ] - }, + }, { - "id": "Bhutan", - "s": 1831002, + "id": "Bhutan", + "s": 1831002, "affiliations": [ - "\u0f60\u0f56\u0fb2\u0f74\u0f42\u0f61\u0f74\u0f63\u0f0b", - "\u0f58\u0f42\u0f62\u0f0b\u0f66\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f62\u0fa9\u0f72\u0f0b\u0f62\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f67\u0f71\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f51\u0f62\u0f0b\u0f51\u0f40\u0f62\u0f0b\u0f53\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f63\u0fb7\u0f74\u0f53\u0f0b\u0f62\u0fa9\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f42\u0f66\u0f62\u0f0b\u0f66\u0fa4\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f56\u0f66\u0f58\u0f0b\u0f62\u0fa9\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f58\u0f7c\u0f44\u0f0b\u0f66\u0f92\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f66\u0fa4\u0f74\u0f0b\u0f53\u0f0b\u0f41\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f42\u0f5e\u0f63\u0f58\u0f0b\u0f66\u0f92\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f54\u0f51\u0fa8\u0f0b\u0f51\u0f42\u0f60\u0f0b\u0f5a\u0f63\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f46\u0f74\u0f0b\u0f41\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f66\u0fa4\u0f0b\u0f62\u0f7c\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f50\u0f72\u0f58\u0f0b\u0f55\u0f74\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f56\u0f74\u0f58\u0f0b\u0f50\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f40\u0fb2\u0f7c\u0f44\u0f0b\u0f42\u0f66\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f56\u0f40\u0fb2\u0f0b\u0f64\u0f72\u0f66\u0f0b\u0f66\u0f92\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f56\u0f40\u0fb2\u0f0b\u0f64\u0f72\u0f66\u0f0b\u0f42\u0fb1\u0f44\u0f0b\u0f59\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", - "\u0f51\u0f56\u0f44\u0f0b\u0f60\u0f51\u0f74\u0f66\u0f0b\u0f55\u0f7c\u0f0b\u0f56\u0fb2\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f60\u0f56\u0fb2\u0f74\u0f42\u0f61\u0f74\u0f63\u0f0b", + "\u0f58\u0f42\u0f62\u0f0b\u0f66\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f62\u0fa9\u0f72\u0f0b\u0f62\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f67\u0f71\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f51\u0f62\u0f0b\u0f51\u0f40\u0f62\u0f0b\u0f53\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f63\u0fb7\u0f74\u0f53\u0f0b\u0f62\u0fa9\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f42\u0f66\u0f62\u0f0b\u0f66\u0fa4\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f56\u0f66\u0f58\u0f0b\u0f62\u0fa9\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f58\u0f7c\u0f44\u0f0b\u0f66\u0f92\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f66\u0fa4\u0f74\u0f0b\u0f53\u0f0b\u0f41\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f42\u0f5e\u0f63\u0f58\u0f0b\u0f66\u0f92\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f54\u0f51\u0fa8\u0f0b\u0f51\u0f42\u0f60\u0f0b\u0f5a\u0f63\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f46\u0f74\u0f0b\u0f41\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f66\u0fa4\u0f0b\u0f62\u0f7c\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f50\u0f72\u0f58\u0f0b\u0f55\u0f74\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f56\u0f74\u0f58\u0f0b\u0f50\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f40\u0fb2\u0f7c\u0f44\u0f0b\u0f42\u0f66\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f56\u0f40\u0fb2\u0f0b\u0f64\u0f72\u0f66\u0f0b\u0f66\u0f92\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f56\u0f40\u0fb2\u0f0b\u0f64\u0f72\u0f66\u0f0b\u0f42\u0fb1\u0f44\u0f0b\u0f59\u0f7a\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", + "\u0f51\u0f56\u0f44\u0f0b\u0f60\u0f51\u0f74\u0f66\u0f0b\u0f55\u0f7c\u0f0b\u0f56\u0fb2\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", "\u0f56\u0f66\u0f58\u0f0b\u0f42\u0fb2\u0f74\u0f56\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b\u0f58\u0f41\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b" - ], + ], "old": [ "Bhutan" ] - }, + }, { - "id": "Bolivia", + "id": "Bolivia", "g": [ { - "id": "Bolivia_North", - "s": 42612324, + "id": "Bolivia_North", + "s": 42612324, "affiliations": [ - "Bolivia", - "Beni", - "La Paz", - "Pando", + "Bolivia", + "Beni", + "La Paz", + "Pando", "Santa Cruz" - ], + ], "old": [ "Bolivia" ] - }, + }, { - "id": "Bolivia_South", - "s": 30911025, + "id": "Bolivia_South", + "s": 30911025, "affiliations": [ - "Bolivia", - "Chuquisaca", - "Cochabamba", - "Oruro", - "Potos\u00ed", + "Bolivia", + "Chuquisaca", + "Cochabamba", + "Oruro", + "Potos\u00ed", "Tarija" - ], + ], "old": [ "Bolivia" ] } ] - }, + }, { - "id": "Bosnia and Herzegovina", + "id": "Bosnia and Herzegovina", "g": [ { - "id": "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina", - "s": 36369365, + "id": "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina", + "s": 36369365, "affiliations": [ - "Bosna i Hercegovina", + "Bosna i Hercegovina", "Federacija Bosne i Hercegovine" - ], + ], "old": [ "Bosnia and Herzegovina" ] - }, + }, { - "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", - "s": 874919, + "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", + "s": 874919, "affiliations": [ - "Br\u010dko distrikt Bosne i Hercegovine", - "Bosna i Hercegovina", + "Br\u010dko distrikt Bosne i Hercegovine", + "Bosna i Hercegovina", "Republika Srpska" - ], + ], "old": [ "Bosnia and Herzegovina" ] - }, + }, { - "id": "Bosnia and Herzegovina_Republic of Srpska", - "s": 30595114, + "id": "Bosnia and Herzegovina_Republic of Srpska", + "s": 30595114, "affiliations": [ - "Bosna i Hercegovina", + "Bosna i Hercegovina", "Republika Srpska" - ], + ], "old": [ "Bosnia and Herzegovina" ] } ] - }, + }, { - "id": "Botswana", - "s": 21609170, + "id": "Botswana", + "s": 21609170, "affiliations": [ - "Botswana", - "Central District", - "Ghanzi District", - "Kgalagadi District", - "Kgatleng District", - "Kweneng District", - "North-East District", - "North-West District", - "South-East District", + "Botswana", + "Central District", + "Ghanzi District", + "Kgalagadi District", + "Kgatleng District", + "Kweneng District", + "North-East District", + "North-West District", + "South-East District", "Southern District" - ], + ], "old": [ "Botswana" ] - }, + }, { - "id": "Brazil", + "id": "Brazil", "g": [ { - "id": "Brazil_Bahia", - "s": 43079826, + "id": "Brazil_Bahia", + "s": 43079826, "affiliations": [ - "Bahia", + "Bahia", "Brasil" - ], + ], "old": [ "Brazil_Northeast" ] - }, + }, { - "id": "Brazil_Goias_North", - "s": 13024402, + "id": "Brazil_Goias_North", + "s": 13024402, "affiliations": [ - "Brasil", + "Brasil", "Goi\u00e1s" - ], + ], "old": [ "Brazil_Central-West" ] - }, + }, { - "id": "Brazil_Goias_Brasilia", - "s": 42386633, + "id": "Brazil_Goias_Brasilia", + "s": 42386633, "affiliations": [ - "Brasil", - "Distrito Federal", + "Brasil", + "Distrito Federal", "Goi\u00e1s" - ], + ], "old": [ "Brazil_Central-West" ] - }, + }, { - "id": "Brazil_Mato Grosso Do Sul", - "s": 19906606, + "id": "Brazil_Mato Grosso Do Sul", + "s": 19906606, "affiliations": [ - "Brasil", + "Brasil", "Mato Grosso do Sul" - ], + ], "old": [ "Brazil_Central-West" ] - }, + }, { - "id": "Brazil_Mato Grosso", - "s": 22220791, + "id": "Brazil_Mato Grosso", + "s": 22220791, "affiliations": [ - "Brasil", + "Brasil", "Mato Grosso" - ], + ], "old": [ "Brazil_Central-West" ] - }, + }, { - "id": "Brazil_North Region_East", - "s": 38383170, + "id": "Brazil_North Region_East", + "s": 38383170, "affiliations": [ - "Amap\u00e1", - "Brasil", - "Par\u00e1", + "Amap\u00e1", + "Brasil", + "Par\u00e1", "Tocantins" - ], + ], "old": [ "Brazil_North" ] - }, + }, { - "id": "Brazil_North Region_West", - "s": 30640959, + "id": "Brazil_North Region_West", + "s": 30640959, "affiliations": [ - "Acre", - "Amazonas", - "Brasil", - "Rond\u00f4nia", + "Acre", + "Amazonas", + "Brasil", + "Rond\u00f4nia", "Roraima" - ], + ], "old": [ "Brazil_North" ] - }, + }, { - "id": "Brazil_Northeast Region_East", - "s": 34020791, + "id": "Brazil_Northeast Region_East", + "s": 34020791, "affiliations": [ - "Alagoas", - "Brasil", - "Pernambuco", + "Alagoas", + "Brasil", + "Pernambuco", "Sergipe" - ], + ], "old": [ "Brazil_Northeast" ] - }, + }, { - "id": "Brazil_Northeast Region_West", - "s": 54980428, + "id": "Brazil_Northeast Region_West", + "s": 54980428, "affiliations": [ - "Brasil", - "Cear\u00e1", - "Maranh\u00e3o", - "Pernambuco", + "Brasil", + "Cear\u00e1", + "Maranh\u00e3o", + "Pernambuco", "Piau\u00ed" - ], + ], "old": [ "Brazil_Northeast" ] - }, + }, { - "id": "Brazil_Paraiba", - "s": 13497205, + "id": "Brazil_Paraiba", + "s": 13497205, "affiliations": [ - "Brasil", + "Brasil", "Para\u00edba" - ], + ], "old": [ "Brazil_Northeast" ] - }, + }, { - "id": "Brazil_Parana_East", - "s": 28375365, + "id": "Brazil_Parana_East", + "s": 28375365, "affiliations": [ - "Brasil", + "Brasil", "Paran\u00e1" - ], + ], "old": [ "Brazil_South" ] - }, + }, { - "id": "Brazil_Parana_West", - "s": 37074864, + "id": "Brazil_Parana_West", + "s": 37074864, "affiliations": [ - "Brasil", + "Brasil", "Paran\u00e1" - ], + ], "old": [ "Brazil_South" ] - }, + }, { - "id": "Brazil_Rio Grande do Norte", - "s": 10951896, + "id": "Brazil_Rio Grande do Norte", + "s": 10951896, "affiliations": [ - "Brasil", - "Pernambuco", + "Brasil", + "Pernambuco", "Rio Grande do Norte" - ], + ], "old": [ "Brazil_Northeast" ] - }, + }, { - "id": "Brazil_Santa Catarina", - "s": 43243232, + "id": "Brazil_Santa Catarina", + "s": 43243232, "affiliations": [ - "Brasil", + "Brasil", "Santa Catarina" - ], + ], "old": [ "Brazil_South" ] - }, + }, { - "id": "Brazil_South Region_East", - "s": 36078573, + "id": "Brazil_South Region_East", + "s": 36078573, "affiliations": [ - "Brasil", + "Brasil", "Rio Grande do Sul" - ], + ], "old": [ "Brazil_South" ] - }, + }, { - "id": "Brazil_South Region_West", - "s": 27178229, + "id": "Brazil_South Region_West", + "s": 27178229, "affiliations": [ - "Brasil", + "Brasil", "Rio Grande do Sul" - ], + ], "old": [ "Brazil_South" ] - }, + }, { - "id": "Brazil_Southeast Region_Espirito Santo", - "s": 19949939, + "id": "Brazil_Southeast Region_Espirito Santo", + "s": 19949939, "affiliations": [ - "Brasil", + "Brasil", "Esp\u00edrito Santo" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Minas Gerais_Contagem", - "s": 58183021, + "id": "Brazil_Southeast Region_Minas Gerais_Contagem", + "s": 58183021, "affiliations": [ - "Brasil", + "Brasil", "Minas Gerais" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Minas Gerais_North", - "s": 37886993, + "id": "Brazil_Southeast Region_Minas Gerais_North", + "s": 37886993, "affiliations": [ - "Brasil", + "Brasil", "Minas Gerais" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Rio de Janeiro", - "s": 43367399, + "id": "Brazil_Southeast Region_Rio de Janeiro", + "s": 43367399, "affiliations": [ - "Brasil", + "Brasil", "Rio de Janeiro" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Sao Paulo_Campinas", - "s": 52501798, + "id": "Brazil_Southeast Region_Sao Paulo_Campinas", + "s": 52501798, "affiliations": [ - "Brasil", + "Brasil", "S\u00e3o Paulo" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Sao Paulo_City", - "s": 59185762, + "id": "Brazil_Southeast Region_Sao Paulo_City", + "s": 59185762, "affiliations": [ - "Brasil", + "Brasil", "S\u00e3o Paulo" - ], + ], "old": [ "Brazil_Southeast" ] - }, + }, { - "id": "Brazil_Southeast Region_Sao Paulo_West", - "s": 49087893, + "id": "Brazil_Southeast Region_Sao Paulo_West", + "s": 49087893, "affiliations": [ - "Brasil", + "Brasil", "S\u00e3o Paulo" - ], + ], "old": [ "Brazil_Southeast" ] } ] - }, + }, { - "id": "Brunei", - "s": 1451389, + "id": "Brunei", + "s": 1451389, "affiliations": [ "Brunei Darussalam" - ], + ], "old": [ "Brunei" ] - }, + }, { - "id": "Bulgaria", + "id": "Bulgaria", "g": [ { - "id": "Bulgaria_East", - "s": 33610929, + "id": "Bulgaria_East", + "s": 33610929, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" - ], + ], "old": [ "Bulgaria" ] - }, + }, { - "id": "Bulgaria_West", - "s": 39860727, + "id": "Bulgaria_West", + "s": 39860727, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" - ], + ], "old": [ "Bulgaria" ] } ] - }, + }, { - "id": "Burkina Faso", - "s": 21569429, + "id": "Burkina Faso", + "s": 21569429, "affiliations": [ - "Boucle du Mouhoun", - "Burkina Faso", - "Cascades", - "Centre", - "Centre-Est", - "Centre-Nord", - "Centre-Ouest", - "Centre-Sud", - "Est", - "Hauts-Bassins", - "Nord", - "Plateau-Central", - "Sahel", + "Boucle du Mouhoun", + "Burkina Faso", + "Cascades", + "Centre", + "Centre-Est", + "Centre-Nord", + "Centre-Ouest", + "Centre-Sud", + "Est", + "Hauts-Bassins", + "Nord", + "Plateau-Central", + "Sahel", "Sud-Ouest" - ], + ], "old": [ "Burkina Faso" ] - }, + }, { - "id": "Burundi", - "s": 9359018, + "id": "Burundi", + "s": 9359018, "affiliations": [ - "Cibitoke", - "Bubanza", - "Bururi", - "Bujumbura Mairie", - "Bujumbura Rural", - "Burundi", - "Cankuzo", - "Gitega", - "Karuzi", - "Kayanza", - "Kirundo", - "Makamba", - "Ngozi", - "Muramvya", - "Muyinga", - "Mwaro", - "Rutana", + "Cibitoke", + "Bubanza", + "Bururi", + "Bujumbura Mairie", + "Bujumbura Rural", + "Burundi", + "Cankuzo", + "Gitega", + "Karuzi", + "Kayanza", + "Kirundo", + "Makamba", + "Ngozi", + "Muramvya", + "Muyinga", + "Mwaro", + "Rutana", "Ruyigi" - ], + ], "old": [ "Burundi" ] - }, + }, { - "id": "Cambodia", - "s": 11512002, + "id": "Cambodia", + "s": 11512002, "affiliations": [ - "Bantey Meanchey", - "Battambang", - "Kampong Cham", - "Kampong Chhnang", - "Kampong Speu", - "Kampong Thom", - "Kampot", - "Kandal", - "Koh Kong", - "Kratie", - "Kep", - "Mondulkiri", - "Oddar Meanchey", - "Pailin", - "Prey Veng", - "Phnom Penh", - "Preah Sihanouk", - "Preah Vihear", - "Pursat", - "Ratanakiri", - "Siem Reap", - "Stung Treng", - "Svay Rieng", - "Takeo", - "Tbong Khmum", + "Bantey Meanchey", + "Battambang", + "Kampong Cham", + "Kampong Chhnang", + "Kampong Speu", + "Kampong Thom", + "Kampot", + "Kandal", + "Koh Kong", + "Kratie", + "Kep", + "Mondulkiri", + "Oddar Meanchey", + "Pailin", + "Prey Veng", + "Phnom Penh", + "Preah Sihanouk", + "Preah Vihear", + "Pursat", + "Ratanakiri", + "Siem Reap", + "Stung Treng", + "Svay Rieng", + "Takeo", + "Tbong Khmum", "\u1796\u17d2\u179a\u17c7\u179a\u17b6\u1787\u17b6\u178e\u17b6\u1785\u1780\u17d2\u179a\u1780\u1798\u17d2\u1796\u17bb\u1787\u17b6 (Cambodia)" - ], + ], "old": [ "Cambodia" ] - }, + }, { - "id": "Cameroon", + "id": "Cameroon", "g": [ { - "id": "Cameroon_Central", - "s": 51776213, + "id": "Cameroon_Central", + "s": 51776213, "affiliations": [ - "Adamaoua", - "Cameroun", - "Centre", - "Est", - "Extr\u00eame-Nord", - "Nord", + "Adamaoua", + "Cameroun", + "Centre", + "Est", + "Extr\u00eame-Nord", + "Nord", "Sud" - ], + ], "old": [ "Cameroon" ] - }, + }, { - "id": "Cameroon_West", - "s": 37511167, + "id": "Cameroon_West", + "s": 37511167, "affiliations": [ - "Cameroun", - "Littoral", - "Nord-Ouest", - "Ouest", + "Cameroun", + "Littoral", + "Nord-Ouest", + "Ouest", "Sud-Ouest" - ], + ], "old": [ "Cameroon" ] } ] - }, + }, { - "id": "Canada", + "id": "Canada", "g": [ { - "id": "Canada_Alberta", + "id": "Canada_Alberta", "g": [ { - "id": "Canada_Alberta_Edmonton", - "s": 65131936, + "id": "Canada_Alberta_Edmonton", + "s": 65131936, "affiliations": [ - "Alberta", + "Alberta", "Canada" - ], + ], "old": [ "Canada_Alberta" ] - }, + }, { - "id": "Canada_Alberta_North", - "s": 26328923, + "id": "Canada_Alberta_North", + "s": 26328923, "affiliations": [ - "Alberta", + "Alberta", "Canada" - ], + ], "old": [ "Canada_Alberta" ] - }, + }, { - "id": "Canada_Alberta_South", - "s": 30924365, + "id": "Canada_Alberta_South", + "s": 30924365, "affiliations": [ - "Alberta", + "Alberta", "Canada" - ], + ], "old": [ "Canada_Alberta" ] } ] - }, + }, { - "id": "Canada_British Columbia", + "id": "Canada_British Columbia", "g": [ { - "id": "Canada_British Columbia_Central", - "s": 44589447, + "id": "Canada_British Columbia_Central", + "s": 44589447, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_Far_North", - "s": 26058118, + "id": "Canada_British Columbia_Far_North", + "s": 26058118, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_Islands", - "s": 36957856, + "id": "Canada_British Columbia_Islands", + "s": 36957856, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_North", - "s": 38655210, + "id": "Canada_British Columbia_North", + "s": 38655210, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_Northeast", - "s": 44514059, + "id": "Canada_British Columbia_Northeast", + "s": 44514059, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_Southeast", - "s": 44357304, + "id": "Canada_British Columbia_Southeast", + "s": 44357304, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] - }, + }, { - "id": "Canada_British Columbia_Vancouver", - "s": 43035636, + "id": "Canada_British Columbia_Vancouver", + "s": 43035636, "affiliations": [ - "British Columbia", + "British Columbia", "Canada" - ], + ], "old": [ "Canada_British Columbia" ] } ] - }, + }, { - "id": "Canada_Labrador", + "id": "Canada_Labrador", "g": [ { - "id": "Canada_Labrador_North", - "s": 45468548, + "id": "Canada_Labrador_North", + "s": 45468548, "affiliations": [ - "Canada", - "Newfoundland and Labrador", + "Canada", + "Newfoundland and Labrador", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] - }, + }, { - "id": "Canada_Labrador_South", - "s": 35167627, + "id": "Canada_Labrador_South", + "s": 35167627, "affiliations": [ - "Canada", + "Canada", "Newfoundland and Labrador" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] - }, + }, { - "id": "Canada_Labrador_West", - "s": 47531622, + "id": "Canada_Labrador_West", + "s": 47531622, "affiliations": [ - "Canada", + "Canada", "Newfoundland and Labrador" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] } ] - }, + }, { - "id": "Canada_Manitoba", + "id": "Canada_Manitoba", "g": [ { - "id": "Canada_Manitoba_Northeast", - "s": 33297554, + "id": "Canada_Manitoba_Northeast", + "s": 33297554, "affiliations": [ - "Canada", - "Manitoba", + "Canada", + "Manitoba", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ - "Canada_Manitoba", + "Canada_Manitoba", "Canada_Nunavut" ] - }, + }, { - "id": "Canada_Manitoba_Northwest", - "s": 38815496, + "id": "Canada_Manitoba_Northwest", + "s": 38815496, "affiliations": [ - "Canada", + "Canada", "Manitoba" - ], + ], "old": [ "Canada_Manitoba" ] - }, + }, { - "id": "Canada_Manitoba_South", - "s": 40568962, + "id": "Canada_Manitoba_South", + "s": 40568962, "affiliations": [ - "Canada", + "Canada", "Manitoba" - ], + ], "old": [ "Canada_Manitoba" ] - }, + }, { - "id": "Canada_Manitoba_Winnipeg", - "s": 35929404, + "id": "Canada_Manitoba_Winnipeg", + "s": 35929404, "affiliations": [ - "Canada", + "Canada", "Manitoba" - ], + ], "old": [ "Canada_Manitoba" ] } ] - }, + }, { - "id": "Canada_New Brunswick", - "s": 47555327, + "id": "Canada_New Brunswick", + "s": 47555327, "affiliations": [ - "Canada", - "Devon Indian Reserve NO. 30", - "New Brunswick", + "Canada", + "Devon Indian Reserve NO. 30", + "New Brunswick", "Oromocto Indian Reserve NO. 26" - ], + ], "old": [ "Canada_New Brunswick" ] - }, + }, { - "id": "Canada_Newfoundland", + "id": "Canada_Newfoundland", "g": [ { - "id": "Canada_Newfoundland_East", - "s": 18879468, + "id": "Canada_Newfoundland_East", + "s": 18879468, "affiliations": [ - "Canada", + "Canada", "Newfoundland and Labrador" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] - }, + }, { - "id": "Canada_Newfoundland_North", - "s": 20217205, + "id": "Canada_Newfoundland_North", + "s": 20217205, "affiliations": [ - "Canada", + "Canada", "Newfoundland and Labrador" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] - }, + }, { - "id": "Canada_Newfoundland_South", - "s": 16680353, + "id": "Canada_Newfoundland_South", + "s": 16680353, "affiliations": [ - "Canada", - "France", - "Newfoundland and Labrador", + "Canada", + "France", + "Newfoundland and Labrador", "\u00cele Verte" - ], + ], "old": [ - "Saint Pierre and Miquelon", + "Saint Pierre and Miquelon", "Canada_Newfoundland and Labrador" ] - }, + }, { - "id": "Canada_Newfoundland_West", - "s": 19788036, + "id": "Canada_Newfoundland_West", + "s": 19788036, "affiliations": [ - "Canada", + "Canada", "Newfoundland and Labrador" - ], + ], "old": [ "Canada_Newfoundland and Labrador" ] } ] - }, + }, { - "id": "Canada_Northwest Territories", + "id": "Canada_Northwest Territories", "g": [ { - "id": "Canada_Northwest Territories_East", - "s": 16394859, + "id": "Canada_Northwest Territories_East", + "s": 16394859, "affiliations": [ - "Canada", + "Canada", "Northwest Territories" - ], + ], "old": [ "Canada_Northwest Territories" ] - }, + }, { - "id": "Canada_Northwest Territories_North", - "s": 28287327, + "id": "Canada_Northwest Territories_North", + "s": 28287327, "affiliations": [ - "Canada", + "Canada", "Northwest Territories" - ], + ], "old": [ "Canada_Northwest Territories" ] - }, + }, { - "id": "Canada_Northwest Territories_Yellowknife", - "s": 41690424, + "id": "Canada_Northwest Territories_Yellowknife", + "s": 41690424, "affiliations": [ - "Canada", + "Canada", "Northwest Territories" - ], + ], "old": [ "Canada_Northwest Territories" ] } ] - }, + }, { - "id": "Canada_Nova Scotia", + "id": "Canada_Nova Scotia", "g": [ { - "id": "Canada_Nova Scotia_Halifax", - "s": 42389002, + "id": "Canada_Nova Scotia_Halifax", + "s": 42389002, "affiliations": [ - "Canada", + "Canada", "Nova Scotia" - ], + ], "old": [ "Canada_Nova Scotia" ] - }, + }, { - "id": "Canada_Nova Scotia_Sydney", - "s": 18550757, + "id": "Canada_Nova Scotia_Sydney", + "s": 18550757, "affiliations": [ - "Canada", - "Nova Scotia", + "Canada", + "Nova Scotia", "Prince Edward Island" - ], + ], "old": [ "Canada_Nova Scotia" ] } ] - }, + }, { - "id": "Canada_Nunavut", + "id": "Canada_Nunavut", "g": [ { - "id": "Canada_Nunavut_North", - "s": 33227846, + "id": "Canada_Nunavut_North", + "s": 33227846, "affiliations": [ - "Canada", + "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ "Canada_Nunavut" ] - }, + }, { - "id": "Canada_Nunavut_South", - "s": 50396114, + "id": "Canada_Nunavut_South", + "s": 50396114, "affiliations": [ - "Canada", + "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ "Canada_Nunavut" ] } ] - }, + }, { - "id": "Canada_Ontario", + "id": "Canada_Ontario", "g": [ { - "id": "Canada_Ontario_Bame", - "s": 44549571, + "id": "Canada_Ontario_Bame", + "s": 44549571, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Kingston", - "s": 57368727, + "id": "Canada_Ontario_Kingston", + "s": 57368727, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_London", - "s": 48514161, + "id": "Canada_Ontario_London", + "s": 48514161, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_Central", - "s": 31858001, + "id": "Canada_Ontario_Northeastern_Central", + "s": 31858001, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_North", - "s": 35920430, + "id": "Canada_Ontario_Northeastern_North", + "s": 35920430, "affiliations": [ - "Canada", - "Ontario", + "Canada", + "Ontario", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ - "Canada_Nunavut", + "Canada_Nunavut", "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_S", - "s": 35958279, + "id": "Canada_Ontario_Northeastern_S", + "s": 35958279, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_SE", - "s": 20002085, + "id": "Canada_Ontario_Northeastern_SE", + "s": 20002085, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_SW", - "s": 39935009, + "id": "Canada_Ontario_Northeastern_SW", + "s": 39935009, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northeastern_Wawa", - "s": 30291697, + "id": "Canada_Ontario_Northeastern_Wawa", + "s": 30291697, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northern", - "s": 40895816, + "id": "Canada_Ontario_Northern", + "s": 40895816, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Northwestern", - "s": 70106543, + "id": "Canada_Ontario_Northwestern", + "s": 70106543, "affiliations": [ - "Canada", - "NU", - "Ontario", + "Canada", + "NU", + "Ontario", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ - "Canada_Nunavut", + "Canada_Nunavut", "Canada_Ontario" ] - }, + }, { - "id": "Canada_Ontario_Toronto", - "s": 61960745, + "id": "Canada_Ontario_Toronto", + "s": 61960745, "affiliations": [ - "Canada", + "Canada", "Ontario" - ], + ], "old": [ "Canada_Ontario" ] } ] - }, + }, { - "id": "Canada_Prince Edward Island", - "s": 7251323, + "id": "Canada_Prince Edward Island", + "s": 7251323, "affiliations": [ - "Canada", + "Canada", "Prince Edward Island" - ], + ], "old": [ "Canada_Prince Edward Island" ] - }, + }, { - "id": "Canada_Quebec", + "id": "Canada_Quebec", "g": [ { - "id": "Canada_Quebec_Quebec", - "s": 47367070, + "id": "Canada_Quebec_Quebec", + "s": 47367070, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_Far North", - "s": 36955139, + "id": "Canada_Quebek_Far North", + "s": 36955139, "affiliations": [ - "Canada", - "NU", - "Qu\u00e9bec", + "Canada", + "NU", + "Qu\u00e9bec", "\u14c4\u14c7\u1557\u1466 Nunavut" - ], + ], "old": [ - "Canada_Quebec", + "Canada_Quebec", "Canada_Nunavut" ] - }, + }, { - "id": "Canada_Quebek_Montreal", - "s": 36875813, + "id": "Canada_Quebek_Montreal", + "s": 36875813, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_Lachute", - "s": 37364105, + "id": "Canada_Quebek_Lachute", + "s": 37364105, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_North", - "s": 41690088, + "id": "Canada_Quebek_North", + "s": 41690088, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_Southeast_Rimouski", - "s": 19277854, + "id": "Canada_Quebek_Southeast_Rimouski", + "s": 19277854, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_Southeast_Saguenay", - "s": 35006021, + "id": "Canada_Quebek_Southeast_Saguenay", + "s": 35006021, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_West_Chibougamau", - "s": 46831500, + "id": "Canada_Quebek_West_Chibougamau", + "s": 46831500, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] - }, + }, { - "id": "Canada_Quebek_West_Rouyn-Noranda", - "s": 30780825, + "id": "Canada_Quebek_West_Rouyn-Noranda", + "s": 30780825, "affiliations": [ - "Canada", + "Canada", "Qu\u00e9bec" - ], + ], "old": [ "Canada_Quebec" ] } ] - }, + }, { - "id": "Canada_Saskatchewan", + "id": "Canada_Saskatchewan", "g": [ { - "id": "Canada_Saskatchewan_North", - "s": 32774412, + "id": "Canada_Saskatchewan_North", + "s": 32774412, "affiliations": [ - "Canada", + "Canada", "Saskatchewan" - ], + ], "old": [ "Canada_Saskatchewan" ] - }, + }, { - "id": "Canada_Saskatchewan_Saskatoon", - "s": 28898920, + "id": "Canada_Saskatchewan_Saskatoon", + "s": 28898920, "affiliations": [ - "Canada", + "Canada", "Saskatchewan" - ], + ], "old": [ "Canada_Saskatchewan" ] - }, + }, { - "id": "Canada_Saskatchewan_Regina", - "s": 40106775, + "id": "Canada_Saskatchewan_Regina", + "s": 40106775, "affiliations": [ - "Canada", + "Canada", "Saskatchewan" - ], + ], "old": [ "Canada_Saskatchewan" ] } ] - }, + }, { - "id": "Canada_Yukon", + "id": "Canada_Yukon", "g": [ { - "id": "Canada_Yukon_North", - "s": 28402481, + "id": "Canada_Yukon_North", + "s": 28402481, "affiliations": [ - "Canada", + "Canada", "Yukon" - ], + ], "old": [ "Canada_Yukon" ] - }, + }, { - "id": "Canada_Yukon_Whitehorse", - "s": 34561287, + "id": "Canada_Yukon_Whitehorse", + "s": 34561287, "affiliations": [ - "Canada", + "Canada", "Yukon" - ], + ], "old": [ "Canada_Yukon" ] @@ -2438,4586 +2438,4586 @@ ] } ] - }, + }, { - "id": "Cape Verde", - "s": 2562983, + "id": "Cape Verde", + "s": 2562983, "affiliations": [ "Cabo Verde" - ], + ], "old": [ "Cape Verde" ] - }, + }, { - "id": "Cayman Islands", - "s": 1128777, + "id": "Cayman Islands", + "s": 1128777, "affiliations": [ "Cayman Islands" - ], + ], "old": [ "Cayman Islands" ] - }, + }, { - "id": "Central African Republic", - "s": 16103372, + "id": "Central African Republic", + "s": 16103372, "affiliations": [ - "Bamingui-Bangoran", - "Basse-Kotto", - "Haut-Mbomou", - "Haute-Kotto", - "Lobaye", - "K\u00e9mo", - "K\u00f6d\u00f6r\u00f6s\u00ease t\u00ee B\u00eaafr\u00eeka - R\u00e9publique Centrafricaine", - "Mamb\u00e9r\u00e9-Kad\u00e9\u00ef", - "Mbomou", - "Nana-Gr\u00e9bizi", - "Nana-Mamb\u00e9r\u00e9", - "Ombella M'Poko", - "Ouaka", - "Ouham", - "Ouham-Pend\u00e9", - "Sangha-Mba\u00e9r\u00e9", + "Bamingui-Bangoran", + "Basse-Kotto", + "Haut-Mbomou", + "Haute-Kotto", + "Lobaye", + "K\u00e9mo", + "K\u00f6d\u00f6r\u00f6s\u00ease t\u00ee B\u00eaafr\u00eeka - R\u00e9publique Centrafricaine", + "Mamb\u00e9r\u00e9-Kad\u00e9\u00ef", + "Mbomou", + "Nana-Gr\u00e9bizi", + "Nana-Mamb\u00e9r\u00e9", + "Ombella M'Poko", + "Ouaka", + "Ouham", + "Ouham-Pend\u00e9", + "Sangha-Mba\u00e9r\u00e9", "Vakaga" - ], + ], "old": [ "Central African Republic" ] - }, + }, { - "id": "Chad", - "s": 10070652, + "id": "Chad", + "s": 10070652, "affiliations": [ - "Bahr el Gazel", - "Batha", - "Borkou Region", - "Chari-Baguirmi", - "Ennedi Region", - "Gu\u00e9ra", - "Hadjer-Lamis", - "Kanem", - "Logone Occidental", - "Logone Oriental", - "Lac", - "Mandoul", - "Mayo-Kebbi Est", - "Mayo-Kebbi Ouest", - "N'Djamena", - "Moyen-Chari", - "Ouadda\u00ef", - "Salamat", - "Sila", - "Tandjil\u00e9", - "Tchad - \u062a\u0634\u0627\u062f", - "Tibesti Region", + "Bahr el Gazel", + "Batha", + "Borkou Region", + "Chari-Baguirmi", + "Ennedi Region", + "Gu\u00e9ra", + "Hadjer-Lamis", + "Kanem", + "Logone Occidental", + "Logone Oriental", + "Lac", + "Mandoul", + "Mayo-Kebbi Est", + "Mayo-Kebbi Ouest", + "N'Djamena", + "Moyen-Chari", + "Ouadda\u00ef", + "Salamat", + "Sila", + "Tandjil\u00e9", + "Tchad - \u062a\u0634\u0627\u062f", + "Tibesti Region", "Wadi Fira Region" - ], + ], "old": [ "Chad" ] - }, + }, { - "id": "Colombia", + "id": "Colombia", "g": [ { - "id": "Colombia_North", - "s": 49855033, + "id": "Colombia_North", + "s": 49855033, "affiliations": [ - "Bol\u00edvar", - "Antioquia", - "Cesar", - "Archipi\u00e9lago de San Andr\u00e9s, Providencia y Santa Catalina", - "Atl\u00e1ntico", - "Colombia", - "C\u00f3rdoba", - "Isla Grande, Col\u00f4mbia", - "La Guajira", - "Magdalena", - "Norte de Santander", - "Santander", + "Bol\u00edvar", + "Antioquia", + "Cesar", + "Archipi\u00e9lago de San Andr\u00e9s, Providencia y Santa Catalina", + "Atl\u00e1ntico", + "Colombia", + "C\u00f3rdoba", + "Isla Grande, Col\u00f4mbia", + "La Guajira", + "Magdalena", + "Norte de Santander", + "Santander", "Sucre" - ], + ], "old": [ "Colombia" ] - }, + }, { - "id": "Colombia_West", - "s": 50265501, + "id": "Colombia_West", + "s": 50265501, "affiliations": [ - "Cauca", - "Bogot\u00e1", - "Caldas", - "Boyac\u00e1", - "Choc\u00f3", - "Colombia", - "Cundinamarca", - "Huila", - "Nari\u00f1o", - "Quind\u00edo", - "Risaralda", - "Tolima", + "Cauca", + "Bogot\u00e1", + "Caldas", + "Boyac\u00e1", + "Choc\u00f3", + "Colombia", + "Cundinamarca", + "Huila", + "Nari\u00f1o", + "Quind\u00edo", + "Risaralda", + "Tolima", "Valle del Cauca" - ], + ], "old": [ - "Colombia", + "Colombia", "Malpelo Island" ] - }, + }, { - "id": "Colombia_East", - "s": 12950608, + "id": "Colombia_East", + "s": 12950608, "affiliations": [ - "Amazonas", - "Arauca", - "Caquet\u00e1", - "Casanare", - "Colombia", - "Guain\u00eda", - "Guaviare", - "Putumayo", - "Meta", - "Vaup\u00e9s", + "Amazonas", + "Arauca", + "Caquet\u00e1", + "Casanare", + "Colombia", + "Guain\u00eda", + "Guaviare", + "Putumayo", + "Meta", + "Vaup\u00e9s", "Vichada" - ], + ], "old": [ "Colombia" ] } ] - }, + }, { - "id": "Comoros", - "s": 846288, + "id": "Comoros", + "s": 846288, "affiliations": [ - "Komori", - "Ngazidja", - "Mwali", + "Komori", + "Ngazidja", + "Mwali", "Nzwani / \u0623\u0646\u062c\u0648\u0627\u0646" - ], + ], "old": [ "Comoros" ] - }, + }, { - "id": "Congo-Brazzaville", - "s": 12923150, + "id": "Congo-Brazzaville", + "s": 12923150, "affiliations": [ - "Bouenza", - "Brazzaville", - "Cuvette", - "Cuvette-Ouest", - "Kouilou", - "Likouala", - "L\u00e9koumou", - "Niari", - "R\u00e9publique du Congo", - "Plateaux", - "Pointe-Noire", - "Pool", + "Bouenza", + "Brazzaville", + "Cuvette", + "Cuvette-Ouest", + "Kouilou", + "Likouala", + "L\u00e9koumou", + "Niari", + "R\u00e9publique du Congo", + "Plateaux", + "Pointe-Noire", + "Pool", "Sangha" - ], + ], "old": [ "Congo-Brazzaville" ] - }, + }, { - "id": "Congo-Kinshasa", + "id": "Congo-Kinshasa", "g": [ { - "id": "Congo-Kinshasa_West", - "s": 47760467, + "id": "Congo-Kinshasa_West", + "s": 47760467, "affiliations": [ - "Bas-Uele", - "Haut-Katanga", - "Haut-Lomami", - "Haut-Uele", - "Ituri", - "Kinshasa", - "Kongo-Central", - "Kasa\u00ef", - "Kasa\u00ef Central", - "Kasa\u00ef Oriental", - "Lomami", - "Lualaba", - "Kwango", - "Kwilu", - "Mai-Ndombe", - "Maniema", - "Mongala", - "R\u00e9publique d\u00e9mocratique du Congo", - "Nord-Ubangi", - "Sankuru", - "Sud-Ubangi", - "Tanganyika", - "Tshopo", - "Tshuapa", + "Bas-Uele", + "Haut-Katanga", + "Haut-Lomami", + "Haut-Uele", + "Ituri", + "Kinshasa", + "Kongo-Central", + "Kasa\u00ef", + "Kasa\u00ef Central", + "Kasa\u00ef Oriental", + "Lomami", + "Lualaba", + "Kwango", + "Kwilu", + "Mai-Ndombe", + "Maniema", + "Mongala", + "R\u00e9publique d\u00e9mocratique du Congo", + "Nord-Ubangi", + "Sankuru", + "Sud-Ubangi", + "Tanganyika", + "Tshopo", + "Tshuapa", "\u00c9quateur" - ], + ], "old": [ "Congo-Kinshasa" ] - }, + }, { - "id": "Congo-Kinshasa_Kivu", - "s": 17647949, + "id": "Congo-Kinshasa_Kivu", + "s": 17647949, "affiliations": [ - "R\u00e9publique d\u00e9mocratique du Congo", - "Nord-Kivu", + "R\u00e9publique d\u00e9mocratique du Congo", + "Nord-Kivu", "Sud-Kivu" - ], + ], "old": [ "Congo-Kinshasa" ] } ] - }, + }, { - "id": "Cook Islands", - "s": 483168, + "id": "Cook Islands", + "s": 483168, "affiliations": [ "Cook Islands" - ], + ], "old": [ "Cook Islands" ] - }, + }, { - "id": "Costa Rica", - "s": 17626096, + "id": "Costa Rica", + "s": 17626096, "affiliations": [ - "Alajuela", - "Cartago", - "Costa Rica", - "Guanacaste", - "Heredia", - "Lim\u00f3n", - "Puntarenas", + "Alajuela", + "Cartago", + "Costa Rica", + "Guanacaste", + "Heredia", + "Lim\u00f3n", + "Puntarenas", "San Jos\u00e9" - ], + ], "old": [ - "Cocos Island", - "Costa Rica", + "Cocos Island", + "Costa Rica", "Clipperton Island" ] - }, + }, { - "id": "Croatia", + "id": "Croatia", "g": [ { - "id": "Croatia_Central", - "s": 32792545, + "id": "Croatia_Central", + "s": 32792545, "affiliations": [ "Hrvatska" - ], + ], "old": [ "Croatia" ] - }, + }, { - "id": "Croatia_West", - "s": 34291437, + "id": "Croatia_West", + "s": 34291437, "affiliations": [ - "Hrvatska", + "Hrvatska", "Italia" - ], + ], "old": [ "Croatia" ] } ] - }, + }, { - "id": "Cuba", - "s": 35586856, + "id": "Cuba", + "s": 35586856, "affiliations": [ - "Artemisa", - "Ciego de \u00c1vila", - "Cienfuegos", - "Camag\u00fcey", - "Matanzas", - "Cuba", - "Granma", - "Guant\u00e1namo", - "Holgu\u00edn", - "Las Tunas", - "Mayabeque", - "Pinar del R\u00edo", - "Sancti Spiritus", - "Santiago de Cuba", + "Artemisa", + "Ciego de \u00c1vila", + "Cienfuegos", + "Camag\u00fcey", + "Matanzas", + "Cuba", + "Granma", + "Guant\u00e1namo", + "Holgu\u00edn", + "Las Tunas", + "Mayabeque", + "Pinar del R\u00edo", + "Sancti Spiritus", + "Santiago de Cuba", "Villa Clara" - ], + ], "old": [ "Cuba" ] - }, + }, { - "id": "Cyprus", - "s": 13223441, + "id": "Cyprus", + "s": 13223441, "affiliations": [ - "British Sovereign Base Areas", + "British Sovereign Base Areas", "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s" - ], + ], "old": [ "Cyprus" ] - }, + }, { - "id": "Czech Republic", + "id": "Czech Republic", "g": [ { - "id": "Czech_Praha", - "s": 19990117, + "id": "Czech_Praha", + "s": 19990117, "affiliations": [ - "Praha", + "Praha", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Severovychod_Pardubicky kraj", - "s": 26563094, + "id": "Czech_Severovychod_Pardubicky kraj", + "s": 26563094, "affiliations": [ - "Severov\u00fdchod", + "Severov\u00fdchod", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Karlovasky kraj", - "s": 14023892, + "id": "Czech_Karlovasky kraj", + "s": 14023892, "affiliations": [ - "Severoz\u00e1pad", + "Severoz\u00e1pad", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Ustecky kraj", - "s": 33240094, + "id": "Czech_Ustecky kraj", + "s": 33240094, "affiliations": [ - "Severoz\u00e1pad", + "Severoz\u00e1pad", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Jihozapad_Plzensky kraj", - "s": 35340075, + "id": "Czech_Jihozapad_Plzensky kraj", + "s": 35340075, "affiliations": [ - "Jihoz\u00e1pad", + "Jihoz\u00e1pad", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Severovychod_Kralovehradecky kraj", - "s": 30246758, + "id": "Czech_Severovychod_Kralovehradecky kraj", + "s": 30246758, "affiliations": [ - "Severov\u00fdchod", + "Severov\u00fdchod", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Olomoucky kraj", - "s": 28295479, + "id": "Czech_Olomoucky kraj", + "s": 28295479, "affiliations": [ - "St\u0159edn\u00ed Morava", + "St\u0159edn\u00ed Morava", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Zlinsky Kraj", - "s": 26218968, + "id": "Czech_Zlinsky Kraj", + "s": 26218968, "affiliations": [ - "St\u0159edn\u00ed Morava", + "St\u0159edn\u00ed Morava", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Stredni Cechy_East", - "s": 42304450, + "id": "Czech_Stredni Cechy_East", + "s": 42304450, "affiliations": [ - "St\u0159edn\u00ed \u010cechy", + "St\u0159edn\u00ed \u010cechy", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Jihozapad_Jihocesky kraj", - "s": 49144893, + "id": "Czech_Jihozapad_Jihocesky kraj", + "s": 49144893, "affiliations": [ - "Jihoz\u00e1pad", + "Jihoz\u00e1pad", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Jihovychod_Kraj Vysocina", - "s": 39864667, + "id": "Czech_Jihovychod_Kraj Vysocina", + "s": 39864667, "affiliations": [ - "Jihov\u00fdchod", + "Jihov\u00fdchod", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Severovychod_Liberecky kraj", - "s": 22775947, + "id": "Czech_Severovychod_Liberecky kraj", + "s": 22775947, "affiliations": [ - "Severov\u00fdchod", + "Severov\u00fdchod", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Stredni Cechy_West", - "s": 31366984, + "id": "Czech_Stredni Cechy_West", + "s": 31366984, "affiliations": [ - "St\u0159edn\u00ed \u010cechy", + "St\u0159edn\u00ed \u010cechy", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Moravskoslezsko", - "s": 41626744, + "id": "Czech_Moravskoslezsko", + "s": 41626744, "affiliations": [ - "Moravskoslezsko", + "Moravskoslezsko", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] - }, + }, { - "id": "Czech_Jihovychod_Jihomoravsky kraj", - "s": 46586044, + "id": "Czech_Jihovychod_Jihomoravsky kraj", + "s": 46586044, "affiliations": [ - "Jihov\u00fdchod", + "Jihov\u00fdchod", "\u010cesko" - ], + ], "old": [ "Czech Republic" ] } ] - }, + }, { - "id": "Cote dIvoire", - "s": 18178646, + "id": "Cote dIvoire", + "s": 18178646, "affiliations": [ - "Abidjan", - "Bas-Sassandra", - "Como\u00e9", - "C\u00f4te d\u2019Ivoire", - "Dengu\u00e9l\u00e9", - "Haut-Sassandra", - "Zanzan", - "G\u00f4h-Djiboua", - "Lacs", - "Lagunes", - "Montagnes", - "Savanes", - "Vall\u00e9e du Bandama", - "Woroba", + "Abidjan", + "Bas-Sassandra", + "Como\u00e9", + "C\u00f4te d\u2019Ivoire", + "Dengu\u00e9l\u00e9", + "Haut-Sassandra", + "Zanzan", + "G\u00f4h-Djiboua", + "Lacs", + "Lagunes", + "Montagnes", + "Savanes", + "Vall\u00e9e du Bandama", + "Woroba", "Yamoussoukro" - ], + ], "old": [ "Ivory Coast" ] - }, + }, { - "id": "Denmark", + "id": "Denmark", "g": [ { - "id": "Denmark_North Denmark Region", - "s": 30608795, + "id": "Denmark_North Denmark Region", + "s": 30608795, "affiliations": [ - "Danmark", + "Danmark", "Region Nordjylland" - ], + ], "old": [ "Denmark" ] - }, + }, { - "id": "Denmark_Central Denmark Region", - "s": 54170282, + "id": "Denmark_Central Denmark Region", + "s": 54170282, "affiliations": [ - "Danmark", + "Danmark", "Region Midtjylland" - ], + ], "old": [ "Denmark" ] - }, + }, { - "id": "Denmark_Capital Region of Denmark", - "s": 39091226, + "id": "Denmark_Capital Region of Denmark", + "s": 39091226, "affiliations": [ - "Danmark", - "Region Hovedstaden", + "Danmark", + "Region Hovedstaden", "Territorial waters of Bornholm" - ], + ], "old": [ "Denmark" ] - }, + }, { - "id": "Denmark_Region Zealand", - "s": 34820123, + "id": "Denmark_Region Zealand", + "s": 34820123, "affiliations": [ - "Danmark", + "Danmark", "Region Sj\u00e6lland" - ], + ], "old": [ "Denmark" ] - }, + }, { - "id": "Denmark_Region of Southern Denmark", - "s": 61109371, + "id": "Denmark_Region of Southern Denmark", + "s": 61109371, "affiliations": [ - "Danmark", + "Danmark", "Region Syddanmark" - ], + ], "old": [ "Denmark" ] } ] - }, + }, { - "id": "Djibouti", - "s": 1770882, + "id": "Djibouti", + "s": 1770882, "affiliations": [ - "Ali Sabieh", - "Arta", - "Dikhil", - "Djibouti", - "Djibouti", - "Obock", + "Ali Sabieh", + "Arta", + "Dikhil", + "Djibouti", + "Djibouti", + "Obock", "Tadjourah" - ], + ], "old": [ "Djibouti" ] - }, + }, { - "id": "Dominican Republic", - "s": 25782843, + "id": "Dominican Republic", + "s": 25782843, "affiliations": [ - "Azua", - "Baoruco", - "Barahona", - "Duarte", - "Dajab\u00f3n", - "Distrito Nacional", - "El Seibo", - "El\u00edas Pi\u00f1a", - "Espaillat", - "Hato Mayor", - "Hermanas Mirabal", - "Independencia", - "La Romana", - "La Altagracia", - "La Vega", - "Mar\u00eda Trinidad S\u00e1nchez", - "Monse\u00f1or Nouel", - "Monte Cristi", - "Monte Plata", - "Peravia", - "Pedernales", - "Puerto Plata", - "Rep\u00fablica Dominicana", - "Saman\u00e1", - "San Crist\u00f3bal", - "San Jos\u00e9 de Ocoa", - "San Juan", - "San Pedro de Macor\u00eds", - "Santiago", - "Santiago Rodr\u00edguez", - "Santo Domingo", - "S\u00e1nchez Ram\u00edrez", + "Azua", + "Baoruco", + "Barahona", + "Duarte", + "Dajab\u00f3n", + "Distrito Nacional", + "El Seibo", + "El\u00edas Pi\u00f1a", + "Espaillat", + "Hato Mayor", + "Hermanas Mirabal", + "Independencia", + "La Romana", + "La Altagracia", + "La Vega", + "Mar\u00eda Trinidad S\u00e1nchez", + "Monse\u00f1or Nouel", + "Monte Cristi", + "Monte Plata", + "Peravia", + "Pedernales", + "Puerto Plata", + "Rep\u00fablica Dominicana", + "Saman\u00e1", + "San Crist\u00f3bal", + "San Jos\u00e9 de Ocoa", + "San Juan", + "San Pedro de Macor\u00eds", + "Santiago", + "Santiago Rodr\u00edguez", + "Santo Domingo", + "S\u00e1nchez Ram\u00edrez", "Valverde" - ], + ], "old": [ "Dominican Republic" ] - }, + }, { - "id": "East Timor", - "s": 2893719, + "id": "East Timor", + "s": 2893719, "affiliations": [ - "Aileu", - "Ainaro", - "Baucau", - "Bobonaro", - "Cova Lima", - "Dili", - "Ermera", - "Indonesia", - "Laut\u00e9m", - "Liqui\u00e7\u00e1", - "Manatuto", - "Manufahi", - "Nusa Tenggara Timur", - "Oecusse", - "Tim\u00f3r Loro Sa'e", + "Aileu", + "Ainaro", + "Baucau", + "Bobonaro", + "Cova Lima", + "Dili", + "Ermera", + "Indonesia", + "Laut\u00e9m", + "Liqui\u00e7\u00e1", + "Manatuto", + "Manufahi", + "Nusa Tenggara Timur", + "Oecusse", + "Tim\u00f3r Loro Sa'e", "Viqueque" - ], + ], "old": [ - "Indonesia", + "Indonesia", "East Timor" ] - }, + }, { - "id": "Chile", + "id": "Chile", "g": [ { - "id": "Campo de Hielo Sur", - "s": 637074, + "id": "Campo de Hielo Sur", + "s": 637074, "affiliations": [ "Acuerdo de Campos de Hielo" ] - }, + }, { - "id": "Chile_Central", - "s": 53840305, + "id": "Chile_Central", + "s": 53840305, "affiliations": [ - "Chile", - "Islote Gaviota", - "Islote Lobos", - "Regi\u00f3n Metropolitana de Santiago", - "Roca Fraile", - "V Regi\u00f3n de Valpara\u00edso", - "VI Regi\u00f3n del Libertador General Bernardo O'Higgins", + "Chile", + "Islote Gaviota", + "Islote Lobos", + "Regi\u00f3n Metropolitana de Santiago", + "Roca Fraile", + "V Regi\u00f3n de Valpara\u00edso", + "VI Regi\u00f3n del Libertador General Bernardo O'Higgins", "VII Regi\u00f3n del Maule" - ], + ], "old": [ "Chile" ] - }, + }, { - "id": "Chile_North", - "s": 16663524, + "id": "Chile_North", + "s": 16663524, "affiliations": [ - "Chile", - "I Regi\u00f3n de Tarapac\u00e1", - "II Regi\u00f3n de Antofagasta", - "III Regi\u00f3n de Atacama", - "IV Regi\u00f3n de Coquimbo", - "V Regi\u00f3n de Valpara\u00edso", + "Chile", + "I Regi\u00f3n de Tarapac\u00e1", + "II Regi\u00f3n de Antofagasta", + "III Regi\u00f3n de Atacama", + "IV Regi\u00f3n de Coquimbo", + "V Regi\u00f3n de Valpara\u00edso", "XV Regi\u00f3n de Arica y Parinacota" - ], + ], "old": [ "Chile" ] - }, + }, { - "id": "Chile_South", - "s": 51874700, + "id": "Chile_South", + "s": 51874700, "affiliations": [ - "Chile", - "IX Regi\u00f3n de la Araucan\u00eda", - "VIII Regi\u00f3n del Biob\u00edo", - "X Regi\u00f3n de Los Lagos", - "XI Regi\u00f3n Ays\u00e9n del General Carlos Ib\u00e1\u00f1ez del Campo", - "XII Regi\u00f3n de Magallanes y de la Ant\u00e1rtica Chilena", + "Chile", + "IX Regi\u00f3n de la Araucan\u00eda", + "VIII Regi\u00f3n del Biob\u00edo", + "X Regi\u00f3n de Los Lagos", + "XI Regi\u00f3n Ays\u00e9n del General Carlos Ib\u00e1\u00f1ez del Campo", + "XII Regi\u00f3n de Magallanes y de la Ant\u00e1rtica Chilena", "XIV Regi\u00f3n de Los R\u00edos" - ], + ], "old": [ "Chile" ] } ] - }, + }, { - "id": "Ecuador", + "id": "Ecuador", "g": [ { - "id": "Ecuador_East", - "s": 27591113, + "id": "Ecuador_East", + "s": 27591113, "affiliations": [ - "Azuay", - "Carchi", - "Ca\u00f1ar", - "Chimborazo", - "Cotopaxi", - "Ecuador", - "Imbabura", - "Loja", - "Morona Santiago", - "Napo", - "Orellana", - "Pichincha", - "Pastaza", - "Sucumb\u00edos", - "Tungurahua", + "Azuay", + "Carchi", + "Ca\u00f1ar", + "Chimborazo", + "Cotopaxi", + "Ecuador", + "Imbabura", + "Loja", + "Morona Santiago", + "Napo", + "Orellana", + "Pichincha", + "Pastaza", + "Sucumb\u00edos", + "Tungurahua", "Zamora Chinchipe" - ], + ], "old": [ "Ecuador" ] - }, + }, { - "id": "Ecuador_West", - "s": 39331764, + "id": "Ecuador_West", + "s": 39331764, "affiliations": [ - "Bol\u00edvar", - "Azuay", - "Ca\u00f1ar", - "Chimborazo", - "Cotopaxi", - "Ecuador", - "El Oro", - "Esmeraldas", - "Gal\u00e1pagos", - "Guayas", - "Imbabura", - "Loja", - "Los R\u00edos", - "Manab\u00ed", - "Pichincha", - "Santa Elena", + "Bol\u00edvar", + "Azuay", + "Ca\u00f1ar", + "Chimborazo", + "Cotopaxi", + "Ecuador", + "El Oro", + "Esmeraldas", + "Gal\u00e1pagos", + "Guayas", + "Imbabura", + "Loja", + "Los R\u00edos", + "Manab\u00ed", + "Pichincha", + "Santa Elena", "Santo Domingo de los Ts\u00e1chilas" - ], + ], "old": [ - "Galapagos Islands", + "Galapagos Islands", "Ecuador" ] } ] - }, + }, { - "id": "Egypt", - "s": 55882368, + "id": "Egypt", + "s": 55882368, "affiliations": [ - "\u062f\u0645\u064a\u0627\u0637\u200e\u200e", - "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0646\u0649 \u0633\u0648\u064a\u0641", - "\u0627\u0644\u0625\u0633\u0645\u0627\u0639\u064a\u0644\u064a\u0629", - "\u0645\u0635\u0631", - "\u0643\u0641\u0631 \u0627\u0644\u0634\u064a\u062e", - "\u062c\u0646\u0648\u0628 \u0633\u064a\u0646\u0627\u0621", - "\u0634\u0645\u0627\u0644 \u0633\u064a\u0646\u0627\u0621", - "\u0623\u0633\u064a\u0648\u0637", - "\u0645\u0637\u0631\u0648\u062d", - "\u0627\u0644\u0628\u062d\u0631 \u0627\u0644\u0623\u062d\u0645\u0645\u0631", - "\u0633\u0648\u0647\u0627\u062c\u200e", - "\u0627\u0644\u0623\u0642\u0635\u0631 / Luxor", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0642\u0646\u0627", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0623\u0633\u0648\u0627\u0646", - "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0648\u0631\u0633\u0639\u064a\u062f", - "\u0627\u0644\u0648\u0627\u062f\u064a \u0627\u0644\u062c\u062f\u064a\u062f", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0641\u064a\u0648\u0645", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u064a\u0632\u0629\u200e", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u0646\u0648\u0641\u064a\u0629", - "\u0627\u0644\u0642\u0627\u0647\u0631\u0629", - "\u0627\u0644\u063a\u0631\u0628\u064a\u0629", - "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u063a\u0631\u0628\u064a", - "\u0627\u0644\u062f\u0642\u0647\u0644\u064a\u0629", - "\u0627\u0644\u0634\u0631\u0642\u064a\u0629\u200e\u200e", - "\u0627\u0644\u0642\u0644\u064a\u0648\u0628\u064a\u0629", - "\u200f\u0627\u0644\u0628\u062d\u064a\u0631\u0629\u200e", + "\u062f\u0645\u064a\u0627\u0637\u200e\u200e", + "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0646\u0649 \u0633\u0648\u064a\u0641", + "\u0627\u0644\u0625\u0633\u0645\u0627\u0639\u064a\u0644\u064a\u0629", + "\u0645\u0635\u0631", + "\u0643\u0641\u0631 \u0627\u0644\u0634\u064a\u062e", + "\u062c\u0646\u0648\u0628 \u0633\u064a\u0646\u0627\u0621", + "\u0634\u0645\u0627\u0644 \u0633\u064a\u0646\u0627\u0621", + "\u0623\u0633\u064a\u0648\u0637", + "\u0645\u0637\u0631\u0648\u062d", + "\u0627\u0644\u0628\u062d\u0631 \u0627\u0644\u0623\u062d\u0645\u0645\u0631", + "\u0633\u0648\u0647\u0627\u062c\u200e", + "\u0627\u0644\u0623\u0642\u0635\u0631 / Luxor", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0642\u0646\u0627", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0623\u0633\u0648\u0627\u0646", + "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0648\u0631\u0633\u0639\u064a\u062f", + "\u0627\u0644\u0648\u0627\u062f\u064a \u0627\u0644\u062c\u062f\u064a\u062f", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0641\u064a\u0648\u0645", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u064a\u0632\u0629\u200e", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u0646\u0648\u0641\u064a\u0629", + "\u0627\u0644\u0642\u0627\u0647\u0631\u0629", + "\u0627\u0644\u063a\u0631\u0628\u064a\u0629", + "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u063a\u0631\u0628\u064a", + "\u0627\u0644\u062f\u0642\u0647\u0644\u064a\u0629", + "\u0627\u0644\u0634\u0631\u0642\u064a\u0629\u200e\u200e", + "\u0627\u0644\u0642\u0644\u064a\u0648\u0628\u064a\u0629", + "\u200f\u0627\u0644\u0628\u062d\u064a\u0631\u0629\u200e", "\u0627\u0644\u0625\u0633\u0643\u0646\u062f\u0631\u064a\u0629" - ], + ], "old": [ "Egypt" ] - }, + }, { - "id": "El Salvador", - "s": 13376590, + "id": "El Salvador", + "s": 13376590, "affiliations": [ - "Departamento de Cuscatl\u00e1n", - "Departamento de La Libertad", - "Departamento de Ahuachap\u00e1n", - "Departamento de Caba\u00f1as", - "Departamento de La Paz", - "Departamento de La Uni\u00f3n", - "Departamento de Moraz\u00e1n", - "Departamento de San Miguel", - "Departamento de San Salvador", - "Departamento de San Vicente", - "Departamento de Santa Ana", - "Departamento de Sonsonate", - "Departamento de Usulut\u00e1n", - "Departemento de Chalatenango", + "Departamento de Cuscatl\u00e1n", + "Departamento de La Libertad", + "Departamento de Ahuachap\u00e1n", + "Departamento de Caba\u00f1as", + "Departamento de La Paz", + "Departamento de La Uni\u00f3n", + "Departamento de Moraz\u00e1n", + "Departamento de San Miguel", + "Departamento de San Salvador", + "Departamento de San Vicente", + "Departamento de Santa Ana", + "Departamento de Sonsonate", + "Departamento de Usulut\u00e1n", + "Departemento de Chalatenango", "El Salvador" - ], + ], "old": [ "El Salvador" ] - }, + }, { - "id": "Equatorial Guinea", - "s": 1448809, + "id": "Equatorial Guinea", + "s": 1448809, "affiliations": [ - "Centro Sur", - "Annob\u00f3n", - "Bioko Norte", - "Bioko Sur", - "Guinea Ecuatorial", - "Ki\u00e9-Ntem", - "Litoral", + "Centro Sur", + "Annob\u00f3n", + "Bioko Norte", + "Bioko Sur", + "Guinea Ecuatorial", + "Ki\u00e9-Ntem", + "Litoral", "Wele-Nzas" - ], + ], "old": [ "Equatorial Guinea" ] - }, + }, { - "id": "Eritrea", - "s": 3127230, + "id": "Eritrea", + "s": 3127230, "affiliations": [ - "Debub", - "Debubawi Kayih Bahri", - "Eritrea", - "Maekel", - "Semienawi Kayih Bahri", - "\u12de\u1263 \u12d3\u1295\u1230\u1263", + "Debub", + "Debubawi Kayih Bahri", + "Eritrea", + "Maekel", + "Semienawi Kayih Bahri", + "\u12de\u1263 \u12d3\u1295\u1230\u1263", "\u130b\u123d-\u1263\u122d\u12ab" - ], + ], "old": [ "Eritrea" ] - }, + }, { - "id": "Estonia", + "id": "Estonia", "g": [ { - "id": "Estonia_West", - "s": 30401670, + "id": "Estonia_West", + "s": 30401670, "affiliations": [ "Eesti" - ], + ], "old": [ "Estonia" ] - }, + }, { - "id": "Estonia_East", - "s": 34664476, + "id": "Estonia_East", + "s": 34664476, "affiliations": [ "Eesti" - ], + ], "old": [ "Estonia" ] } ] - }, + }, { - "id": "Ethiopia", - "s": 31789298, + "id": "Ethiopia", + "s": 31789298, "affiliations": [ - "Addis Abeba", - "Afar", - "Amhara", - "Dir\u0113 Dawa", - "B\u012bnshangul-Gumuz Kilil", - "Harari", - "Gambela", - "Oromia", - "Oromia - Benishangul-Gumuz", - "Oromia - Harari", - "Southern Nations", - "Somali", - "Tigray", + "Addis Abeba", + "Afar", + "Amhara", + "Dir\u0113 Dawa", + "B\u012bnshangul-Gumuz Kilil", + "Harari", + "Gambela", + "Oromia", + "Oromia - Benishangul-Gumuz", + "Oromia - Harari", + "Southern Nations", + "Somali", + "Tigray", "\u12a2\u1275\u12ee\u1335\u12eb Ethiopia" - ], + ], "old": [ "Ethiopia" ] - }, + }, { - "id": "Faroe Islands", - "s": 1719507, + "id": "Faroe Islands", + "s": 1719507, "affiliations": [ - "Eysturoyar s\u00fdsla", - "F\u00f8royar", - "Nor\u00f0oyar s\u00fdsla", - "Sandoyar s\u00fdsla", - "Streymoyar s\u00fdsla", - "Su\u00f0uroyar s\u00fdsla", - "Territorial waters of Faroe Islands", + "Eysturoyar s\u00fdsla", + "F\u00f8royar", + "Nor\u00f0oyar s\u00fdsla", + "Sandoyar s\u00fdsla", + "Streymoyar s\u00fdsla", + "Su\u00f0uroyar s\u00fdsla", + "Territorial waters of Faroe Islands", "V\u00e1ga s\u00fdsla" - ], + ], "old": [ "Faroe Islands" ] - }, + }, { - "id": "Federated States of Micronesia", - "s": 1003078, + "id": "Federated States of Micronesia", + "s": 1003078, "affiliations": [ - "Chuuk", - "Federated States of Micronesia", - "Kosrae", - "Pohnpei", + "Chuuk", + "Federated States of Micronesia", + "Kosrae", + "Pohnpei", "Yap" - ], + ], "old": [ "Micronesia" ] - }, + }, { - "id": "Fiji", - "s": 5489273, + "id": "Fiji", + "s": 5489273, "affiliations": [ - "Central", - "Eastern", - "Northern", + "Central", + "Eastern", + "Northern", "Viti" - ], + ], "old": [ "Fiji" ] - }, + }, { - "id": "Finland", + "id": "Finland", "g": [ { - "id": "Finland_Western Finland_Jyvaskyla", - "s": 20414249, + "id": "Finland_Western Finland_Jyvaskyla", + "s": 20414249, "affiliations": [ - "L\u00e4nsi-Suomi", + "L\u00e4nsi-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Western Finland_Tampere", - "s": 39140755, + "id": "Finland_Western Finland_Tampere", + "s": 39140755, "affiliations": [ - "L\u00e4nsi-Suomi", + "L\u00e4nsi-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Northern Finland", - "s": 36490134, + "id": "Finland_Northern Finland", + "s": 36490134, "affiliations": [ - "Pohjois-Suomi", + "Pohjois-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Eastern Finland_North", - "s": 22598193, + "id": "Finland_Eastern Finland_North", + "s": 22598193, "affiliations": [ - "It\u00e4-Suomi", + "It\u00e4-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Eastern Finland_South", - "s": 29429259, + "id": "Finland_Eastern Finland_South", + "s": 29429259, "affiliations": [ - "It\u00e4-Suomi", + "It\u00e4-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Southern Finland_West", - "s": 20411043, + "id": "Finland_Southern Finland_West", + "s": 20411043, "affiliations": [ - "Etel\u00e4-Suomi", - "Suomi", + "Etel\u00e4-Suomi", + "Suomi", "\u00c5land" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Southern Finland_Helsinki", - "s": 53916449, + "id": "Finland_Southern Finland_Helsinki", + "s": 53916449, "affiliations": [ - "Etel\u00e4-Suomi", + "Etel\u00e4-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] - }, + }, { - "id": "Finland_Southern Finland_Lappeenranta", - "s": 27866920, + "id": "Finland_Southern Finland_Lappeenranta", + "s": 27866920, "affiliations": [ - "Etel\u00e4-Suomi", + "Etel\u00e4-Suomi", "Suomi" - ], + ], "old": [ "Finland" ] } ] - }, + }, { - "id": "France", + "id": "France", "g": [ { - "id": "France_Alsace", + "id": "France_Alsace", "g": [ { - "id": "France_Alsace_Bas-Rhin", - "s": 38476401, + "id": "France_Alsace_Bas-Rhin", + "s": 38476401, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Alsace" ] - }, + }, { - "id": "France_Alsace_Haut-Rhin", - "s": 28273840, + "id": "France_Alsace_Haut-Rhin", + "s": 28273840, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Alsace" ] } ] - }, + }, { - "id": "France_Aquitaine", + "id": "France_Aquitaine", "g": [ { - "id": "France_Aquitaine_Dordogne", - "s": 21795587, + "id": "France_Aquitaine_Dordogne", + "s": 21795587, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Aquitaine" ] - }, + }, { - "id": "France_Aquitaine_Gironde", - "s": 48185222, + "id": "France_Aquitaine_Gironde", + "s": 48185222, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Aquitaine" ] - }, + }, { - "id": "France_Aquitaine_Landes", - "s": 22037185, + "id": "France_Aquitaine_Landes", + "s": 22037185, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Aquitaine" ] - }, + }, { - "id": "France_Aquitaine_Lot-et-Garonne", - "s": 17002905, + "id": "France_Aquitaine_Lot-et-Garonne", + "s": 17002905, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Aquitaine" ] - }, + }, { - "id": "France_Aquitaine_Pyrenees-Atlantiques", - "s": 32246965, + "id": "France_Aquitaine_Pyrenees-Atlantiques", + "s": 32246965, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Aquitaine" ] } ] - }, + }, { - "id": "France_Auvergne", + "id": "France_Auvergne", "g": [ { - "id": "France_Auvergne_Allier", - "s": 21481024, + "id": "France_Auvergne_Allier", + "s": 21481024, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Auvergne" ] - }, + }, { - "id": "France_Auvergne_Cantal", - "s": 12792646, + "id": "France_Auvergne_Cantal", + "s": 12792646, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Auvergne" ] - }, + }, { - "id": "France_Auvergne_Haute-Loire", - "s": 13421661, + "id": "France_Auvergne_Haute-Loire", + "s": 13421661, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Auvergne" ] - }, + }, { - "id": "France_Auvergne_Puy-de-Dome", - "s": 33926308, + "id": "France_Auvergne_Puy-de-Dome", + "s": 33926308, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Auvergne" ] } ] - }, + }, { - "id": "France_Brittany", + "id": "France_Brittany", "g": [ { - "id": "France_Brittany_Cotes-dArmor", - "s": 33563353, + "id": "France_Brittany_Cotes-dArmor", + "s": 33563353, "affiliations": [ - "Bretagne", - "France", - "Guernsey", + "Bretagne", + "France", + "Guernsey", "Jersey" - ], + ], "old": [ "France_Bretagne" ] - }, + }, { - "id": "France_Brittany_Finistere", - "s": 49957474, + "id": "France_Brittany_Finistere", + "s": 49957474, "affiliations": [ - "Bretagne", + "Bretagne", "France" - ], + ], "old": [ "France_Bretagne" ] - }, + }, { - "id": "France_Brittany_Ille-et-Vilaine", - "s": 42518217, + "id": "France_Brittany_Ille-et-Vilaine", + "s": 42518217, "affiliations": [ - "Bretagne", - "France", + "Bretagne", + "France", "Jersey" - ], + ], "old": [ "France_Bretagne" ] - }, + }, { - "id": "France_Brittany_Morbihan", - "s": 35680519, + "id": "France_Brittany_Morbihan", + "s": 35680519, "affiliations": [ - "Bretagne", + "Bretagne", "France" - ], + ], "old": [ "France_Bretagne" ] } ] - }, + }, { - "id": "France_Burgundy", + "id": "France_Burgundy", "g": [ { - "id": "France_Burgundy_Cote-dOr", - "s": 23220972, + "id": "France_Burgundy_Cote-dOr", + "s": 23220972, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Bourgogne" ] - }, + }, { - "id": "France_Burgundy_Nievre", - "s": 12436578, + "id": "France_Burgundy_Nievre", + "s": 12436578, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Bourgogne" ] - }, + }, { - "id": "France_Burgundy_Saone-et-Loire", - "s": 40474230, + "id": "France_Burgundy_Saone-et-Loire", + "s": 40474230, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Bourgogne" ] - }, + }, { - "id": "France_Burgundy_Yonne", - "s": 20674081, + "id": "France_Burgundy_Yonne", + "s": 20674081, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Bourgogne" ] } ] - }, + }, { - "id": "France_Centre-Val de Loire", + "id": "France_Centre-Val de Loire", "g": [ { - "id": "France_Centre-Val de Loire_Cher", - "s": 14305804, + "id": "France_Centre-Val de Loire_Cher", + "s": 14305804, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] - }, + }, { - "id": "France_Centre-Val de Loire_Eure-et-Loir", - "s": 12902096, + "id": "France_Centre-Val de Loire_Eure-et-Loir", + "s": 12902096, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] - }, + }, { - "id": "France_Centre-Val de Loire_Indre", - "s": 17624934, + "id": "France_Centre-Val de Loire_Indre", + "s": 17624934, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] - }, + }, { - "id": "France_Centre-Val de Loire_Indre-et-Loire", - "s": 25032750, + "id": "France_Centre-Val de Loire_Indre-et-Loire", + "s": 25032750, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] - }, + }, { - "id": "France_Centre-Val de Loire_Loir-et-Cher", - "s": 14273958, + "id": "France_Centre-Val de Loire_Loir-et-Cher", + "s": 14273958, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] - }, + }, { - "id": "France_Centre-Val de Loire_Loiret", - "s": 24013783, + "id": "France_Centre-Val de Loire_Loiret", + "s": 24013783, "affiliations": [ - "Centre-Val de Loire", + "Centre-Val de Loire", "France" - ], + ], "old": [ "France_Centre" ] } ] - }, + }, { - "id": "France_Champagne-Ardenne", - "s": 44617770, + "id": "France_Champagne-Ardenne", + "s": 44617770, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Champagne-Ardenne" ] - }, + }, { - "id": "France_Corsica", - "s": 10042397, + "id": "France_Corsica", + "s": 10042397, "affiliations": [ - "Corse - Mer M\u00e9diterran\u00e9e", - "Corse", - "France", - "Italia", + "Corse - Mer M\u00e9diterran\u00e9e", + "Corse", + "France", + "Italia", "Monaco" - ], + ], "old": [ "France_Corsica" ] - }, + }, { - "id": "France_Free County_North", - "s": 30665121, + "id": "France_Free County_North", + "s": 30665121, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Franche-Comte" ] - }, + }, { - "id": "France_Free County_South", - "s": 23124317, + "id": "France_Free County_South", + "s": 23124317, "affiliations": [ - "Bourgogne-Franche-Comt\u00e9", + "Bourgogne-Franche-Comt\u00e9", "France" - ], + ], "old": [ "France_Franche-Comte" ] - }, + }, { - "id": "France_French Guiana", - "s": 6087660, + "id": "France_French Guiana", + "s": 6087660, "affiliations": [ - "France", + "France", "Guyane" - ], + ], "old": [ "French Guiana" ] - }, + }, { - "id": "France_Ile-de-France", + "id": "France_Ile-de-France", "g": [ { - "id": "France_Ile-de-France_Essonne", - "s": 25131631, + "id": "France_Ile-de-France_Essonne", + "s": 25131631, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Hauts-de-Seine", - "s": 11973477, + "id": "France_Ile-de-France_Hauts-de-Seine", + "s": 11973477, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Paris", - "s": 14271706, + "id": "France_Ile-de-France_Paris", + "s": 14271706, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Seine-Saint-Denis", - "s": 15102840, + "id": "France_Ile-de-France_Seine-Saint-Denis", + "s": 15102840, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Seine-et-Marne", - "s": 33331061, + "id": "France_Ile-de-France_Seine-et-Marne", + "s": 33331061, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Val-dOise", - "s": 17422209, + "id": "France_Ile-de-France_Val-dOise", + "s": 17422209, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Val-de-Marne", - "s": 14000176, + "id": "France_Ile-de-France_Val-de-Marne", + "s": 14000176, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] - }, + }, { - "id": "France_Ile-de-France_Yvelines", - "s": 23831807, + "id": "France_Ile-de-France_Yvelines", + "s": 23831807, "affiliations": [ - "France", + "France", "\u00cele-de-France" - ], + ], "old": [ "France_Paris & Ile-de-France" ] } ] - }, + }, { - "id": "France_Languedoc-Roussillon", + "id": "France_Languedoc-Roussillon", "g": [ { - "id": "France_Languedoc-Roussillon_Aude", - "s": 24074108, + "id": "France_Languedoc-Roussillon_Aude", + "s": 24074108, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Languedoc-Roussillon" ] - }, + }, { - "id": "France_Languedoc-Roussillon_Gard", - "s": 26878363, + "id": "France_Languedoc-Roussillon_Gard", + "s": 26878363, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Languedoc-Roussillon" ] - }, + }, { - "id": "France_Languedoc-Roussillon_Herault", - "s": 39175998, + "id": "France_Languedoc-Roussillon_Herault", + "s": 39175998, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Languedoc-Roussillon" ] - }, + }, { - "id": "France_Languedoc-Roussillon_Lozere", - "s": 9356602, + "id": "France_Languedoc-Roussillon_Lozere", + "s": 9356602, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Languedoc-Roussillon" ] - }, + }, { - "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", - "s": 22490974, + "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", + "s": 22490974, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Languedoc-Roussillon" ] } ] - }, + }, { - "id": "France_Limousin", - "s": 50458359, + "id": "France_Limousin", + "s": 50458359, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Limousin" ] - }, + }, { - "id": "France_Lorraine", + "id": "France_Lorraine", "g": [ { - "id": "France_Lorraine_Meurthe-et-Moselle", - "s": 22935195, + "id": "France_Lorraine_Meurthe-et-Moselle", + "s": 22935195, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Lorraine" ] - }, + }, { - "id": "France_Lorraine_Meuse", - "s": 10649178, + "id": "France_Lorraine_Meuse", + "s": 10649178, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Lorraine" ] - }, + }, { - "id": "France_Lorraine_Moselle", - "s": 32794703, + "id": "France_Lorraine_Moselle", + "s": 32794703, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Lorraine" ] - }, + }, { - "id": "France_Lorraine_Vosges", - "s": 22221541, + "id": "France_Lorraine_Vosges", + "s": 22221541, "affiliations": [ - "Alsace-Champagne-Ardenne-Lorraine", + "Alsace-Champagne-Ardenne-Lorraine", "France" - ], + ], "old": [ "France_Lorraine" ] } ] - }, + }, { - "id": "France_Lower Normandy", + "id": "France_Lower Normandy", "g": [ { - "id": "France_Lower Normandy_Calvados", - "s": 25910202, + "id": "France_Lower Normandy_Calvados", + "s": 25910202, "affiliations": [ - "France", + "France", "Normandie" - ], + ], "old": [ "France_Basse-Normandie" ] - }, + }, { - "id": "France_Lower Normandy_Manche", - "s": 26383345, + "id": "France_Lower Normandy_Manche", + "s": 26383345, "affiliations": [ - "France", - "Jersey", + "France", + "Jersey", "Normandie" - ], + ], "old": [ "France_Basse-Normandie" ] - }, + }, { - "id": "France_Lower Normandy_Orne", - "s": 18301793, + "id": "France_Lower Normandy_Orne", + "s": 18301793, "affiliations": [ - "France", + "France", "Normandie" - ], + ], "old": [ "France_Basse-Normandie" ] } ] - }, + }, { - "id": "France_Midi-Pyrenees", + "id": "France_Midi-Pyrenees", "g": [ { - "id": "France_Midi-Pyrenees_Ariege", - "s": 10093107, + "id": "France_Midi-Pyrenees_Ariege", + "s": 10093107, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Aveyron", - "s": 27612975, + "id": "France_Midi-Pyrenees_Aveyron", + "s": 27612975, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Gers", - "s": 15683847, + "id": "France_Midi-Pyrenees_Gers", + "s": 15683847, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Haute-Garonne", - "s": 43761388, + "id": "France_Midi-Pyrenees_Haute-Garonne", + "s": 43761388, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Hautes-Pyrenees", - "s": 29330863, + "id": "France_Midi-Pyrenees_Hautes-Pyrenees", + "s": 29330863, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Lot", - "s": 14563340, + "id": "France_Midi-Pyrenees_Lot", + "s": 14563340, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Tarn", - "s": 20251149, + "id": "France_Midi-Pyrenees_Tarn", + "s": 20251149, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] - }, + }, { - "id": "France_Midi-Pyrenees_Tarn-et-Garonne", - "s": 13775767, + "id": "France_Midi-Pyrenees_Tarn-et-Garonne", + "s": 13775767, "affiliations": [ - "France", + "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" - ], + ], "old": [ "France_Midi-Pyrenees" ] } ] - }, + }, { - "id": "France_New Caledonia", - "s": 5244880, + "id": "France_New Caledonia", + "s": 5244880, "affiliations": [ - "France", - "France, Nouvelle-Cal\u00e9donie, Grande Terre et r\u00e9cifs d'Entrecasteaux (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, R\u00e9cif de P\u00e9trie (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs Bampton et Chesterfield (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de l'Astrolabe (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, \u00cele Hunter (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, \u00cele Matthew (eaux territoriales)", - "France, Nouvelle-Cal\u00e9donie, \u00cele de Walpole (eaux territoriales)", + "France", + "France, Nouvelle-Cal\u00e9donie, Grande Terre et r\u00e9cifs d'Entrecasteaux (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, R\u00e9cif de P\u00e9trie (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs Bampton et Chesterfield (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de l'Astrolabe (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, \u00cele Hunter (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, \u00cele Matthew (eaux territoriales)", + "France, Nouvelle-Cal\u00e9donie, \u00cele de Walpole (eaux territoriales)", "France, Nouvelle-Cal\u00e9donie, \u00celes Loyaut\u00e9 (eaux territoriales)" - ], + ], "old": [ "New Caledonia" ] - }, + }, { - "id": "France_Nord-Pas-de-Calais", + "id": "France_Nord-Pas-de-Calais", "g": [ { - "id": "France_Nord-Pas-de-Calais_Nord", - "s": 31149428, + "id": "France_Nord-Pas-de-Calais_Nord", + "s": 31149428, "affiliations": [ - "France", + "France", "Nord-Pas-de-Calais-Picardie" - ], + ], "old": [ "France_Nord-Pas-de-Calais" ] - }, + }, { - "id": "France_Nord-Pas-de-Calais_Lille", - "s": 36503472, + "id": "France_Nord-Pas-de-Calais_Lille", + "s": 36503472, "affiliations": [ - "France", + "France", "Nord-Pas-de-Calais-Picardie" - ], + ], "old": [ "France_Nord-Pas-de-Calais" ] - }, + }, { - "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", - "s": 48963622, + "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", + "s": 48963622, "affiliations": [ - "England", - "France", - "Nord-Pas-de-Calais-Picardie", + "England", + "France", + "Nord-Pas-de-Calais-Picardie", "United Kingdom" - ], + ], "old": [ "France_Nord-Pas-de-Calais" ] } ] - }, + }, { - "id": "France_Pays de la Loire", + "id": "France_Pays de la Loire", "g": [ { - "id": "France_Pays de la Loire_Loire-Atlantique_Nantes", - "s": 36056240, + "id": "France_Pays de la Loire_Loire-Atlantique_Nantes", + "s": 36056240, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] - }, + }, { - "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", - "s": 20334550, + "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", + "s": 20334550, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] - }, + }, { - "id": "France_Pays de la Loire_Maine-et-Loire", - "s": 36425858, + "id": "France_Pays de la Loire_Maine-et-Loire", + "s": 36425858, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] - }, + }, { - "id": "France_Pays de la Loire_Mayenne", - "s": 18815511, + "id": "France_Pays de la Loire_Mayenne", + "s": 18815511, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] - }, + }, { - "id": "France_Pays de la Loire_Sarthe", - "s": 31466035, + "id": "France_Pays de la Loire_Sarthe", + "s": 31466035, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] - }, + }, { - "id": "France_Pays de la Loire_Vendee", - "s": 48066069, + "id": "France_Pays de la Loire_Vendee", + "s": 48066069, "affiliations": [ - "France", + "France", "Pays de la Loire" - ], + ], "old": [ "France_Pays de la Loire" ] } ] - }, + }, { - "id": "France_Picardy", + "id": "France_Picardy", "g": [ { - "id": "France_Picardy_Aisne", - "s": 22266737, + "id": "France_Picardy_Aisne", + "s": 22266737, "affiliations": [ - "France", + "France", "Nord-Pas-de-Calais-Picardie" - ], + ], "old": [ "France_Picardie" ] - }, + }, { - "id": "France_Picardy_Oise", - "s": 27182214, + "id": "France_Picardy_Oise", + "s": 27182214, "affiliations": [ - "France", + "France", "Nord-Pas-de-Calais-Picardie" - ], + ], "old": [ "France_Picardie" ] - }, + }, { - "id": "France_Picardy_Somme", - "s": 26163517, + "id": "France_Picardy_Somme", + "s": 26163517, "affiliations": [ - "France", + "France", "Nord-Pas-de-Calais-Picardie" - ], + ], "old": [ "France_Picardie" ] } ] - }, + }, { - "id": "France_Poitou-Charentes", + "id": "France_Poitou-Charentes", "g": [ { - "id": "France_Poitou-Charentes_Charente", - "s": 22988703, + "id": "France_Poitou-Charentes_Charente", + "s": 22988703, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Poitou-Charentes" ] - }, + }, { - "id": "France_Poitou-Charentes_Charente-Maritime", - "s": 42611878, + "id": "France_Poitou-Charentes_Charente-Maritime", + "s": 42611878, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Poitou-Charentes" ] - }, + }, { - "id": "France_Poitou-Charentes_Deux-Sevres", - "s": 29562102, + "id": "France_Poitou-Charentes_Deux-Sevres", + "s": 29562102, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Poitou-Charentes" ] - }, + }, { - "id": "France_Poitou-Charentes_Vienne", - "s": 26074758, + "id": "France_Poitou-Charentes_Vienne", + "s": 26074758, "affiliations": [ - "Aquitaine-Limousin-Poitou-Charentes", + "Aquitaine-Limousin-Poitou-Charentes", "France" - ], + ], "old": [ "France_Poitou-Charentes" ] } ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur", + "id": "France_Provence-Alpes-Cote dAzur", "g": [ { - "id": "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence", - "s": 12841633, + "id": "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence", + "s": 12841633, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Provence-Alpes-Cote d'Azur" ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", - "s": 44106714, + "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", + "s": 44106714, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Provence-Alpes-Cote d'Azur" ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", - "s": 11240478, + "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", + "s": 11240478, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Provence-Alpes-Cote d'Azur" ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", - "s": 23919206, + "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", + "s": 23919206, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ - "France_Provence-Alpes-Cote d'Azur", + "France_Provence-Alpes-Cote d'Azur", "Monaco" ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur_Var", - "s": 33899438, + "id": "France_Provence-Alpes-Cote dAzur_Var", + "s": 33899438, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Provence-Alpes-Cote d'Azur" ] - }, + }, { - "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", - "s": 25624079, + "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", + "s": 25624079, "affiliations": [ - "France", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Provence-Alpes-Cote d'Azur" ] } ] - }, + }, { - "id": "France_Rhone-Alpes", + "id": "France_Rhone-Alpes", "g": [ { - "id": "France_Rhone-Alpes_Ain", - "s": 30736427, + "id": "France_Rhone-Alpes_Ain", + "s": 30736427, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Ardeche", - "s": 19699645, + "id": "France_Rhone-Alpes_Ardeche", + "s": 19699645, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Drome", - "s": 25810501, + "id": "France_Rhone-Alpes_Drome", + "s": 25810501, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", - "France", + "Auvergne-Rh\u00f4ne-Alpes", + "France", "Provence-Alpes-C\u00f4te d'Azur" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Haute-Savoie", - "s": 26900873, + "id": "France_Rhone-Alpes_Haute-Savoie", + "s": 26900873, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Isere", - "s": 40173935, + "id": "France_Rhone-Alpes_Isere", + "s": 40173935, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Loire", - "s": 24676778, + "id": "France_Rhone-Alpes_Loire", + "s": 24676778, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Rhone", - "s": 38850731, + "id": "France_Rhone-Alpes_Rhone", + "s": 38850731, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] - }, + }, { - "id": "France_Rhone-Alpes_Savoie", - "s": 19642057, + "id": "France_Rhone-Alpes_Savoie", + "s": 19642057, "affiliations": [ - "Auvergne-Rh\u00f4ne-Alpes", + "Auvergne-Rh\u00f4ne-Alpes", "France" - ], + ], "old": [ "France_Rhone-Alpes" ] } ] - }, + }, { - "id": "France_Southern Islands", - "s": 20107410, + "id": "France_Southern Islands", + "s": 20107410, "affiliations": [ - "France", - "France, Mayotte (eaux territoriales)", - "France, La R\u00e9union (eaux territoriales)", - "France, Terres australes et antarctiques fran\u00e7aises, Saint-Paul-et-Amsterdam (eaux territoriales)", - "France, Terres australes et antarctiques fran\u00e7aises, \u00celes Crozet (eaux territoriales)", - "France, Terres australes et antarctiques fran\u00e7aises, \u00celes Kerguelen (eaux territoriales)", - "France, Terres australes et antarctiques fran\u00e7aises, \u00celes \u00c9parses, \u00cele Tromelin (eaux territoriales)", - "Heard Island and McDonald Islands", - "La R\u00e9union", + "France", + "France, Mayotte (eaux territoriales)", + "France, La R\u00e9union (eaux territoriales)", + "France, Terres australes et antarctiques fran\u00e7aises, Saint-Paul-et-Amsterdam (eaux territoriales)", + "France, Terres australes et antarctiques fran\u00e7aises, \u00celes Crozet (eaux territoriales)", + "France, Terres australes et antarctiques fran\u00e7aises, \u00celes Kerguelen (eaux territoriales)", + "France, Terres australes et antarctiques fran\u00e7aises, \u00celes \u00c9parses, \u00cele Tromelin (eaux territoriales)", + "Heard Island and McDonald Islands", + "La R\u00e9union", "Mayotte" - ], + ], "old": [ - "Reunion", - "French Southern Territories", - "Heard Island and McDonald Islands", + "Reunion", + "French Southern Territories", + "Heard Island and McDonald Islands", "Mayotte" ] - }, + }, { - "id": "France_Upper Normandy", - "s": 49633060, + "id": "France_Upper Normandy", + "s": 49633060, "affiliations": [ - "France", + "France", "Normandie" - ], + ], "old": [ "France_Haute-Normandie" ] - }, + }, { - "id": "French Polynesia", - "s": 2517342, + "id": "French Polynesia", + "s": 2517342, "affiliations": [ - "France", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Gambier (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Marquises (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Sous-le-Vent (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, Archipel des Tuamotu (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Australes (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du D\u00e9sappointement (eaux territoriales)", - "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)", + "France", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Gambier (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Marquises (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Sous-le-Vent (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, Archipel des Tuamotu (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Australes (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du D\u00e9sappointement (eaux territoriales)", + "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)", "Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)" - ], + ], "old": [ "French Polynesia" ] - }, + }, { - "id": "Wallis and Futuna", - "s": 314826, + "id": "Wallis and Futuna", + "s": 314826, "affiliations": [ - "France", + "France", "France, Wallis-et-Futuna (eaux territoriales)" - ], + ], "old": [ "Wallis and Futuna" ] } ] - }, + }, { - "id": "Gabon", - "s": 4416827, + "id": "Gabon", + "s": 4416827, "affiliations": [ - "Estuaire", - "Gabon", - "Haut-Ogoou\u00e9", - "Ngouni\u00e9", - "Moyen-Ogoou\u00e9", - "Ogoou\u00e9-Maritime", - "Nyanga", - "Ogoou\u00e9-Ivindo", - "Ogoou\u00e9-Lolo", + "Estuaire", + "Gabon", + "Haut-Ogoou\u00e9", + "Ngouni\u00e9", + "Moyen-Ogoou\u00e9", + "Ogoou\u00e9-Maritime", + "Nyanga", + "Ogoou\u00e9-Ivindo", + "Ogoou\u00e9-Lolo", "Woleu-Ntem" - ], + ], "old": [ "Gabon" ] - }, + }, { - "id": "Georgia Region", + "id": "Georgia Region", "g": [ { - "id": "Georgia", - "s": 34374178, + "id": "Georgia", + "s": 34374178, "affiliations": [ - "\u10d7\u10d1\u10d8\u10da\u10d8\u10e1\u10d8", - "\u10d8\u10db\u10d4\u10e0\u10d4\u10d7\u10d8", - "\u10e1\u10d0\u10db\u10d4\u10d2\u10e0\u10d4\u10da\u10dd-\u10d6\u10d4\u10db\u10dd \u10e1\u10d5\u10d0\u10dc\u10d4\u10d7\u10d8", - "\u10e8\u10d8\u10d3\u10d0 \u10e5\u10d0\u10e0\u10d7\u10da\u10d8", - "\u10e0\u10d0\u10ed\u10d0-\u10da\u10d4\u10e9\u10ee\u10e3\u10db\u10d8 \u10d3\u10d0 \u10e5\u10d5\u10d4\u10db\u10dd \u10e1\u10d5\u10d0\u10dc\u10d4\u10d7\u10d8", - "\u10d2\u10e3\u10e0\u10d8\u10d0", - "\u10e5\u10d5\u10d4\u10db\u10dd \u10e5\u10d0\u10e0\u10d7\u10da\u10d8", - "\u10d9\u10d0\u10ee\u10d4\u10d7\u10d8", - "\u10db\u10ea\u10ee\u10d4\u10d7\u10d0-\u10db\u10d7\u10d8\u10d0\u10dc\u10d4\u10d7\u10d8", - "\u10e1\u10d0\u10db\u10ea\u10ee\u10d4-\u10ef\u10d0\u10d5\u10d0\u10ee\u10d4\u10d7\u10d8", - "\u10d0\u10ed\u10d0\u10e0\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0", + "\u10d7\u10d1\u10d8\u10da\u10d8\u10e1\u10d8", + "\u10d8\u10db\u10d4\u10e0\u10d4\u10d7\u10d8", + "\u10e1\u10d0\u10db\u10d4\u10d2\u10e0\u10d4\u10da\u10dd-\u10d6\u10d4\u10db\u10dd \u10e1\u10d5\u10d0\u10dc\u10d4\u10d7\u10d8", + "\u10e8\u10d8\u10d3\u10d0 \u10e5\u10d0\u10e0\u10d7\u10da\u10d8", + "\u10e0\u10d0\u10ed\u10d0-\u10da\u10d4\u10e9\u10ee\u10e3\u10db\u10d8 \u10d3\u10d0 \u10e5\u10d5\u10d4\u10db\u10dd \u10e1\u10d5\u10d0\u10dc\u10d4\u10d7\u10d8", + "\u10d2\u10e3\u10e0\u10d8\u10d0", + "\u10e5\u10d5\u10d4\u10db\u10dd \u10e5\u10d0\u10e0\u10d7\u10da\u10d8", + "\u10d9\u10d0\u10ee\u10d4\u10d7\u10d8", + "\u10db\u10ea\u10ee\u10d4\u10d7\u10d0-\u10db\u10d7\u10d8\u10d0\u10dc\u10d4\u10d7\u10d8", + "\u10e1\u10d0\u10db\u10ea\u10ee\u10d4-\u10ef\u10d0\u10d5\u10d0\u10ee\u10d4\u10d7\u10d8", + "\u10d0\u10ed\u10d0\u10e0\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" - ], + ], "old": [ "Georgia" ] - }, + }, { - "id": "Abkhazia", - "s": 4557239, + "id": "Abkhazia", + "s": 4557239, "affiliations": [ - "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", - "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", + "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", + "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" - ], + ], "old": [ "Georgia" ] - }, + }, { - "id": "South Ossetia", - "s": 1508781, + "id": "South Ossetia", + "s": 1508781, "affiliations": [ - "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", - "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", + "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", + "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" - ], + ], "old": [ "Georgia" ] } ] - }, + }, { - "id": "Germany", + "id": "Germany", "g": [ { - "id": "Germany_Baden-Wurttemberg", + "id": "Germany_Baden-Wurttemberg", "g": [ { - "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", - "s": 75131006, + "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", + "s": 75131006, "affiliations": [ - "Baden-W\u00fcrttemberg", - "Deutschland", - "Schaffhausen", + "Baden-W\u00fcrttemberg", + "Deutschland", + "Schaffhausen", "Z\u00fcrich" - ], + ], "old": [ "Germany_Baden-Wurttemberg" ] - }, + }, { - "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", - "s": 78757821, + "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", + "s": 78757821, "affiliations": [ - "Baden-W\u00fcrttemberg", + "Baden-W\u00fcrttemberg", "Deutschland" - ], + ], "old": [ "Germany_Baden-Wurttemberg" ] - }, + }, { - "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", - "s": 25612932, + "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", + "s": 25612932, "affiliations": [ - "Baden-W\u00fcrttemberg", + "Baden-W\u00fcrttemberg", "Deutschland" - ], + ], "old": [ "Germany_Baden-Wurttemberg" ] - }, + }, { - "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", - "s": 73742213, + "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", + "s": 73742213, "affiliations": [ - "Baden-W\u00fcrttemberg", + "Baden-W\u00fcrttemberg", "Deutschland" - ], + ], "old": [ "Germany_Baden-Wurttemberg" ] - }, + }, { - "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", - "s": 55378361, + "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", + "s": 55378361, "affiliations": [ - "Baden-W\u00fcrttemberg", + "Baden-W\u00fcrttemberg", "Deutschland" - ], + ], "old": [ "Germany_Baden-Wurttemberg" ] } ] - }, + }, { - "id": "Germany_Berlin", - "s": 42398431, + "id": "Germany_Berlin", + "s": 42398431, "affiliations": [ - "Berlin", + "Berlin", "Deutschland" - ], + ], "old": [ "Germany_Berlin & Brandenburg" ] - }, + }, { - "id": "Germany_Brandenburg_North", - "s": 39867970, + "id": "Germany_Brandenburg_North", + "s": 39867970, "affiliations": [ - "Brandenburg", + "Brandenburg", "Deutschland" - ], + ], "old": [ "Germany_Berlin & Brandenburg" ] - }, + }, { - "id": "Germany_Brandenburg_South", - "s": 41934514, + "id": "Germany_Brandenburg_South", + "s": 41934514, "affiliations": [ - "Brandenburg", + "Brandenburg", "Deutschland" - ], + ], "old": [ "Germany_Berlin & Brandenburg" ] - }, + }, { - "id": "Germany_Free State of Bavaria", + "id": "Germany_Free State of Bavaria", "g": [ { - "id": "Germany_Free State of Bavaria_Lower Bavaria", - "s": 44413889, + "id": "Germany_Free State of Bavaria_Lower Bavaria", + "s": 44413889, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Lower Franconia", - "s": 39344142, + "id": "Germany_Free State of Bavaria_Lower Franconia", + "s": 39344142, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Middle Franconia", - "s": 44957997, + "id": "Germany_Free State of Bavaria_Middle Franconia", + "s": 44957997, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Swabia", - "s": 63058197, + "id": "Germany_Free State of Bavaria_Swabia", + "s": 63058197, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Bavaria_East", - "s": 39821491, + "id": "Germany_Free State of Bavaria_Upper Bavaria_East", + "s": 39821491, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", - "s": 20324777, + "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", + "s": 20324777, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", - "s": 39105986, + "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", + "s": 39105986, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Bavaria_South", - "s": 17754064, + "id": "Germany_Free State of Bavaria_Upper Bavaria_South", + "s": 17754064, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Franconia", - "s": 40978019, + "id": "Germany_Free State of Bavaria_Upper Franconia", + "s": 40978019, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] - }, + }, { - "id": "Germany_Free State of Bavaria_Upper Palatinate", - "s": 40213971, + "id": "Germany_Free State of Bavaria_Upper Palatinate", + "s": 40213971, "affiliations": [ - "Bayern", + "Bayern", "Deutschland" - ], + ], "old": [ "Germany_Bavaria" ] } ] - }, + }, { - "id": "Germany_Hamburg_main", - "s": 23791367, + "id": "Germany_Hamburg_main", + "s": 23791367, "affiliations": [ - "Deutschland", + "Deutschland", "Hamburg" - ], + ], "old": [ "Germany_Hamburg" ] - }, + }, { - "id": "Germany_Hesse", + "id": "Germany_Hesse", "g": [ { - "id": "Germany_Hesse_Regierungsbezirk Darmstadt", - "s": 77484255, + "id": "Germany_Hesse_Regierungsbezirk Darmstadt", + "s": 77484255, "affiliations": [ - "Deutschland", + "Deutschland", "Hessen" - ], + ], "old": [ "Germany_Hesse" ] - }, + }, { - "id": "Germany_Hesse_Regierungsbezirk Giessen", - "s": 31809157, + "id": "Germany_Hesse_Regierungsbezirk Giessen", + "s": 31809157, "affiliations": [ - "Deutschland", + "Deutschland", "Hessen" - ], + ], "old": [ "Germany_Hesse" ] - }, + }, { - "id": "Germany_Hesse_Regierungsbezirk Kassel", - "s": 44346400, + "id": "Germany_Hesse_Regierungsbezirk Kassel", + "s": 44346400, "affiliations": [ - "Deutschland", + "Deutschland", "Hessen" - ], + ], "old": [ "Germany_Hesse" ] } ] - }, + }, { - "id": "Germany_Lower Saxony", + "id": "Germany_Lower Saxony", "g": [ { - "id": "Germany_Lower Saxony_Bremen_Bremen", - "s": 43523314, + "id": "Germany_Lower Saxony_Bremen_Bremen", + "s": 43523314, "affiliations": [ - "Bremen", - "Deutschland", - "Hamburg", + "Bremen", + "Deutschland", + "Hamburg", "Niedersachsen" - ], + ], "old": [ - "Germany_Bremen & Lower Saxony", + "Germany_Bremen & Lower Saxony", "Germany_Hamburg" ] - }, + }, { - "id": "Germany_Lower Saxony_Bremen_Munster", - "s": 44850245, + "id": "Germany_Lower Saxony_Bremen_Munster", + "s": 44850245, "affiliations": [ - "Deutschland", + "Deutschland", "Niedersachsen" - ], + ], "old": [ "Germany_Bremen & Lower Saxony" ] - }, + }, { - "id": "Germany_Lower Saxony_Hannover", - "s": 38707136, + "id": "Germany_Lower Saxony_Hannover", + "s": 38707136, "affiliations": [ - "Deutschland", + "Deutschland", "Niedersachsen" - ], + ], "old": [ "Germany_Bremen & Lower Saxony" ] - }, + }, { - "id": "Germany_Lower Saxony_Braunschweig", - "s": 45845564, + "id": "Germany_Lower Saxony_Braunschweig", + "s": 45845564, "affiliations": [ - "Deutschland", + "Deutschland", "Niedersachsen" - ], + ], "old": [ "Germany_Bremen & Lower Saxony" ] - }, + }, { - "id": "Germany_Lower Saxony_Oldenburg", - "s": 66979061, + "id": "Germany_Lower Saxony_Oldenburg", + "s": 66979061, "affiliations": [ - "Bremen", - "Deutschland", + "Bremen", + "Deutschland", "Niedersachsen" - ], + ], "old": [ "Germany_Bremen & Lower Saxony" ] } ] - }, + }, { - "id": "Germany_Mecklenburg-Vorpommern", - "s": 62688477, + "id": "Germany_Mecklenburg-Vorpommern", + "s": 62688477, "affiliations": [ - "Deutschland", + "Deutschland", "Mecklenburg-Vorpommern" - ], + ], "old": [ "Germany_Mecklenburg-Vorpommern" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia", + "id": "Germany_North Rhine-Westphalia", "g": [ { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg", - "s": 38092687, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg", + "s": 38092687, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", - "s": 65507237, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", + "s": 65507237, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", - "s": 72315603, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", + "s": 72315603, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", - "s": 56739943, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", + "s": 56739943, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", - "s": 47740084, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", + "s": 47740084, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", - "s": 15805777, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", + "s": 15805777, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", - "s": 50853518, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", + "s": 50853518, "affiliations": [ - "Deutschland", - "Deutschland - Belgique / Belgi\u00eb / Belgien", + "Deutschland", + "Deutschland - Belgique / Belgi\u00eb / Belgien", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", - "s": 67779492, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", + "s": 67779492, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", - "s": 38775468, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", + "s": 38775468, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] - }, + }, { - "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", - "s": 45776370, + "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", + "s": 45776370, "affiliations": [ - "Deutschland", + "Deutschland", "Nordrhein-Westfalen" - ], + ], "old": [ "Germany_North Rhine-Westphalia" ] } ] - }, + }, { - "id": "Germany_Rhineland-Palatinate_Koblenz", - "s": 52309316, + "id": "Germany_Rhineland-Palatinate_Koblenz", + "s": 52309316, "affiliations": [ - "Deutschland", + "Deutschland", "Rheinland-Pfalz" - ], + ], "old": [ "Germany_Rhineland-Palatinate" ] - }, + }, { - "id": "Germany_Rhineland-Palatinate_South", - "s": 52895403, + "id": "Germany_Rhineland-Palatinate_South", + "s": 52895403, "affiliations": [ - "Deutschland", + "Deutschland", "Rheinland-Pfalz" - ], + ], "old": [ "Germany_Rhineland-Palatinate" ] - }, + }, { - "id": "Germany_Saarland", - "s": 24183496, + "id": "Germany_Saarland", + "s": 24183496, "affiliations": [ - "Deutschland", + "Deutschland", "Saarland" - ], + ], "old": [ "Germany_Saarland" ] - }, + }, { - "id": "Germany_Saxony-Anhalt_Magdeburg", - "s": 35686955, + "id": "Germany_Saxony-Anhalt_Magdeburg", + "s": 35686955, "affiliations": [ - "Deutschland", + "Deutschland", "Sachsen-Anhalt" - ], + ], "old": [ "Germany_Saxony-Anhalt" ] - }, + }, { - "id": "Germany_Saxony-Anhalt_Halle", - "s": 32267400, + "id": "Germany_Saxony-Anhalt_Halle", + "s": 32267400, "affiliations": [ - "Deutschland", + "Deutschland", "Sachsen-Anhalt" - ], + ], "old": [ "Germany_Saxony-Anhalt" ] - }, + }, { - "id": "Germany_Saxony_Dresden", - "s": 44434460, + "id": "Germany_Saxony_Dresden", + "s": 44434460, "affiliations": [ - "Deutschland", + "Deutschland", "Sachsen" - ], + ], "old": [ "Germany_Saxony" ] - }, + }, { - "id": "Germany_Saxony_Leipzig", - "s": 75955162, + "id": "Germany_Saxony_Leipzig", + "s": 75955162, "affiliations": [ - "Deutschland", + "Deutschland", "Sachsen" - ], + ], "old": [ "Germany_Saxony" ] - }, + }, { - "id": "Germany_Schleswig-Holstein_Kiel", - "s": 41398652, + "id": "Germany_Schleswig-Holstein_Kiel", + "s": 41398652, "affiliations": [ - "Danmark", - "Deutschland", + "Danmark", + "Deutschland", "Schleswig-Holstein" - ], + ], "old": [ "Germany_Schleswig-Holstein" ] - }, + }, { - "id": "Germany_Schleswig-Holstein_Flensburg", - "s": 40743529, + "id": "Germany_Schleswig-Holstein_Flensburg", + "s": 40743529, "affiliations": [ - "Deutschland", + "Deutschland", "Schleswig-Holstein" - ], + ], "old": [ "Germany_Schleswig-Holstein" ] - }, + }, { - "id": "Germany_Thuringia", - "s": 69665759, + "id": "Germany_Thuringia", + "s": 69665759, "affiliations": [ - "Deutschland", + "Deutschland", "Th\u00fcringen" - ], + ], "old": [ "Germany_Thuringia" ] } ] - }, + }, { - "id": "Ghana", - "s": 13584396, + "id": "Ghana", + "s": 13584396, "affiliations": [ - "Ashanti Region", - "Brong-Ahafo Region", - "Central Region", - "Eastern Region", - "Ghana", - "Greater Accra Region", - "Northern Region", - "Upper East Region", - "Upper West Region", - "Volta Region", + "Ashanti Region", + "Brong-Ahafo Region", + "Central Region", + "Eastern Region", + "Ghana", + "Greater Accra Region", + "Northern Region", + "Upper East Region", + "Upper West Region", + "Volta Region", "Western Region" - ], + ], "old": [ "Ghana" ] - }, + }, { - "id": "Gibraltar", - "s": 286496, + "id": "Gibraltar", + "s": 286496, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Gibraltar" - ], + ], "old": [ - "Spain", + "Spain", "Gibraltar" ] - }, + }, { - "id": "Greece", + "id": "Greece", "g": [ { - "id": "Greece_Decentralized Administration of Crete", - "s": 8224127, + "id": "Greece_Decentralized Administration of Crete", + "s": 8224127, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", - "Territorial waters of Greece - Gavdos and Gavdopoula", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "Territorial waters of Greece - Gavdos and Gavdopoula", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039a\u03c1\u03ae\u03c4\u03b7\u03c2" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of West Greece", - "s": 23044910, + "id": "Greece_Decentralized Administration of West Greece", + "s": 23044910, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", - "Territorial waters of Greece - Strofades", - "Shqip\u00ebria", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "Territorial waters of Greece - Strofades", + "Shqip\u00ebria", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u03a0\u03b5\u03bb\u03bf\u03c0\u03bf\u03bd\u03bd\u03ae\u03c3\u03bf\u03c5, \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2 \u03ba\u03b1\u03b9 \u0399\u03bf\u03bd\u03af\u03bf\u03c5" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of Aegean", - "s": 13955695, + "id": "Greece_Decentralized Administration of Aegean", + "s": 13955695, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03b9\u03b3\u03b1\u03af\u03bf\u03c5" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", - "s": 13843855, + "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", + "s": 13843855, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0397\u03c0\u03b5\u03af\u03c1\u03bf\u03c5 - \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of Macedonia and Thrace", - "s": 30640395, + "id": "Greece_Decentralized Administration of Macedonia and Thrace", + "s": 30640395, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2 - \u0398\u03c1\u03ac\u03ba\u03b7\u03c2" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of Thessaly - Central Greece", - "s": 29978398, + "id": "Greece_Decentralized Administration of Thessaly - Central Greece", + "s": 29978398, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", - "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0398\u03b5\u03c3\u03c3\u03b1\u03bb\u03af\u03b1\u03c2 - \u03a3\u03c4\u03b5\u03c1\u03b5\u03ac\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2" - ], + ], "old": [ "Greece" ] - }, + }, { - "id": "Greece_Decentralized Administration of Attica", - "s": 24799677, + "id": "Greece_Decentralized Administration of Attica", + "s": 24799677, "affiliations": [ - "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", + "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2" - ], + ], "old": [ "Greece" ] } ] - }, + }, { - "id": "Greenland", - "s": 22590580, + "id": "Greenland", + "s": 22590580, "affiliations": [ "Kalaallit Nunaat" - ], + ], "old": [ "Greenland" ] - }, + }, { - "id": "Guatemala", - "s": 19918382, + "id": "Guatemala", + "s": 19918382, "affiliations": [ - "Alta Verapaz", - "Baja Verapaz", - "Chimaltenango", - "Chiquimula", - "El Progreso", - "Escuintla", - "Guatemala", - "Guatemala", - "Huehuetenango", - "Izabal", - "Jalapa", - "Jutiapa", - "Pet\u00e9n", - "Quetzaltenango", - "Quich\u00e9", - "Retalhuleu", - "Sacatep\u00e9quez", - "San Marcos", - "Santa Rosa", - "Solol\u00e1", - "Suchitep\u00e9quez", - "Totonicap\u00e1n", + "Alta Verapaz", + "Baja Verapaz", + "Chimaltenango", + "Chiquimula", + "El Progreso", + "Escuintla", + "Guatemala", + "Guatemala", + "Huehuetenango", + "Izabal", + "Jalapa", + "Jutiapa", + "Pet\u00e9n", + "Quetzaltenango", + "Quich\u00e9", + "Retalhuleu", + "Sacatep\u00e9quez", + "San Marcos", + "Santa Rosa", + "Solol\u00e1", + "Suchitep\u00e9quez", + "Totonicap\u00e1n", "Zacapa" - ], + ], "old": [ "Guatemala" ] - }, + }, { - "id": "Guernsey", - "s": 836693, + "id": "Guernsey", + "s": 836693, "affiliations": [ - "Alderney", - "Brecqhou", - "Burhou", - "Caquorobert Islet", - "Crevichon", - "Jethou", - "Fauconniere", - "Fondu", - "Guernsey", - "Guernsey", - "Herm", - "Hermetier Island", - "L'Etac de Sark", - "Le Plat Houmet", - "Les Casquets", - "Lihou Island", - "Mouliere", - "Raz Island", - "Ortac", - "Putrainez Islet", - "Renonquet", - "Selle Rocque", + "Alderney", + "Brecqhou", + "Burhou", + "Caquorobert Islet", + "Crevichon", + "Jethou", + "Fauconniere", + "Fondu", + "Guernsey", + "Guernsey", + "Herm", + "Hermetier Island", + "L'Etac de Sark", + "Le Plat Houmet", + "Les Casquets", + "Lihou Island", + "Mouliere", + "Raz Island", + "Ortac", + "Putrainez Islet", + "Renonquet", + "Selle Rocque", "Sark" - ], + ], "old": [ - "UK_England", + "UK_England", "Guernsey" ] - }, + }, { - "id": "Guinea", - "s": 30347930, + "id": "Guinea", + "s": 30347930, "affiliations": [ - "Conakry", - "Faranah", - "Guin\u00e9e", - "Kankan", - "R\u00e9gion de Bok\u00e9", - "R\u00e9gion de Kindia", - "R\u00e9gion de Lab\u00e9", - "R\u00e9gion de Mamou", + "Conakry", + "Faranah", + "Guin\u00e9e", + "Kankan", + "R\u00e9gion de Bok\u00e9", + "R\u00e9gion de Kindia", + "R\u00e9gion de Lab\u00e9", + "R\u00e9gion de Mamou", "R\u00e9gion de Nz\u00e9r\u00e9kor\u00e9" - ], + ], "old": [ "Guinea" ] - }, + }, { - "id": "Guinea-Bissau", - "s": 3693822, + "id": "Guinea-Bissau", + "s": 3693822, "affiliations": [ - "Guin\u00e9-Bissau", - "Regi\u00e3o de Bafat\u00e1", - "Regi\u00e3o de Biombo", - "Regi\u00e3o de Bolama", - "Regi\u00e3o de Cacheu", - "Regi\u00e3o de Gabu", - "Regi\u00e3o de Oio", - "Regi\u00e3o de Quinara", + "Guin\u00e9-Bissau", + "Regi\u00e3o de Bafat\u00e1", + "Regi\u00e3o de Biombo", + "Regi\u00e3o de Bolama", + "Regi\u00e3o de Cacheu", + "Regi\u00e3o de Gabu", + "Regi\u00e3o de Oio", + "Regi\u00e3o de Quinara", "Regi\u00e3o de Tombali" - ], + ], "old": [ "Guinea-Bissau" ] - }, + }, { - "id": "Guyana", - "s": 4224640, + "id": "Guyana", + "s": 4224640, "affiliations": [ "Guyana" - ], + ], "old": [ "Guyana" ] - }, + }, { - "id": "Haiti", - "s": 21118903, + "id": "Haiti", + "s": 21118903, "affiliations": [ - "Ayiti", - "D\u00e9partement de l'Artibonite", - "D\u00e9partement de l'Ouest", - "D\u00e9partement de la Grande-Anse", - "D\u00e9partement des Nippes", - "D\u00e9partement du Centre", - "D\u00e9partement du Nord", - "D\u00e9partement du Nord-Est", - "D\u00e9partement du Nord-Ouest", - "D\u00e9partement du Sud", + "Ayiti", + "D\u00e9partement de l'Artibonite", + "D\u00e9partement de l'Ouest", + "D\u00e9partement de la Grande-Anse", + "D\u00e9partement des Nippes", + "D\u00e9partement du Centre", + "D\u00e9partement du Nord", + "D\u00e9partement du Nord-Est", + "D\u00e9partement du Nord-Ouest", + "D\u00e9partement du Sud", "D\u00e9partement du Sud-Est" - ], + ], "old": [ "Haiti" ] - }, + }, { - "id": "Honduras", - "s": 17708649, + "id": "Honduras", + "s": 17708649, "affiliations": [ - "Atl\u00e1ntida", - "Chinandega", - "Choluteca", - "Col\u00f3n", - "Comayagua", - "Cort\u00e9s", - "Cop\u00e1n", - "El Para\u00edso", - "Francisco Moraz\u00e1n", - "Gracias a Dios", - "Honduras", - "Intibuc\u00e1", - "Islas de la Bah\u00eda", - "La Paz", - "Lempira", - "Olancho", - "Ocotepeque", - "Santa B\u00e1rbara", - "Valle", + "Atl\u00e1ntida", + "Chinandega", + "Choluteca", + "Col\u00f3n", + "Comayagua", + "Cort\u00e9s", + "Cop\u00e1n", + "El Para\u00edso", + "Francisco Moraz\u00e1n", + "Gracias a Dios", + "Honduras", + "Intibuc\u00e1", + "Islas de la Bah\u00eda", + "La Paz", + "Lempira", + "Olancho", + "Ocotepeque", + "Santa B\u00e1rbara", + "Valle", "Yoro" - ], + ], "old": [ "Honduras" ] - }, + }, { - "id": "Hungary", + "id": "Hungary", "g": [ { - "id": "Hungary_Northern Great Plain", - "s": 43953372, + "id": "Hungary_Northern Great Plain", + "s": 43953372, "affiliations": [ - "Alf\u00f6ld \u00e9s \u00c9szak", + "Alf\u00f6ld \u00e9s \u00c9szak", "Magyarorsz\u00e1g" - ], + ], "old": [ "Hungary" ] - }, + }, { - "id": "Hungary_Transdanubia", - "s": 49214245, + "id": "Hungary_Transdanubia", + "s": 49214245, "affiliations": [ - "Dun\u00e1nt\u00fal", + "Dun\u00e1nt\u00fal", "Magyarorsz\u00e1g" - ], + ], "old": [ "Hungary" ] - }, + }, { - "id": "Hungary_Kozep-Magyarorszag", - "s": 28698706, + "id": "Hungary_Kozep-Magyarorszag", + "s": 28698706, "affiliations": [ - "K\u00f6z\u00e9p-Magyarorsz\u00e1g", + "K\u00f6z\u00e9p-Magyarorsz\u00e1g", "Magyarorsz\u00e1g" - ], + ], "old": [ "Hungary" ] } ] - }, + }, { - "id": "Iceland", - "s": 16524007, + "id": "Iceland", + "s": 16524007, "affiliations": [ "\u00cdsland" - ], + ], "old": [ "Iceland" ] - }, + }, { - "id": "India", + "id": "India", "g": [ { - "id": "India_Andaman and Nicobar Islands", - "s": 1273063, + "id": "India_Andaman and Nicobar Islands", + "s": 1273063, "affiliations": [ - "Andaman and Nicobar Islands", + "Andaman and Nicobar Islands", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Lakshadweep", - "s": 272950, + "id": "India_Lakshadweep", + "s": 272950, "affiliations": [ - "India", + "India", "Lakshadweep" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Andhra Pradesh", - "s": 22539609, + "id": "India_Andhra Pradesh", + "s": 22539609, "affiliations": [ - "Andhra Pradesh", - "India", + "Andhra Pradesh", + "India", "Puducherry" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Gujarat", - "s": 22440551, + "id": "India_Gujarat", + "s": 22440551, "affiliations": [ - "Gujarat", - "India", - "Union Territory of Dadra & Nagar Haveli", + "Gujarat", + "India", + "Union Territory of Dadra & Nagar Haveli", "Union Territory of Damman & Diu" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Kerala", - "s": 11234214, + "id": "India_Kerala", + "s": 11234214, "affiliations": [ - "India", + "India", "Kerala" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Madhya Pradesh", - "s": 19571308, + "id": "India_Madhya Pradesh", + "s": 19571308, "affiliations": [ - "India", + "India", "Madhya Pradesh" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Rajasthan", - "s": 29394774, + "id": "India_Rajasthan", + "s": 29394774, "affiliations": [ - "India", + "India", "Rajasthan" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Tamil Nadu", - "s": 48148467, + "id": "India_Tamil Nadu", + "s": 48148467, "affiliations": [ - "Cuddalore-Puducherry Administrative Boundary", - "India", - "Kaduvanur (Puducherry)", - "Manamedu (Puducherry)", - "Nettapakkam (Puducherry)", - "Puducherry", - "Sorapattu", + "Cuddalore-Puducherry Administrative Boundary", + "India", + "Kaduvanur (Puducherry)", + "Manamedu (Puducherry)", + "Nettapakkam (Puducherry)", + "Puducherry", + "Sorapattu", "Tamil Nadu" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Haryana", - "s": 30285451, + "id": "India_Haryana", + "s": 30285451, "affiliations": [ - "Haryana", + "Haryana", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Goa", - "s": 1536083, + "id": "India_Goa", + "s": 1536083, "affiliations": [ - "Goa", + "Goa", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Karnataka_North", - "s": 21907440, + "id": "India_Karnataka_North", + "s": 21907440, "affiliations": [ - "India", + "India", "Karnataka" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Karnataka_South", - "s": 47111634, + "id": "India_Karnataka_South", + "s": 47111634, "affiliations": [ - "India", + "India", "Karnataka" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Maharashtra", - "s": 53397258, + "id": "India_Maharashtra", + "s": 53397258, "affiliations": [ - "Ankisha", - "Ganjiramannapeta", - "India", - "Kambalpeta", - "Karnataka - Maharashtra border", - "Maharashtra", + "Ankisha", + "Ganjiramannapeta", + "India", + "Kambalpeta", + "Karnataka - Maharashtra border", + "Maharashtra", "Rangadhampetha" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Telangana", - "s": 65250676, + "id": "India_Telangana", + "s": 65250676, "affiliations": [ - "India", + "India", "Telangana" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Delhi", - "s": 12677228, + "id": "India_Delhi", + "s": 12677228, "affiliations": [ - "Delhi", + "Delhi", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Uttar Pradesh", - "s": 27380463, + "id": "India_Uttar Pradesh", + "s": 27380463, "affiliations": [ - "Uttar Pradesh", + "Uttar Pradesh", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Odisha", - "s": 8955704, + "id": "India_Odisha", + "s": 8955704, "affiliations": [ - "India", + "India", "Odisha" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Chhattisgarh", - "s": 5073493, + "id": "India_Chhattisgarh", + "s": 5073493, "affiliations": [ - "Chhattisgarh", + "Chhattisgarh", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Jharkhand", - "s": 4302138, + "id": "India_Jharkhand", + "s": 4302138, "affiliations": [ - "Jharkhand", + "Jharkhand", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Bihar", - "s": 7575919, + "id": "India_Bihar", + "s": 7575919, "affiliations": [ - "Bihar", + "Bihar", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Tripura", - "s": 567924, + "id": "India_Tripura", + "s": 567924, "affiliations": [ - "India", + "India", "Tripura" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_West Bengal", - "s": 28654039, + "id": "India_West Bengal", + "s": 28654039, "affiliations": [ - "Border India - Bangladesh", - "Dist. Judges Court", - "India", + "Border India - Bangladesh", + "Dist. Judges Court", + "India", "West Bengal" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Sikkim", - "s": 537597, + "id": "India_Sikkim", + "s": 537597, "affiliations": [ - "India", + "India", "Sikkim" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Uttarakhand", - "s": 6385410, + "id": "India_Uttarakhand", + "s": 6385410, "affiliations": [ - "Uttarakhand", + "Uttarakhand", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Mizoram", - "s": 559541, + "id": "India_Mizoram", + "s": 559541, "affiliations": [ - "India", + "India", "Mizoram" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Meghalaya", - "s": 868424, + "id": "India_Meghalaya", + "s": 868424, "affiliations": [ - "India", + "India", "Meghalaya" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Manipur", - "s": 635417, + "id": "India_Manipur", + "s": 635417, "affiliations": [ - "India", + "India", "Manipur" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Nagaland", - "s": 505089, + "id": "India_Nagaland", + "s": 505089, "affiliations": [ - "India", + "India", "Nagaland" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Assam", - "s": 2848554, + "id": "India_Assam", + "s": 2848554, "affiliations": [ - "Assam", + "Assam", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Arunachal Pradesh", - "s": 1496347, + "id": "India_Arunachal Pradesh", + "s": 1496347, "affiliations": [ - "Arunachal Pradesh", + "Arunachal Pradesh", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Himachal Pradesh", - "s": 3189745, + "id": "India_Himachal Pradesh", + "s": 3189745, "affiliations": [ - "Himachal Pradesh", + "Himachal Pradesh", "India" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Jammu and Kashmir", - "s": 5010023, + "id": "India_Jammu and Kashmir", + "s": 5010023, "affiliations": [ - "India", + "India", "Jammu and Kashmir" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Chandigarh", - "s": 1107460, + "id": "India_Chandigarh", + "s": 1107460, "affiliations": [ - "India", + "India", "Union Territory of Chand\u012bgarh" - ], + ], "old": [ "India" ] - }, + }, { - "id": "India_Punjab", - "s": 13022059, + "id": "India_Punjab", + "s": 13022059, "affiliations": [ - "India", + "India", "Punjab" - ], + ], "old": [ "India" ] } ] - }, + }, { - "id": "Indonesia", + "id": "Indonesia", "g": [ { - "id": "Indonesia_Central", - "s": 52426529, + "id": "Indonesia_Central", + "s": 52426529, "affiliations": [ - "Gorontalo", - "Indonesia", - "Kalimantan Barat", - "Kalimantan Selatan", - "Kalimantan Tengah", - "Kalimantan Timur", - "Kalimantan Utara", - "Sulawesi Tenggara", - "Sulawesi Barat", - "Sulawesi Selatan", - "Sulawesi Tengah", + "Gorontalo", + "Indonesia", + "Kalimantan Barat", + "Kalimantan Selatan", + "Kalimantan Tengah", + "Kalimantan Timur", + "Kalimantan Utara", + "Sulawesi Tenggara", + "Sulawesi Barat", + "Sulawesi Selatan", + "Sulawesi Tengah", "Sulawesi Utara" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_West", - "s": 35922598, + "id": "Indonesia_West", + "s": 35922598, "affiliations": [ - "Aceh", - "Banten", - "Bengkulu", - "Indonesia", - "Jambi", - "Lampung", - "Kepulauan Bangka Belitung", - "Kepulauan Riau", - "Riau", - "Singapura", - "Sumatera Barat", - "Sumatera Selatan", + "Aceh", + "Banten", + "Bengkulu", + "Indonesia", + "Jambi", + "Lampung", + "Kepulauan Bangka Belitung", + "Kepulauan Riau", + "Riau", + "Singapura", + "Sumatera Barat", + "Sumatera Selatan", "Sumatera Utara" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_Jawa Tengah", - "s": 28788203, + "id": "Indonesia_Jawa Tengah", + "s": 28788203, "affiliations": [ - "Daerah Istimewa Yogyakarta", - "Indonesia", + "Daerah Istimewa Yogyakarta", + "Indonesia", "Jawa Tengah" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_Jawa Barat", - "s": 34331575, + "id": "Indonesia_Jawa Barat", + "s": 34331575, "affiliations": [ - "Banten", - "Daerah Khusus Ibukota Jakarta", - "Indonesia", + "Banten", + "Daerah Khusus Ibukota Jakarta", + "Indonesia", "Jawa Barat" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_Nusa Tenggara", - "s": 35236697, + "id": "Indonesia_Nusa Tenggara", + "s": 35236697, "affiliations": [ - "Bali", - "Batas Dusun Muntigunung Induk", - "Batas Dusun Muntigunung Tengah", - "Indonesia", - "Nusa Tenggara Barat", + "Bali", + "Batas Dusun Muntigunung Induk", + "Batas Dusun Muntigunung Tengah", + "Indonesia", + "Nusa Tenggara Barat", "Nusa Tenggara Timur" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_Jawa Timur", - "s": 33861410, + "id": "Indonesia_Jawa Timur", + "s": 33861410, "affiliations": [ - "Indonesia", + "Indonesia", "Jawa Timur" - ], + ], "old": [ "Indonesia" ] - }, + }, { - "id": "Indonesia_East", - "s": 11657021, + "id": "Indonesia_East", + "s": 11657021, "affiliations": [ - "Indonesia", - "Maluku", - "Maluku Utara", - "Papua Barat", + "Indonesia", + "Maluku", + "Maluku Utara", + "Papua Barat", "Papua" - ], + ], "old": [ "Indonesia" ] } ] - }, + }, { - "id": "Iran", + "id": "Iran", "g": [ { - "id": "Iran_East", - "s": 30396434, + "id": "Iran_East", + "s": 30396434, "affiliations": [ - "\u06cc\u0632\u062f\u200e", - "\u06a9\u0631\u0645\u0627\u0646", - "\u0633\u06cc\u0633\u062a\u0627\u0646 \u0648 \u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646\u200e", - "\u062e\u0631\u0627\u0633\u0627\u0646 \u0631\u0636\u0648\u06cc\u200e", - "\u062e\u0631\u0627\u0633\u0627\u0646 \u062c\u0646\u0648\u0628\u06cc\u200e", - "\u062e\u0631\u0627\u0633\u0627\u0646 \u0634\u0645\u0627\u0644\u06cc\u200e", + "\u06cc\u0632\u062f\u200e", + "\u06a9\u0631\u0645\u0627\u0646", + "\u0633\u06cc\u0633\u062a\u0627\u0646 \u0648 \u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646\u200e", + "\u062e\u0631\u0627\u0633\u0627\u0646 \u0631\u0636\u0648\u06cc\u200e", + "\u062e\u0631\u0627\u0633\u0627\u0646 \u062c\u0646\u0648\u0628\u06cc\u200e", + "\u062e\u0631\u0627\u0633\u0627\u0646 \u0634\u0645\u0627\u0644\u06cc\u200e", "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e" - ], + ], "old": [ "Iran" ] - }, + }, { - "id": "Iran_South", - "s": 43258380, + "id": "Iran_South", + "s": 43258380, "affiliations": [ - "\u0644\u0631\u0633\u062a\u0627\u0646\u200e", - "\u0641\u0627\u0631\u0633\u200e", - "\u0645\u0631\u06a9\u0632\u06cc", - "\u0627\u0635\u0641\u0647\u0627\u0646", - "\u0627\u06cc\u0644\u0627\u0645\u200e", - "\u0628\u0648\u0634\u0647\u0631\u200e", - "\u0647\u0645\u062f\u0627\u0646\u200e", - "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e", - "\u062e\u0648\u0632\u0633\u062a\u0627\u0646\u200e", - "\u06a9\u0631\u062f\u0633\u062a\u0627\u0646\u200e", - "\u06a9\u0647\u06af\u06cc\u0644\u0648\u06cc\u0647 \u0648 \u0628\u0648\u06cc\u0631 \u0627\u062d\u0645\u062f", - "\u0686\u0647\u0627\u0631\u0645\u062d\u0627\u0644 \u0648 \u0628\u062e\u062a\u06cc\u0627\u0631\u06cc\u200e", - "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", + "\u0644\u0631\u0633\u062a\u0627\u0646\u200e", + "\u0641\u0627\u0631\u0633\u200e", + "\u0645\u0631\u06a9\u0632\u06cc", + "\u0627\u0635\u0641\u0647\u0627\u0646", + "\u0627\u06cc\u0644\u0627\u0645\u200e", + "\u0628\u0648\u0634\u0647\u0631\u200e", + "\u0647\u0645\u062f\u0627\u0646\u200e", + "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e", + "\u062e\u0648\u0632\u0633\u062a\u0627\u0646\u200e", + "\u06a9\u0631\u062f\u0633\u062a\u0627\u0646\u200e", + "\u06a9\u0647\u06af\u06cc\u0644\u0648\u06cc\u0647 \u0648 \u0628\u0648\u06cc\u0631 \u0627\u062d\u0645\u062f", + "\u0686\u0647\u0627\u0631\u0645\u062d\u0627\u0644 \u0648 \u0628\u062e\u062a\u06cc\u0627\u0631\u06cc\u200e", + "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", "\u200f\u0647\u0631\u0645\u0632\u06af\u0627\u0646\u200e" - ], + ], "old": [ "Iran" ] - }, + }, { - "id": "Iran_North", - "s": 46508580, + "id": "Iran_North", + "s": 46508580, "affiliations": [ - "\u0642\u0645\u200e", - "\u0627\u0644\u0628\u0631\u0632", - "\u062a\u0647\u0631\u0627\u0646", - "\u0632\u0646\u062c\u0627\u0646\u200e", - "\u0633\u0645\u0646\u0627\u0646\u200e", - "\u0642\u0632\u0648\u06cc\u0646\u200e", - "\u06af\u0644\u0633\u062a\u0627\u0646", - "\u06af\u064a\u0644\u0627\u0646\u200e", - "\u0627\u0631\u062f\u0628\u06cc\u0644\u200e", - "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e", - "\u06a9\u0631\u062f\u0633\u062a\u0627\u0646\u200e", - "\u0622\u0630\u0631\u0628\u0627\u06cc\u062c\u0627\u0646 \u063a\u0631\u0628\u06cc\u200e", - "\u0645\u0627\u0632\u0646\u062f\u0631\u0627\u0646\u200e", - "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", + "\u0642\u0645\u200e", + "\u0627\u0644\u0628\u0631\u0632", + "\u062a\u0647\u0631\u0627\u0646", + "\u0632\u0646\u062c\u0627\u0646\u200e", + "\u0633\u0645\u0646\u0627\u0646\u200e", + "\u0642\u0632\u0648\u06cc\u0646\u200e", + "\u06af\u0644\u0633\u062a\u0627\u0646", + "\u06af\u064a\u0644\u0627\u0646\u200e", + "\u0627\u0631\u062f\u0628\u06cc\u0644\u200e", + "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e", + "\u06a9\u0631\u062f\u0633\u062a\u0627\u0646\u200e", + "\u0622\u0630\u0631\u0628\u0627\u06cc\u062c\u0627\u0646 \u063a\u0631\u0628\u06cc\u200e", + "\u0645\u0627\u0632\u0646\u062f\u0631\u0627\u0646\u200e", + "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e", "\u0622\u0630\u0631\u0628\u0627\u06cc\u062c\u0627\u0646 \u0634\u0631\u0642\u06cc" - ], + ], "old": [ "Iran" ] } ] - }, + }, { - "id": "Iraq", + "id": "Iraq", "g": [ { - "id": "Iraq_North", - "s": 33576327, + "id": "Iraq_North", + "s": 33576327, "affiliations": [ - "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", - "garaki handren", - "\u062f\u0647\u0648\u0643", - "\u0635\u0644\u0627\u062d \u0627\u0644\u062f\u064a\u0646", - "\u0623\u0631\u0628\u064a\u0644", - "\u062d\u0644\u0628\u062c\u0629", - "\u062f\u064a\u0627\u0644\u0649", - "\u0643\u0631\u0643\u0648\u0643", - "\u0646\u06cc\u0646\u0648\u0649", - "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", + "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", + "garaki handren", + "\u062f\u0647\u0648\u0643", + "\u0635\u0644\u0627\u062d \u0627\u0644\u062f\u064a\u0646", + "\u0623\u0631\u0628\u064a\u0644", + "\u062d\u0644\u0628\u062c\u0629", + "\u062f\u064a\u0627\u0644\u0649", + "\u0643\u0631\u0643\u0648\u0643", + "\u0646\u06cc\u0646\u0648\u0649", + "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", "\u0627\u0644\u0633\u0644\u064a\u0645\u0627\u0646\u064a\u0629" - ], + ], "old": [ "Iraq" ] - }, + }, { - "id": "Iraq_South", - "s": 26742971, + "id": "Iraq_South", + "s": 26742971, "affiliations": [ - "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", - "\u0630\u064a \u0642\u0627\u0631", - "\u0628\u0627\u0628\u0644", - "\u0648\u0627\u0633\u0637", - "\u0635\u0644\u0627\u062d \u0627\u0644\u062f\u064a\u0646", - "\u0627\u0644\u0646\u062c\u0641", - "\u062f\u064a\u0627\u0644\u0649", - "\u0645\u064a\u0633\u0627\u0646", - "\u0627\u0644\u0645\u062b\u0646\u0649", - "\u0627\u0644\u0628\u0635\u0631\u0629", - "\u0643\u0631\u0628\u0644\u0627\u0621", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u063a\u062f\u0627\u062f", - "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", + "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", + "\u0630\u064a \u0642\u0627\u0631", + "\u0628\u0627\u0628\u0644", + "\u0648\u0627\u0633\u0637", + "\u0635\u0644\u0627\u062d \u0627\u0644\u062f\u064a\u0646", + "\u0627\u0644\u0646\u062c\u0641", + "\u062f\u064a\u0627\u0644\u0649", + "\u0645\u064a\u0633\u0627\u0646", + "\u0627\u0644\u0645\u062b\u0646\u0649", + "\u0627\u0644\u0628\u0635\u0631\u0629", + "\u0643\u0631\u0628\u0644\u0627\u0621", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u063a\u062f\u0627\u062f", + "\u0627\u0644\u0623\u0646\u0628\u0627\u0631", "\u0627\u0644\u0642\u0627\u062f\u0633\u064a\u0629" - ], + ], "old": [ "Iraq" ] } ] - }, + }, { - "id": "Isle of Man", - "s": 1984739, + "id": "Isle of Man", + "s": 1984739, "affiliations": [ - "Isle of Man", - "Scotland", + "Isle of Man", + "Scotland", "United Kingdom" - ], + ], "old": [ "Isle of Man" ] - }, + }, { - "id": "Israel Region", + "id": "Israel Region", "g": [ { - "id": "Jerusalem", - "s": 3631556, + "id": "Jerusalem", + "s": 3631556, "affiliations": [ - "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", + "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" - ], + ], "old": [ - "Israel", + "Israel", "Palestine" ] - }, + }, { - "id": "Israel", - "s": 37092095, + "id": "Israel", + "s": 37092095, "affiliations": [ - "\u05de\u05d7\u05d5\u05d6 \u05d7\u05d9\u05e4\u05d4", - "\u05de\u05d7\u05d5\u05d6 \u05ea\u05dc \u05d0\u05d1\u05d9\u05d1", - "\u05de\u05d7\u05d5\u05d6 \u05d4\u05d3\u05e8\u05d5\u05dd", - "\u05de\u05d7\u05d5\u05d6 \u05d4\u05de\u05e8\u05db\u05d6", - "\u05de\u05d7\u05d5\u05d6 \u05d4\u05e6\u05e4\u05d5\u05df", - "\u0642\u0636\u0627\u0621 \u062d\u0627\u0635\u0628\u064a\u0627", - "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", + "\u05de\u05d7\u05d5\u05d6 \u05d7\u05d9\u05e4\u05d4", + "\u05de\u05d7\u05d5\u05d6 \u05ea\u05dc \u05d0\u05d1\u05d9\u05d1", + "\u05de\u05d7\u05d5\u05d6 \u05d4\u05d3\u05e8\u05d5\u05dd", + "\u05de\u05d7\u05d5\u05d6 \u05d4\u05de\u05e8\u05db\u05d6", + "\u05de\u05d7\u05d5\u05d6 \u05d4\u05e6\u05e4\u05d5\u05df", + "\u0642\u0636\u0627\u0621 \u062d\u0627\u0635\u0628\u064a\u0627", + "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" - ], + ], "old": [ "Israel" ] } ] - }, + }, { - "id": "Italy", + "id": "Italy", "g": [ { - "id": "Italy_Abruzzo", - "s": 13506818, + "id": "Italy_Abruzzo", + "s": 13506818, "affiliations": [ - "Abruzzo", + "Abruzzo", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Aosta Valley", - "s": 7425790, + "id": "Italy_Aosta Valley", + "s": 7425790, "affiliations": [ - "Italia", + "Italia", "Valle d'Aosta/Vall\u00e9e d'Aoste" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Apulia", - "s": 62401371, + "id": "Italy_Apulia", + "s": 62401371, "affiliations": [ - "Isola della Chianca", - "Isola della Malva", - "Isola Sant'Andrea", - "Isola dei Conigli", - "Isola del Campo", - "Italia", + "Isola della Chianca", + "Isola della Malva", + "Isola Sant'Andrea", + "Isola dei Conigli", + "Isola del Campo", + "Italia", "Puglia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Basilicata", - "s": 8815001, + "id": "Italy_Basilicata", + "s": 8815001, "affiliations": [ - "Basilicata", + "Basilicata", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Calabria", - "s": 18795069, + "id": "Italy_Calabria", + "s": 18795069, "affiliations": [ - "Calabria", - "Isola di Cirella", - "Isola di Dino", + "Calabria", + "Isola di Cirella", + "Isola di Dino", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Campania", - "s": 28623199, + "id": "Italy_Campania", + "s": 28623199, "affiliations": [ - "Campania", - "Isola Licosa", - "Il Gallo Lungo", - "Isola di Vivara", - "Italia", - "La Rotonda", - "La Castelluccia", + "Campania", + "Isola Licosa", + "Il Gallo Lungo", + "Isola di Vivara", + "Italia", + "La Rotonda", + "La Castelluccia", "Scoglio Rovigliano" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia", + "id": "Italy_Emilia", "g": [ { - "id": "Italy_Emilia-Romagna_Bologna", - "s": 21045210, + "id": "Italy_Emilia-Romagna_Bologna", + "s": 21045210, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Ferrara", - "s": 9492627, + "id": "Italy_Emilia-Romagna_Ferrara", + "s": 9492627, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Forli-Cesena", - "s": 8910064, + "id": "Italy_Emilia-Romagna_Forli-Cesena", + "s": 8910064, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Modena", - "s": 18569638, + "id": "Italy_Emilia-Romagna_Modena", + "s": 18569638, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Parma", - "s": 13308908, + "id": "Italy_Emilia-Romagna_Parma", + "s": 13308908, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Piacenza", - "s": 8387585, + "id": "Italy_Emilia-Romagna_Piacenza", + "s": 8387585, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Ravenna", - "s": 8050400, + "id": "Italy_Emilia-Romagna_Ravenna", + "s": 8050400, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Reggio Emilia", - "s": 10791667, + "id": "Italy_Emilia-Romagna_Reggio Emilia", + "s": 10791667, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Emilia-Romagna_Rimini", - "s": 6245195, + "id": "Italy_Emilia-Romagna_Rimini", + "s": 6245195, "affiliations": [ - "Emilia-Romagna", + "Emilia-Romagna", "Italia" - ], + ], "old": [ "Italy" ] } ] - }, + }, { - "id": "Italy_Friuli", + "id": "Italy_Friuli", "g": [ { - "id": "Italy_Friuli-Venezia Giulia_Gorizia", - "s": 6105846, + "id": "Italy_Friuli-Venezia Giulia_Gorizia", + "s": 6105846, "affiliations": [ - "Friuli Venezia Giulia", + "Friuli Venezia Giulia", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Friuli-Venezia Giulia_Pordenone", - "s": 15905994, + "id": "Italy_Friuli-Venezia Giulia_Pordenone", + "s": 15905994, "affiliations": [ - "Friuli Venezia Giulia", + "Friuli Venezia Giulia", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Friuli-Venezia Giulia_Trieste", - "s": 5523794, + "id": "Italy_Friuli-Venezia Giulia_Trieste", + "s": 5523794, "affiliations": [ - "Friuli Venezia Giulia", + "Friuli Venezia Giulia", "Italia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Friuli-Venezia Giulia_Udine", - "s": 34530419, + "id": "Italy_Friuli-Venezia Giulia_Udine", + "s": 34530419, "affiliations": [ - "Friuli Venezia Giulia", + "Friuli Venezia Giulia", "Italia" - ], + ], "old": [ "Italy" ] } ] - }, + }, { - "id": "Italy_Lazio", - "s": 42088431, + "id": "Italy_Lazio", + "s": 42088431, "affiliations": [ - "Civitatis Vatican\u00e6", - "Gavi", - "Zannone", - "Italia", - "Lazio", - "Palmarola", + "Civitatis Vatican\u00e6", + "Gavi", + "Zannone", + "Italia", + "Lazio", + "Palmarola", "Ventotene" - ], + ], "old": [ - "Italy", + "Italy", "Vatican" ] - }, + }, { - "id": "Italy_Liguria", - "s": 34230100, + "id": "Italy_Liguria", + "s": 34230100, "affiliations": [ - "Italia", + "Italia", "Liguria" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy", + "id": "Italy_Lombardy", "g": [ { - "id": "Italy_Lombardy_Bergamo", - "s": 12642758, + "id": "Italy_Lombardy_Bergamo", + "s": 12642758, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Brescia", - "s": 19913446, + "id": "Italy_Lombardy_Brescia", + "s": 19913446, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Como", - "s": 9278539, + "id": "Italy_Lombardy_Como", + "s": 9278539, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Cremona", - "s": 4609374, + "id": "Italy_Lombardy_Cremona", + "s": 4609374, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Lecco", - "s": 7123171, + "id": "Italy_Lombardy_Lecco", + "s": 7123171, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Lodi", - "s": 4326110, + "id": "Italy_Lombardy_Lodi", + "s": 4326110, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Mantua", - "s": 5235813, + "id": "Italy_Lombardy_Mantua", + "s": 5235813, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Milan", - "s": 21699247, + "id": "Italy_Lombardy_Milan", + "s": 21699247, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Monza and Brianza", - "s": 8261492, + "id": "Italy_Lombardy_Monza and Brianza", + "s": 8261492, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Pavia", - "s": 16258496, + "id": "Italy_Lombardy_Pavia", + "s": 16258496, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Sondrio", - "s": 6665673, + "id": "Italy_Lombardy_Sondrio", + "s": 6665673, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Lombardy_Varese", - "s": 11790344, + "id": "Italy_Lombardy_Varese", + "s": 11790344, "affiliations": [ - "Italia", + "Italia", "Lombardia" - ], + ], "old": [ "Italy" ] } ] - }, + }, { - "id": "Italy_Marche", - "s": 18453733, + "id": "Italy_Marche", + "s": 18453733, "affiliations": [ - "Italia", + "Italia", "Marche" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Molise", - "s": 6341083, + "id": "Italy_Molise", + "s": 6341083, "affiliations": [ - "Italia", + "Italia", "Molise" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont", + "id": "Italy_Piemont", "g": [ { - "id": "Italy_Piemont_Alessandria", - "s": 9698336, + "id": "Italy_Piemont_Alessandria", + "s": 9698336, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Asti", - "s": 2784471, + "id": "Italy_Piemont_Asti", + "s": 2784471, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Biella", - "s": 2645444, + "id": "Italy_Piemont_Biella", + "s": 2645444, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Cuneo", - "s": 21217380, + "id": "Italy_Piemont_Cuneo", + "s": 21217380, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Novara", - "s": 6199015, + "id": "Italy_Piemont_Novara", + "s": 6199015, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Torino", - "s": 20873800, + "id": "Italy_Piemont_Torino", + "s": 20873800, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Verbano-Cusio-Ossola", - "s": 4691445, + "id": "Italy_Piemont_Verbano-Cusio-Ossola", + "s": 4691445, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Piemont_Vercelli", - "s": 6029031, + "id": "Italy_Piemont_Vercelli", + "s": 6029031, "affiliations": [ - "Italia", + "Italia", "Piemonte" - ], + ], "old": [ "Italy" ] } ] - }, + }, { - "id": "Italy_Sardinia", - "s": 41768995, + "id": "Italy_Sardinia", + "s": 41768995, "affiliations": [ - "Isola Tuaredda", - "Isola de Sa tonnara", - "Isola del Toro", - "Isola di Campionna", - "Isola Rossa", - "Isola Sa mesa longa", - "Isola San Macario", - "Isola dei Ratti", - "Italia", - "Scoglio Pan di Zucchero", - "Sardigna/Sardegna", + "Isola Tuaredda", + "Isola de Sa tonnara", + "Isola del Toro", + "Isola di Campionna", + "Isola Rossa", + "Isola Sa mesa longa", + "Isola San Macario", + "Isola dei Ratti", + "Italia", + "Scoglio Pan di Zucchero", + "Sardigna/Sardegna", "Scoglio Il Catalano" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Sicily", - "s": 59703871, + "id": "Italy_Sicily", + "s": 59703871, "affiliations": [ - "Isola dei Cani", - "Isola delle Correnti", - "Isola Formica", - "Isola Lachea", - "Isola Marettimo", - "Isola Piccola", - "Isola delle Femmine", - "Faraglione Grande", - "Faraglione Mezzano", - "Faraglione Piccolo", - "Faraglione di Tracino", - "Galeotta", - "Isola di Capo Passero", - "Il Faraglione", - "Isolotto di Ognina", - "Isola Colombaia", - "Isola San Pantaleo", - "Isola Santa Maria", - "Isola dei Conigli", - "Isola dei Porri", - "Isolotto Bottaro", - "Isolotto Lisca Bianca", - "Italia", - "Lampione", - "Preveto", - "Pietra Quaglietto", - "Territorial waters of Italy - Ustica", - "Testa di Monaco", - "Rocca San Nicola", - "Scoglio Scibiliana", - "Scoglio Spinazzola", - "Scoglio a Pizzo", - "Scoglio del Sacramento", - "Scoglio di Maraone", - "Scola", - "Scoglio Faraglione", - "Scoglio Grande", - "Scoglio Palumbo", + "Isola dei Cani", + "Isola delle Correnti", + "Isola Formica", + "Isola Lachea", + "Isola Marettimo", + "Isola Piccola", + "Isola delle Femmine", + "Faraglione Grande", + "Faraglione Mezzano", + "Faraglione Piccolo", + "Faraglione di Tracino", + "Galeotta", + "Isola di Capo Passero", + "Il Faraglione", + "Isolotto di Ognina", + "Isola Colombaia", + "Isola San Pantaleo", + "Isola Santa Maria", + "Isola dei Conigli", + "Isola dei Porri", + "Isolotto Bottaro", + "Isolotto Lisca Bianca", + "Italia", + "Lampione", + "Preveto", + "Pietra Quaglietto", + "Territorial waters of Italy - Ustica", + "Testa di Monaco", + "Rocca San Nicola", + "Scoglio Scibiliana", + "Scoglio Spinazzola", + "Scoglio a Pizzo", + "Scoglio del Sacramento", + "Scoglio di Maraone", + "Scola", + "Scoglio Faraglione", + "Scoglio Grande", + "Scoglio Palumbo", "Sicilia" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Trentino-Alto Adige Sudtirol", - "s": 47558581, + "id": "Italy_Trentino-Alto Adige Sudtirol", + "s": 47558581, "affiliations": [ - "Italia", + "Italia", "Trentino-Alto Adige/S\u00fcdtirol" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Tuscany_Grosseto", - "s": 18434517, + "id": "Italy_Tuscany_Grosseto", + "s": 18434517, "affiliations": [ - "Formica Piccola", - "Formica Grande", - "Formica III", - "Giannutri", - "Isolotto dello Sparviero", - "Italia", - "Le Scole", + "Formica Piccola", + "Formica Grande", + "Formica III", + "Giannutri", + "Isolotto dello Sparviero", + "Italia", + "Le Scole", "Toscana" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Tuscany_Massa e Carrara", - "s": 42206123, + "id": "Italy_Tuscany_Massa e Carrara", + "s": 42206123, "affiliations": [ - "Cerboli", - "Isola della Peraiola", - "Gorgona", - "Il Frate", - "Isole Gemini", - "Italia", - "Palmaiola", - "Scoglio d'Africa", + "Cerboli", + "Isola della Peraiola", + "Gorgona", + "Il Frate", + "Isole Gemini", + "Italia", + "Palmaiola", + "Scoglio d'Africa", "Toscana" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Umbria", - "s": 15098562, + "id": "Italy_Umbria", + "s": 15098562, "affiliations": [ - "Italia", + "Italia", "Umbria" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto", + "id": "Italy_Veneto", "g": [ { - "id": "Italy_Veneto_Belluno", - "s": 10210907, + "id": "Italy_Veneto_Belluno", + "s": 10210907, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Padova", - "s": 23083202, + "id": "Italy_Veneto_Padova", + "s": 23083202, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Rovigo", - "s": 8086845, + "id": "Italy_Veneto_Rovigo", + "s": 8086845, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Treviso", - "s": 28118512, + "id": "Italy_Veneto_Treviso", + "s": 28118512, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Venezia", - "s": 17152460, + "id": "Italy_Veneto_Venezia", + "s": 17152460, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Verona", - "s": 22259427, + "id": "Italy_Veneto_Verona", + "s": 22259427, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] - }, + }, { - "id": "Italy_Veneto_Vicenza", - "s": 21927877, + "id": "Italy_Veneto_Vicenza", + "s": 21927877, "affiliations": [ - "Italia", + "Italia", "Veneto" - ], + ], "old": [ "Italy" ] @@ -7025,620 +7025,620 @@ ] } ] - }, + }, { - "id": "Jamaica", - "s": 6363903, + "id": "Jamaica", + "s": 6363903, "affiliations": [ "Jamaica" - ], + ], "old": [ "Jamaica" ] - }, + }, { - "id": "Japan", + "id": "Japan", "g": [ { - "id": "Japan_Chubu Region", + "id": "Japan_Chubu Region", "g": [ { - "id": "Japan_Chubu Region_Aichi_Nagoya", - "s": 62876417, + "id": "Japan_Chubu Region_Aichi_Nagoya", + "s": 62876417, "affiliations": [ - "\u65e5\u672c", - "\u4e09\u91cd\u770c", + "\u65e5\u672c", + "\u4e09\u91cd\u770c", "\u611b\u77e5\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Aichi_Toyohashi", - "s": 19875537, + "id": "Japan_Chubu Region_Aichi_Toyohashi", + "s": 19875537, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u611b\u77e5\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Fukui", - "s": 14790338, + "id": "Japan_Chubu Region_Fukui", + "s": 14790338, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u798f\u4e95\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Gifu", - "s": 32324567, + "id": "Japan_Chubu Region_Gifu", + "s": 32324567, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5c90\u961c\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Ishikawa", - "s": 16788405, + "id": "Japan_Chubu Region_Ishikawa", + "s": 16788405, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u77f3\u5ddd\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Nagano", - "s": 39297229, + "id": "Japan_Chubu Region_Nagano", + "s": 39297229, "affiliations": [ - "\u9577\u91ce\u770c", + "\u9577\u91ce\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Niigata", - "s": 42775164, + "id": "Japan_Chubu Region_Niigata", + "s": 42775164, "affiliations": [ - "\u65e5\u672c", - "\u65b0\u6f5f\u770c", + "\u65e5\u672c", + "\u65b0\u6f5f\u770c", "\u77f3\u5ddd\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Shizuoka", - "s": 55487471, + "id": "Japan_Chubu Region_Shizuoka", + "s": 55487471, "affiliations": [ - "\u9759\u5ca1\u770c", + "\u9759\u5ca1\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Toyama", - "s": 16703199, + "id": "Japan_Chubu Region_Toyama", + "s": 16703199, "affiliations": [ - "\u65e5\u672c", - "\u5bcc\u5c71\u770c", + "\u65e5\u672c", + "\u5bcc\u5c71\u770c", "\u77f3\u5ddd\u770c" - ], + ], "old": [ "Japan_Chubu" ] - }, + }, { - "id": "Japan_Chubu Region_Yamanashi", - "s": 17696931, + "id": "Japan_Chubu Region_Yamanashi", + "s": 17696931, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5c71\u68a8\u770c" - ], + ], "old": [ "Japan_Chubu" ] } ] - }, + }, { - "id": "Japan_Chugoku Region", + "id": "Japan_Chugoku Region", "g": [ { - "id": "Japan_Chugoku Region_Hiroshima", - "s": 37955852, + "id": "Japan_Chugoku Region_Hiroshima", + "s": 37955852, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5e83\u5cf6\u770c" - ], + ], "old": [ "Japan_Chugoku" ] - }, + }, { - "id": "Japan_Chugoku Region_Okayama", - "s": 23290392, + "id": "Japan_Chugoku Region_Okayama", + "s": 23290392, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5ca1\u5c71\u770c" - ], + ], "old": [ "Japan_Chugoku" ] - }, + }, { - "id": "Japan_Chugoku Region_Shimane", - "s": 15531588, + "id": "Japan_Chugoku Region_Shimane", + "s": 15531588, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5cf6\u6839\u770c" - ], + ], "old": [ "Japan_Chugoku" ] - }, + }, { - "id": "Japan_Chugoku Region_Tottori", - "s": 13571478, + "id": "Japan_Chugoku Region_Tottori", + "s": 13571478, "affiliations": [ - "\u9ce5\u53d6\u770c", + "\u9ce5\u53d6\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Chugoku" ] - }, + }, { - "id": "Japan_Chugoku Region_Yamaguchi", - "s": 18632365, + "id": "Japan_Chugoku Region_Yamaguchi", + "s": 18632365, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5c71\u53e3\u770c" - ], + ], "old": [ "Japan_Chugoku" ] } ] - }, + }, { - "id": "Japan_Hokkaido Region", + "id": "Japan_Hokkaido Region", "g": [ { - "id": "Japan_Hokkaido Region_East", - "s": 22692908, + "id": "Japan_Hokkaido Region_East", + "s": 22692908, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5317\u6d77\u9053" - ], + ], "old": [ "Japan_Hokkaido" ] - }, + }, { - "id": "Japan_Hokkaido Region_North", - "s": 28620181, + "id": "Japan_Hokkaido Region_North", + "s": 28620181, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5317\u6d77\u9053" - ], + ], "old": [ "Japan_Hokkaido" ] - }, + }, { - "id": "Japan_Hokkaido Region_West", - "s": 16543074, + "id": "Japan_Hokkaido Region_West", + "s": 16543074, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5317\u6d77\u9053" - ], + ], "old": [ "Japan_Hokkaido" ] - }, + }, { - "id": "Japan_Hokkaido Region_Sapporo", - "s": 40654976, + "id": "Japan_Hokkaido Region_Sapporo", + "s": 40654976, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5317\u6d77\u9053" - ], + ], "old": [ "Japan_Hokkaido" ] } ] - }, + }, { - "id": "Japan_Kanto", + "id": "Japan_Kanto", "g": [ { - "id": "Japan_Kanto_Chiba", - "s": 54290271, + "id": "Japan_Kanto_Chiba", + "s": 54290271, "affiliations": [ - "\u65e5\u672c", - "\u5343\u8449\u770c", - "\u6771\u4eac\u90fd", + "\u65e5\u672c", + "\u5343\u8449\u770c", + "\u6771\u4eac\u90fd", "\u795e\u5948\u5ddd\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Gunma", - "s": 33008388, + "id": "Japan_Kanto_Gunma", + "s": 33008388, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u7fa4\u99ac\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Ibaraki", - "s": 39286202, + "id": "Japan_Kanto_Ibaraki", + "s": 39286202, "affiliations": [ - "\u8328\u57ce\u770c", - "\u65e5\u672c", - "\u5343\u8449\u770c", + "\u8328\u57ce\u770c", + "\u65e5\u672c", + "\u5343\u8449\u770c", "\u798f\u5cf6\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Kanagawa", - "s": 57896692, + "id": "Japan_Kanto_Kanagawa", + "s": 57896692, "affiliations": [ - "\u9759\u5ca1\u770c", - "\u65e5\u672c", - "\u5343\u8449\u770c", - "\u6771\u4eac\u90fd", + "\u9759\u5ca1\u770c", + "\u65e5\u672c", + "\u5343\u8449\u770c", + "\u6771\u4eac\u90fd", "\u795e\u5948\u5ddd\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Saitama", - "s": 59941878, + "id": "Japan_Kanto_Saitama", + "s": 59941878, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u57fc\u7389\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Tochigi", - "s": 29864800, + "id": "Japan_Kanto_Tochigi", + "s": 29864800, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u6803\u6728\u770c" - ], + ], "old": [ "Japan_Kanto" ] - }, + }, { - "id": "Japan_Kanto_Tokyo", - "s": 75583882, + "id": "Japan_Kanto_Tokyo", + "s": 75583882, "affiliations": [ - "\u9759\u5ca1\u770c", - "\u65e5\u672c", + "\u9759\u5ca1\u770c", + "\u65e5\u672c", "\u6771\u4eac\u90fd" - ], + ], "old": [ "Japan_Kanto" ] } ] - }, + }, { - "id": "Japan_Kinki Region", + "id": "Japan_Kinki Region", "g": [ { - "id": "Japan_Kinki Region_Mie", - "s": 23133412, + "id": "Japan_Kinki Region_Mie", + "s": 23133412, "affiliations": [ - "\u65e5\u672c", - "\u4e09\u91cd\u770c", + "\u65e5\u672c", + "\u4e09\u91cd\u770c", "\u611b\u77e5\u770c" - ], + ], "old": [ "Japan_Kinki" ] - }, + }, { - "id": "Japan_Kinki Region_Nara", - "s": 14637571, + "id": "Japan_Kinki Region_Nara", + "s": 14637571, "affiliations": [ - "\u65e5\u672c", - "\u5948\u826f\u770c", + "\u65e5\u672c", + "\u5948\u826f\u770c", "\u548c\u6b4c\u5c71\u770c" - ], + ], "old": [ "Japan_Kinki" ] - }, + }, { - "id": "Japan_Kinki Region_Osaka_Osaka", - "s": 49198006, + "id": "Japan_Kinki Region_Osaka_Osaka", + "s": 49198006, "affiliations": [ - "\u65e5\u672c", - "\u5175\u5eab\u770c", + "\u65e5\u672c", + "\u5175\u5eab\u770c", "\u5927\u962a\u5e9c" - ], + ], "old": [ "Japan_Kinki" ] - }, + }, { - "id": "Japan_Kinki Region_Osaka_West", - "s": 35702922, + "id": "Japan_Kinki Region_Osaka_West", + "s": 35702922, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5175\u5eab\u770c" - ], + ], "old": [ "Japan_Kinki" ] - }, + }, { - "id": "Japan_Kinki Region_Wakayama", - "s": 11103246, + "id": "Japan_Kinki Region_Wakayama", + "s": 11103246, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u548c\u6b4c\u5c71\u770c" - ], + ], "old": [ "Japan_Kinki" ] } ] - }, + }, { - "id": "Japan_Kyushu Region", + "id": "Japan_Kyushu Region", "g": [ { - "id": "Japan_Kyushu Region_Fukuoka", - "s": 38990539, + "id": "Japan_Kyushu Region_Fukuoka", + "s": 38990539, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u798f\u5ca1\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Kagoshima", - "s": 30263513, + "id": "Japan_Kyushu Region_Kagoshima", + "s": 30263513, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u9e7f\u5150\u5cf6\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Kumamoto", - "s": 29258614, + "id": "Japan_Kyushu Region_Kumamoto", + "s": 29258614, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u718a\u672c\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Miyazaki", - "s": 17436443, + "id": "Japan_Kyushu Region_Miyazaki", + "s": 17436443, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5bae\u5d0e\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Nagasaki", - "s": 15943229, + "id": "Japan_Kyushu Region_Nagasaki", + "s": 15943229, "affiliations": [ - "\u9577\u5d0e\u770c", + "\u9577\u5d0e\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Oita", - "s": 18372032, + "id": "Japan_Kyushu Region_Oita", + "s": 18372032, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5927\u5206\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Okinawa", - "s": 13882546, + "id": "Japan_Kyushu Region_Okinawa", + "s": 13882546, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u6c96\u7e04\u770c" - ], + ], "old": [ "Japan_Kyushu" ] - }, + }, { - "id": "Japan_Kyushu Region_Saga", - "s": 13230062, + "id": "Japan_Kyushu Region_Saga", + "s": 13230062, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u4f50\u8cc0\u770c" - ], + ], "old": [ "Japan_Kyushu" ] } ] - }, + }, { - "id": "Japan_Shikoku Region", + "id": "Japan_Shikoku Region", "g": [ { - "id": "Japan_Shikoku Region_Ehime", - "s": 23477285, + "id": "Japan_Shikoku Region_Ehime", + "s": 23477285, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u611b\u5a9b\u770c" - ], + ], "old": [ "Japan_Shikoku" ] - }, + }, { - "id": "Japan_Shikoku Region_Kagawa", - "s": 9836775, + "id": "Japan_Shikoku Region_Kagawa", + "s": 9836775, "affiliations": [ - "\u9999\u5ddd\u770c", + "\u9999\u5ddd\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Shikoku" ] - }, + }, { - "id": "Japan_Shikoku Region_Kochi", - "s": 12715632, + "id": "Japan_Shikoku Region_Kochi", + "s": 12715632, "affiliations": [ - "\u9ad8\u77e5\u770c", + "\u9ad8\u77e5\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Shikoku" ] - }, + }, { - "id": "Japan_Shikoku Region_Kyoto", - "s": 42061236, + "id": "Japan_Shikoku Region_Kyoto", + "s": 42061236, "affiliations": [ - "\u65e5\u672c", - "\u4eac\u90fd\u5e9c", + "\u65e5\u672c", + "\u4eac\u90fd\u5e9c", "\u6ecb\u8cc0\u770c" - ], + ], "old": [ "Japan_Kinki" ] - }, + }, { - "id": "Japan_Shikoku Region_Tokushima", - "s": 13540127, + "id": "Japan_Shikoku Region_Tokushima", + "s": 13540127, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5fb3\u5cf6\u770c" - ], + ], "old": [ "Japan_Shikoku" ] } ] - }, + }, { - "id": "Japan_Tohoku", + "id": "Japan_Tohoku", "g": [ { - "id": "Japan_Tohoku_Akita", - "s": 23070635, + "id": "Japan_Tohoku_Akita", + "s": 23070635, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u79cb\u7530\u770c" - ], + ], "old": [ "Japan_Tohoku" ] - }, + }, { - "id": "Japan_Tohoku_Aomori", - "s": 21605274, + "id": "Japan_Tohoku_Aomori", + "s": 21605274, "affiliations": [ - "\u9752\u68ee\u770c", + "\u9752\u68ee\u770c", "\u65e5\u672c" - ], + ], "old": [ "Japan_Tohoku" ] - }, + }, { - "id": "Japan_Tohoku_Fukushima", - "s": 45975889, + "id": "Japan_Tohoku_Fukushima", + "s": 45975889, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u798f\u5cf6\u770c" - ], + ], "old": [ "Japan_Tohoku" ] - }, + }, { - "id": "Japan_Tohoku_Iwate", - "s": 28484396, + "id": "Japan_Tohoku_Iwate", + "s": 28484396, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5ca9\u624b\u770c" - ], + ], "old": [ "Japan_Tohoku" ] - }, + }, { - "id": "Japan_Tohoku_Miyagi", - "s": 26562959, + "id": "Japan_Tohoku_Miyagi", + "s": 26562959, "affiliations": [ - "\u65e5\u672c", - "\u5bae\u57ce\u770c", + "\u65e5\u672c", + "\u5bae\u57ce\u770c", "\u798f\u5cf6\u770c" - ], + ], "old": [ "Japan_Tohoku" ] - }, + }, { - "id": "Japan_Tohoku_Yamagata", - "s": 21827860, + "id": "Japan_Tohoku_Yamagata", + "s": 21827860, "affiliations": [ - "\u65e5\u672c", + "\u65e5\u672c", "\u5c71\u5f62\u770c" - ], + ], "old": [ "Japan_Tohoku" ] @@ -7646,8395 +7646,8395 @@ ] } ] - }, + }, { - "id": "Jersey", - "s": 1366129, + "id": "Jersey", + "s": 1366129, "affiliations": [ - "France", - "Guernsey", - "Jersey", - "Jersey", - "Janvrin's Tomb", - "King's Rock", - "L'Ile Percee", - "La Motte", - "Queen's Rock", + "France", + "Guernsey", + "Jersey", + "Jersey", + "Janvrin's Tomb", + "King's Rock", + "L'Ile Percee", + "La Motte", + "Queen's Rock", "The Islet" - ], + ], "old": [ "Jersey" ] - }, + }, { - "id": "Jordan", - "s": 20276685, + "id": "Jordan", + "s": 20276685, "affiliations": [ - "Ajloun", - "Amman", - "Aqaba", - "Balqa", - "Irbid", - "Jarash", - "Karak", - "Ma'an", - "Madaba", - "Mafraq", - "Tafilah", - "Zarqa", + "Ajloun", + "Amman", + "Aqaba", + "Balqa", + "Irbid", + "Jarash", + "Karak", + "Ma'an", + "Madaba", + "Mafraq", + "Tafilah", + "Zarqa", "\u0627\u0644\u0623\u0631\u062f\u0646" - ], + ], "old": [ "Jordan" ] - }, + }, { - "id": "Kazakhstan", + "id": "Kazakhstan", "g": [ { - "id": "Kazakhstan_North", - "s": 32625990, + "id": "Kazakhstan_North", + "s": 32625990, "affiliations": [ - "\u0410\u0441\u0442\u0430\u043d\u0430", - "\u0421\u0435\u0432\u0435\u0440\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u049a\u0430\u0437\u0430\u049b\u0441\u0442\u0430\u043d", - "\u0410\u043a\u043c\u043e\u043b\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u041a\u043e\u0441\u0442\u0430\u043d\u0430\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u041f\u0430\u0432\u043b\u043e\u0434\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0410\u0441\u0442\u0430\u043d\u0430", + "\u0421\u0435\u0432\u0435\u0440\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u049a\u0430\u0437\u0430\u049b\u0441\u0442\u0430\u043d", + "\u0410\u043a\u043c\u043e\u043b\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041a\u043e\u0441\u0442\u0430\u043d\u0430\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041f\u0430\u0432\u043b\u043e\u0434\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u0430\u0440\u0430\u0433\u0430\u043d\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Kazakhstan" ] - }, + }, { - "id": "Kazakhstan_South", - "s": 38846703, + "id": "Kazakhstan_South", + "s": 38846703, "affiliations": [ - "\u0410\u043b\u043c\u0430\u0442\u044b", - "\u0410\u0442\u044b\u0440\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0416\u0430\u043c\u0431\u044b\u043b\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u042e\u0436\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0417\u0430\u043f\u0430\u0434\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u049a\u0430\u0437\u0430\u049b\u0441\u0442\u0430\u043d", - "\u0412\u043e\u0441\u0442\u043e\u0447\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0410\u043a\u0442\u044e\u0431\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0410\u043b\u043c\u0430\u0442\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u041c\u0430\u043d\u0433\u0438\u0441\u0442\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0410\u043b\u043c\u0430\u0442\u044b", + "\u0410\u0442\u044b\u0440\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0416\u0430\u043c\u0431\u044b\u043b\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u042e\u0436\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0417\u0430\u043f\u0430\u0434\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u049a\u0430\u0437\u0430\u049b\u0441\u0442\u0430\u043d", + "\u0412\u043e\u0441\u0442\u043e\u0447\u043d\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0410\u043a\u0442\u044e\u0431\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0410\u043b\u043c\u0430\u0442\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041c\u0430\u043d\u0433\u0438\u0441\u0442\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u044b\u0437\u044b\u043b\u043e\u0440\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Kazakhstan" ] } ] - }, + }, { - "id": "Kenya", - "s": 20810705, + "id": "Kenya", + "s": 20810705, "affiliations": [ - "Baringo", - "Bungoma", - "Busia", - "Bomet", - "Elegeyo-Marakwet", - "Embu", - "Garissa", - "Homa Bay", - "Isiolo", - "Kajiado", - "Kakamega", - "Lamu", - "Kenya", - "Kericho", - "Kiambu", - "Kilifi", - "Kirinyaga", - "Kisii", - "Kisumu", - "Kitui", - "Kwale", - "Laikipia", - "Machakos", - "Makueni", - "Mandera", - "Marsabit", - "Meru", - "Migori", - "Mombasa", - "Murang`a", - "Nairobi", - "Nakuru", - "Nandi", - "Narok", - "Nyamira", - "Nyandarua", - "Nyeri", - "Tharaka-Nithi", - "Samburu", - "Siaya", - "Taita Taveta", - "Tana River", - "Trans Nzoia", - "Turkana", - "Uasin Gishu", - "Vihiga", - "Wajir", + "Baringo", + "Bungoma", + "Busia", + "Bomet", + "Elegeyo-Marakwet", + "Embu", + "Garissa", + "Homa Bay", + "Isiolo", + "Kajiado", + "Kakamega", + "Lamu", + "Kenya", + "Kericho", + "Kiambu", + "Kilifi", + "Kirinyaga", + "Kisii", + "Kisumu", + "Kitui", + "Kwale", + "Laikipia", + "Machakos", + "Makueni", + "Mandera", + "Marsabit", + "Meru", + "Migori", + "Mombasa", + "Murang`a", + "Nairobi", + "Nakuru", + "Nandi", + "Narok", + "Nyamira", + "Nyandarua", + "Nyeri", + "Tharaka-Nithi", + "Samburu", + "Siaya", + "Taita Taveta", + "Tana River", + "Trans Nzoia", + "Turkana", + "Uasin Gishu", + "Vihiga", + "Wajir", "West Pokot" - ], + ], "old": [ "Kenya" ] - }, + }, { - "id": "Kingdom of Lesotho", - "s": 33355906, + "id": "Kingdom of Lesotho", + "s": 33355906, "affiliations": [ "Lesotho" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "Kiribati", - "s": 918014, + "id": "Kiribati", + "s": 918014, "affiliations": [ "Kiribati" - ], + ], "old": [ "Kiribati" ] - }, + }, { - "id": "Kuwait", - "s": 4915894, + "id": "Kuwait", + "s": 4915894, "affiliations": [ - "\u062d\u0648\u0644\u064a", - "\u0645\u0628\u0627\u0631\u0643 \u0627\u0644\u0643\u0628\u064a\u0631\u200e", - "\u0627\u0644\u0627\u062d\u0645\u062f\u064a", - "\u0627\u0644\u062c\u0647\u0631\u0627\u0621", - "\u0627\u0644\u0639\u0627\u0635\u0645\u0629", - "\u0627\u0644\u0641\u0631\u0648\u0627\u0646\u064a\u0629", + "\u062d\u0648\u0644\u064a", + "\u0645\u0628\u0627\u0631\u0643 \u0627\u0644\u0643\u0628\u064a\u0631\u200e", + "\u0627\u0644\u0627\u062d\u0645\u062f\u064a", + "\u0627\u0644\u062c\u0647\u0631\u0627\u0621", + "\u0627\u0644\u0639\u0627\u0635\u0645\u0629", + "\u0627\u0644\u0641\u0631\u0648\u0627\u0646\u064a\u0629", "\u200f\u0627\u0644\u0643\u0648\u064a\u062a\u200e" - ], + ], "old": [ "Kuwait" ] - }, + }, { - "id": "Kyrgyzstan", - "s": 23961956, + "id": "Kyrgyzstan", + "s": 23961956, "affiliations": [ - "\u041d\u0430\u0440\u044b\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0422\u0430\u043b\u0430\u0441\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "Chong-Kara", - "Farg'ona Viloyati", - "\u0418\u0441\u0441\u044b\u043a-\u041a\u0443\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0411\u0430\u0442\u043a\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "Jangy-ayyl", - "\u0411\u0438\u0448\u043a\u0435\u043a", - "\u041e\u0448\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0414\u0436\u0430\u043b\u0430\u043b-\u0410\u0431\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0427\u0443\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041d\u0430\u0440\u044b\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0422\u0430\u043b\u0430\u0441\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "Chong-Kara", + "Farg'ona Viloyati", + "\u0418\u0441\u0441\u044b\u043a-\u041a\u0443\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0411\u0430\u0442\u043a\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "Jangy-ayyl", + "\u0411\u0438\u0448\u043a\u0435\u043a", + "\u041e\u0448\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0414\u0436\u0430\u043b\u0430\u043b-\u0410\u0431\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0427\u0443\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u041a\u044b\u0440\u0433\u044b\u0437\u0441\u0442\u0430\u043d" - ], + ], "old": [ "Kyrgyzstan" ] - }, + }, { - "id": "Laos", - "s": 9265969, + "id": "Laos", + "s": 9265969, "affiliations": [ - "\u0e84\u0ecd\u0eb2\u0ea1\u0ec8\u0ea7\u0e99", - "\u0e88\u0eb3\u0e9b\u0eb2\u0eaa\u0eb1\u0e81", - "\u0e8a\u0ebd\u0e87\u0e82\u0ea7\u0eb2\u0e87", - "\u0e9a\u0ecd\u0ec8\u0ec1\u0e81\u0ec9\u0ea7", - "\u0eaa\u0eb2\u0ea5\u0eb0\u0ea7\u0eb1\u0e99", - "\u0ead\u0eb1\u0e94\u0e95\u0eb0\u0e9b\u0eb7", - "\u0ead\u0eb8\u0e94\u0ebb\u0ea1\u0ec4\u0e8a", - "\u0eab\u0ebb\u0ea7\u0e9e\u0eb1\u0e99", - "\u0ea7\u0ebd\u0e87\u0e88\u0eb1\u0e99", - "\u0e9a\u0ecd\u0ea5\u0eb4\u0e84\u0eb3\u0ec4\u0e8a", - "\u0e9b\u0eb0\u0ec0\u0e97\u0e94\u0ea5\u0eb2\u0ea7", - "\u0e9c\u0ebb\u0ec9\u0e87\u0eaa\u0eb2\u0ea5\u0eb5", - "\u0ec4\u0e8a\u0e8d\u0eb0\u0e9a\u0eb9\u0ea5\u0eb5", - "\u0ec4\u0e8a\u0eaa\u0ebb\u0ea1\u0e9a\u0eb9\u0e99", - "\u0eab\u0ea5\u0ea7\u0e87\u0e9e\u0eb0\u0e9a\u0eb2\u0e87", - "\u0eab\u0ea5\u0ea7\u0e87\u0e99\u0ecd\u0ec9\u0eb2\u0e97\u0eb2", - "\u0eaa\u0eb0\u0eab\u0ea7\u0eb1\u0e99\u0e99\u0eb0\u0ec0\u0e82\u0e94", + "\u0e84\u0ecd\u0eb2\u0ea1\u0ec8\u0ea7\u0e99", + "\u0e88\u0eb3\u0e9b\u0eb2\u0eaa\u0eb1\u0e81", + "\u0e8a\u0ebd\u0e87\u0e82\u0ea7\u0eb2\u0e87", + "\u0e9a\u0ecd\u0ec8\u0ec1\u0e81\u0ec9\u0ea7", + "\u0eaa\u0eb2\u0ea5\u0eb0\u0ea7\u0eb1\u0e99", + "\u0ead\u0eb1\u0e94\u0e95\u0eb0\u0e9b\u0eb7", + "\u0ead\u0eb8\u0e94\u0ebb\u0ea1\u0ec4\u0e8a", + "\u0eab\u0ebb\u0ea7\u0e9e\u0eb1\u0e99", + "\u0ea7\u0ebd\u0e87\u0e88\u0eb1\u0e99", + "\u0e9a\u0ecd\u0ea5\u0eb4\u0e84\u0eb3\u0ec4\u0e8a", + "\u0e9b\u0eb0\u0ec0\u0e97\u0e94\u0ea5\u0eb2\u0ea7", + "\u0e9c\u0ebb\u0ec9\u0e87\u0eaa\u0eb2\u0ea5\u0eb5", + "\u0ec4\u0e8a\u0e8d\u0eb0\u0e9a\u0eb9\u0ea5\u0eb5", + "\u0ec4\u0e8a\u0eaa\u0ebb\u0ea1\u0e9a\u0eb9\u0e99", + "\u0eab\u0ea5\u0ea7\u0e87\u0e9e\u0eb0\u0e9a\u0eb2\u0e87", + "\u0eab\u0ea5\u0ea7\u0e87\u0e99\u0ecd\u0ec9\u0eb2\u0e97\u0eb2", + "\u0eaa\u0eb0\u0eab\u0ea7\u0eb1\u0e99\u0e99\u0eb0\u0ec0\u0e82\u0e94", "\u0e99\u0eb0\u0e84\u0ead\u0e99\u0eab\u0ebc\u0ea7\u0e87\u0ea7\u0ebd\u0e87\u0e88\u0eb1\u0e99" - ], + ], "old": [ "Laos" ] - }, + }, { - "id": "Latvia", - "s": 52156900, + "id": "Latvia", + "s": 52156900, "affiliations": [ - "Latgale", - "Latvija", - "Kurzeme", - "Vidzeme", + "Latgale", + "Latvija", + "Kurzeme", + "Vidzeme", "Zemgale" - ], + ], "old": [ "Latvia" ] - }, + }, { - "id": "Lebanon", - "s": 13000581, + "id": "Lebanon", + "s": 13000581, "affiliations": [ - "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0644\u0628\u0646\u0627\u0646\u064a\u0629", - "\u0642\u0636\u0627\u0621 \u0632\u063a\u0631\u062a\u0627", - "\u0642\u0636\u0627\u0621 \u062c\u0632\u064a\u0646", - "\u0642\u0636\u0627\u0621 \u0635\u0648\u0631", - "\u0642\u0636\u0627\u0621 \u0628\u0646\u062a \u062c\u0628\u064a\u0644", - "\u0642\u0636\u0627\u0621 \u062c\u0628\u064a\u0644", - "\u0642\u0636\u0627\u0621 \u0632\u062d\u0644\u0629", - "\u0642\u0636\u0627\u0621 \u0635\u064a\u062f\u0627", - "\u0642\u0636\u0627\u0621 \u0639\u0643\u0627\u0631", - "\u0642\u0636\u0627\u0621 \u0628\u0634\u0631\u0651\u064a", - "\u0642\u0636\u0627\u0621 \u0645\u0631\u062c\u0639\u064a\u0648\u0646", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0634\u0648\u0641", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0645\u062a\u0646", - "\u0642\u0636\u0627\u0621 \u0628\u0639\u0628\u062f\u0627", - "\u0642\u0636\u0627\u0621 \u0628\u0639\u0644\u0628\u0643", - "\u0642\u0636\u0627\u0621 \u0631\u0627\u0634\u064a\u0627", - "\u0642\u0636\u0627\u0621 \u0639\u0627\u0644\u064a\u0647", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0643\u0648\u0631\u0629", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0647\u0631\u0645\u0644", - "\u0642\u0636\u0627\u0621 \u062d\u0627\u0635\u0628\u064a\u0627", - "\u0642\u0636\u0627\u0621 \u0637\u0631\u0627\u0628\u0644\u0633", - "\u0642\u0636\u0627\u0621 \u0643\u0633\u0631\u0648\u0627\u0646", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0645\u0646\u064a\u0629 \u0636\u0646\u064a\u0651\u0629", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u0642\u0627\u0639 \u0627\u0644\u063a\u0631\u0628\u064a", - "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u062a\u0631\u0648\u0646", + "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0644\u0628\u0646\u0627\u0646\u064a\u0629", + "\u0642\u0636\u0627\u0621 \u0632\u063a\u0631\u062a\u0627", + "\u0642\u0636\u0627\u0621 \u062c\u0632\u064a\u0646", + "\u0642\u0636\u0627\u0621 \u0635\u0648\u0631", + "\u0642\u0636\u0627\u0621 \u0628\u0646\u062a \u062c\u0628\u064a\u0644", + "\u0642\u0636\u0627\u0621 \u062c\u0628\u064a\u0644", + "\u0642\u0636\u0627\u0621 \u0632\u062d\u0644\u0629", + "\u0642\u0636\u0627\u0621 \u0635\u064a\u062f\u0627", + "\u0642\u0636\u0627\u0621 \u0639\u0643\u0627\u0631", + "\u0642\u0636\u0627\u0621 \u0628\u0634\u0631\u0651\u064a", + "\u0642\u0636\u0627\u0621 \u0645\u0631\u062c\u0639\u064a\u0648\u0646", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0634\u0648\u0641", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0645\u062a\u0646", + "\u0642\u0636\u0627\u0621 \u0628\u0639\u0628\u062f\u0627", + "\u0642\u0636\u0627\u0621 \u0628\u0639\u0644\u0628\u0643", + "\u0642\u0636\u0627\u0621 \u0631\u0627\u0634\u064a\u0627", + "\u0642\u0636\u0627\u0621 \u0639\u0627\u0644\u064a\u0647", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0643\u0648\u0631\u0629", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0647\u0631\u0645\u0644", + "\u0642\u0636\u0627\u0621 \u062d\u0627\u0635\u0628\u064a\u0627", + "\u0642\u0636\u0627\u0621 \u0637\u0631\u0627\u0628\u0644\u0633", + "\u0642\u0636\u0627\u0621 \u0643\u0633\u0631\u0648\u0627\u0646", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0645\u0646\u064a\u0629 \u0636\u0646\u064a\u0651\u0629", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u0642\u0627\u0639 \u0627\u0644\u063a\u0631\u0628\u064a", + "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u062a\u0631\u0648\u0646", "\u0642\u0636\u0627\u0621 \u0627\u0644\u0646\u0628\u0637\u064a\u0629" - ], + ], "old": [ "Lebanon" ] - }, + }, { - "id": "Liberia", - "s": 14573176, + "id": "Liberia", + "s": 14573176, "affiliations": [ - "Bomi County", - "Bong County", - "Montserrado County", - "Gbarpolu County", - "Grand Bassa County", - "Grand Cape Mount County", - "Grand Gedeh County", - "Grand Kru County", - "Lofa County", - "Liberia", - "Margibi County", - "Maryland County", - "Nimba County", - "River Cess County", - "River Gee County", + "Bomi County", + "Bong County", + "Montserrado County", + "Gbarpolu County", + "Grand Bassa County", + "Grand Cape Mount County", + "Grand Gedeh County", + "Grand Kru County", + "Lofa County", + "Liberia", + "Margibi County", + "Maryland County", + "Nimba County", + "River Cess County", + "River Gee County", "Sinoe County" - ], + ], "old": [ "Liberia" ] - }, + }, { - "id": "Libya", - "s": 18594893, + "id": "Libya", + "s": 18594893, "affiliations": [ - "Libya \u2d4d\u2d49\u2d31\u2d62\u2d30 \u0644\u064a\u0628\u064a\u0627", - "\u0633\u0631\u062a", - "\u063a\u0627\u062a", - "\u062f\u0631\u0646\u0629", - "\u0633\u0628\u0647\u0627", - "\u0645\u0631\u0632\u0642", - "\u0648\u0627\u062f\u064a \u0627\u0644\u0634\u0627\u0637\u0626", - "\u0648\u0627\u062f\u064a \u0627\u0644\u062d\u064a\u0627\u0629", - "\u0627\u0644\u0645\u0631\u062c", - "\u0646\u0627\u0644\u0648\u062a", - "\u0627\u0644\u062c\u0628\u0644 \u0627\u0644\u0623\u062e\u0636\u0631", - "\u0627\u0644\u062c\u0628\u0644 \u0627\u0644\u063a\u0631\u0628\u064a", - "\u0627\u0644\u062c\u0641\u0631\u0629", - "\u0627\u0644\u0643\u0641\u0631\u0629", - "\u0627\u0644\u0645\u0631\u0642\u0628", - "\u0628\u0646\u063a\u0627\u0632\u064a", - "\u0637\u0631\u0627\u0628\u0644\u0633", - "\u0645\u0635\u0631\u0627\u062a\u0629", - "\u0627\u0644\u0646\u0642\u0627\u0637 \u0627\u0644\u062e\u0645\u0633", - "\u0627\u0644\u0628\u0637\u0646\u0627\u0646", - "\u0627\u0644\u062c\u0641\u0627\u0631\u0629", - "\u0627\u0644\u0648\u0627\u062d\u0627\u062a", + "Libya \u2d4d\u2d49\u2d31\u2d62\u2d30 \u0644\u064a\u0628\u064a\u0627", + "\u0633\u0631\u062a", + "\u063a\u0627\u062a", + "\u062f\u0631\u0646\u0629", + "\u0633\u0628\u0647\u0627", + "\u0645\u0631\u0632\u0642", + "\u0648\u0627\u062f\u064a \u0627\u0644\u0634\u0627\u0637\u0626", + "\u0648\u0627\u062f\u064a \u0627\u0644\u062d\u064a\u0627\u0629", + "\u0627\u0644\u0645\u0631\u062c", + "\u0646\u0627\u0644\u0648\u062a", + "\u0627\u0644\u062c\u0628\u0644 \u0627\u0644\u0623\u062e\u0636\u0631", + "\u0627\u0644\u062c\u0628\u0644 \u0627\u0644\u063a\u0631\u0628\u064a", + "\u0627\u0644\u062c\u0641\u0631\u0629", + "\u0627\u0644\u0643\u0641\u0631\u0629", + "\u0627\u0644\u0645\u0631\u0642\u0628", + "\u0628\u0646\u063a\u0627\u0632\u064a", + "\u0637\u0631\u0627\u0628\u0644\u0633", + "\u0645\u0635\u0631\u0627\u062a\u0629", + "\u0627\u0644\u0646\u0642\u0627\u0637 \u0627\u0644\u062e\u0645\u0633", + "\u0627\u0644\u0628\u0637\u0646\u0627\u0646", + "\u0627\u0644\u062c\u0641\u0627\u0631\u0629", + "\u0627\u0644\u0648\u0627\u062d\u0627\u062a", "\u0627\u0644\u0632\u0627\u0648\u064a\u0629" - ], + ], "old": [ "Libya" ] - }, + }, { - "id": "Liechtenstein", - "s": 1079727, + "id": "Liechtenstein", + "s": 1079727, "affiliations": [ "Liechtenstein" - ], + ], "old": [ "Liechtenstein" ] - }, + }, { - "id": "Lithuania", + "id": "Lithuania", "g": [ { - "id": "Lithuania_East", - "s": 42212170, + "id": "Lithuania_East", + "s": 42212170, "affiliations": [ - "Alytaus apskritis", - "Kauno apskritis", - "Lietuva", - "Utenos apskritis", + "Alytaus apskritis", + "Kauno apskritis", + "Lietuva", + "Utenos apskritis", "Vilniaus apskritis" - ], + ], "old": [ "Lithuania" ] - }, + }, { - "id": "Lithuania_West", - "s": 41851735, + "id": "Lithuania_West", + "s": 41851735, "affiliations": [ - "Klaip\u0117dos apskritis", - "Lietuva", - "Marijampol\u0117s apskritis", - "Panev\u0117\u017eio apskritis", - "Tel\u0161i\u0173 apskritis", - "Taurag\u0117s apskritis", + "Klaip\u0117dos apskritis", + "Lietuva", + "Marijampol\u0117s apskritis", + "Panev\u0117\u017eio apskritis", + "Tel\u0161i\u0173 apskritis", + "Taurag\u0117s apskritis", "\u0160iauli\u0173 apskritis" - ], + ], "old": [ "Lithuania" ] } ] - }, + }, { - "id": "Luxembourg", - "s": 13788850, + "id": "Luxembourg", + "s": 13788850, "affiliations": [ "L\u00ebtzebuerg" - ], + ], "old": [ "Luxembourg" ] - }, + }, { - "id": "Macedonia", - "s": 15952282, + "id": "Macedonia", + "s": 15952282, "affiliations": [ - "\u0418\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", - "\u041f\u043e\u043b\u043e\u0448\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", - "\u0421\u043a\u043e\u043f\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", - "\u0412\u0430\u0440\u0434\u0430\u0440\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", - "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430", - "\u0408\u0443\u0433\u043e\u0437\u0430\u043f\u0430\u0434\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", - "\u0408\u0443\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", - "\u041f\u0435\u043b\u0430\u0433\u043e\u043d\u0438\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", + "\u0418\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", + "\u041f\u043e\u043b\u043e\u0448\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", + "\u0421\u043a\u043e\u043f\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", + "\u0412\u0430\u0440\u0434\u0430\u0440\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", + "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430", + "\u0408\u0443\u0433\u043e\u0437\u0430\u043f\u0430\u0434\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", + "\u0408\u0443\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", + "\u041f\u0435\u043b\u0430\u0433\u043e\u043d\u0438\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", "\u0421\u0435\u0432\u0435\u0440\u043e\u0438\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d" - ], + ], "old": [ "Macedonia" ] - }, + }, { - "id": "Madagascar", - "s": 32385093, + "id": "Madagascar", + "s": 32385093, "affiliations": [ - "Madagasikara", - "Region de Anosy", - "R\u00e9gion de Diana", - "R\u00e9gion de Sava", + "Madagasikara", + "Region de Anosy", + "R\u00e9gion de Diana", + "R\u00e9gion de Sava", "Pr\u00e9fecture de police de Nosy Be" - ], + ], "old": [ "Madagascar" ] - }, + }, { - "id": "Malawi", - "s": 15946451, + "id": "Malawi", + "s": 15946451, "affiliations": [ - "Border Malawi - Mozambique", - "Central", - "Malawi", - "Niassa", - "Mo\u00e7ambique", - "Northern", + "Border Malawi - Mozambique", + "Central", + "Malawi", + "Niassa", + "Mo\u00e7ambique", + "Northern", "Southern" - ], + ], "old": [ "Malawi" ] - }, + }, { - "id": "Malaysia", - "s": 56971771, + "id": "Malaysia", + "s": 56971771, "affiliations": [ - "Terengganu / \u062a\u0631\u06a0\u06ac\u0627\u0646\u0648", - "Johor", - "Kedah / \u0642\u062f\u062d", - "Kelantan / \u06a9\u0644\u0646\u062a\u0646 \u062f\u0627\u0631 \u0627\u0644\u0646\u0639\u064a\u0645", - "Kuala Lumpur", - "Labuan", - "Putrajaya", - "Malaysia", - "Negeri Sembilan", - "Melaka", - "Perak / \u06a8\u064a\u0631\u0642", - "Perlis", - "Pahang", - "Pulau Bidong", - "Pulau Burung", - "Pulau Rusukan Besar", - "Pulau Rusukan Kecil", - "Pulau Susu Dara Kecil", - "Pulau Tenggol", - "Pulau Tikus", - "Pulau Aman", - "Pulau Betong", - "Pulau Daat", - "Pulau Gedung", - "Pulau Gemia", - "Pulau Jerejak", - "Pulau Kapas", - "Pulau Kendi", - "Pulau Kuraman", - "Pulau Papan", - "Pulau Pinang", - "Pulau Rhu", - "Pulau Rimau", - "Sabah", - "Selangor", - "Sarawak", + "Terengganu / \u062a\u0631\u06a0\u06ac\u0627\u0646\u0648", + "Johor", + "Kedah / \u0642\u062f\u062d", + "Kelantan / \u06a9\u0644\u0646\u062a\u0646 \u062f\u0627\u0631 \u0627\u0644\u0646\u0639\u064a\u0645", + "Kuala Lumpur", + "Labuan", + "Putrajaya", + "Malaysia", + "Negeri Sembilan", + "Melaka", + "Perak / \u06a8\u064a\u0631\u0642", + "Perlis", + "Pahang", + "Pulau Bidong", + "Pulau Burung", + "Pulau Rusukan Besar", + "Pulau Rusukan Kecil", + "Pulau Susu Dara Kecil", + "Pulau Tenggol", + "Pulau Tikus", + "Pulau Aman", + "Pulau Betong", + "Pulau Daat", + "Pulau Gedung", + "Pulau Gemia", + "Pulau Jerejak", + "Pulau Kapas", + "Pulau Kendi", + "Pulau Kuraman", + "Pulau Papan", + "Pulau Pinang", + "Pulau Rhu", + "Pulau Rimau", + "Sabah", + "Selangor", + "Sarawak", "Singapura" - ], + ], "old": [ "Malaysia" ] - }, + }, { - "id": "Maldives", - "s": 1830186, + "id": "Maldives", + "s": 1830186, "affiliations": [ - "Mathi-Dhekunu Province", - "Mathi-Uthuru Province", - "Dhekunu Province", - "Uthuru Province", - "Gnaviyani", - "Mal\u00e9", - "Medhu Province", - "Medhu-Dhekunu Province", - "Medhu-Uthuru Province", + "Mathi-Dhekunu Province", + "Mathi-Uthuru Province", + "Dhekunu Province", + "Uthuru Province", + "Gnaviyani", + "Mal\u00e9", + "Medhu Province", + "Medhu-Dhekunu Province", + "Medhu-Uthuru Province", "\u078b\u07a8\u0788\u07ac\u0780\u07a8\u0783\u07a7\u0787\u07b0\u0796\u07ad\u078e\u07ac \u0796\u07aa\u0789\u07aa\u0780\u07ab\u0783\u07a8\u0787\u07b0\u0794\u07a7" - ], + ], "old": [ "Maldives" ] - }, + }, { - "id": "Mali", - "s": 39025670, + "id": "Mali", + "s": 39025670, "affiliations": [ - "District de Bamako", - "Gao", - "Koulikoro", - "Kayes", - "Kidal", - "Mali", - "Mopti", - "Sikasso", - "S\u00e9gou", + "District de Bamako", + "Gao", + "Koulikoro", + "Kayes", + "Kidal", + "Mali", + "Mopti", + "Sikasso", + "S\u00e9gou", "Tombouctou" - ], + ], "old": [ "Mali" ] - }, + }, { - "id": "Malta", - "s": 3764479, + "id": "Malta", + "s": 3764479, "affiliations": [ - "Comino", - "Cominotto", - "Ghawdex", - "Gozo", - "Islet in the Comino", - "Kemmuna", - "Malta", + "Comino", + "Cominotto", + "Ghawdex", + "Gozo", + "Islet in the Comino", + "Kemmuna", + "Malta", "Malta" - ], + ], "old": [ "Malta" ] - }, + }, { - "id": "Marshall Islands", - "s": 747318, + "id": "Marshall Islands", + "s": 747318, "affiliations": [ "Aolep\u0101n Aor\u014dkin M\u0327aje\u013c" - ], + ], "old": [ "Marshall Islands" ] - }, + }, { - "id": "Mauritania", - "s": 5609467, + "id": "Mauritania", + "s": 5609467, "affiliations": [ - "\u0646\u0648\u0627\u0643\u0634\u0648\u0637", - "Mauritanie \u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627", - "\u062a\u064a\u0631\u0633 \u0632\u0645\u0648\u0631", - "\u0623\u062f\u0631\u0627\u0631", - "\u0648\u0644\u0627\u064a\u0629 \u062a\u0643\u0627\u0646\u062a", - "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u062d\u0648\u0636 \u0627\u0644\u063a\u0631\u0628\u064a", - "\u0627\u0644\u062d\u0648\u0636 \u0627\u0644\u0634\u0631\u0642\u064a", - "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u0628\u0631\u0627\u0643\u0646\u0629", - "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u062a\u0631\u0627\u0631\u0632\u0629", - "\u062f\u0627\u062e\u0644\u0629 \u0646\u0648\u0627\u0630\u064a\u0628\u0648", - "\u0643\u0648\u0631\u0643\u0648\u0644", - "\u0625\u064a\u0646\u0634\u064a\u0631\u064a", + "\u0646\u0648\u0627\u0643\u0634\u0648\u0637", + "Mauritanie \u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627", + "\u062a\u064a\u0631\u0633 \u0632\u0645\u0648\u0631", + "\u0623\u062f\u0631\u0627\u0631", + "\u0648\u0644\u0627\u064a\u0629 \u062a\u0643\u0627\u0646\u062a", + "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u062d\u0648\u0636 \u0627\u0644\u063a\u0631\u0628\u064a", + "\u0627\u0644\u062d\u0648\u0636 \u0627\u0644\u0634\u0631\u0642\u064a", + "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u0628\u0631\u0627\u0643\u0646\u0629", + "\u0648\u0644\u0627\u064a\u0629 \u0627\u0644\u062a\u0631\u0627\u0631\u0632\u0629", + "\u062f\u0627\u062e\u0644\u0629 \u0646\u0648\u0627\u0630\u064a\u0628\u0648", + "\u0643\u0648\u0631\u0643\u0648\u0644", + "\u0625\u064a\u0646\u0634\u064a\u0631\u064a", "\u063a\u064a\u062f\u064a\u0645\u0627\u063a\u0627" - ], + ], "old": [ "Mauritania" ] - }, + }, { - "id": "Mauritius", - "s": 2280917, + "id": "Mauritius", + "s": 2280917, "affiliations": [ - "Black River", - "Mauritius", - "Flacq", - "Grand Port", - "\u00cele Gombrani", - "\u00cele Hermitage", - "\u00cele Paille en Queue", - "\u00cele Plate", - "Moka", - "\u00cele au Chat ou Pierrot", - "\u00cele aux Cocos", - "\u00cele aux Diamants", - "\u00cele aux Fous", - "\u00cele aux Pintades", - "\u00cele aux Sables", - "Pamplemousses", - "Plaines Wilhems", - "Port Louis", - "Rivi\u00e8re du Rempart", - "Rodrigues", - "Savanne", - "\u00cele Catherine", - "\u00cele Crabe", - "\u00cele Destin\u00e9e", - "\u00cele Deux Fr\u00e8res", + "Black River", + "Mauritius", + "Flacq", + "Grand Port", + "\u00cele Gombrani", + "\u00cele Hermitage", + "\u00cele Paille en Queue", + "\u00cele Plate", + "Moka", + "\u00cele au Chat ou Pierrot", + "\u00cele aux Cocos", + "\u00cele aux Diamants", + "\u00cele aux Fous", + "\u00cele aux Pintades", + "\u00cele aux Sables", + "Pamplemousses", + "Plaines Wilhems", + "Port Louis", + "Rivi\u00e8re du Rempart", + "Rodrigues", + "Savanne", + "\u00cele Catherine", + "\u00cele Crabe", + "\u00cele Destin\u00e9e", + "\u00cele Deux Fr\u00e8res", "\u00cele Fr\u00e9gate" - ], + ], "old": [ "Mauritius" ] - }, + }, { - "id": "Mexico", + "id": "Mexico", "g": [ { - "id": "Mexico_California", - "s": 18282958, + "id": "Mexico_California", + "s": 18282958, "affiliations": [ - "Baja California", - "Baja California Sur", - "Colima", + "Baja California", + "Baja California Sur", + "Colima", "Estados Unidos Mexicanos" - ], + ], "old": [ - "Mexico", - "Guadalupe Island", - "Socorro Island", + "Mexico", + "Guadalupe Island", + "Socorro Island", "Clarion Island" ] - }, + }, { - "id": "Mexico_Central_East", - "s": 42599057, + "id": "Mexico_Central_East", + "s": 42599057, "affiliations": [ - "Coahuila de Zaragoza", - "Estados Unidos Mexicanos", - "Nuevo Le\u00f3n", - "San Luis Potos\u00ed", + "Coahuila de Zaragoza", + "Estados Unidos Mexicanos", + "Nuevo Le\u00f3n", + "San Luis Potos\u00ed", "Tamaulipas" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_Central_West", - "s": 54556179, + "id": "Mexico_Central_West", + "s": 54556179, "affiliations": [ - "Aguascalientes", - "Colima", - "Durango", - "Estados Unidos Mexicanos", - "Jalisco", - "Nayarit", - "Sinaloa", + "Aguascalientes", + "Colima", + "Durango", + "Estados Unidos Mexicanos", + "Jalisco", + "Nayarit", + "Sinaloa", "Zacatecas" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_East", - "s": 39326112, + "id": "Mexico_East", + "s": 39326112, "affiliations": [ - "Campeche", - "Chiapas", - "Estados Unidos Mexicanos", - "Oaxaca", - "Orange Walk", - "Quintana Roo", - "Tabasco", - "Veracruz de Ignacio de la Llave", + "Campeche", + "Chiapas", + "Estados Unidos Mexicanos", + "Oaxaca", + "Orange Walk", + "Quintana Roo", + "Tabasco", + "Veracruz de Ignacio de la Llave", "Yucat\u00e1n" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_Mexico", - "s": 73374355, + "id": "Mexico_Mexico", + "s": 73374355, "affiliations": [ - "Distrito Federal", - "Estados Unidos Mexicanos", - "Hidalgo", - "Morelos", - "M\u00e9xico", - "Puebla", - "Tlaxcala", + "Distrito Federal", + "Estados Unidos Mexicanos", + "Hidalgo", + "Morelos", + "M\u00e9xico", + "Puebla", + "Tlaxcala", "Veracruz de Ignacio de la Llave" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_Chihuahua", - "s": 33042743, + "id": "Mexico_Chihuahua", + "s": 33042743, "affiliations": [ - "Chihuahua", - "Coahuila de Zaragoza", - "Durango", - "Estados Unidos Mexicanos", - "Nuevo Le\u00f3n", + "Chihuahua", + "Coahuila de Zaragoza", + "Durango", + "Estados Unidos Mexicanos", + "Nuevo Le\u00f3n", "Sinaloa" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_Sonora", - "s": 28364652, + "id": "Mexico_Sonora", + "s": 28364652, "affiliations": [ - "Chihuahua", - "Durango", - "Estados Unidos Mexicanos", - "Sinaloa", + "Chihuahua", + "Durango", + "Estados Unidos Mexicanos", + "Sinaloa", "Sonora" - ], + ], "old": [ "Mexico" ] - }, + }, { - "id": "Mexico_South", - "s": 48234526, + "id": "Mexico_South", + "s": 48234526, "affiliations": [ - "Estados Unidos Mexicanos", - "Guerrero", - "Guanajuato", - "Michoac\u00e1n de Ocampo", - "Oaxaca", - "Quer\u00e9taro", + "Estados Unidos Mexicanos", + "Guerrero", + "Guanajuato", + "Michoac\u00e1n de Ocampo", + "Oaxaca", + "Quer\u00e9taro", "Veracruz de Ignacio de la Llave" - ], + ], "old": [ "Mexico" ] } ] - }, + }, { - "id": "Moldova", - "s": 29025644, + "id": "Moldova", + "s": 29025644, "affiliations": [ - "G\u0103g\u0103uzia - Gagauz Yeri - \u0413\u0430\u0433\u0430\u0443\u0437\u0438\u044f", - "Moldova", + "G\u0103g\u0103uzia - Gagauz Yeri - \u0413\u0430\u0433\u0430\u0443\u0437\u0438\u044f", + "Moldova", "\u041f\u0440\u0438\u0434\u043d\u0435\u0441\u0442\u0440\u043e\u0432\u044c\u0435" - ], + ], "old": [ "Moldova" ] - }, + }, { - "id": "Monaco", - "s": 215648, + "id": "Monaco", + "s": 215648, "affiliations": [ - "France", + "France", "Monaco" - ], + ], "old": [ "Monaco" ] - }, + }, { - "id": "Mongolia", - "s": 13242914, + "id": "Mongolia", + "s": 13242914, "affiliations": [ - "Border Darkhan-Uul - Selenge", - "\u0423\u0432\u0441 \u0430\u0439\u043c\u0430\u0433", - "Border T\u00f6v - Ulan Bator", - "Border Ulan Bator - T\u00f6v", - "\u0423\u043b\u0430\u0430\u043d\u0431\u0430\u0430\u0442\u0430\u0440", - "\u0422\u04e9\u0432", - "\u0425\u043e\u0432\u0434", - "\u0411\u0430\u044f\u043d-\u04e8\u043b\u0433\u0438\u0439", - "\u0413\u043e\u0432\u044c-\u0410\u043b\u0442\u0430\u0439", - "\u041e\u0440\u0445\u043e\u043d \u0430\u0439\u043c\u0430\u0433", - "\u0411\u0443\u043b\u0433\u0430\u043d", - "\u0414\u043e\u0440\u043d\u043e\u0434", - "\u0417\u0430\u0432\u0445\u0430\u043d", - "\u0425\u044d\u043d\u0442\u0438\u0439", - "\u041c\u043e\u043d\u0433\u043e\u043b \u0443\u043b\u0441", - "\u0414\u0430\u0440\u0445\u0430\u043d-\u0423\u0443\u043b", - "\u0421\u044d\u043b\u044d\u043d\u0433\u044d", - "\u0425\u04e9\u0432\u0441\u0433\u04e9\u043b", - "\u0410\u0440\u0445\u0430\u043d\u0433\u0430\u0439", - "\u0414\u0443\u043d\u0434\u0433\u043e\u0432\u044c", - "\u04e8\u043c\u043d\u04e9\u0433\u043e\u0432\u044c", - "\u0414\u043e\u0440\u043d\u043e\u0433\u043e\u0432\u044c", - "\u0421\u04af\u0445\u0431\u0430\u0430\u0442\u0430\u0440", - "\u0411\u0430\u044f\u043d\u0445\u043e\u043d\u0433\u043e\u0440", - "\u0413\u043e\u0432\u044c\u0441\u04af\u043c\u0431\u044d\u0440", + "Border Darkhan-Uul - Selenge", + "\u0423\u0432\u0441 \u0430\u0439\u043c\u0430\u0433", + "Border T\u00f6v - Ulan Bator", + "Border Ulan Bator - T\u00f6v", + "\u0423\u043b\u0430\u0430\u043d\u0431\u0430\u0430\u0442\u0430\u0440", + "\u0422\u04e9\u0432", + "\u0425\u043e\u0432\u0434", + "\u0411\u0430\u044f\u043d-\u04e8\u043b\u0433\u0438\u0439", + "\u0413\u043e\u0432\u044c-\u0410\u043b\u0442\u0430\u0439", + "\u041e\u0440\u0445\u043e\u043d \u0430\u0439\u043c\u0430\u0433", + "\u0411\u0443\u043b\u0433\u0430\u043d", + "\u0414\u043e\u0440\u043d\u043e\u0434", + "\u0417\u0430\u0432\u0445\u0430\u043d", + "\u0425\u044d\u043d\u0442\u0438\u0439", + "\u041c\u043e\u043d\u0433\u043e\u043b \u0443\u043b\u0441", + "\u0414\u0430\u0440\u0445\u0430\u043d-\u0423\u0443\u043b", + "\u0421\u044d\u043b\u044d\u043d\u0433\u044d", + "\u0425\u04e9\u0432\u0441\u0433\u04e9\u043b", + "\u0410\u0440\u0445\u0430\u043d\u0433\u0430\u0439", + "\u0414\u0443\u043d\u0434\u0433\u043e\u0432\u044c", + "\u04e8\u043c\u043d\u04e9\u0433\u043e\u0432\u044c", + "\u0414\u043e\u0440\u043d\u043e\u0433\u043e\u0432\u044c", + "\u0421\u04af\u0445\u0431\u0430\u0430\u0442\u0430\u0440", + "\u0411\u0430\u044f\u043d\u0445\u043e\u043d\u0433\u043e\u0440", + "\u0413\u043e\u0432\u044c\u0441\u04af\u043c\u0431\u044d\u0440", "\u04e8\u0432\u04e9\u0440\u0445\u0430\u043d\u0433\u0430\u0439" - ], + ], "old": [ "Mongolia" ] - }, + }, { - "id": "Montenegro", - "s": 12995134, + "id": "Montenegro", + "s": 12995134, "affiliations": [ "Crna Gora" - ], + ], "old": [ "Montenegro" ] - }, + }, { - "id": "Morocco", + "id": "Morocco", "g": [ { - "id": "Morocco_Western Sahara", - "s": 6171963, + "id": "Morocco_Western Sahara", + "s": 6171963, "affiliations": [ - "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", - "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646", - "La\u00e2youne-Sakia El Hamra \u2d4d\u2d44\u2d62\u2d53\u2d4f-\u2d59\u2d30\u2d47\u2d62\u2d30 \u2d4d\u2d43\u2d30\u2d4e\u2d54\u2d30 \u0627\u0644\u0639\u064a\u0648\u0646-\u0627\u0644\u0633\u0627\u0642\u064a\u0629 \u0627\u0644\u062d\u0645\u0631\u0627\u0621", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", + "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646", + "La\u00e2youne-Sakia El Hamra \u2d4d\u2d44\u2d62\u2d53\u2d4f-\u2d59\u2d30\u2d47\u2d62\u2d30 \u2d4d\u2d43\u2d30\u2d4e\u2d54\u2d30 \u0627\u0644\u0639\u064a\u0648\u0646-\u0627\u0644\u0633\u0627\u0642\u064a\u0629 \u0627\u0644\u062d\u0645\u0631\u0627\u0621", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629" - ], + ], "old": [ - "Morocco", + "Morocco", "Sahrawi" ] - }, + }, { - "id": "Morocco_Southern", - "s": 31733289, + "id": "Morocco_Southern", + "s": 31733289, "affiliations": [ - "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", - "Dr\u00e2a-Tafilalet \u2d37\u2d30\u2d54\u2d44\u2d30-\u2d5c\u2d30\u2d3c\u2d49\u2d4d\u2d30\u2d4d\u2d5c \u062f\u0631\u0639\u0629-\u062a\u0627\u0641\u064a\u0644\u0627\u0644\u062a", - "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633", - "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", - "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629", + "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", + "Dr\u00e2a-Tafilalet \u2d37\u2d30\u2d54\u2d44\u2d30-\u2d5c\u2d30\u2d3c\u2d49\u2d4d\u2d30\u2d4d\u2d5c \u062f\u0631\u0639\u0629-\u062a\u0627\u0641\u064a\u0644\u0627\u0644\u062a", + "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633", + "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629", "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629" - ], + ], "old": [ "Morocco" ] - }, + }, { - "id": "Morocco_Doukkala-Abda", - "s": 23184033, + "id": "Morocco_Doukkala-Abda", + "s": 23184033, "affiliations": [ - "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", - "Casablanca-Settat \u2d5c\u2d49\u2d33\u2d4e\u2d49 \u2d5c\u2d53\u2d4e\u2d4d\u2d49\u2d4d\u2d5c-\u2d59\u2d5f\u2d5f\u2d30\u2d5c \u0627\u0644\u062f\u0627\u0631 \u0627\u0644\u0628\u064a\u0636\u0627\u0621-\u0633\u0637\u0627\u062a", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", + "Casablanca-Settat \u2d5c\u2d49\u2d33\u2d4e\u2d49 \u2d5c\u2d53\u2d4e\u2d4d\u2d49\u2d4d\u2d5c-\u2d59\u2d5f\u2d5f\u2d30\u2d5c \u0627\u0644\u062f\u0627\u0631 \u0627\u0644\u0628\u064a\u0636\u0627\u0621-\u0633\u0637\u0627\u062a", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Marrakech-Safi \u2d4e\u2d55\u2d55\u2d30\u2d3d\u2d5b-\u2d30\u2d59\u2d3c\u2d49 \u0645\u0631\u0627\u0643\u0634-\u0623\u0633\u0641\u064a" - ], + ], "old": [ "Morocco" ] - }, + }, { - "id": "Morocco_Rabat-Sale-Zemmour-Zaer", - "s": 17597979, + "id": "Morocco_Rabat-Sale-Zemmour-Zaer", + "s": 17597979, "affiliations": [ - "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", - "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629", - "Rabat-Sal\u00e9-K\u00e9nitra \u2d3b\u2d54\u2d54\u2d31\u2d30\u2d5f-\u2d59\u2d4d\u2d30-\u2d47\u2d4f\u2d49\u2d5f\u2d54\u2d30 \u0627\u0644\u0631\u0628\u0627\u0637-\u0633\u0644\u0627-\u0627\u0644\u0642\u0646\u064a\u0637\u0631\u0629", + "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629", + "Rabat-Sal\u00e9-K\u00e9nitra \u2d3b\u2d54\u2d54\u2d31\u2d30\u2d5f-\u2d59\u2d4d\u2d30-\u2d47\u2d4f\u2d49\u2d5f\u2d54\u2d30 \u0627\u0644\u0631\u0628\u0627\u0637-\u0633\u0644\u0627-\u0627\u0644\u0642\u0646\u064a\u0637\u0631\u0629", "Tanger-T\u00e9touan-Al Hoceima \u2d5f\u2d30\u2d4f\u2d4a-\u2d5f\u2d49\u2d5c\u2d30\u2d61\u2d49\u2d4f-\u2d4d\u2d43\u2d53\u2d59\u2d49\u2d4e\u2d30 \u0637\u0646\u062c\u0629-\u062a\u0637\u0648\u0627\u0646-\u0627\u0644\u062d\u0633\u064a\u0645\u0629" - ], + ], "old": [ "Morocco" ] } ] - }, + }, { - "id": "Mozambique", - "s": 55164565, + "id": "Mozambique", + "s": 55164565, "affiliations": [ - "Cabo Delgado", - "Gaza", - "Inhambane", - "Manica", - "Maputo", - "Niassa", - "Mo\u00e7ambique", - "Nampula", - "Tete", - "Sofala", + "Cabo Delgado", + "Gaza", + "Inhambane", + "Manica", + "Maputo", + "Niassa", + "Mo\u00e7ambique", + "Nampula", + "Tete", + "Sofala", "Zamb\u00e9zia" - ], + ], "old": [ "Mozambique" ] - }, + }, { - "id": "Myanmar", - "s": 41547366, + "id": "Myanmar", + "s": 41547366, "affiliations": [ - "Ayeyarwady", - "Bago Region", - "Chin", - "Kachin", - "Kayah", - "Kayin", - "Magway", - "Mandalay", - "Mon", - "Naypyitaw", - "Rakhine", - "Shan State", - "Tanintharyi", - "Yangon", - "\u1005\u1005\u103a\u1000\u102d\u102f\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038 (Sagaing)", + "Ayeyarwady", + "Bago Region", + "Chin", + "Kachin", + "Kayah", + "Kayin", + "Magway", + "Mandalay", + "Mon", + "Naypyitaw", + "Rakhine", + "Shan State", + "Tanintharyi", + "Yangon", + "\u1005\u1005\u103a\u1000\u102d\u102f\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038 (Sagaing)", "\u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f\u1019\u103c\u1014\u103a\u1019\u102c\u1014\u102d\u102f\u1004\u103a\u1004\u1036\u1010\u1031\u102c\u103a\u200c" - ], + ], "old": [ "Burma" ] - }, + }, { - "id": "Namibia", - "s": 12107237, + "id": "Namibia", + "s": 12107237, "affiliations": [ - "Arandis", - "Aranos7", - "Erongo Region", - "Hardap Region", - "Katima Mulilo", - "Kavango-East Region", - "Kavango-West Region", - "Khomas Region", - "Kunene Region", - "Namibia", - "Ohangwena Region", - "Okahao", - "Omaheke Region", - "Omusati Region", - "Oranjemund", - "Oshana Region", - "Oshikoto Region", - "Otavi", - "Otjozondjupa Region", - "Outapi", - "Rehoboth", - "Zambezi Region", + "Arandis", + "Aranos7", + "Erongo Region", + "Hardap Region", + "Katima Mulilo", + "Kavango-East Region", + "Kavango-West Region", + "Khomas Region", + "Kunene Region", + "Namibia", + "Ohangwena Region", + "Okahao", + "Omaheke Region", + "Omusati Region", + "Oranjemund", + "Oshana Region", + "Oshikoto Region", + "Otavi", + "Otjozondjupa Region", + "Outapi", + "Rehoboth", + "Zambezi Region", "\u01c1Karas Region" - ], + ], "old": [ "Namibia" ] - }, + }, { - "id": "Nauru", - "s": 262456, + "id": "Nauru", + "s": 262456, "affiliations": [ "Naoero" - ], + ], "old": [ "Nauru" ] - }, + }, { - "id": "Nepal", + "id": "Nepal", "g": [ { - "id": "Nepal_West", - "s": 35554410, + "id": "Nepal_West", + "s": 35554410, "affiliations": [ - "\u092e\u0927\u094d\u092f-\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", - "\u0928\u0947\u092a\u093e\u0932", - "\u0938\u0941\u0926\u0941\u0930 \u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", + "\u092e\u0927\u094d\u092f-\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", + "\u0928\u0947\u092a\u093e\u0932", + "\u0938\u0941\u0926\u0941\u0930 \u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930" - ], + ], "old": [ "Nepal" ] - }, + }, { - "id": "Nepal_Kathmandu", - "s": 24263597, + "id": "Nepal_Kathmandu", + "s": 24263597, "affiliations": [ - "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", + "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" - ], + ], "old": [ "Nepal" ] - }, + }, { - "id": "Nepal_Madhyamanchal", - "s": 21750627, + "id": "Nepal_Madhyamanchal", + "s": 21750627, "affiliations": [ - "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", + "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" - ], + ], "old": [ "Nepal" ] - }, + }, { - "id": "Nepal_Purwanchal", - "s": 10329972, + "id": "Nepal_Purwanchal", + "s": 10329972, "affiliations": [ - "\u092a\u0941\u0930\u094d\u0935\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", + "\u092a\u0941\u0930\u094d\u0935\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" - ], + ], "old": [ "Nepal" ] } ] - }, + }, { - "id": "Nicaragua", - "s": 16459880, + "id": "Nicaragua", + "s": 16459880, "affiliations": [ - "Boaco", - "Carazo", - "Matagalpa", - "Chinandega", - "Chontales", - "Jinotega", - "Estel\u00ed", - "Gracias a Dios", - "Granada", - "Le\u00f3n", - "Madriz", - "Managua", - "Masaya", - "Nicaragua", - "R\u00edo San Juan", - "Nueva Segovia", - "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Norte", - "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Sur", + "Boaco", + "Carazo", + "Matagalpa", + "Chinandega", + "Chontales", + "Jinotega", + "Estel\u00ed", + "Gracias a Dios", + "Granada", + "Le\u00f3n", + "Madriz", + "Managua", + "Masaya", + "Nicaragua", + "R\u00edo San Juan", + "Nueva Segovia", + "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Norte", + "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Sur", "Rivas" - ], + ], "old": [ "Nicaragua" ] - }, + }, { - "id": "Niger", - "s": 16380115, + "id": "Niger", + "s": 16380115, "affiliations": [ - "Agadez", - "Dosso", - "Diffa", - "Maradi", - "Niamey", - "Niger", - "Tahoua", - "Tillab\u00e9ri", + "Agadez", + "Dosso", + "Diffa", + "Maradi", + "Niamey", + "Niger", + "Tahoua", + "Tillab\u00e9ri", "Zinder" - ], + ], "old": [ "Niger" ] - }, + }, { - "id": "Nigeria", + "id": "Nigeria", "g": [ { - "id": "Nigeria_South", - "s": 47769004, + "id": "Nigeria_South", + "s": 47769004, "affiliations": [ - "Abia", - "Adamawa", - "Akwa Ibom", - "Anambra", - "Bayelsa", - "Benue", - "Cross River", - "Delta", - "Ebonyi", - "Edo", - "Ekiti", - "Enugu", - "Federal Capital Territory", - "Imo", - "Kaduna", - "Kogi", - "Kebbi", - "Kwara", - "Lagos", - "Nasarawa", - "Niger", - "Nigeria", - "Ogun", - "Ondo", - "Osun", - "Oyo", - "Plateau", - "Rivers", + "Abia", + "Adamawa", + "Akwa Ibom", + "Anambra", + "Bayelsa", + "Benue", + "Cross River", + "Delta", + "Ebonyi", + "Edo", + "Ekiti", + "Enugu", + "Federal Capital Territory", + "Imo", + "Kaduna", + "Kogi", + "Kebbi", + "Kwara", + "Lagos", + "Nasarawa", + "Niger", + "Nigeria", + "Ogun", + "Ondo", + "Osun", + "Oyo", + "Plateau", + "Rivers", "Taraba" - ], + ], "old": [ "Nigeria" ] - }, + }, { - "id": "Nigeria_North", - "s": 31407654, + "id": "Nigeria_North", + "s": 31407654, "affiliations": [ - "Bauchi", - "Borno", - "Jigawa", - "Gombe", - "Kano", - "Katsina", - "Kebbi", - "Niger", - "Nigeria", - "Sokoto", - "Yobe", + "Bauchi", + "Borno", + "Jigawa", + "Gombe", + "Kano", + "Katsina", + "Kebbi", + "Niger", + "Nigeria", + "Sokoto", + "Yobe", "Zamfara" - ], + ], "old": [ "Nigeria" ] } ] - }, + }, { - "id": "Niue", - "s": 189088, + "id": "Niue", + "s": 189088, "affiliations": [ "Niu\u0113" - ], + ], "old": [ "Niue" ] - }, + }, { - "id": "North Korea", - "s": 17810979, + "id": "North Korea", + "s": 17810979, "affiliations": [ - "\uac15\uc6d0\ub3c4", - "\ub7c9\uac15\ub3c4", - "\uc790\uac15\ub3c4", - "\uae08\uac15\uc0b0\uad00\uad11\uc9c0\uad6c", - "\ud3c9\uc548\ub0a8\ub3c4", - "\ud3c9\uc548\ubd81\ub3c4", - "\ud568\uacbd\ub0a8\ub3c4", - "\ud568\uacbd\ubd81\ub3c4", - "\ud669\ud574\ub0a8\ub3c4", - "\ud669\ud574\ubd81\ub3c4", - "\ud3c9\uc591\uc9c1\ud560\uc2dc", + "\uac15\uc6d0\ub3c4", + "\ub7c9\uac15\ub3c4", + "\uc790\uac15\ub3c4", + "\uae08\uac15\uc0b0\uad00\uad11\uc9c0\uad6c", + "\ud3c9\uc548\ub0a8\ub3c4", + "\ud3c9\uc548\ubd81\ub3c4", + "\ud568\uacbd\ub0a8\ub3c4", + "\ud568\uacbd\ubd81\ub3c4", + "\ud669\ud574\ub0a8\ub3c4", + "\ud669\ud574\ubd81\ub3c4", + "\ud3c9\uc591\uc9c1\ud560\uc2dc", "\uc870\uc120\ubbfc\uc8fc\uc8fc\uc758\uc778\ubbfc\uacf5\ud654\uad6d" - ], + ], "old": [ "North Korea" ] - }, + }, { - "id": "Norway", + "id": "Norway", "g": [ { - "id": "Norway_Northern", - "s": 39276177, + "id": "Norway_Northern", + "s": 39276177, "affiliations": [ - "Finnmark", - "Norge", + "Finnmark", + "Norge", "Troms" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Hordaland", - "s": 38232738, + "id": "Norway_Hordaland", + "s": 38232738, "affiliations": [ - "Hordaland", + "Hordaland", "Norge" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Nordland", - "s": 27206147, + "id": "Norway_Nordland", + "s": 27206147, "affiliations": [ - "Nordland", - "Norge", + "Nordland", + "Norge", "Troms" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Svalbard", - "s": 1186062, + "id": "Norway_Svalbard", + "s": 1186062, "affiliations": [ - "Norge", + "Norge", "Svalbard" - ], + ], "old": [ "Svalbard and Jan Mayen" ] - }, + }, { - "id": "Norway_Oppland", - "s": 32124757, + "id": "Norway_Oppland", + "s": 32124757, "affiliations": [ - "Norge", + "Norge", "Oppland" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Rogaland", - "s": 18789877, + "id": "Norway_Rogaland", + "s": 18789877, "affiliations": [ - "Norge", + "Norge", "Rogaland" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Hedmark", - "s": 37003407, + "id": "Norway_Hedmark", + "s": 37003407, "affiliations": [ - "Hedmark", + "Hedmark", "Norge" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Jan Mayen", - "s": 194687, + "id": "Norway_Jan Mayen", + "s": 194687, "affiliations": [ - "Jan Mayen", + "Jan Mayen", "Norge" ] - }, + }, { - "id": "Norway_North Trondelag", - "s": 32257815, + "id": "Norway_North Trondelag", + "s": 32257815, "affiliations": [ - "Nord-Tr\u00f8ndelag", - "Norge", + "Nord-Tr\u00f8ndelag", + "Norge", "S\u00f8r-Tr\u00f8ndelag" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_South Trondelag", - "s": 48520945, + "id": "Norway_South Trondelag", + "s": 48520945, "affiliations": [ - "Norge", + "Norge", "S\u00f8r-Tr\u00f8ndelag" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Southern", - "s": 54149495, + "id": "Norway_Southern", + "s": 54149495, "affiliations": [ - "Aust-Agder", - "\u00d8stfold", - "Norge", - "Telemark", - "Vest-Agder", + "Aust-Agder", + "\u00d8stfold", + "Norge", + "Telemark", + "Vest-Agder", "Vestfold" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Western", - "s": 47367485, + "id": "Norway_Western", + "s": 47367485, "affiliations": [ - "M\u00f8re og Romsdal", - "Norge", + "M\u00f8re og Romsdal", + "Norge", "Sogn og Fjordane" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Central", - "s": 50883409, + "id": "Norway_Central", + "s": 50883409, "affiliations": [ - "Akershus", - "Buskerud", - "Norge", + "Akershus", + "Buskerud", + "Norge", "Oslo" - ], + ], "old": [ "Norway" ] - }, + }, { - "id": "Norway_Bouvet Island", - "s": 13885, + "id": "Norway_Bouvet Island", + "s": 13885, "affiliations": [ - "Bouvet\u00f8ya", + "Bouvet\u00f8ya", "Norge" - ], + ], "old": [ "Bouvet Island" ] } ] - }, + }, { - "id": "Oman", - "s": 13810661, + "id": "Oman", + "s": 13810661, "affiliations": [ - "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u0629", - "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629", - "\u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0634\u0631\u0642\u064a\u0629", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0638\u0641\u0627\u0631", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0642\u0637", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u062c\u0646\u0648\u0628 \u0627\u0644\u0628\u0627\u0637\u0646\u0629", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0634\u0645\u0627\u0644 \u0627\u0644\u0628\u0627\u0637\u0646\u0629", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0648\u0633\u0637\u0649", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0646\u062f\u0645", - "\u200f\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646\u200e", + "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u0629", + "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629", + "\u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0634\u0631\u0642\u064a\u0629", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0638\u0641\u0627\u0631", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0642\u0637", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u062c\u0646\u0648\u0628 \u0627\u0644\u0628\u0627\u0637\u0646\u0629", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0634\u0645\u0627\u0644 \u0627\u0644\u0628\u0627\u0637\u0646\u0629", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0648\u0633\u0637\u0649", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0646\u062f\u0645", + "\u200f\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646\u200e", "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0628\u0631\u064a\u0645\u064a" - ], + ], "old": [ "Oman" ] - }, + }, { - "id": "Pakistan", - "s": 51038063, + "id": "Pakistan", + "s": 51038063, "affiliations": [ - "\u0633\u0646\u068c", - "\u0622\u0632\u0627\u062f \u062c\u0645\u0648\u06ba \u0648 \u06a9\u0634\u0645\u06cc\u0631", - "\u06af\u0644\u06af\u062a \u0628\u0644\u062a\u0633\u062a\u0627\u0646", - "\u062e\u06cc\u0628\u0631 \u067e\u062e\u062a\u0648\u0646\u062e\u0648\u0627", - "\u067e\u0646\u062c\u0627\u0628", - "\u0648\u0641\u0627\u0642\u06cc \u0642\u0628\u0627\u0626\u0644\u06cc \u0639\u0644\u0627\u0642\u06c1 \u062c\u0627\u062a", - "\u0648\u0641\u0627\u0642\u06cc \u062f\u0627\u0631\u0627\u0644\u062d\u06a9\u0648\u0645\u062a", - "\u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646 / Balochistan", + "\u0633\u0646\u068c", + "\u0622\u0632\u0627\u062f \u062c\u0645\u0648\u06ba \u0648 \u06a9\u0634\u0645\u06cc\u0631", + "\u06af\u0644\u06af\u062a \u0628\u0644\u062a\u0633\u062a\u0627\u0646", + "\u062e\u06cc\u0628\u0631 \u067e\u062e\u062a\u0648\u0646\u062e\u0648\u0627", + "\u067e\u0646\u062c\u0627\u0628", + "\u0648\u0641\u0627\u0642\u06cc \u0642\u0628\u0627\u0626\u0644\u06cc \u0639\u0644\u0627\u0642\u06c1 \u062c\u0627\u062a", + "\u0648\u0641\u0627\u0642\u06cc \u062f\u0627\u0631\u0627\u0644\u062d\u06a9\u0648\u0645\u062a", + "\u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646 / Balochistan", "\u200f\u067e\u0627\u06a9\u0633\u062a\u0627\u0646\u200e" - ], + ], "old": [ "Pakistan" ] - }, + }, { - "id": "Palau", - "s": 314322, + "id": "Palau", + "s": 314322, "affiliations": [ "Belau" - ], + ], "old": [ "Palau" ] - }, + }, { - "id": "Panama", - "s": 11591412, + "id": "Panama", + "s": 11591412, "affiliations": [ - "Bocas del Toro", - "Chiriqu\u00ed", - "Cocl\u00e9", - "Col\u00f3n", - "Dari\u00e9n", - "Ember\u00e1-Wounaan", - "Guna Yala", - "Herrera", - "Isla Bastimentos", - "Isla Loma Partida", - "Los Santos", - "Kuna de Madugand\u00ed", - "Kuna de Wargand\u00ed", - "Ng\u00e4be-Bugl\u00e9", - "Panam\u00e1 Oeste", - "Panam\u00e1", - "Panam\u00e1", + "Bocas del Toro", + "Chiriqu\u00ed", + "Cocl\u00e9", + "Col\u00f3n", + "Dari\u00e9n", + "Ember\u00e1-Wounaan", + "Guna Yala", + "Herrera", + "Isla Bastimentos", + "Isla Loma Partida", + "Los Santos", + "Kuna de Madugand\u00ed", + "Kuna de Wargand\u00ed", + "Ng\u00e4be-Bugl\u00e9", + "Panam\u00e1 Oeste", + "Panam\u00e1", + "Panam\u00e1", "Veraguas" - ], + ], "old": [ "Panama" ] - }, + }, { - "id": "Papua New Guinea", - "s": 6137976, + "id": "Papua New Guinea", + "s": 6137976, "affiliations": [ - "Border Central-NCD", - "Bougainville", - "Manus", - "Central", - "East New Britain", - "East Sepik", - "Eastern Highlands", - "Enga", - "Gulf", - "Hela", - "Jiwaka", - "Madang", - "New Ireland", - "Milne Bay", - "Morobe", - "National Capital District", - "Oro", - "Papua Niugini", - "Sandaun", - "Simbu", - "Southern Highlands", - "West New Britain", - "Western", + "Border Central-NCD", + "Bougainville", + "Manus", + "Central", + "East New Britain", + "East Sepik", + "Eastern Highlands", + "Enga", + "Gulf", + "Hela", + "Jiwaka", + "Madang", + "New Ireland", + "Milne Bay", + "Morobe", + "National Capital District", + "Oro", + "Papua Niugini", + "Sandaun", + "Simbu", + "Southern Highlands", + "West New Britain", + "Western", "Western Highlands" - ], + ], "old": [ "Papua New Guinea" ] - }, + }, { - "id": "Paraguay", - "s": 27437774, + "id": "Paraguay", + "s": 27437774, "affiliations": [ - "Alto Paraguay", - "Alto Paran\u00e1", - "Amambay", - "Caaguaz\u00fa", - "Caazap\u00e1", - "Boquer\u00f3n", - "Borde Cordillera - Caaguaz\u00fa", - "Canindey\u00fa", - "Central", - "Distrito Capital de Paraguay", - "Concepci\u00f3n", - "Cordillera", - "Guair\u00e1", - "Isla Dorado", - "Itap\u00faa", - "Misiones", - "\u00d1eembuc\u00fa", - "Paraguar\u00ed", - "Paraguay", - "Presidente Hayes", + "Alto Paraguay", + "Alto Paran\u00e1", + "Amambay", + "Caaguaz\u00fa", + "Caazap\u00e1", + "Boquer\u00f3n", + "Borde Cordillera - Caaguaz\u00fa", + "Canindey\u00fa", + "Central", + "Distrito Capital de Paraguay", + "Concepci\u00f3n", + "Cordillera", + "Guair\u00e1", + "Isla Dorado", + "Itap\u00faa", + "Misiones", + "\u00d1eembuc\u00fa", + "Paraguar\u00ed", + "Paraguay", + "Presidente Hayes", "San Pedro" - ], + ], "old": [ "Paraguay" ] - }, + }, { - "id": "People's Republic of China", + "id": "People's Republic of China", "g": [ { - "id": "China_Anhui", - "s": 10480531, + "id": "China_Anhui", + "s": 10480531, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u5b89\u5fbd\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Chongqing", - "s": 4494647, + "id": "China_Chongqing", + "s": 4494647, "affiliations": [ - "\u91cd\u5e86\u5e02", + "\u91cd\u5e86\u5e02", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Fujian", - "s": 9417042, + "id": "China_Fujian", + "s": 9417042, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u798f\u5efa\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Gansu", - "s": 7341845, + "id": "China_Gansu", + "s": 7341845, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u7518\u8083\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Guangdong", - "s": 51565597, + "id": "China_Guangdong", + "s": 51565597, "affiliations": [ - "\u4e2d\u56fd", - "\u5e7f\u4e1c\u7701", + "\u4e2d\u56fd", + "\u5e7f\u4e1c\u7701", "\u6d77\u5357\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Guangxi", - "s": 7235196, + "id": "China_Guangxi", + "s": 7235196, "affiliations": [ - "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a", + "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Guizhou", - "s": 3952060, + "id": "China_Guizhou", + "s": 3952060, "affiliations": [ - "\u8d35\u5dde\u7701", + "\u8d35\u5dde\u7701", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Hebei", - "s": 25206811, + "id": "China_Hebei", + "s": 25206811, "affiliations": [ - "\u4e2d\u56fd", - "\u5317\u4eac\u5e02", - "\u5929\u6d25\u5e02", + "\u4e2d\u56fd", + "\u5317\u4eac\u5e02", + "\u5929\u6d25\u5e02", "\u6cb3\u5317\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Heilongjiang", - "s": 9230892, + "id": "China_Heilongjiang", + "s": 9230892, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u9ed1\u9f99\u6c5f\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Henan", - "s": 10645794, + "id": "China_Henan", + "s": 10645794, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u6cb3\u5357\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Hubei", - "s": 9577981, + "id": "China_Hubei", + "s": 9577981, "affiliations": [ - "Border Henan - Hubei", - "\u4e2d\u56fd", + "Border Henan - Hubei", + "\u4e2d\u56fd", "\u6e56\u5317\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Hunan", - "s": 8620548, + "id": "China_Hunan", + "s": 8620548, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u6e56\u5357\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Inner Mongolia", - "s": 13630965, + "id": "China_Inner Mongolia", + "s": 13630965, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Jiangsu", - "s": 31265206, + "id": "China_Jiangsu", + "s": 31265206, "affiliations": [ - "\u4e2d\u56fd", - "\u6c5f\u82cf\u7701", + "\u4e2d\u56fd", + "\u6c5f\u82cf\u7701", "\u79e6\u5c71\u5c9b" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Jiangxi", - "s": 9451312, + "id": "China_Jiangxi", + "s": 9451312, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u6c5f\u897f\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Jilin", - "s": 9754775, + "id": "China_Jilin", + "s": 9754775, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u5409\u6797\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Liaoning", - "s": 10760376, + "id": "China_Liaoning", + "s": 10760376, "affiliations": [ - "\u8fbd\u5b81\u7701", + "\u8fbd\u5b81\u7701", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Ningxia Hui", - "s": 2698758, + "id": "China_Ningxia Hui", + "s": 2698758, "affiliations": [ - "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a", + "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Qinghai", - "s": 6153171, + "id": "China_Qinghai", + "s": 6153171, "affiliations": [ - "\u9752\u6d77\u7701", + "\u9752\u6d77\u7701", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Shaanxi", - "s": 10428666, + "id": "China_Shaanxi", + "s": 10428666, "affiliations": [ - "\u9655\u897f\u7701", + "\u9655\u897f\u7701", "\u4e2d\u56fd" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Shandong", - "s": 20146726, + "id": "China_Shandong", + "s": 20146726, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u5c71\u4e1c\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Shanghai", - "s": 11473485, + "id": "China_Shanghai", + "s": 11473485, "affiliations": [ - "\u4e2d\u56fd", - "\u4e0a\u6d77\u5e02", + "\u4e2d\u56fd", + "\u4e0a\u6d77\u5e02", "\u6d59\u6c5f\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Shanxi", - "s": 5605680, + "id": "China_Shanxi", + "s": 5605680, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u5c71\u897f\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Sichuan", - "s": 13365014, + "id": "China_Sichuan", + "s": 13365014, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u56db\u5ddd\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Tibet Autonomous Region", - "s": 12242753, + "id": "China_Tibet Autonomous Region", + "s": 12242753, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u897f\u85cf\u81ea\u6cbb\u533a (\u0f56\u0f7c\u0f51\u0f0b\u0f62\u0f44\u0f0b\u0f66\u0f90\u0fb1\u0f7c\u0f44\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b)" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Xinjiang", - "s": 13014356, + "id": "China_Xinjiang", + "s": 13014356, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Yunnan", - "s": 13764047, + "id": "China_Yunnan", + "s": 13764047, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u4e91\u5357\u7701" - ], + ], "old": [ "China" ] - }, + }, { - "id": "China_Zhejiang", - "s": 19941190, + "id": "China_Zhejiang", + "s": 19941190, "affiliations": [ - "\u4e2d\u56fd", + "\u4e2d\u56fd", "\u6d59\u6c5f\u7701" - ], + ], "old": [ "China" ] } ] - }, + }, { - "id": "Taiwan", + "id": "Taiwan", "g": [ { - "id": "Taiwan_North", - "s": 40119020, + "id": "Taiwan_North", + "s": 40119020, "affiliations": [ - "\u4e2d\u56fd", - "\u65b0\u5317\u5e02", - "\u6843\u5712\u5e02", - "\u798f\u5efa\u7701", - "\u81fa\u4e2d\u5e02", - "\u81fa\u5317\u5e02", + "\u4e2d\u56fd", + "\u65b0\u5317\u5e02", + "\u6843\u5712\u5e02", + "\u798f\u5efa\u7701", + "\u81fa\u4e2d\u5e02", + "\u81fa\u5317\u5e02", "\u4e2d\u83ef\u6c11\u570b" - ], + ], "old": [ - "Taiwan", + "Taiwan", "China" ] - }, + }, { - "id": "Taiwan_South", - "s": 44167794, + "id": "Taiwan_South", + "s": 44167794, "affiliations": [ - "\u9ad8\u96c4\u5e02", - "\u53f0\u5357\u5e02", - "\u81fa\u4e2d\u5e02", + "\u9ad8\u96c4\u5e02", + "\u53f0\u5357\u5e02", + "\u81fa\u4e2d\u5e02", "\u4e2d\u83ef\u6c11\u570b" - ], + ], "old": [ "Taiwan" ] } ] - }, + }, { - "id": "Peru", + "id": "Peru", "g": [ { - "id": "Peru_North", - "s": 31491006, + "id": "Peru_North", + "s": 31491006, "affiliations": [ - "Amazonas", - "Ancash", - "Cajamarca", - "Hu\u00e1nuco", - "Loreto", - "La Libertad", - "Lambayeque", - "Per\u00fa", - "Piura", - "Pasco", - "San Mart\u00edn", - "Tumbes", + "Amazonas", + "Ancash", + "Cajamarca", + "Hu\u00e1nuco", + "Loreto", + "La Libertad", + "Lambayeque", + "Per\u00fa", + "Piura", + "Pasco", + "San Mart\u00edn", + "Tumbes", "Ucayali" - ], + ], "old": [ "Peru" ] - }, + }, { - "id": "Peru_Lima", - "s": 28803100, + "id": "Peru_Lima", + "s": 28803100, "affiliations": [ - "Callao", - "Huancavelica", - "Ica", - "Jun\u00edn", - "Lima", + "Callao", + "Huancavelica", + "Ica", + "Jun\u00edn", + "Lima", "Per\u00fa" - ], + ], "old": [ "Peru" ] - }, + }, { - "id": "Peru_South", - "s": 27410361, + "id": "Peru_South", + "s": 27410361, "affiliations": [ - "Apur\u00edmac", - "Arequipa", - "Ayacucho", - "Cusco", - "Madre de Dios", - "Moquegua", - "Per\u00fa", - "Puno", + "Apur\u00edmac", + "Arequipa", + "Ayacucho", + "Cusco", + "Madre de Dios", + "Moquegua", + "Per\u00fa", + "Puno", "Tacna" - ], + ], "old": [ "Peru" ] } ] - }, + }, { - "id": "Philippines", + "id": "Philippines", "g": [ { - "id": "Philippines_Mindanao", - "s": 26759428, + "id": "Philippines_Mindanao", + "s": 26759428, "affiliations": [ - "Agusan Del Sur", - "Agusan del Norte", - "Iligan City", - "Basilan", - "Dinagat Islands", - "Bukidnon", - "Camiguin", - "Compostela Valley", - "Cotabato", - "Davao City", - "Davao Del Norte", - "Davao Occidental", - "Davao Oriental", - "Davao del Sur", - "Lanao Del Norte", - "Lanao Del Sur", - "Maguindanao", - "Misamis Occidental", - "Misamis Oriental", - "Philippines", - "Saguing", - "Sarangani", - "Siquijor", - "South Cotabato", - "Sultan Kudarat", - "Sulu", - "Surigao Del Norte", - "Surigao del Sur", - "Tawi Tawi", - "Zamboanga Sibugay", - "Zamboanga del Norte", + "Agusan Del Sur", + "Agusan del Norte", + "Iligan City", + "Basilan", + "Dinagat Islands", + "Bukidnon", + "Camiguin", + "Compostela Valley", + "Cotabato", + "Davao City", + "Davao Del Norte", + "Davao Occidental", + "Davao Oriental", + "Davao del Sur", + "Lanao Del Norte", + "Lanao Del Sur", + "Maguindanao", + "Misamis Occidental", + "Misamis Oriental", + "Philippines", + "Saguing", + "Sarangani", + "Siquijor", + "South Cotabato", + "Sultan Kudarat", + "Sulu", + "Surigao Del Norte", + "Surigao del Sur", + "Tawi Tawi", + "Zamboanga Sibugay", + "Zamboanga del Norte", "Zamboanga del Sur" - ], + ], "old": [ "Philippines" ] - }, + }, { - "id": "Philippines_Visayas", - "s": 38061438, + "id": "Philippines_Visayas", + "s": 38061438, "affiliations": [ - "Aklan", - "Bohol", - "Antique", - "Biliran", - "Dinagat Islands", - "Camiguin", - "Capiz", - "Cebu", - "Eastern Samar", - "Guimaras", - "Iloilo", - "Leyte", - "Masbate", - "Negros Occidental", - "Negros Oriental", - "Northern Samar", - "Palawan", - "Philippines", - "Samar", - "Siquijor", - "Southern Leyte", + "Aklan", + "Bohol", + "Antique", + "Biliran", + "Dinagat Islands", + "Camiguin", + "Capiz", + "Cebu", + "Eastern Samar", + "Guimaras", + "Iloilo", + "Leyte", + "Masbate", + "Negros Occidental", + "Negros Oriental", + "Northern Samar", + "Palawan", + "Philippines", + "Samar", + "Siquijor", + "Southern Leyte", "Sorsogon" - ], + ], "old": [ "Philippines" ] - }, + }, { - "id": "Philippines_Luzon_South", - "s": 6635145, + "id": "Philippines_Luzon_South", + "s": 6635145, "affiliations": [ - "Antique", - "Ban Than (Zhongzhou) Reef", - "Batangas", - "Biliran", - "Marinduque", - "Masbate", - "Occidental Mindoro", - "Oriental Mindoro", - "Palawan", - "Philippines", - "Quezon", - "Romblon", - "Sorsogon", + "Antique", + "Ban Than (Zhongzhou) Reef", + "Batangas", + "Biliran", + "Marinduque", + "Masbate", + "Occidental Mindoro", + "Oriental Mindoro", + "Palawan", + "Philippines", + "Quezon", + "Romblon", + "Sorsogon", "\u592a\u5e73\u5cf6" - ], + ], "old": [ "Philippines" ] - }, + }, { - "id": "Philippines_Luzon_Manila", - "s": 53625537, + "id": "Philippines_Luzon_Manila", + "s": 53625537, "affiliations": [ - "Catanduanes", - "Cavite", - "Albay", - "Batangas", - "Camarines Norte", - "Camarines Sur", - "Laguna", - "Marinduque", - "Masbate", - "Philippines", - "Quezon", - "Rizal", + "Catanduanes", + "Cavite", + "Albay", + "Batangas", + "Camarines Norte", + "Camarines Sur", + "Laguna", + "Marinduque", + "Masbate", + "Philippines", + "Quezon", + "Rizal", "Sorsogon" - ], + ], "old": [ "Philippines" ] - }, + }, { - "id": "Philippines_Luzon_North", - "s": 34626238, + "id": "Philippines_Luzon_North", + "s": 34626238, "affiliations": [ - "Abra", - "Cavite", - "Apayao", - "Aurora", - "Bataan", - "Batanes", - "Batangas", - "Benguet", - "Bulacan", - "Cagayan", - "Ifugao", - "Ilocos Norte", - "Ilocos Sur", - "Isabela", - "Kalinga", - "La Union", - "Mountain Province", - "Nueva Ecija", - "Nueva Vizcaya", - "Occidental Mindoro", - "Pangasinan", - "Pampanga", - "Philippines", - "Quirino", - "Tarlac", - "Zambales", + "Abra", + "Cavite", + "Apayao", + "Aurora", + "Bataan", + "Batanes", + "Batangas", + "Benguet", + "Bulacan", + "Cagayan", + "Ifugao", + "Ilocos Norte", + "Ilocos Sur", + "Isabela", + "Kalinga", + "La Union", + "Mountain Province", + "Nueva Ecija", + "Nueva Vizcaya", + "Occidental Mindoro", + "Pangasinan", + "Pampanga", + "Philippines", + "Quirino", + "Tarlac", + "Zambales", "\u6d77\u5357\u7701" - ], + ], "old": [ "Philippines" ] } ] - }, + }, { - "id": "Pitcairn Islands", - "s": 57989, + "id": "Pitcairn Islands", + "s": 57989, "affiliations": [ "Pitcairn Islands" - ], + ], "old": [ "Pitcairn Islands" ] - }, + }, { - "id": "Poland", + "id": "Poland", "g": [ { - "id": "Poland_West Pomeranian Voivodeship", - "s": 45805562, + "id": "Poland_West Pomeranian Voivodeship", + "s": 45805562, "affiliations": [ - "Polska", - "Territorial waters of Bornholm", + "Polska", + "Territorial waters of Bornholm", "wojew\u00f3dztwo zachodniopomorskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Pomeranian Voivodeship", - "s": 44882427, + "id": "Poland_Pomeranian Voivodeship", + "s": 44882427, "affiliations": [ - "Polska", - "Territorial waters of Bornholm", + "Polska", + "Territorial waters of Bornholm", "wojew\u00f3dztwo pomorskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Podlaskie Voivodeship", - "s": 25465062, + "id": "Poland_Podlaskie Voivodeship", + "s": 25465062, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo podlaskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Masovian Voivodeship", - "s": 86406315, + "id": "Poland_Masovian Voivodeship", + "s": 86406315, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo mazowieckie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Lubusz Voivodeship", - "s": 26120396, + "id": "Poland_Lubusz Voivodeship", + "s": 26120396, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo lubuskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Lublin Voivodeship", - "s": 51946435, + "id": "Poland_Lublin Voivodeship", + "s": 51946435, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo lubelskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Lower Silesian Voivodeship", - "s": 68708659, + "id": "Poland_Lower Silesian Voivodeship", + "s": 68708659, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo dolno\u015bl\u0105skie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Warmian-Masurian Voivodeship", - "s": 35548267, + "id": "Poland_Warmian-Masurian Voivodeship", + "s": 35548267, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo warmi\u0144sko-mazurskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Lodz Voivodeship", - "s": 42760231, + "id": "Poland_Lodz Voivodeship", + "s": 42760231, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo \u0142\u00f3dzkie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Subcarpathian Voivodeship", - "s": 57802031, + "id": "Poland_Subcarpathian Voivodeship", + "s": 57802031, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo podkarpackie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Lesser Poland Voivodeship", - "s": 72840108, + "id": "Poland_Lesser Poland Voivodeship", + "s": 72840108, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo ma\u0142opolskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Silesian Voivodeship", - "s": 83180435, + "id": "Poland_Silesian Voivodeship", + "s": 83180435, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo \u015bl\u0105skie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Kuyavian-Pomeranian Voivodeship", - "s": 33820647, + "id": "Poland_Kuyavian-Pomeranian Voivodeship", + "s": 33820647, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo kujawsko-pomorskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Greater Poland Voivodeship", - "s": 56456034, + "id": "Poland_Greater Poland Voivodeship", + "s": 56456034, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo wielkopolskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Opole Voivodeship", - "s": 22163600, + "id": "Poland_Opole Voivodeship", + "s": 22163600, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo opolskie" - ], + ], "old": [ "Poland" ] - }, + }, { - "id": "Poland_Swietokrzyskie Voivodeship", - "s": 26607395, + "id": "Poland_Swietokrzyskie Voivodeship", + "s": 26607395, "affiliations": [ - "Polska", + "Polska", "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie" - ], + ], "old": [ "Poland" ] } ] - }, + }, { - "id": "Portugal", + "id": "Portugal", "g": [ { - "id": "Portugal_Porto", - "s": 44612561, + "id": "Portugal_Porto", + "s": 44612561, "affiliations": [ - "Centro", - "Norte", + "Centro", + "Norte", "Portugal" - ], + ], "old": [ "Portugal" ] - }, + }, { - "id": "Portugal_South", - "s": 47715612, + "id": "Portugal_South", + "s": 47715612, "affiliations": [ - "Centro", - "Alentejo", - "Algarve", - "Lisboa", + "Centro", + "Alentejo", + "Algarve", + "Lisboa", "Portugal" - ], + ], "old": [ "Portugal" ] - }, + }, { - "id": "Portugal_Islands", - "s": 8104100, + "id": "Portugal_Islands", + "s": 8104100, "affiliations": [ - "Ilh\u00e9u dos Rosais", - "Ilh\u00e9us dos Rosais", - "Illh\u00e9u da Vila", - "Arquip\u00e9lago da Madeira", - "A\u00e7ores", - "Deserta Grande", - "Fradinhos", - "Ilh\u00e9u Alagado", - "Ilh\u00e9u Ch\u00e3o", - "Ilh\u00e9u Maria Vaz", - "Ilha do Bugio", - "Ilh\u00e9u Mole", - "Ilh\u00e9u da Cevada", - "Ilh\u00e9u da Mina", - "Ilh\u00e9u de S\u00e3o Louren\u00e7o", - "Ilh\u00e9u da Praia", - "Ilh\u00e9u da Ribeira da Janela", - "Ilh\u00e9u da Rocha do Navio", - "Ilh\u00e9u da Vila", - "Ilh\u00e9u das Cabras", - "Ilh\u00e9u das Cenouras", - "Ilh\u00e9u das Lago\u00ednhas", - "Ilh\u00e9u de Baixo", - "Ilh\u00e9u de Baixo ou da Cal", - "Ilh\u00e9u do Campan\u00e1rio", - "Ilh\u00e9u de Cima", - "Ilh\u00e9u do Norte", - "Ilh\u00e9u do Topo", - "Ilh\u00e9u de Ferro", - "Ilh\u00e9u do Farol", - "Ilh\u00e9u do Monchique", - "Portugal", + "Ilh\u00e9u dos Rosais", + "Ilh\u00e9us dos Rosais", + "Illh\u00e9u da Vila", + "Arquip\u00e9lago da Madeira", + "A\u00e7ores", + "Deserta Grande", + "Fradinhos", + "Ilh\u00e9u Alagado", + "Ilh\u00e9u Ch\u00e3o", + "Ilh\u00e9u Maria Vaz", + "Ilha do Bugio", + "Ilh\u00e9u Mole", + "Ilh\u00e9u da Cevada", + "Ilh\u00e9u da Mina", + "Ilh\u00e9u de S\u00e3o Louren\u00e7o", + "Ilh\u00e9u da Praia", + "Ilh\u00e9u da Ribeira da Janela", + "Ilh\u00e9u da Rocha do Navio", + "Ilh\u00e9u da Vila", + "Ilh\u00e9u das Cabras", + "Ilh\u00e9u das Cenouras", + "Ilh\u00e9u das Lago\u00ednhas", + "Ilh\u00e9u de Baixo", + "Ilh\u00e9u de Baixo ou da Cal", + "Ilh\u00e9u do Campan\u00e1rio", + "Ilh\u00e9u de Cima", + "Ilh\u00e9u do Norte", + "Ilh\u00e9u do Topo", + "Ilh\u00e9u de Ferro", + "Ilh\u00e9u do Farol", + "Ilh\u00e9u do Monchique", + "Portugal", "Portugal (\u00e1guas territoriais)" - ], + ], "old": [ "Portugal" ] - }, + }, { - "id": "Portugal_Viseu", - "s": 35210556, + "id": "Portugal_Viseu", + "s": 35210556, "affiliations": [ - "Centro", - "Norte", + "Centro", + "Norte", "Portugal" - ], + ], "old": [ "Portugal" ] } ] - }, + }, { - "id": "Qatar", - "s": 5849845, + "id": "Qatar", + "s": 5849845, "affiliations": [ - "Ad Dawhah", - "Al Ghuwariyah", - "Al Jumaliyah", - "Al Khawr", - "Al Wakrah", - "Ar Rayyan", - "Ash Shamal", - "Jariyan Al Batnah", - "Umm Salal", + "Ad Dawhah", + "Al Ghuwariyah", + "Al Jumaliyah", + "Al Khawr", + "Al Wakrah", + "Ar Rayyan", + "Ash Shamal", + "Jariyan Al Batnah", + "Umm Salal", "\u200f\u0642\u0637\u0631\u200e" - ], + ], "old": [ - "Qatar", + "Qatar", "United Arab Emirates" ] - }, + }, { - "id": "Republic of Kosovo", - "s": 9130327, + "id": "Republic of Kosovo", + "s": 9130327, "affiliations": [ "Republika e Kosov\u00ebs" - ], + ], "old": [ "Kosovo" ] - }, + }, { - "id": "Romania", + "id": "Romania", "g": [ { - "id": "Romania_South_East", - "s": 21501240, + "id": "Romania_South_East", + "s": 21501240, "affiliations": [ - "Br\u0103ila", - "Buz\u0103u", - "Constan\u021ba", - "Gala\u021bi", - "Rom\u00e2nia", - "Tulcea", + "Br\u0103ila", + "Buz\u0103u", + "Constan\u021ba", + "Gala\u021bi", + "Rom\u00e2nia", + "Tulcea", "Vrancea" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_Centre", - "s": 37084776, + "id": "Romania_Centre", + "s": 37084776, "affiliations": [ - "Alba", - "Bra\u0219ov", - "Covasna", - "Harghita", - "Mure\u0219", - "Rom\u00e2nia", + "Alba", + "Bra\u0219ov", + "Covasna", + "Harghita", + "Mure\u0219", + "Rom\u00e2nia", "Sibiu" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_West", - "s": 26469890, + "id": "Romania_West", + "s": 26469890, "affiliations": [ - "Arad", - "Cara\u0219 Severin", - "Hunedoara", - "Rom\u00e2nia", + "Arad", + "Cara\u0219 Severin", + "Hunedoara", + "Rom\u00e2nia", "Timi\u0219" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_North_West", - "s": 34546258, + "id": "Romania_North_West", + "s": 34546258, "affiliations": [ - "Bihor", - "Bistri\u021ba-N\u0103s\u0103ud", - "Cluj", - "Maramure\u0219", - "Rom\u00e2nia", - "Satu Mare", + "Bihor", + "Bistri\u021ba-N\u0103s\u0103ud", + "Cluj", + "Maramure\u0219", + "Rom\u00e2nia", + "Satu Mare", "S\u0103laj" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_South_West", - "s": 21023103, + "id": "Romania_South_West", + "s": 21023103, "affiliations": [ - "Dolj", - "Gorj", - "Mehedin\u021bi", - "Olt", - "Rom\u00e2nia", + "Dolj", + "Gorj", + "Mehedin\u021bi", + "Olt", + "Rom\u00e2nia", "V\u00e2lcea" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_North_East", - "s": 30991033, + "id": "Romania_North_East", + "s": 30991033, "affiliations": [ - "Bac\u0103u", - "Boto\u0219ani", - "Ia\u0219i", - "Neam\u021b", - "Rom\u00e2nia", - "Suceava", + "Bac\u0103u", + "Boto\u0219ani", + "Ia\u0219i", + "Neam\u021b", + "Rom\u00e2nia", + "Suceava", "Vaslui" - ], + ], "old": [ "Romania" ] - }, + }, { - "id": "Romania_South", - "s": 37417045, + "id": "Romania_South", + "s": 37417045, "affiliations": [ - "Arge\u0219", - "Bucure\u0219ti", - "D\u00e2mbovi\u021ba", - "C\u0103l\u0103ra\u0219i", - "Giurgiu", - "Ilfov", - "Ialomi\u021ba", - "Municipiul Bucure\u0219ti", - "Prahova", - "Rom\u00e2nia", + "Arge\u0219", + "Bucure\u0219ti", + "D\u00e2mbovi\u021ba", + "C\u0103l\u0103ra\u0219i", + "Giurgiu", + "Ilfov", + "Ialomi\u021ba", + "Municipiul Bucure\u0219ti", + "Prahova", + "Rom\u00e2nia", "Teleorman" - ], + ], "old": [ "Romania" ] } ] - }, + }, { - "id": "Russian Federation", + "id": "Russian Federation", "g": [ { - "id": "Crimea", - "s": 24839137, + "id": "Crimea", + "s": 24839137, "affiliations": [ - "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", - "\u0421\u0435\u0432\u0430\u0441\u0442\u043e\u043f\u043e\u043b\u044c", - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0421\u0435\u0432\u0430\u0441\u0442\u043e\u043f\u043e\u043b\u044c", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c" - ], + ], "old": [ "Crimea" ] - }, + }, { - "id": "Russia_Altai Krai", - "s": 21674892, + "id": "Russia_Altai Krai", + "s": 21674892, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u043b\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Altai Republic", - "s": 6235839, + "id": "Russia_Altai Republic", + "s": 6235839, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0410\u043b\u0442\u0430\u0439" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Amur Oblast", - "s": 7405636, + "id": "Russia_Amur Oblast", + "s": 7405636, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u043c\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Arkhangelsk Oblast_Central", - "s": 50206006, + "id": "Russia_Arkhangelsk Oblast_Central", + "s": 50206006, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Arkhangelsk Oblast_North", - "s": 20470824, + "id": "Russia_Arkhangelsk Oblast_North", + "s": 20470824, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", - "\u0417\u0435\u043c\u043b\u044f \u0424\u0440\u0430\u043d\u0446\u0430-\u0418\u043e\u0441\u0438\u0444\u0430", - "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0417\u0435\u043c\u043b\u044f \u0424\u0440\u0430\u043d\u0446\u0430-\u0418\u043e\u0441\u0438\u0444\u0430", + "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Astrakhan Oblast", - "s": 6572858, + "id": "Russia_Astrakhan Oblast", + "s": 6572858, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Bashkortostan", - "s": 31819321, + "id": "Russia_Bashkortostan", + "s": 31819321, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0430\u0448\u043a\u043e\u0440\u0442\u043e\u0441\u0442\u0430\u043d" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Belgorod Oblast", - "s": 16862330, + "id": "Russia_Belgorod Oblast", + "s": 16862330, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0435\u043b\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Bryansk Oblast", - "s": 14373595, + "id": "Russia_Bryansk Oblast", + "s": 14373595, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0440\u044f\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Buryatia", - "s": 7699815, + "id": "Russia_Buryatia", + "s": 7699815, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0411\u0443\u0440\u044f\u0442\u0438\u044f" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Chechen Republic", - "s": 4675972, + "id": "Russia_Chechen Republic", + "s": 4675972, "affiliations": [ - "\u0427\u0435\u0447\u0435\u043d\u0441\u043a\u0430\u044f \u0440\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0427\u0435\u0447\u0435\u043d\u0441\u043a\u0430\u044f \u0440\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Chelyabinsk Oblast", - "s": 43328142, + "id": "Russia_Chelyabinsk Oblast", + "s": 43328142, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0427\u0435\u043b\u044f\u0431\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Chukotka Autonomous Okrug", - "s": 7179449, + "id": "Russia_Chukotka Autonomous Okrug", + "s": 7179449, "affiliations": [ - "\u0427\u0443\u043a\u043e\u0442\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0427\u0443\u043a\u043e\u0442\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Chuvashia", - "s": 11483536, + "id": "Russia_Chuvashia", + "s": 11483536, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0427\u0443\u0432\u0430\u0448\u0438\u044f" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Ingushetia", - "s": 831050, + "id": "Russia_Ingushetia", + "s": 831050, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0418\u043d\u0433\u0443\u0448\u0435\u0442\u0438\u044f" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Irkutsk Oblast", - "s": 21748566, + "id": "Russia_Irkutsk Oblast", + "s": 21748566, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0418\u0440\u043a\u0443\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Ivanovo Oblast", - "s": 10112803, + "id": "Russia_Ivanovo Oblast", + "s": 10112803, "affiliations": [ - "\u0418\u0432\u0430\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0418\u0432\u0430\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Jewish Autonomous Oblast", - "s": 3931706, + "id": "Russia_Jewish Autonomous Oblast", + "s": 3931706, "affiliations": [ - "\u0415\u0432\u0440\u0435\u0439\u0441\u043a\u0430\u044f \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0415\u0432\u0440\u0435\u0439\u0441\u043a\u0430\u044f \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Kabardino-Balkaria", - "s": 3290175, + "id": "Russia_Kabardino-Balkaria", + "s": 3290175, "affiliations": [ - "\u041a\u0430\u0431\u0430\u0440\u0434\u0438\u043d\u043e-\u0411\u0430\u043b\u043a\u0430\u0440\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041a\u0430\u0431\u0430\u0440\u0434\u0438\u043d\u043e-\u0411\u0430\u043b\u043a\u0430\u0440\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Kaliningrad Oblast", - "s": 7678483, + "id": "Russia_Kaliningrad Oblast", + "s": 7678483, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043b\u0438\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Kaluga Oblast", - "s": 21502978, + "id": "Russia_Kaluga Oblast", + "s": 21502978, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043b\u0443\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Kamchatka Krai", - "s": 9527772, + "id": "Russia_Kamchatka Krai", + "s": 9527772, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0430\u043c\u0447\u0430\u0442\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Karachay-Cherkessia", - "s": 8027460, + "id": "Russia_Karachay-Cherkessia", + "s": 8027460, "affiliations": [ - "\u041a\u0430\u0440\u0430\u0447\u0430\u0435\u0432\u043e-\u0427\u0435\u0440\u043a\u0435\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041a\u0430\u0440\u0430\u0447\u0430\u0435\u0432\u043e-\u0427\u0435\u0440\u043a\u0435\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Kemerov Oblast", - "s": 18142077, + "id": "Russia_Kemerov Oblast", + "s": 18142077, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0435\u043c\u0435\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Khabarovsk Krai", - "s": 42103758, + "id": "Russia_Khabarovsk Krai", + "s": 42103758, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0425\u0430\u0431\u0430\u0440\u043e\u0432\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Khakassia", - "s": 5422556, + "id": "Russia_Khakassia", + "s": 5422556, "affiliations": [ - "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0425\u0430\u043a\u0430\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0425\u0430\u043a\u0430\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Kirov Oblast", - "s": 45331527, + "id": "Russia_Kirov Oblast", + "s": 45331527, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0438\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Komi Republic", - "s": 21710378, + "id": "Russia_Komi Republic", + "s": 21710378, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u043e\u043c\u0438" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Kostroma Oblast", - "s": 7779360, + "id": "Russia_Kostroma Oblast", + "s": 7779360, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u043e\u0441\u0442\u0440\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Krasnodar Krai", - "s": 52354939, + "id": "Russia_Krasnodar Krai", + "s": 52354939, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Krasnodar Krai_Adygeya", - "s": 37255287, + "id": "Russia_Krasnodar Krai_Adygeya", + "s": 37255287, "affiliations": [ - "\u0410\u0434\u044b\u0433\u0435\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0410\u0434\u044b\u0433\u0435\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Krasnoyarsk Krai_North", - "s": 22900232, + "id": "Russia_Krasnoyarsk Krai_North", + "s": 22900232, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Krasnoyarsk Krai_South", - "s": 29287709, + "id": "Russia_Krasnoyarsk Krai_South", + "s": 29287709, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Kurgan Oblast", - "s": 10515522, + "id": "Russia_Kurgan Oblast", + "s": 10515522, "affiliations": [ - "\u041a\u0443\u0440\u0433\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041a\u0443\u0440\u0433\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Kursk Oblast", - "s": 27814579, + "id": "Russia_Kursk Oblast", + "s": 27814579, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041a\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Leningradskaya Oblast_Karelsky", - "s": 24816213, + "id": "Russia_Leningradskaya Oblast_Karelsky", + "s": 24816213, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Leningradskaya Oblast_Southeast", - "s": 45963969, + "id": "Russia_Leningradskaya Oblast_Southeast", + "s": 45963969, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Lipetsk Oblast", - "s": 21790299, + "id": "Russia_Lipetsk Oblast", + "s": 21790299, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0438\u043f\u0435\u0446\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Magadan Oblast", - "s": 3734440, + "id": "Russia_Magadan Oblast", + "s": 3734440, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u0430\u0433\u0430\u0434\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Mari El", - "s": 13515227, + "id": "Russia_Mari El", + "s": 13515227, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u0430\u0440\u0438\u0439 \u042d\u043b" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Moscow Oblast_East", - "s": 50668964, + "id": "Russia_Moscow Oblast_East", + "s": 50668964, "affiliations": [ - "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Moscow Oblast_West", - "s": 28795117, + "id": "Russia_Moscow Oblast_West", + "s": 28795117, "affiliations": [ - "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0441\u043a\u0432\u0430" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Moscow", - "s": 37612889, + "id": "Russia_Moscow", + "s": 37612889, "affiliations": [ - "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0441\u043a\u0432\u0430" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Murmansk Oblast", - "s": 31608516, + "id": "Russia_Murmansk Oblast", + "s": 31608516, "affiliations": [ - "\u041c\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041c\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Nenets Autonomous Okrug", - "s": 12851621, + "id": "Russia_Nenets Autonomous Okrug", + "s": 12851621, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Nizhny Novgorod Oblast", - "s": 37737330, + "id": "Russia_Nizhny Novgorod Oblast", + "s": 37737330, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u0438\u0436\u0435\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_North Ossetia-Alania", - "s": 2901801, + "id": "Russia_North Ossetia-Alania", + "s": 2901801, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f - \u0410\u043b\u0430\u043d\u0438\u044f" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Novgorod Oblast", - "s": 13847368, + "id": "Russia_Novgorod Oblast", + "s": 13847368, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u043e\u0432\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Novosibirsk Oblast", - "s": 40867452, + "id": "Russia_Novosibirsk Oblast", + "s": 40867452, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041d\u043e\u0432\u043e\u0441\u0438\u0431\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Omsk Oblast", - "s": 30307312, + "id": "Russia_Omsk Oblast", + "s": 30307312, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Orenburg Oblast", - "s": 21914539, + "id": "Russia_Orenburg Oblast", + "s": 21914539, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041e\u0440\u0435\u043d\u0431\u0443\u0440\u0433\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Oryol Oblast", - "s": 4877342, + "id": "Russia_Oryol Oblast", + "s": 4877342, "affiliations": [ - "\u041e\u0440\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041e\u0440\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Penza Oblast", - "s": 13960648, + "id": "Russia_Penza Oblast", + "s": 13960648, "affiliations": [ - "\u041f\u0435\u043d\u0437\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041f\u0435\u043d\u0437\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Perm Krai_North", - "s": 23678526, + "id": "Russia_Perm Krai_North", + "s": 23678526, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Perm Krai_South", - "s": 35542379, + "id": "Russia_Perm Krai_South", + "s": 35542379, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Primorsky Krai", - "s": 17563108, + "id": "Russia_Primorsky Krai", + "s": 17563108, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041f\u0440\u0438\u043c\u043e\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Pskov Oblast", - "s": 24727085, + "id": "Russia_Pskov Oblast", + "s": 24727085, "affiliations": [ - "\u041f\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u041f\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Republic of Dagestan", - "s": 8014476, + "id": "Russia_Republic of Dagestan", + "s": 8014476, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0414\u0430\u0433\u0435\u0441\u0442\u0430\u043d" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Republic of Kalmykia", - "s": 3490639, + "id": "Russia_Republic of Kalmykia", + "s": 3490639, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", - "\u041a\u0430\u043b\u043c\u044b\u043a\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u041a\u0430\u043b\u043c\u044b\u043a\u0438\u044f", "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Republic of Karelia_North", - "s": 32161506, + "id": "Russia_Republic of Karelia_North", + "s": 32161506, "affiliations": [ - "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Republic of Karelia_South", - "s": 23853341, + "id": "Russia_Republic of Karelia_South", + "s": 23853341, "affiliations": [ - "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Republic of Mordovia", - "s": 11553212, + "id": "Russia_Republic of Mordovia", + "s": 11553212, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041c\u043e\u0440\u0434\u043e\u0432\u0438\u044f" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Rostov Oblast", - "s": 37043207, + "id": "Russia_Rostov Oblast", + "s": 37043207, "affiliations": [ - "\u0420\u043e\u0441\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Ryazan Oblast", - "s": 16531941, + "id": "Russia_Ryazan Oblast", + "s": 16531941, "affiliations": [ - "\u0420\u044f\u0437\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u044f\u0437\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Saint Petersburg", - "s": 28253867, + "id": "Russia_Saint Petersburg", + "s": 28253867, "affiliations": [ - "\u0421\u0430\u043d\u043a\u0442-\u041f\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0421\u0430\u043d\u043a\u0442-\u041f\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Sakha Republic", - "s": 45071238, + "id": "Russia_Sakha Republic", + "s": 45071238, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0421\u0430\u0445\u0430 (\u042f\u043a\u0443\u0442\u0438\u044f)" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Sakhalin Oblast", - "s": 23948689, + "id": "Russia_Sakhalin Oblast", + "s": 23948689, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0430\u0445\u0430\u043b\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Far Eastern" ] - }, + }, { - "id": "Russia_Samara Oblast", - "s": 25034174, + "id": "Russia_Samara Oblast", + "s": 25034174, "affiliations": [ - "\u0421\u0430\u043c\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0421\u0430\u043c\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Saratov Oblast", - "s": 19002949, + "id": "Russia_Saratov Oblast", + "s": 19002949, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0430\u0440\u0430\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Smolensk Oblast", - "s": 14793263, + "id": "Russia_Smolensk Oblast", + "s": 14793263, "affiliations": [ - "\u0421\u043c\u043e\u043b\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0421\u043c\u043e\u043b\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Stavropol Krai", - "s": 19789572, + "id": "Russia_Stavropol Krai", + "s": 19789572, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0442\u0430\u0432\u0440\u043e\u043f\u043e\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_North Caucasian" ] - }, + }, { - "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", - "s": 32150641, + "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", + "s": 32150641, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Sverdlovsk Oblast_North", - "s": 28793094, + "id": "Russia_Sverdlovsk Oblast_North", + "s": 28793094, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Tambov Oblast", - "s": 8802461, + "id": "Russia_Tambov Oblast", + "s": 8802461, "affiliations": [ - "\u0422\u0430\u043c\u0431\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0422\u0430\u043c\u0431\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Tatarstan", - "s": 33813096, + "id": "Russia_Tatarstan", + "s": 33813096, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0430\u0442\u0430\u0440\u0441\u0442\u0430\u043d" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Tomsk Oblast", - "s": 14912801, + "id": "Russia_Tomsk Oblast", + "s": 14912801, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Tula Oblast", - "s": 14952095, + "id": "Russia_Tula Oblast", + "s": 14952095, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0443\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Tuva", - "s": 2617587, + "id": "Russia_Tuva", + "s": 2617587, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u044b\u0432\u0430" - ], + ], "old": [ "Russia_Siberian" ] - }, + }, { - "id": "Russia_Tver Oblast", - "s": 30556919, + "id": "Russia_Tver Oblast", + "s": 30556919, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0422\u0432\u0435\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Tyumen Oblast", - "s": 17853218, + "id": "Russia_Tyumen Oblast", + "s": 17853218, "affiliations": [ - "\u0422\u044e\u043c\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0422\u044e\u043c\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Udmurt Republic", - "s": 20201393, + "id": "Russia_Udmurt Republic", + "s": 20201393, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0423\u0434\u043c\u0443\u0440\u0442\u0438\u044f" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Ulyanovsk Oblast", - "s": 12577989, + "id": "Russia_Ulyanovsk Oblast", + "s": 12577989, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0423\u043b\u044c\u044f\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Volga" ] - }, + }, { - "id": "Russia_Vladimir Oblast", - "s": 32671941, + "id": "Russia_Vladimir Oblast", + "s": 32671941, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043b\u0430\u0434\u0438\u043c\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Volgograd Oblast", - "s": 29354802, + "id": "Russia_Volgograd Oblast", + "s": 29354802, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u043b\u0433\u043e\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Southern" ] - }, + }, { - "id": "Russia_Vologda Oblast", - "s": 26722526, + "id": "Russia_Vologda Oblast", + "s": 26722526, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u043b\u043e\u0433\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Northwestern" ] - }, + }, { - "id": "Russia_Voronezh Oblast", - "s": 29599992, + "id": "Russia_Voronezh Oblast", + "s": 29599992, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0412\u043e\u0440\u043e\u043d\u0435\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Yamalo-Nenets Autonomous Okrug", - "s": 16627442, + "id": "Russia_Yamalo-Nenets Autonomous Okrug", + "s": 16627442, "affiliations": [ - "\u042f\u043c\u0430\u043b\u043e-\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u042f\u043c\u0430\u043b\u043e-\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Yaroslavl Oblast", - "s": 26778004, + "id": "Russia_Yaroslavl Oblast", + "s": 26778004, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u042f\u0440\u043e\u0441\u043b\u0430\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Russia_Central" ] - }, + }, { - "id": "Russia_Yugra_Khanty", - "s": 33170107, + "id": "Russia_Yugra_Khanty", + "s": 33170107, "affiliations": [ - "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Yugra_Surgut", - "s": 24917769, + "id": "Russia_Yugra_Surgut", + "s": 24917769, "affiliations": [ - "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", - "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", + "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f" - ], + ], "old": [ "Russia_Urals" ] - }, + }, { - "id": "Russia_Zabaykalsky Krai", - "s": 13604656, + "id": "Russia_Zabaykalsky Krai", + "s": 13604656, "affiliations": [ - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", "\u0417\u0430\u0431\u0430\u0439\u043a\u0430\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439" - ], + ], "old": [ "Russia_Siberian" ] } ] - }, + }, { - "id": "Rwanda", - "s": 5701857, + "id": "Rwanda", + "s": 5701857, "affiliations": [ - "Amajvepfo", - "Iburasirasuba", - "Iburengerazuba", - "Majyaruguru", - "Rwanda", + "Amajvepfo", + "Iburasirasuba", + "Iburengerazuba", + "Majyaruguru", + "Rwanda", "Umujyi wa Kigali" - ], + ], "old": [ "Rwanda" ] - }, + }, { - "id": "Sahrawi Arab Democratic Republic", - "s": 248851, + "id": "Sahrawi Arab Democratic Republic", + "s": 248851, "affiliations": [ - "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "RASD" - ], + ], "old": [ "Sahrawi" ] - }, + }, { - "id": "Saint Helena Ascension and Tristan da Cunha", - "s": 257269, + "id": "Saint Helena Ascension and Tristan da Cunha", + "s": 257269, "affiliations": [ - "Gough Island", - "Inaccessible Island", - "Nightingale Island", - "Saint Helena, Ascension and Tristan da Cunha", + "Gough Island", + "Inaccessible Island", + "Nightingale Island", + "Saint Helena, Ascension and Tristan da Cunha", "Tristan da Cunha" - ], + ], "old": [ "Saint Helena, Ascension and Tristan da Cunha" ] - }, + }, { - "id": "Samoa", - "s": 1699579, + "id": "Samoa", + "s": 1699579, "affiliations": [ - "American Samoa", - "S\u0101moa", + "American Samoa", + "S\u0101moa", "United States of America" - ], + ], "old": [ - "Samoa", + "Samoa", "American Samoa" ] - }, + }, { - "id": "San Marino", - "s": 326831, + "id": "San Marino", + "s": 326831, "affiliations": [ - "Italia", + "Italia", "San Marino" - ], + ], "old": [ - "Italy", + "Italy", "San Marino" ] - }, + }, { - "id": "Saudi Arabia", + "id": "Saudi Arabia", "g": [ { - "id": "Saudi Arabia_South", - "s": 35113262, + "id": "Saudi Arabia_South", + "s": 35113262, "affiliations": [ - "\u0639\u0633\u064a\u0631", - "\u062c\u0627\u0632\u0627\u0646", - "\u0646\u062c\u0631\u0627\u0646", - "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0631\u064a\u0627\u0636", - "\u0627\u0644\u0634\u0631\u0642\u064a\u0629", + "\u0639\u0633\u064a\u0631", + "\u062c\u0627\u0632\u0627\u0646", + "\u0646\u062c\u0631\u0627\u0646", + "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0631\u064a\u0627\u0636", + "\u0627\u0644\u0634\u0631\u0642\u064a\u0629", "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e" - ], + ], "old": [ "Saudi Arabia" ] - }, + }, { - "id": "Saudi Arabia_North", - "s": 28946370, + "id": "Saudi Arabia_North", + "s": 28946370, "affiliations": [ - "\u0645\u0643\u0629 \u0627\u0644\u0645\u0643\u0631\u0645\u0629", - "\u062a\u0628\u0648\u0643", - "\u062d\u0627\u0626\u0644", - "\u0627\u0644\u062c\u0648\u0641", - "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0642\u0635\u064a\u0645", - "\u0627\u0644\u0628\u0627\u062d\u0629", - "\u0627\u0644\u062d\u062f\u0648\u062f \u0627\u0644\u0634\u0645\u0627\u0644\u064a", - "\u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0627\u0644\u0645\u0646\u0648\u0631\u0629", + "\u0645\u0643\u0629 \u0627\u0644\u0645\u0643\u0631\u0645\u0629", + "\u062a\u0628\u0648\u0643", + "\u062d\u0627\u0626\u0644", + "\u0627\u0644\u062c\u0648\u0641", + "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0642\u0635\u064a\u0645", + "\u0627\u0644\u0628\u0627\u062d\u0629", + "\u0627\u0644\u062d\u062f\u0648\u062f \u0627\u0644\u0634\u0645\u0627\u0644\u064a", + "\u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0627\u0644\u0645\u0646\u0648\u0631\u0629", "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e" - ], + ], "old": [ "Saudi Arabia" ] } ] - }, + }, { - "id": "Senegal", - "s": 40844614, + "id": "Senegal", + "s": 40844614, "affiliations": [ - "Basse", - "Janjanbureh", - "Mansakonko", - "Regi\u00e3o de Cacheu", + "Basse", + "Janjanbureh", + "Mansakonko", + "Regi\u00e3o de Cacheu", "Senegal" - ], + ], "old": [ "Senegal" ] - }, + }, { - "id": "Serbia", - "s": 47432195, + "id": "Serbia", + "s": 47432195, "affiliations": [ - "\u0421\u0440\u0431\u0438\u0458\u0430", - "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430", + "\u0421\u0440\u0431\u0438\u0458\u0430", + "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430", "\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u0430 \u0421\u0440\u0431\u0438\u0458\u0430" - ], + ], "old": [ "Serbia" ] - }, + }, { - "id": "Seychelles", - "s": 465927, + "id": "Seychelles", + "s": 465927, "affiliations": [ "Sesel" - ], + ], "old": [ "Seychelles" ] - }, + }, { - "id": "Sierra Leone", - "s": 21993206, + "id": "Sierra Leone", + "s": 21993206, "affiliations": [ - "Eastern Province", - "Northern Province", - "Sierra Leone", - "Southern Province", + "Eastern Province", + "Northern Province", + "Sierra Leone", + "Southern Province", "Western Area" - ], + ], "old": [ "Sierra Leone" ] - }, + }, { - "id": "Singapore", - "s": 6984219, + "id": "Singapore", + "s": 6984219, "affiliations": [ - "Johor", - "Malaysia", + "Johor", + "Malaysia", "Singapura" - ], + ], "old": [ "Singapore" ] - }, + }, { - "id": "Slovakia", + "id": "Slovakia", "g": [ { - "id": "Slovakia_Region of Presov", - "s": 18001563, + "id": "Slovakia_Region of Presov", + "s": 18001563, "affiliations": [ - "Pre\u0161ovsk\u00fd kraj", + "Pre\u0161ovsk\u00fd kraj", "Slovensko" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Kosice", - "s": 16728975, + "id": "Slovakia_Region of Kosice", + "s": 16728975, "affiliations": [ - "Ko\u0161ick\u00fd kraj", + "Ko\u0161ick\u00fd kraj", "Slovensko" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Banska Bystrica", - "s": 19420847, + "id": "Slovakia_Region of Banska Bystrica", + "s": 19420847, "affiliations": [ - "Banskobystrick\u00fd kraj", + "Banskobystrick\u00fd kraj", "Slovensko" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Trnava", - "s": 11824000, + "id": "Slovakia_Region of Trnava", + "s": 11824000, "affiliations": [ - "Slovensko", + "Slovensko", "Trnavsk\u00fd kraj" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Trencin", - "s": 14641266, + "id": "Slovakia_Region of Trencin", + "s": 14641266, "affiliations": [ - "Slovensko", + "Slovensko", "Tren\u010diansky kraj" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Nitra", - "s": 14907765, + "id": "Slovakia_Region of Nitra", + "s": 14907765, "affiliations": [ - "Nitriansky kraj", + "Nitriansky kraj", "Slovensko" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Bratislava", - "s": 11458620, + "id": "Slovakia_Region of Bratislava", + "s": 11458620, "affiliations": [ - "Bratislavsk\u00fd kraj", + "Bratislavsk\u00fd kraj", "Slovensko" - ], + ], "old": [ "Slovakia" ] - }, + }, { - "id": "Slovakia_Region of Zilina", - "s": 18410619, + "id": "Slovakia_Region of Zilina", + "s": 18410619, "affiliations": [ - "Slovensko", + "Slovensko", "\u017dilinsk\u00fd kraj" - ], + ], "old": [ "Slovakia" ] } ] - }, + }, { - "id": "Slovenia", + "id": "Slovenia", "g": [ { - "id": "Slovenia_East", - "s": 39720108, + "id": "Slovenia_East", + "s": 39720108, "affiliations": [ - "Border SI-HR", + "Border SI-HR", "Slovenija" - ], + ], "old": [ "Slovenia" ] - }, + }, { - "id": "Slovenia_West", - "s": 53350109, + "id": "Slovenia_West", + "s": 53350109, "affiliations": [ "Slovenija" - ], + ], "old": [ "Slovenia" ] } ] - }, + }, { - "id": "Solomon Islands", - "s": 1439227, + "id": "Solomon Islands", + "s": 1439227, "affiliations": [ - "Capital Territory", - "Central Province", - "Choiseul Province", - "Guadalcanal Province", - "Isabel Province", - "Makira-Ulawa Province", - "Malaita Province", - "Rennell and Bellona Province", - "Solomon Islands", - "Temotu Province", + "Capital Territory", + "Central Province", + "Choiseul Province", + "Guadalcanal Province", + "Isabel Province", + "Makira-Ulawa Province", + "Malaita Province", + "Rennell and Bellona Province", + "Solomon Islands", + "Temotu Province", "Western Province" - ], + ], "old": [ "Solomon Islands" ] - }, + }, { - "id": "Somalia", - "s": 17709889, + "id": "Somalia", + "s": 17709889, "affiliations": [ - "Awdal", - "Bakool", - "Banadir", - "Bari", - "Bay", - "Galgaduud", - "Gedo", - "Hiiraan", - "Jubbada Dhexe", - "Jubbada Hoose", - "Nugaal", - "Mudug", - "Shabeellaha Hoose", - "Sanaag", - "Shabeellaha Dhexe", - "Sool", - "Soomaaliya", - "Togdheer", + "Awdal", + "Bakool", + "Banadir", + "Bari", + "Bay", + "Galgaduud", + "Gedo", + "Hiiraan", + "Jubbada Dhexe", + "Jubbada Hoose", + "Nugaal", + "Mudug", + "Shabeellaha Hoose", + "Sanaag", + "Shabeellaha Dhexe", + "Sool", + "Soomaaliya", + "Togdheer", "Woqooyi Galbeed" - ], + ], "old": [ "Somalia" ] - }, + }, { - "id": "South Africa", + "id": "South Africa", "g": [ { - "id": "South Africa_Western Cape", - "s": 25613746, + "id": "South Africa_Western Cape", + "s": 25613746, "affiliations": [ - "Prince Edward Islands", - "South Africa", + "Prince Edward Islands", + "South Africa", "Western Cape" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Gauteng", - "s": 28435680, + "id": "South Africa_Gauteng", + "s": 28435680, "affiliations": [ - "Gauteng", + "Gauteng", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_North West", - "s": 8827144, + "id": "South Africa_North West", + "s": 8827144, "affiliations": [ - "North West", + "North West", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Free State", - "s": 10634250, + "id": "South Africa_Free State", + "s": 10634250, "affiliations": [ - "Free State", + "Free State", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Eastern Cape", - "s": 15307435, + "id": "South Africa_Eastern Cape", + "s": 15307435, "affiliations": [ - "Eastern Cape", + "Eastern Cape", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Northern Cape", - "s": 7881739, + "id": "South Africa_Northern Cape", + "s": 7881739, "affiliations": [ - "Northern Cape", + "Northern Cape", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Mpumalanga", - "s": 8919705, + "id": "South Africa_Mpumalanga", + "s": 8919705, "affiliations": [ - "Mpumalanga", + "Mpumalanga", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_Limpopo", - "s": 13643549, + "id": "South Africa_Limpopo", + "s": 13643549, "affiliations": [ - "Limpopo", + "Limpopo", "South Africa" - ], + ], "old": [ "South Africa" ] - }, + }, { - "id": "South Africa_KwaZulu-Natal", - "s": 20415775, + "id": "South Africa_KwaZulu-Natal", + "s": 20415775, "affiliations": [ - "KwaZulu-Natal", + "KwaZulu-Natal", "South Africa" - ], + ], "old": [ "South Africa" ] } ] - }, + }, { - "id": "South Georgia and the South Sandwich Islands", - "s": 310245, + "id": "South Georgia and the South Sandwich Islands", + "s": 310245, "affiliations": [ - "Freezland Rock", + "Freezland Rock", "South Georgia and South Sandwich Islands" - ], + ], "old": [ "South Georgia and the South Sandwich Islands" ] - }, + }, { - "id": "South Ossetia", - "s": 1508781, + "id": "South Ossetia", + "s": 1508781, "affiliations": [ - "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", - "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", + "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", + "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd" - ], + ], "old": [ "Georgia" ] - }, + }, { - "id": "South Sudan", - "s": 25495742, + "id": "South Sudan", + "s": 25495742, "affiliations": [ - "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", - "Central Equatoria", - "Eastern Equatoria", - "Lakes", - "Jonglei", - "Northern Bahr el Ghazal State", - "South Sudan", - "Unity State", - "Upper Nile State", - "Western Bahr el Ghazal State", - "Western Equatoria", + "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", + "Central Equatoria", + "Eastern Equatoria", + "Lakes", + "Jonglei", + "Northern Bahr el Ghazal State", + "South Sudan", + "Unity State", + "Upper Nile State", + "Western Bahr el Ghazal State", + "Western Equatoria", "\u0648\u0627\u0631\u0627\u0628" - ], + ], "old": [ "South Sudan" ] - }, + }, { - "id": "Spain", + "id": "Spain", "g": [ { - "id": "Spain_Andalusia_Granada", - "s": 33568894, + "id": "Spain_Andalusia_Granada", + "s": 33568894, "affiliations": [ - "Andaluc\u00eda", - "Espa\u00f1a (mare territorial)", + "Andaluc\u00eda", + "Espa\u00f1a (mare territorial)", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Andalusia_Sevilla", - "s": 44165834, + "id": "Spain_Andalusia_Sevilla", + "s": 44165834, "affiliations": [ - "Andaluc\u00eda", + "Andaluc\u00eda", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Aragon", - "s": 28245636, + "id": "Spain_Aragon", + "s": 28245636, "affiliations": [ - "Arag\u00f3n", + "Arag\u00f3n", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Balearic Islands", - "s": 15823697, + "id": "Spain_Balearic Islands", + "s": 15823697, "affiliations": [ - "Illes Balears", + "Illes Balears", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Basque Country", - "s": 26995459, + "id": "Spain_Basque Country", + "s": 26995459, "affiliations": [ - "Castilla y Le\u00f3n", - "Espa\u00f1a", + "Castilla y Le\u00f3n", + "Espa\u00f1a", "Euskadi" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Canary Islands", - "s": 24985836, + "id": "Spain_Canary Islands", + "s": 24985836, "affiliations": [ - "Canarias", + "Canarias", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Cantabria", - "s": 13638465, + "id": "Spain_Cantabria", + "s": 13638465, "affiliations": [ - "Cantabria", + "Cantabria", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Castile and Leon_West", - "s": 45416150, + "id": "Spain_Castile and Leon_West", + "s": 45416150, "affiliations": [ - "Castilla y Le\u00f3n", + "Castilla y Le\u00f3n", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Castile and Leon_East", - "s": 33191029, + "id": "Spain_Castile and Leon_East", + "s": 33191029, "affiliations": [ - "Castilla y Le\u00f3n", + "Castilla y Le\u00f3n", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Castile-La Mancha", - "s": 47946035, + "id": "Spain_Castile-La Mancha", + "s": 47946035, "affiliations": [ - "Castilla-La Mancha", + "Castilla-La Mancha", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Catalonia_Provincia de Barcelona", - "s": 36215607, + "id": "Spain_Catalonia_Provincia de Barcelona", + "s": 36215607, "affiliations": [ - "Catalunya", + "Catalunya", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Catalonia_Provincia de Girona", - "s": 18631977, + "id": "Spain_Catalonia_Provincia de Girona", + "s": 18631977, "affiliations": [ - "Catalunya", + "Catalunya", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Catalonia_Provincia de Lleida", - "s": 17943220, + "id": "Spain_Catalonia_Provincia de Lleida", + "s": 17943220, "affiliations": [ - "Catalunya", + "Catalunya", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Catalonia_Provincia de Tarragona", - "s": 13709272, + "id": "Spain_Catalonia_Provincia de Tarragona", + "s": 13709272, "affiliations": [ - "Catalunya", + "Catalunya", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Ceuta", - "s": 283228, + "id": "Spain_Ceuta", + "s": 283228, "affiliations": [ - "Ceuta", - "Espa\u00f1a", + "Ceuta", + "Espa\u00f1a", "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Community of Madrid", - "s": 36599941, + "id": "Spain_Community of Madrid", + "s": 36599941, "affiliations": [ - "Comunidad de Madrid", + "Comunidad de Madrid", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Comunidad Foral de Navarra", - "s": 11631856, + "id": "Spain_Comunidad Foral de Navarra", + "s": 11631856, "affiliations": [ - "Comunidad Foral de Navarra", + "Comunidad Foral de Navarra", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Extremadura", - "s": 20154402, + "id": "Spain_Extremadura", + "s": 20154402, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Extremadura" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Galicia_North", - "s": 32792184, + "id": "Spain_Galicia_North", + "s": 32792184, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Galicia" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Galicia_South", - "s": 26832426, + "id": "Spain_Galicia_South", + "s": 26832426, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Galicia" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_La Rioja", - "s": 4861058, + "id": "Spain_La Rioja", + "s": 4861058, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "La Rioja" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Melilla", - "s": 633410, + "id": "Spain_Melilla", + "s": 633410, "affiliations": [ - "Espa\u00f1a", - "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", + "Espa\u00f1a", + "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", "Melilla" - ], + ], "old": [ - "Morocco", + "Morocco", "Spain" ] - }, + }, { - "id": "Spain_Principado de Asturias", - "s": 17353413, + "id": "Spain_Principado de Asturias", + "s": 17353413, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Principado de Asturias" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Region de Murcia", - "s": 16474149, + "id": "Spain_Region de Murcia", + "s": 16474149, "affiliations": [ - "Espa\u00f1a", + "Espa\u00f1a", "Regi\u00f3n de Murcia" - ], + ], "old": [ "Spain" ] - }, + }, { - "id": "Spain_Valencian Community", - "s": 50407296, + "id": "Spain_Valencian Community", + "s": 50407296, "affiliations": [ - "Comunitat Valenciana", + "Comunitat Valenciana", "Espa\u00f1a" - ], + ], "old": [ "Spain" ] } ] - }, + }, { - "id": "Palestine Region", + "id": "Palestine Region", "g": [ { - "id": "Jerusalem", - "s": 3631556, + "id": "Jerusalem", + "s": 3631556, "affiliations": [ - "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", + "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" - ], + ], "old": [ - "Israel", + "Israel", "Palestine" ] - }, + }, { - "id": "Palestine", - "s": 17787534, + "id": "Palestine", + "s": 17787534, "affiliations": [ - "Area A", - "Area B", + "Area A", + "Area B", "Area C" - ], + ], "old": [ "Palestine" ] } ] - }, + }, { - "id": "Sri Lanka", - "s": 32926649, + "id": "Sri Lanka", + "s": 32926649, "affiliations": [ - "Central Province", - "Eastern Province", - "Uva Province", - "North Central", - "North Western Province", - "Northern Province", - "Sabaragamuwa Province", - "Southern Province", - "Western Province", + "Central Province", + "Eastern Province", + "Uva Province", + "North Central", + "North Western Province", + "Northern Province", + "Sabaragamuwa Province", + "Southern Province", + "Western Province", "\u0dc1\u0dca\u200d\u0dbb\u0dd3 \u0dbd\u0d82\u0d9a\u0dcf" - ], + ], "old": [ "Sri Lanka" ] - }, + }, { - "id": "Sudan", + "id": "Sudan", "g": [ { - "id": "Sudan_East", - "s": 13720889, + "id": "Sudan_East", + "s": 13720889, "affiliations": [ - "Al Ba\u1e29r al A\u1e29mar", - "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", - "al-Jazeera", - "al-Khartum", - "Kassala", - "Nahr an-Nil", - "Sannar", - "al-Qadarif", - "an-Nil al-Abyad", - "an-Nil al-Azraq", + "Al Ba\u1e29r al A\u1e29mar", + "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", + "al-Jazeera", + "al-Khartum", + "Kassala", + "Nahr an-Nil", + "Sannar", + "al-Qadarif", + "an-Nil al-Abyad", + "an-Nil al-Azraq", "ash-Shamaliyah" - ], + ], "old": [ "Sudan" ] - }, + }, { - "id": "Sudan_West", - "s": 55127147, + "id": "Sudan_West", + "s": 55127147, "affiliations": [ - "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", - "Gharb Darfur", - "al-Jazeera", - "al-Khartum", - "Janub Kurdufan", - "Jonub Darfur", - "Nahr an-Nil", - "Shamal Darfur", - "Shamal Kurdufan", - "Sannar", - "Sharq Darfur", - "South Sudan", - "Wasat Darfur", - "an-Nil al-Abyad", - "ash-Shamaliyah", + "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", + "Gharb Darfur", + "al-Jazeera", + "al-Khartum", + "Janub Kurdufan", + "Jonub Darfur", + "Nahr an-Nil", + "Shamal Darfur", + "Shamal Kurdufan", + "Sannar", + "Sharq Darfur", + "South Sudan", + "Wasat Darfur", + "an-Nil al-Abyad", + "ash-Shamaliyah", "\u0648\u0627\u0631\u0627\u0628" - ], + ], "old": [ "Sudan" ] } ] - }, + }, { - "id": "Suriname", - "s": 4508104, + "id": "Suriname", + "s": 4508104, "affiliations": [ - "Brokopondo", - "Commewijne", - "Coronie", - "Marowijne", - "Nickerie", - "Para", - "Paramaribo", - "Saramacca", - "Sipaliwini", - "Suriname", + "Brokopondo", + "Commewijne", + "Coronie", + "Marowijne", + "Nickerie", + "Para", + "Paramaribo", + "Saramacca", + "Sipaliwini", + "Suriname", "Wanica" - ], + ], "old": [ "Suriname" ] - }, + }, { - "id": "Swaziland", - "s": 10485874, + "id": "Swaziland", + "s": 10485874, "affiliations": [ - "Sifundza seHhohho", - "Sifundza seLubombo", - "Sifundza seManzini", - "Sifundza seShiselweni", + "Sifundza seHhohho", + "Sifundza seLubombo", + "Sifundza seManzini", + "Sifundza seShiselweni", "Swatini" - ], + ], "old": [ "Swaziland" ] - }, + }, { - "id": "Sweden", + "id": "Sweden", "g": [ { - "id": "Sweden_Malardalen", - "s": 24574887, + "id": "Sweden_Malardalen", + "s": 24574887, "affiliations": [ - "S\u00f6dermanlands l\u00e4n", - "Sverige", - "Uppsala l\u00e4n", + "S\u00f6dermanlands l\u00e4n", + "Sverige", + "Uppsala l\u00e4n", "V\u00e4stmanlands l\u00e4n" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Stockholm", - "s": 37178486, + "id": "Sweden_Stockholm", + "s": 37178486, "affiliations": [ - "Stockholms l\u00e4n", + "Stockholms l\u00e4n", "Sverige" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Ostra Gotaland", - "s": 46016443, + "id": "Sweden_Ostra Gotaland", + "s": 46016443, "affiliations": [ - "Gotlands l\u00e4n", - "J\u00f6nk\u00f6pings l\u00e4n", - "Kalmar l\u00e4n", - "Kronobergs l\u00e4n", - "\u00d6sterg\u00f6tlands l\u00e4n", - "Stockholms l\u00e4n", - "Sverige", + "Gotlands l\u00e4n", + "J\u00f6nk\u00f6pings l\u00e4n", + "Kalmar l\u00e4n", + "Kronobergs l\u00e4n", + "\u00d6sterg\u00f6tlands l\u00e4n", + "Stockholms l\u00e4n", + "Sverige", "Territorial waters of Gotland" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Norra Sverige", - "s": 30840983, + "id": "Sweden_Norra Sverige", + "s": 30840983, "affiliations": [ - "Norrbottens l\u00e4n", - "Sverige", + "Norrbottens l\u00e4n", + "Sverige", "V\u00e4sterbottens l\u00e4n" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Mellannorrland", - "s": 22859034, + "id": "Sweden_Mellannorrland", + "s": 22859034, "affiliations": [ - "J\u00e4mtlands l\u00e4n", - "Sverige", + "J\u00e4mtlands l\u00e4n", + "Sverige", "V\u00e4sternorrlands l\u00e4n" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Bergslagen", - "s": 49426483, + "id": "Sweden_Bergslagen", + "s": 49426483, "affiliations": [ - "Dalarnas l\u00e4n", - "G\u00e4vleborgs l\u00e4n", - "\u00d6rebro l\u00e4n", - "Sverige", + "Dalarnas l\u00e4n", + "G\u00e4vleborgs l\u00e4n", + "\u00d6rebro l\u00e4n", + "Sverige", "V\u00e4rmlands l\u00e4n" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Vastra Gotaland", - "s": 52771321, + "id": "Sweden_Vastra Gotaland", + "s": 52771321, "affiliations": [ - "Danmark", - "Hallands l\u00e4n", - "Sverige", + "Danmark", + "Hallands l\u00e4n", + "Sverige", "V\u00e4stra G\u00f6talands l\u00e4n" - ], + ], "old": [ "Sweden" ] - }, + }, { - "id": "Sweden_Sodra Gotaland", - "s": 37772842, + "id": "Sweden_Sodra Gotaland", + "s": 37772842, "affiliations": [ - "Blekinge l\u00e4n", - "Danmark", - "Sk\u00e5ne l\u00e4n", - "Sverige", + "Blekinge l\u00e4n", + "Danmark", + "Sk\u00e5ne l\u00e4n", + "Sverige", "Territorial waters of Bornholm" - ], + ], "old": [ "Sweden" ] } ] - }, + }, { - "id": "Switzerland", + "id": "Switzerland", "g": [ { - "id": "Switzerland_Eastern", - "s": 36913572, + "id": "Switzerland_Eastern", + "s": 36913572, "affiliations": [ - "Appenzell Ausserrhoden", - "Appenzell Innerrhoden", - "Glarus", - "Graub\u00fcnden - Grigioni - Grischun", - "Sankt Gallen", - "Schaffhausen", - "Schweiz, Suisse, Svizzera, Svizra", + "Appenzell Ausserrhoden", + "Appenzell Innerrhoden", + "Glarus", + "Graub\u00fcnden - Grigioni - Grischun", + "Sankt Gallen", + "Schaffhausen", + "Schweiz, Suisse, Svizzera, Svizra", "Thurgau" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Central", - "s": 17764716, + "id": "Switzerland_Central", + "s": 17764716, "affiliations": [ - "Luzern", - "Nidwalden", - "Obwalden", - "Schweiz, Suisse, Svizzera, Svizra", - "Schwyz", - "Uri", + "Luzern", + "Nidwalden", + "Obwalden", + "Schweiz, Suisse, Svizzera, Svizra", + "Schwyz", + "Uri", "Zug" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Espace Mittelland_Bern", - "s": 38750947, + "id": "Switzerland_Espace Mittelland_Bern", + "s": 38750947, "affiliations": [ - "Basel-Landschaft", - "Bern - Berne", - "Fribourg - Freiburg", - "Jura", - "Neuch\u00e2tel", - "Schweiz, Suisse, Svizzera, Svizra", - "Solothurn", + "Basel-Landschaft", + "Bern - Berne", + "Fribourg - Freiburg", + "Jura", + "Neuch\u00e2tel", + "Schweiz, Suisse, Svizzera, Svizra", + "Solothurn", "Vaud" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Espace Mittelland_East", - "s": 15819350, + "id": "Switzerland_Espace Mittelland_East", + "s": 15819350, "affiliations": [ - "Bern - Berne", + "Bern - Berne", "Schweiz, Suisse, Svizzera, Svizra" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Ticino", - "s": 8216437, + "id": "Switzerland_Ticino", + "s": 8216437, "affiliations": [ - "Schweiz, Suisse, Svizzera, Svizra", + "Schweiz, Suisse, Svizzera, Svizra", "Ticino" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Northwestern", - "s": 25660399, + "id": "Switzerland_Northwestern", + "s": 25660399, "affiliations": [ - "Aargau", - "Basel-Landschaft", - "Basel-Stadt", + "Aargau", + "Basel-Landschaft", + "Basel-Stadt", "Schweiz, Suisse, Svizzera, Svizra" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Lake Geneva region", - "s": 44307012, + "id": "Switzerland_Lake Geneva region", + "s": 44307012, "affiliations": [ - "Fribourg - Freiburg", - "Gen\u00e8ve", - "Schweiz, Suisse, Svizzera, Svizra", - "Vaud", + "Fribourg - Freiburg", + "Gen\u00e8ve", + "Schweiz, Suisse, Svizzera, Svizra", + "Vaud", "Valais - Wallis" - ], + ], "old": [ "Switzerland" ] - }, + }, { - "id": "Switzerland_Zurich", - "s": 29327669, + "id": "Switzerland_Zurich", + "s": 29327669, "affiliations": [ - "Schweiz, Suisse, Svizzera, Svizra", + "Schweiz, Suisse, Svizzera, Svizra", "Z\u00fcrich" - ], + ], "old": [ "Switzerland" ] } ] - }, + }, { - "id": "Syria", - "s": 43564600, + "id": "Syria", + "s": 43564600, "affiliations": [ - "Al-Hasakah", - "Aleppo", - "Ar-Raqqah", - "As-Suwayda", - "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0648\u0631\u064a\u0629", - "\u0631\u064a\u0641 \u062f\u0645\u0634\u0642", - "Daraa", - "Deir ez-Zor", - "Hama", - "Idlib", - "Latakia", - "Quneitra", - "Tartus", - "UNDOF", + "Al-Hasakah", + "Aleppo", + "Ar-Raqqah", + "As-Suwayda", + "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0648\u0631\u064a\u0629", + "\u0631\u064a\u0641 \u062f\u0645\u0634\u0642", + "Daraa", + "Deir ez-Zor", + "Hama", + "Idlib", + "Latakia", + "Quneitra", + "Tartus", + "UNDOF", "\u062d\u0645\u0635" - ], + ], "old": [ "Syria" ] - }, + }, { - "id": "Sao Tome and Principe", - "s": 446503, + "id": "Sao Tome and Principe", + "s": 446503, "affiliations": [ - "Pr\u00edncipe Province", - "S\u00e3o Tom\u00e9 Province", + "Pr\u00edncipe Province", + "S\u00e3o Tom\u00e9 Province", "S\u00e3o Tom\u00e9 e Pr\u00edncipe" - ], + ], "old": [ "Sao Tome and Principe" ] - }, + }, { - "id": "Tajikistan", - "s": 9491159, + "id": "Tajikistan", + "s": 9491159, "affiliations": [ - "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0421\u0443\u0493\u0434", - "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0425\u0430\u0442\u043b\u043e\u043d", - "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u041c\u0443\u0445\u0442\u043e\u0440\u0438 \u041a\u04ef\u04b3\u0438\u0441\u0442\u043e\u043d\u0438 \u0411\u0430\u0434\u0430\u0445\u0448\u043e\u043d", - "\u041d\u043e\u04b3\u0438\u044f\u04b3\u043e\u0438 \u0442\u043e\u0431\u0435\u0438 \u04b7\u0443\u043c\u04b3\u0443\u0440\u04e3", + "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0421\u0443\u0493\u0434", + "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0425\u0430\u0442\u043b\u043e\u043d", + "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u041c\u0443\u0445\u0442\u043e\u0440\u0438 \u041a\u04ef\u04b3\u0438\u0441\u0442\u043e\u043d\u0438 \u0411\u0430\u0434\u0430\u0445\u0448\u043e\u043d", + "\u041d\u043e\u04b3\u0438\u044f\u04b3\u043e\u0438 \u0442\u043e\u0431\u0435\u0438 \u04b7\u0443\u043c\u04b3\u0443\u0440\u04e3", "\u0422\u043e\u04b7\u0438\u043a\u0438\u0441\u0442\u043e\u043d" - ], + ], "old": [ "Tajikistan" ] - }, + }, { - "id": "Tanzania", - "s": 44766652, + "id": "Tanzania", + "s": 44766652, "affiliations": [ - "Arusha", - "Dar es Salaam", - "Dodoma", - "Iringa", - "Kagera", - "Kilimanjaro", - "Kaskazini Pemba", - "Kusini Pemba", - "Katavi", - "Kigoma", - "Lindi", - "Pwani", - "Manyara", - "Mara", - "Mbeya", - "Morogoro", - "Mtwara", - "Njombe", - "Rukwa", - "Ruvuma", - "Singida", - "Tanzania", - "Tanga", - "Unguja Kaskazini", - "Unguja Kusini", + "Arusha", + "Dar es Salaam", + "Dodoma", + "Iringa", + "Kagera", + "Kilimanjaro", + "Kaskazini Pemba", + "Kusini Pemba", + "Katavi", + "Kigoma", + "Lindi", + "Pwani", + "Manyara", + "Mara", + "Mbeya", + "Morogoro", + "Mtwara", + "Njombe", + "Rukwa", + "Ruvuma", + "Singida", + "Tanzania", + "Tanga", + "Unguja Kaskazini", + "Unguja Kusini", "Unguja Mjini Magharibi" - ], + ], "old": [ "Tanzania" ] - }, + }, { - "id": "Thailand", + "id": "Thailand", "g": [ { - "id": "Thailand_North", - "s": 25691613, + "id": "Thailand_North", + "s": 25691613, "affiliations": [ - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e30\u0e40\u0e22\u0e32", - "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e32\u0e01", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e25\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e48\u0e32\u0e19", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e41\u0e1e\u0e23\u0e48", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e33\u0e1b\u0e32\u0e07", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e33\u0e1e\u0e39\u0e19", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e15\u0e23\u0e14\u0e34\u0e15\u0e16\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e42\u0e02\u0e17\u0e31\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e29\u0e13\u0e38\u0e42\u0e25\u0e01", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e23\u0e32\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e43\u0e2b\u0e21\u0e48", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e30\u0e40\u0e22\u0e32", + "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e32\u0e01", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e25\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e48\u0e32\u0e19", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e41\u0e1e\u0e23\u0e48", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e33\u0e1b\u0e32\u0e07", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e33\u0e1e\u0e39\u0e19", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e15\u0e23\u0e14\u0e34\u0e15\u0e16\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e42\u0e02\u0e17\u0e31\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e29\u0e13\u0e38\u0e42\u0e25\u0e01", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e23\u0e32\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e43\u0e2b\u0e21\u0e48", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e41\u0e21\u0e48\u0e2e\u0e48\u0e2d\u0e07\u0e2a\u0e2d\u0e19" - ], + ], "old": [ "Thailand" ] - }, + }, { - "id": "Thailand_Central", - "s": 46258361, + "id": "Thailand_Central", + "s": 46258361, "affiliations": [ - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e48\u0e32\u0e07\u0e17\u0e2d\u0e07", - "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e32\u0e01", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e25\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e32\u0e0d\u0e08\u0e19\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e32\u0e2c\u0e2a\u0e34\u0e19\u0e18\u0e38\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e33\u0e41\u0e1e\u0e07\u0e40\u0e1e\u0e0a\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e2a\u0e27\u0e23\u0e23\u0e04\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1a\u0e38\u0e23\u0e35\u0e23\u0e31\u0e21\u0e22\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e21\u0e2b\u0e32\u0e2a\u0e32\u0e23\u0e04\u0e32\u0e21", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e22\u0e42\u0e2a\u0e18\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2b\u0e19\u0e2d\u0e07\u0e1a\u0e31\u0e27\u0e25\u0e33\u0e20\u0e39", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e1a\u0e25\u0e23\u0e32\u0e0a\u0e18\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e34\u0e07\u0e2b\u0e4c\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e1e\u0e0a\u0e23\u0e1a\u0e39\u0e23\u0e13\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e31\u0e22\u0e19\u0e32\u0e17", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e1e\u0e19\u0e21", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1a\u0e36\u0e07\u0e01\u0e32\u0e2c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e23\u0e32\u0e0a\u0e2a\u0e35\u0e21\u0e32", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e08\u0e34\u0e15\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e1e\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e01\u0e25\u0e19\u0e04\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e02\u0e2d\u0e19\u0e41\u0e01\u0e48\u0e19", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e31\u0e22\u0e20\u0e39\u0e21\u0e34", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e23\u0e30\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e42\u0e02\u0e17\u0e31\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2b\u0e19\u0e2d\u0e07\u0e04\u0e32\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e29\u0e13\u0e38\u0e42\u0e25\u0e01", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e21\u0e38\u0e01\u0e14\u0e32\u0e2b\u0e32\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e49\u0e2d\u0e22\u0e40\u0e2d\u0e47\u0e14", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e28\u0e23\u0e35\u0e2a\u0e30\u0e40\u0e01\u0e29", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e23\u0e34\u0e19\u0e17\u0e23\u0e4c", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e14\u0e23\u0e18\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e17\u0e31\u0e22\u0e18\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e1e\u0e23\u0e23\u0e13\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e33\u0e19\u0e32\u0e08\u0e40\u0e08\u0e23\u0e34\u0e0d", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e48\u0e32\u0e07\u0e17\u0e2d\u0e07", + "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e32\u0e01", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e25\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e32\u0e0d\u0e08\u0e19\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e32\u0e2c\u0e2a\u0e34\u0e19\u0e18\u0e38\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e33\u0e41\u0e1e\u0e07\u0e40\u0e1e\u0e0a\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e2a\u0e27\u0e23\u0e23\u0e04\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1a\u0e38\u0e23\u0e35\u0e23\u0e31\u0e21\u0e22\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e21\u0e2b\u0e32\u0e2a\u0e32\u0e23\u0e04\u0e32\u0e21", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e22\u0e42\u0e2a\u0e18\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2b\u0e19\u0e2d\u0e07\u0e1a\u0e31\u0e27\u0e25\u0e33\u0e20\u0e39", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e1a\u0e25\u0e23\u0e32\u0e0a\u0e18\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e34\u0e07\u0e2b\u0e4c\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e1e\u0e0a\u0e23\u0e1a\u0e39\u0e23\u0e13\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e31\u0e22\u0e19\u0e32\u0e17", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e1e\u0e19\u0e21", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1a\u0e36\u0e07\u0e01\u0e32\u0e2c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e23\u0e32\u0e0a\u0e2a\u0e35\u0e21\u0e32", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e08\u0e34\u0e15\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e25\u0e1e\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e01\u0e25\u0e19\u0e04\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e02\u0e2d\u0e19\u0e41\u0e01\u0e48\u0e19", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e31\u0e22\u0e20\u0e39\u0e21\u0e34", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e23\u0e30\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e42\u0e02\u0e17\u0e31\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2b\u0e19\u0e2d\u0e07\u0e04\u0e32\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e34\u0e29\u0e13\u0e38\u0e42\u0e25\u0e01", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e21\u0e38\u0e01\u0e14\u0e32\u0e2b\u0e32\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e49\u0e2d\u0e22\u0e40\u0e2d\u0e47\u0e14", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e28\u0e23\u0e35\u0e2a\u0e30\u0e40\u0e01\u0e29", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e23\u0e34\u0e19\u0e17\u0e23\u0e4c", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e14\u0e23\u0e18\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e38\u0e17\u0e31\u0e22\u0e18\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e1e\u0e23\u0e23\u0e13\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e33\u0e19\u0e32\u0e08\u0e40\u0e08\u0e23\u0e34\u0e0d", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e23\u0e30\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e2d\u0e22\u0e38\u0e18\u0e22\u0e32" - ], + ], "old": [ "Thailand" ] - }, + }, { - "id": "Thailand_South", - "s": 45797400, + "id": "Thailand_South", + "s": 45797400, "affiliations": [ - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e38\u0e21\u0e1e\u0e23", - "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e2a\u0e32\u0e04\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e23\u0e31\u0e07", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e23\u0e32\u0e14", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e22\u0e30\u0e25\u0e32", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e15\u0e39\u0e25", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e31\u0e07\u0e07\u0e32", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e30\u0e19\u0e2d\u0e07", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e1b\u0e23\u0e32\u0e01\u0e32\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e30\u0e22\u0e2d\u0e07", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e07\u0e02\u0e25\u0e32", - "\u0e01\u0e23\u0e38\u0e07\u0e40\u0e17\u0e1e\u0e21\u0e2b\u0e32\u0e19\u0e04\u0e23", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e2a\u0e07\u0e04\u0e23\u0e32\u0e21", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e23\u0e32\u0e29\u0e0e\u0e23\u0e4c\u0e18\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e23\u0e30\u0e1a\u0e35\u0e48", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e25\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e1b\u0e10\u0e21", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e09\u0e30\u0e40\u0e0a\u0e34\u0e07\u0e40\u0e17\u0e23\u0e32", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e31\u0e17\u0e25\u0e38\u0e07", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e20\u0e39\u0e40\u0e01\u0e47\u0e15", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e19\u0e32\u0e22\u0e01", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e19\u0e17\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e31\u0e15\u0e15\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e32\u0e0a\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e23\u0e30\u0e41\u0e01\u0e49\u0e27", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e08\u0e31\u0e19\u0e17\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e23\u0e32\u0e18\u0e34\u0e27\u0e32\u0e2a", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e17\u0e38\u0e21\u0e18\u0e32\u0e19\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e1e\u0e0a\u0e23\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e23\u0e32\u0e08\u0e35\u0e19\u0e1a\u0e38\u0e23\u0e35", - "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e18\u0e23\u0e23\u0e21\u0e23\u0e32\u0e0a", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e38\u0e21\u0e1e\u0e23", + "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e2a\u0e32\u0e04\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e23\u0e31\u0e07", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e15\u0e23\u0e32\u0e14", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e22\u0e30\u0e25\u0e32", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e15\u0e39\u0e25", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e31\u0e07\u0e07\u0e32", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e30\u0e19\u0e2d\u0e07", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e1b\u0e23\u0e32\u0e01\u0e32\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e30\u0e22\u0e2d\u0e07", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e07\u0e02\u0e25\u0e32", + "\u0e01\u0e23\u0e38\u0e07\u0e40\u0e17\u0e1e\u0e21\u0e2b\u0e32\u0e19\u0e04\u0e23", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e21\u0e38\u0e17\u0e23\u0e2a\u0e07\u0e04\u0e23\u0e32\u0e21", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e38\u0e23\u0e32\u0e29\u0e0e\u0e23\u0e4c\u0e18\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e01\u0e23\u0e30\u0e1a\u0e35\u0e48", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e25\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e1b\u0e10\u0e21", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e09\u0e30\u0e40\u0e0a\u0e34\u0e07\u0e40\u0e17\u0e23\u0e32", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e31\u0e17\u0e25\u0e38\u0e07", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e20\u0e39\u0e40\u0e01\u0e47\u0e15", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e19\u0e32\u0e22\u0e01", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e19\u0e17\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e31\u0e15\u0e15\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e23\u0e32\u0e0a\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2a\u0e23\u0e30\u0e41\u0e01\u0e49\u0e27", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e08\u0e31\u0e19\u0e17\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e23\u0e32\u0e18\u0e34\u0e27\u0e32\u0e2a", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e17\u0e38\u0e21\u0e18\u0e32\u0e19\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e1e\u0e0a\u0e23\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e23\u0e32\u0e08\u0e35\u0e19\u0e1a\u0e38\u0e23\u0e35", + "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e18\u0e23\u0e23\u0e21\u0e23\u0e32\u0e0a", "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e23\u0e30\u0e08\u0e27\u0e1a\u0e04\u0e35\u0e23\u0e35\u0e02\u0e31\u0e19\u0e18\u0e4c" - ], + ], "old": [ "Thailand" ] } ] - }, + }, { - "id": "The Bahamas", - "s": 5849413, + "id": "The Bahamas", + "s": 5849413, "affiliations": [ - "Ciego de \u00c1vila", + "Ciego de \u00c1vila", "The Bahamas" - ], + ], "old": [ "Bahamas" ] - }, + }, { - "id": "The Gambia", - "s": 4269859, + "id": "The Gambia", + "s": 4269859, "affiliations": [ - "Brikama", - "Banjul", - "Basse", - "Gambia", - "Janjanbureh", - "Kanifing", - "Kerewan", - "Kuntaur", - "Mansakonko", + "Brikama", + "Banjul", + "Basse", + "Gambia", + "Janjanbureh", + "Kanifing", + "Kerewan", + "Kuntaur", + "Mansakonko", "Senegal" - ], + ], "old": [ "Gambia" ] - }, + }, { - "id": "Netherlands", + "id": "Netherlands", "g": [ { - "id": "Netherlands_Drenthe", - "s": 34808516, + "id": "Netherlands_Drenthe", + "s": 34808516, "affiliations": [ - "Drenthe", + "Drenthe", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Flevoland", - "s": 21374894, + "id": "Netherlands_Flevoland", + "s": 21374894, "affiliations": [ - "Flevoland", + "Flevoland", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Friesland", - "s": 46779856, + "id": "Netherlands_Friesland", + "s": 46779856, "affiliations": [ - "Friesland", + "Friesland", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Gelderland_Nijmegen", - "s": 33003041, + "id": "Netherlands_Gelderland_Nijmegen", + "s": 33003041, "affiliations": [ - "Gelderland", + "Gelderland", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Gelderland_North", - "s": 53792308, + "id": "Netherlands_Gelderland_North", + "s": 53792308, "affiliations": [ - "Gelderland", + "Gelderland", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Gelderland_Zutphen", - "s": 23170202, + "id": "Netherlands_Gelderland_Zutphen", + "s": 23170202, "affiliations": [ - "Gelderland", + "Gelderland", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Groningen", - "s": 33990192, + "id": "Netherlands_Groningen", + "s": 33990192, "affiliations": [ - "Deutschland", - "Groningen", - "Nederland", + "Deutschland", + "Groningen", + "Nederland", "Niedersachsen" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Limburg", - "s": 59938250, + "id": "Netherlands_Limburg", + "s": 59938250, "affiliations": [ - "Limburg", + "Limburg", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Brabant_Eindhoven", - "s": 51240075, + "id": "Netherlands_North Brabant_Eindhoven", + "s": 51240075, "affiliations": [ - "Nederland", + "Nederland", "Noord-Brabant" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Brabant_Roosendaal", - "s": 17535169, + "id": "Netherlands_North Brabant_Roosendaal", + "s": 17535169, "affiliations": [ - "Nederland", + "Nederland", "Noord-Brabant" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Brabant_Tiburg", - "s": 38610240, + "id": "Netherlands_North Brabant_Tiburg", + "s": 38610240, "affiliations": [ - "Nederland", - "Nederland - Belgique / Belgi\u00eb / Belgien", + "Nederland", + "Nederland - Belgique / Belgi\u00eb / Belgien", "Noord-Brabant" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Brabant_Uden", - "s": 18156439, + "id": "Netherlands_North Brabant_Uden", + "s": 18156439, "affiliations": [ - "Nederland", + "Nederland", "Noord-Brabant" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Holland_Alkmaar", - "s": 29974116, + "id": "Netherlands_North Holland_Alkmaar", + "s": 29974116, "affiliations": [ - "Nederland", + "Nederland", "Noord-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Holland_Amsterdam", - "s": 63971684, + "id": "Netherlands_North Holland_Amsterdam", + "s": 63971684, "affiliations": [ - "Nederland", + "Nederland", "Noord-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_North Holland_Zaandam", - "s": 23066797, + "id": "Netherlands_North Holland_Zaandam", + "s": 23066797, "affiliations": [ - "Nederland", + "Nederland", "Noord-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Overijssel_Enschede", - "s": 35680112, + "id": "Netherlands_Overijssel_Enschede", + "s": 35680112, "affiliations": [ - "Nederland", + "Nederland", "Overijssel" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Overijssel_Zwolle", - "s": 31464998, + "id": "Netherlands_Overijssel_Zwolle", + "s": 31464998, "affiliations": [ - "Nederland", + "Nederland", "Overijssel" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_South Holland_Brielle", - "s": 16842881, + "id": "Netherlands_South Holland_Brielle", + "s": 16842881, "affiliations": [ - "Nederland", + "Nederland", "Zuid-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_South Holland_Den Haag", - "s": 50417524, + "id": "Netherlands_South Holland_Den Haag", + "s": 50417524, "affiliations": [ - "Nederland", + "Nederland", "Zuid-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_South Holland_Leiden", - "s": 21116798, + "id": "Netherlands_South Holland_Leiden", + "s": 21116798, "affiliations": [ - "Nederland", + "Nederland", "Zuid-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_South Holland_Rotterdam", - "s": 53161295, + "id": "Netherlands_South Holland_Rotterdam", + "s": 53161295, "affiliations": [ - "Nederland", + "Nederland", "Zuid-Holland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Utrecht_Amersfoort", - "s": 25293795, + "id": "Netherlands_Utrecht_Amersfoort", + "s": 25293795, "affiliations": [ - "Utrecht", + "Utrecht", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Utrecht_Utrecht", - "s": 29403827, + "id": "Netherlands_Utrecht_Utrecht", + "s": 29403827, "affiliations": [ - "Utrecht", + "Utrecht", "Nederland" - ], + ], "old": [ "Netherlands" ] - }, + }, { - "id": "Netherlands_Zeeland", - "s": 27566291, + "id": "Netherlands_Zeeland", + "s": 27566291, "affiliations": [ - "Nederland", + "Nederland", "Zeeland" - ], + ], "old": [ "Netherlands" ] } ] - }, + }, { - "id": "Togo", - "s": 18148099, + "id": "Togo", + "s": 18148099, "affiliations": [ - "R\u00e9gion Centrale", - "R\u00e9gion Maritime", - "R\u00e9gion de la Kara", - "R\u00e9gion des Plateaux", - "R\u00e9gion des Savanes", + "R\u00e9gion Centrale", + "R\u00e9gion Maritime", + "R\u00e9gion de la Kara", + "R\u00e9gion des Plateaux", + "R\u00e9gion des Savanes", "Togo" - ], + ], "old": [ "Togo" ] - }, + }, { - "id": "Tonga", - "s": 2779894, + "id": "Tonga", + "s": 2779894, "affiliations": [ - "Ha\u02bbapai", - "Ongo Niua", - "Tonga", - "Vahe Hihifo", - "Vahe Kolofo'ou", - "Vahe Kolomotu'a", - "Vahe Lapaha", - "Vahe Nukunuku", - "Vahe Tatakamotonga", - "Vahe Vaini", + "Ha\u02bbapai", + "Ongo Niua", + "Tonga", + "Vahe Hihifo", + "Vahe Kolofo'ou", + "Vahe Kolomotu'a", + "Vahe Lapaha", + "Vahe Nukunuku", + "Vahe Tatakamotonga", + "Vahe Vaini", "Vava\u02bbu" - ], + ], "old": [ "Tonga" ] - }, + }, { - "id": "Tunisia", - "s": 39036808, + "id": "Tunisia", + "s": 39036808, "affiliations": [ - "Tunisie \u2d5c\u2d53\u2d4f\u2d59 \u062a\u0648\u0646\u0633", - "\u0628\u0627\u062c\u0629", - "\u062a\u0648\u0632\u0631", - "\u062a\u0648\u0646\u0633", - "\u0633\u0648\u0633\u0629", - "\u0639\u0631\u0648\u0633", - "\u0642\u0627\u0628\u0633", - "\u0642\u0628\u0644\u064a", - "\u0642\u0641\u0635\u0629", - "\u0646\u0627\u0628\u0644", - "\u0633\u064a\u062f\u064a \u0628\u0648\u0632\u064a\u062f", - "\u0628\u0646\u0632\u0631\u062a", - "\u0627\u0644\u0643\u0627\u0641", - "\u0632\u063a\u0648\u0627\u0646", - "\u0635\u0641\u0627\u0642\u0633", - "\u0645\u062f\u0646\u064a\u0646", - "\u0645\u0646\u0648\u0628\u0629", - "\u0623\u0631\u064a\u0627\u0646\u0629", - "\u062a\u0637\u0627\u0648\u064a\u0646", - "\u062c\u0646\u062f\u0648\u0628\u0629", - "\u0633\u0644\u064a\u0627\u0646\u0629", - "\u0627\u0644\u0642\u0635\u0631\u064a\u0646", - "\u0627\u0644\u0645\u0647\u062f\u064a\u0629", - "\u0627\u0644\u0642\u064a\u0631\u0648\u0627\u0646", + "Tunisie \u2d5c\u2d53\u2d4f\u2d59 \u062a\u0648\u0646\u0633", + "\u0628\u0627\u062c\u0629", + "\u062a\u0648\u0632\u0631", + "\u062a\u0648\u0646\u0633", + "\u0633\u0648\u0633\u0629", + "\u0639\u0631\u0648\u0633", + "\u0642\u0627\u0628\u0633", + "\u0642\u0628\u0644\u064a", + "\u0642\u0641\u0635\u0629", + "\u0646\u0627\u0628\u0644", + "\u0633\u064a\u062f\u064a \u0628\u0648\u0632\u064a\u062f", + "\u0628\u0646\u0632\u0631\u062a", + "\u0627\u0644\u0643\u0627\u0641", + "\u0632\u063a\u0648\u0627\u0646", + "\u0635\u0641\u0627\u0642\u0633", + "\u0645\u062f\u0646\u064a\u0646", + "\u0645\u0646\u0648\u0628\u0629", + "\u0623\u0631\u064a\u0627\u0646\u0629", + "\u062a\u0637\u0627\u0648\u064a\u0646", + "\u062c\u0646\u062f\u0648\u0628\u0629", + "\u0633\u0644\u064a\u0627\u0646\u0629", + "\u0627\u0644\u0642\u0635\u0631\u064a\u0646", + "\u0627\u0644\u0645\u0647\u062f\u064a\u0629", + "\u0627\u0644\u0642\u064a\u0631\u0648\u0627\u0646", "\u0627\u0644\u0645\u0646\u0633\u062a\u064a\u0631" - ], + ], "old": [ "Tunisia" ] - }, + }, { - "id": "Turkey", + "id": "Turkey", "g": [ { - "id": "Turkey_Mediterranean Region", - "s": 36182962, + "id": "Turkey_Mediterranean Region", + "s": 36182962, "affiliations": [ - "Adana", - "Antalya", - "Burdur", - "Hatay", - "Isparta", - "Kahramanmara\u015f", - "Mersin \u0130li", - "Osmaniye", + "Adana", + "Antalya", + "Burdur", + "Hatay", + "Isparta", + "Kahramanmara\u015f", + "Mersin \u0130li", + "Osmaniye", "T\u00fcrkiye" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Southeastern Anatolia Region", - "s": 22881789, + "id": "Turkey_Southeastern Anatolia Region", + "s": 22881789, "affiliations": [ - "Ad\u0131yaman", - "Batman", - "Bitlis", - "Diyarbak\u0131r", - "Gaziantep", - "Kilis", - "Mardin", - "Siirt", - "T\u00fcrkiye", - "\u015eanl\u0131urfa", + "Ad\u0131yaman", + "Batman", + "Bitlis", + "Diyarbak\u0131r", + "Gaziantep", + "Kilis", + "Mardin", + "Siirt", + "T\u00fcrkiye", + "\u015eanl\u0131urfa", "\u015e\u0131rnak" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Marmara Region_Istanbul", - "s": 44574221, + "id": "Turkey_Marmara Region_Istanbul", + "s": 44574221, "affiliations": [ - "Edirne", - "Kocaeli", - "K\u0131rklareli", - "Tekirda\u011f", - "T\u00fcrkiye", - "Yalova", - "\u00c7anakkale", + "Edirne", + "Kocaeli", + "K\u0131rklareli", + "Tekirda\u011f", + "T\u00fcrkiye", + "Yalova", + "\u00c7anakkale", "\u0130stanbul" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Marmara Region_Bursa", - "s": 32416729, + "id": "Turkey_Marmara Region_Bursa", + "s": 32416729, "affiliations": [ - "Bal\u0131kesir", - "Bilecik", - "Bursa", - "Edirne", - "Kocaeli", - "Sakarya", - "Tekirda\u011f", - "T\u00fcrkiye", - "Yalova", - "\u00c7anakkale", + "Bal\u0131kesir", + "Bilecik", + "Bursa", + "Edirne", + "Kocaeli", + "Sakarya", + "Tekirda\u011f", + "T\u00fcrkiye", + "Yalova", + "\u00c7anakkale", "\u0130stanbul" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Eastern Anatolia Region", - "s": 23187539, + "id": "Turkey_Eastern Anatolia Region", + "s": 23187539, "affiliations": [ - "Ardahan", - "A\u011fr\u0131", - "Bing\u00f6l \u0130li", - "Bitlis", - "Elaz\u0131\u011f", - "Erzincan", - "Erzurum", - "Hakkari", - "I\u011fd\u0131r", - "Kars", - "Malatya", - "Mu\u015f", - "Van", - "Tunceli", + "Ardahan", + "A\u011fr\u0131", + "Bing\u00f6l \u0130li", + "Bitlis", + "Elaz\u0131\u011f", + "Erzincan", + "Erzurum", + "Hakkari", + "I\u011fd\u0131r", + "Kars", + "Malatya", + "Mu\u015f", + "Van", + "Tunceli", "T\u00fcrkiye" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Black Sea Region", - "s": 29289635, + "id": "Turkey_Black Sea Region", + "s": 29289635, "affiliations": [ - "Amasya", - "Bolu", - "Artvin", - "Bart\u0131n", - "Bayburt", - "D\u00fczce", - "Giresun", - "G\u00fcm\u00fc\u015fhane", - "Karab\u00fck", - "Kastamonu", - "Ordu", - "Rize", - "Samsun", - "Sinop", - "Tokat", - "Trabzon", - "T\u00fcrkiye", - "Zonguldak", + "Amasya", + "Bolu", + "Artvin", + "Bart\u0131n", + "Bayburt", + "D\u00fczce", + "Giresun", + "G\u00fcm\u00fc\u015fhane", + "Karab\u00fck", + "Kastamonu", + "Ordu", + "Rize", + "Samsun", + "Sinop", + "Tokat", + "Trabzon", + "T\u00fcrkiye", + "Zonguldak", "\u00c7orum" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Central Anatolia Region_Ankara", - "s": 38326373, + "id": "Turkey_Central Anatolia Region_Ankara", + "s": 38326373, "affiliations": [ - "Aksaray", - "Ankara", - "Eski\u015fehir", - "Konya", - "Karaman", - "K\u0131r\u015fehir", - "K\u0131r\u0131kkale", - "T\u00fcrkiye", + "Aksaray", + "Ankara", + "Eski\u015fehir", + "Konya", + "Karaman", + "K\u0131r\u015fehir", + "K\u0131r\u0131kkale", + "T\u00fcrkiye", "\u00c7ank\u0131r\u0131" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Central Anatolia Region_Kayseri", - "s": 16742527, + "id": "Turkey_Central Anatolia Region_Kayseri", + "s": 16742527, "affiliations": [ - "Kayseri", - "K\u0131r\u015fehir", - "Nev\u015fehir", - "Ni\u011fde", - "Sivas", - "T\u00fcrkiye", + "Kayseri", + "K\u0131r\u015fehir", + "Nev\u015fehir", + "Ni\u011fde", + "Sivas", + "T\u00fcrkiye", "Yozgat" - ], + ], "old": [ "Turkey" ] - }, + }, { - "id": "Turkey_Aegean Region", - "s": 42546693, + "id": "Turkey_Aegean Region", + "s": 42546693, "affiliations": [ - "Afyonkarahisar", - "Ayd\u0131n", - "Denizli", - "K\u00fctahya", - "Manisa", - "Mu\u011fla", - "T\u00fcrkiye", - "U\u015fak", + "Afyonkarahisar", + "Ayd\u0131n", + "Denizli", + "K\u00fctahya", + "Manisa", + "Mu\u011fla", + "T\u00fcrkiye", + "U\u015fak", "\u0130zmir" - ], + ], "old": [ "Turkey" ] } ] - }, + }, { - "id": "Turkmenistan", - "s": 7917477, + "id": "Turkmenistan", + "s": 7917477, "affiliations": [ - "Ahal", - "Balkan", - "Da\u015foguz", - "Lebap", - "Mary", + "Ahal", + "Balkan", + "Da\u015foguz", + "Lebap", + "Mary", "T\u00fcrkmenistan" - ], + ], "old": [ "Turkmenistan" ] - }, + }, { - "id": "Turks and Caicos Islands", - "s": 485384, + "id": "Turks and Caicos Islands", + "s": 485384, "affiliations": [ - "Rep\u00fablica Dominicana", - "The Bahamas", + "Rep\u00fablica Dominicana", + "The Bahamas", "Turks and Caicos Islands" - ], + ], "old": [ "Turks and Caicos Islands" ] - }, + }, { - "id": "Tuvalu", - "s": 237880, + "id": "Tuvalu", + "s": 237880, "affiliations": [ "Tuvalu" - ], + ], "old": [ "Tuvalu" ] - }, + }, { - "id": "Uganda", - "s": 28417249, + "id": "Uganda", + "s": 28417249, "affiliations": [ - "Abim", - "Agago", - "Alebtong", - "Apac", - "Busia", - "Butambala", - "Central Region", - "Dokolo", - "Eastern Region", - "Gulu", - "Isingiro", - "Kaabong", - "Kabarole", - "Kamuli", - "Kanungu District", - "Kapchorwa", - "Kole", - "Katakwi", - "Kayunga", - "Kibaale", - "Kiruhura", - "Lira", - "Mayuge", - "Nwoya", - "Mitooma", - "Mpigi", - "Nakapiripirit", - "Nakaseke", - "Northern Region", - "Ntungamo", - "Oyam", - "Pader", - "Rakai", - "Rubirizi", - "Sembabule", - "Serere", - "Soroti", - "Tororo", - "Uganda", + "Abim", + "Agago", + "Alebtong", + "Apac", + "Busia", + "Butambala", + "Central Region", + "Dokolo", + "Eastern Region", + "Gulu", + "Isingiro", + "Kaabong", + "Kabarole", + "Kamuli", + "Kanungu District", + "Kapchorwa", + "Kole", + "Katakwi", + "Kayunga", + "Kibaale", + "Kiruhura", + "Lira", + "Mayuge", + "Nwoya", + "Mitooma", + "Mpigi", + "Nakapiripirit", + "Nakaseke", + "Northern Region", + "Ntungamo", + "Oyam", + "Pader", + "Rakai", + "Rubirizi", + "Sembabule", + "Serere", + "Soroti", + "Tororo", + "Uganda", "Western Region" - ], + ], "old": [ "Uganda" ] - }, + }, { - "id": "Ukraine", + "id": "Ukraine", "g": [ { - "id": "Ukraine_Cherkasy Oblast", - "s": 10339825, + "id": "Ukraine_Cherkasy Oblast", + "s": 10339825, "affiliations": [ - "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Chernihiv Oblast", - "s": 12363478, + "id": "Ukraine_Chernihiv Oblast", + "s": 12363478, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0427\u0435\u0440\u043d\u0456\u0433\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Chernivtsi Oblast", - "s": 10180378, + "id": "Ukraine_Chernivtsi Oblast", + "s": 10180378, "affiliations": [ - "\u0427\u0435\u0440\u043d\u0456\u0432\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0427\u0435\u0440\u043d\u0456\u0432\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Dnipropetrovsk Oblast", - "s": 30124883, + "id": "Ukraine_Dnipropetrovsk Oblast", + "s": 30124883, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043d\u0456\u043f\u0440\u043e\u043f\u0435\u0442\u0440\u043e\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Donetsk Oblast", - "s": 36103805, + "id": "Ukraine_Donetsk Oblast", + "s": 36103805, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Ivano-Frankivsk Oblast", - "s": 12389474, + "id": "Ukraine_Ivano-Frankivsk Oblast", + "s": 12389474, "affiliations": [ - "\u0406\u0432\u0430\u043d\u043e-\u0424\u0440\u0430\u043d\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0406\u0432\u0430\u043d\u043e-\u0424\u0440\u0430\u043d\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Kharkiv Oblast", - "s": 21903305, + "id": "Ukraine_Kharkiv Oblast", + "s": 21903305, "affiliations": [ - "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Kherson Oblast", - "s": 7396113, + "id": "Ukraine_Kherson Oblast", + "s": 7396113, "affiliations": [ - "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Khmelnytskyi Oblast", - "s": 10600863, + "id": "Ukraine_Khmelnytskyi Oblast", + "s": 10600863, "affiliations": [ - "\u0425\u043c\u0435\u043b\u044c\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0425\u043c\u0435\u043b\u044c\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Kirovohrad Oblast", - "s": 11265969, + "id": "Ukraine_Kirovohrad Oblast", + "s": 11265969, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041a\u0456\u0440\u043e\u0432\u043e\u0433\u0440\u0430\u0434\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Kyiv Oblast", - "s": 29288165, + "id": "Ukraine_Kyiv Oblast", + "s": 29288165, "affiliations": [ - "\u041a\u0438\u0457\u0432", - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u041a\u0438\u0457\u0432", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041a\u0438\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Luhansk Oblast", - "s": 17485801, + "id": "Ukraine_Luhansk Oblast", + "s": 17485801, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Lviv Oblast", - "s": 21506111, + "id": "Ukraine_Lviv Oblast", + "s": 21506111, "affiliations": [ - "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Mykolaiv Oblast", - "s": 9272170, + "id": "Ukraine_Mykolaiv Oblast", + "s": 9272170, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041c\u0438\u043a\u043e\u043b\u0430\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Odessa Oblast", - "s": 19879131, + "id": "Ukraine_Odessa Oblast", + "s": 19879131, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Poltava Oblast", - "s": 12149628, + "id": "Ukraine_Poltava Oblast", + "s": 12149628, "affiliations": [ - "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Rivne Oblast", - "s": 7689373, + "id": "Ukraine_Rivne Oblast", + "s": 7689373, "affiliations": [ - "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Sumy Oblast", - "s": 13841452, + "id": "Ukraine_Sumy Oblast", + "s": 13841452, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Ternopil Oblast", - "s": 13570323, + "id": "Ukraine_Ternopil Oblast", + "s": 13570323, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0422\u0435\u0440\u043d\u043e\u043f\u0456\u043b\u044c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Vinnytsia Oblast", - "s": 13925184, + "id": "Ukraine_Vinnytsia Oblast", + "s": 13925184, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Volyn Oblast", - "s": 10315115, + "id": "Ukraine_Volyn Oblast", + "s": 10315115, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Zakarpattia Oblast", - "s": 10196033, + "id": "Ukraine_Zakarpattia Oblast", + "s": 10196033, "affiliations": [ - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0417\u0430\u043a\u0430\u0440\u043f\u0430\u0442\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Zaporizhia Oblast", - "s": 9132893, + "id": "Ukraine_Zaporizhia Oblast", + "s": 9132893, "affiliations": [ - "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Ukraine_Zhytomyr Oblast", - "s": 6828565, + "id": "Ukraine_Zhytomyr Oblast", + "s": 6828565, "affiliations": [ - "\u0416\u0438\u0442\u043e\u043c\u0438\u0440\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", + "\u0416\u0438\u0442\u043e\u043c\u0438\u0440\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" - ], + ], "old": [ "Ukraine" ] - }, + }, { - "id": "Crimea", - "s": 24839137, + "id": "Crimea", + "s": 24839137, "affiliations": [ - "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", - "\u0420\u043e\u0441\u0441\u0438\u044f", - "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", - "\u0421\u0435\u0432\u0430\u0441\u0442\u043e\u043f\u043e\u043b\u044c", - "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", + "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", + "\u0420\u043e\u0441\u0441\u0438\u044f", + "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", + "\u0421\u0435\u0432\u0430\u0441\u0442\u043e\u043f\u043e\u043b\u044c", + "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c" - ], + ], "old": [ "Crimea" ] } ] - }, + }, { - "id": "United Arab Emirates", - "s": 23984469, + "id": "United Arab Emirates", + "s": 23984469, "affiliations": [ - "\u0623\u0628\u0648 \u0638\u0628\u064a", - "\u200f\u0623\u0645 \u0627\u0644\u0642\u064a\u0648\u064a\u0646\u200e", - "\u062f\u0628\u064a\u200e", - "\u200f\u0631\u0623\u0633 \u0627\u0644\u062e\u064a\u0645\u0629\u200e", - "\u0639\u062c\u0645\u0627\u0646", - "\u0641\u062c\u064a\u0631\u0629", - "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0646\u062f\u0645", - "\u0627\u0644\u0634\u0627\u0631\u0642\u0629", + "\u0623\u0628\u0648 \u0638\u0628\u064a", + "\u200f\u0623\u0645 \u0627\u0644\u0642\u064a\u0648\u064a\u0646\u200e", + "\u062f\u0628\u064a\u200e", + "\u200f\u0631\u0623\u0633 \u0627\u0644\u062e\u064a\u0645\u0629\u200e", + "\u0639\u062c\u0645\u0627\u0646", + "\u0641\u062c\u064a\u0631\u0629", + "\u0645\u062d\u0627\u0641\u0638\u0629 \u0645\u0633\u0646\u062f\u0645", + "\u0627\u0644\u0634\u0627\u0631\u0642\u0629", "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629 \u0627\u0644\u0645\u062a\u0651\u062d\u062f\u0629" - ], + ], "old": [ "United Arab Emirates" ] - }, + }, { - "id": "Falkland Islands", - "s": 1416681, + "id": "Falkland Islands", + "s": 1416681, "affiliations": [ "Falkland Islands" - ], + ], "old": [ "Falkland Islands" ] - }, + }, { - "id": "United Kingdom", + "id": "United Kingdom", "g": [ { - "id": "British Indian Ocean Territory", - "s": 115646, + "id": "British Indian Ocean Territory", + "s": 115646, "affiliations": [ "British Indian Ocean Territory" - ], + ], "old": [ "British Indian Ocean Territory" ] - }, + }, { - "id": "UK_England_East Midlands", - "s": 64319210, + "id": "UK_England_East Midlands", + "s": 64319210, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_East of England_Essex", - "s": 40060083, + "id": "UK_England_East of England_Essex", + "s": 40060083, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_East of England_Norfolk", - "s": 46967499, + "id": "UK_England_East of England_Norfolk", + "s": 46967499, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_Greater London", - "s": 43469340, + "id": "UK_England_Greater London", + "s": 43469340, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_North East England", - "s": 29305894, + "id": "UK_England_North East England", + "s": 29305894, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_North West England_Manchester", - "s": 55983436, + "id": "UK_England_North West England_Manchester", + "s": 55983436, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_North West England_Lancaster", - "s": 17943341, + "id": "UK_England_North West England_Lancaster", + "s": 17943341, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_South East_Brighton", - "s": 47675287, + "id": "UK_England_South East_Brighton", + "s": 47675287, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_South East_Oxford", - "s": 51630477, + "id": "UK_England_South East_Oxford", + "s": 51630477, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_South West England_Bristol", - "s": 54150870, + "id": "UK_England_South West England_Bristol", + "s": 54150870, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_South West England_Cornwall", - "s": 29229897, + "id": "UK_England_South West England_Cornwall", + "s": 29229897, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_West Midlands", - "s": 76653121, + "id": "UK_England_West Midlands", + "s": 76653121, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_England_Yorkshire and the Humber", - "s": 74145995, + "id": "UK_England_Yorkshire and the Humber", + "s": 74145995, "affiliations": [ - "England", + "England", "United Kingdom" - ], + ], "old": [ "UK_England" ] - }, + }, { - "id": "UK_Northern Ireland", - "s": 17806671, + "id": "UK_Northern Ireland", + "s": 17806671, "affiliations": [ - "Northern Ireland", - "Scotland", + "Northern Ireland", + "Scotland", "United Kingdom" - ], + ], "old": [ "UK_Northern Ireland" ] - }, + }, { - "id": "UK_Scotland_North", - "s": 54575425, + "id": "UK_Scotland_North", + "s": 54575425, "affiliations": [ - "Scotland", + "Scotland", "United Kingdom" - ], + ], "old": [ "UK_Scotland" ] - }, + }, { - "id": "UK_Scotland_South", - "s": 53107896, + "id": "UK_Scotland_South", + "s": 53107896, "affiliations": [ - "Isle of Man", - "Scotland", + "Isle of Man", + "Scotland", "United Kingdom" - ], + ], "old": [ "UK_Scotland" ] - }, + }, { - "id": "UK_Wales", - "s": 51070631, + "id": "UK_Wales", + "s": 51070631, "affiliations": [ - "United Kingdom", + "United Kingdom", "Wales" - ], + ], "old": [ "UK_Wales" ] } ] - }, + }, { - "id": "Ireland", + "id": "Ireland", "g": [ { - "id": "Ireland_Connacht", - "s": 20253144, + "id": "Ireland_Connacht", + "s": 20253144, "affiliations": [ "Ireland" - ], + ], "old": [ "Ireland" ] - }, + }, { - "id": "Ireland_Leinster", - "s": 36928926, + "id": "Ireland_Leinster", + "s": 36928926, "affiliations": [ "Ireland" - ], + ], "old": [ "Ireland" ] - }, + }, { - "id": "Ireland_Munster", - "s": 26282077, + "id": "Ireland_Munster", + "s": 26282077, "affiliations": [ "Ireland" - ], + ], "old": [ "Ireland" ] - }, + }, { - "id": "Ireland_Northern Counties", - "s": 8562457, + "id": "Ireland_Northern Counties", + "s": 8562457, "affiliations": [ "Ireland" - ], + ], "old": [ "Ireland" ] } ] - }, + }, { - "id": "United States of America", + "id": "United States of America", "g": [ { - "id": "Alabama", + "id": "Alabama", "g": [ { - "id": "US_Alabama_Birmingham", - "s": 43736214, + "id": "US_Alabama_Birmingham", + "s": 43736214, "affiliations": [ - "Alabama", + "Alabama", "United States of America" - ], + ], "old": [ "USA_Alabama" ] - }, + }, { - "id": "US_Alabama_Montgomery", - "s": 51348862, + "id": "US_Alabama_Montgomery", + "s": 51348862, "affiliations": [ - "Alabama", + "Alabama", "United States of America" - ], + ], "old": [ "USA_Alabama" ] } ] - }, + }, { - "id": "US_Alaska", - "s": 40857400, + "id": "US_Alaska", + "s": 40857400, "affiliations": [ - "Alaska", + "Alaska", "United States of America" - ], + ], "old": [ "USA_Alaska" ] - }, + }, { - "id": "Arizona", + "id": "Arizona", "g": [ { - "id": "US_Arizona_Flagstaff", - "s": 32244298, + "id": "US_Arizona_Flagstaff", + "s": 32244298, "affiliations": [ - "Arizona", + "Arizona", "United States of America" - ], + ], "old": [ "USA_Arizona" ] - }, + }, { - "id": "US_Arizona_Phoenix", - "s": 58068337, + "id": "US_Arizona_Phoenix", + "s": 58068337, "affiliations": [ - "Arizona", + "Arizona", "United States of America" - ], + ], "old": [ "USA_Arizona" ] - }, + }, { - "id": "US_Arizona_Tucson", - "s": 22098218, + "id": "US_Arizona_Tucson", + "s": 22098218, "affiliations": [ - "Arizona", + "Arizona", "United States of America" - ], + ], "old": [ "USA_Arizona" ] } ] - }, + }, { - "id": "US_Arkansas", + "id": "US_Arkansas", "g": [ { - "id": "US_Arkansas_North", - "s": 41832306, + "id": "US_Arkansas_North", + "s": 41832306, "affiliations": [ - "Arkansas", + "Arkansas", "United States of America" - ], + ], "old": [ "USA_Arkansas" ] - }, + }, { - "id": "US_Arkansas_South", - "s": 28613397, + "id": "US_Arkansas_South", + "s": 28613397, "affiliations": [ - "Arkansas", + "Arkansas", "United States of America" - ], + ], "old": [ "USA_Arkansas" ] } ] - }, + }, { - "id": "California", + "id": "California", "g": [ { - "id": "US_California_Chico", - "s": 32651762, + "id": "US_California_Chico", + "s": 32651762, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Bakersfield_Bakersfield", - "s": 34801495, + "id": "US_California_Bakersfield_Bakersfield", + "s": 34801495, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Bakersfield_Lancaster", - "s": 20746440, + "id": "US_California_Bakersfield_Lancaster", + "s": 20746440, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_LA", - "s": 93697106, + "id": "US_California_LA", + "s": 93697106, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_LA North", - "s": 20122086, + "id": "US_California_LA North", + "s": 20122086, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Redding", - "s": 39996812, + "id": "US_California_Redding", + "s": 39996812, "affiliations": [ - "California", - "Hoopa Valley Tribe", + "California", + "Hoopa Valley Tribe", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Sacramento_Sacramento", - "s": 26570809, + "id": "US_California_Sacramento_Sacramento", + "s": 26570809, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Sacramento_Fresno", - "s": 30366387, + "id": "US_California_Sacramento_Fresno", + "s": 30366387, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Sacramento_Stockton", - "s": 34754334, + "id": "US_California_Sacramento_Stockton", + "s": 34754334, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_San Diego", - "s": 55694040, + "id": "US_California_San Diego", + "s": 55694040, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Santa_Clara_Santa Cruz", - "s": 17457724, + "id": "US_California_Santa_Clara_Santa Cruz", + "s": 17457724, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] - }, + }, { - "id": "US_California_Santa_Clara_Palo Alto", - "s": 75716953, + "id": "US_California_Santa_Clara_Palo Alto", + "s": 75716953, "affiliations": [ - "California", + "California", "United States of America" - ], + ], "old": [ "USA_California" ] } ] - }, + }, { - "id": "Colorado", + "id": "Colorado", "g": [ { - "id": "US_Colorado_Aspen", - "s": 34923302, + "id": "US_Colorado_Aspen", + "s": 34923302, "affiliations": [ - "Colorado", + "Colorado", "United States of America" - ], + ], "old": [ "USA_Colorado" ] - }, + }, { - "id": "US_Colorado_Denver", - "s": 67715621, + "id": "US_Colorado_Denver", + "s": 67715621, "affiliations": [ - "Colorado", + "Colorado", "United States of America" - ], + ], "old": [ "USA_Colorado" ] - }, + }, { - "id": "US_Colorado_South", - "s": 36360647, + "id": "US_Colorado_South", + "s": 36360647, "affiliations": [ - "Colorado", + "Colorado", "United States of America" - ], + ], "old": [ "USA_Colorado" ] } ] - }, + }, { - "id": "US_Connecticut", - "s": 31564986, + "id": "US_Connecticut", + "s": 31564986, "affiliations": [ - "Connecticut", + "Connecticut", "United States of America" - ], + ], "old": [ "USA_Connecticut" ] - }, + }, { - "id": "US_Delaware", - "s": 10582454, + "id": "US_Delaware", + "s": 10582454, "affiliations": [ - "Delaware", + "Delaware", "United States of America" - ], + ], "old": [ "USA_Delaware" ] - }, + }, { - "id": "Florida", + "id": "Florida", "g": [ { - "id": "US_Florida_Jacksonville", - "s": 38356038, + "id": "US_Florida_Jacksonville", + "s": 38356038, "affiliations": [ - "Florida", + "Florida", "United States of America" - ], + ], "old": [ "USA_Florida" ] - }, + }, { - "id": "US_Florida_Miami", - "s": 57437968, + "id": "US_Florida_Miami", + "s": 57437968, "affiliations": [ - "Florida", + "Florida", "United States of America" - ], + ], "old": [ "USA_Florida" ] - }, + }, { - "id": "US_Florida_Orlando", - "s": 24620653, + "id": "US_Florida_Orlando", + "s": 24620653, "affiliations": [ - "Florida", + "Florida", "United States of America" - ], + ], "old": [ "USA_Florida" ] - }, + }, { - "id": "US_Florida_Tampa", - "s": 53801404, + "id": "US_Florida_Tampa", + "s": 53801404, "affiliations": [ - "Florida", + "Florida", "United States of America" - ], + ], "old": [ "USA_Florida" ] - }, + }, { - "id": "US_Florida_Gainesville", - "s": 33157392, + "id": "US_Florida_Gainesville", + "s": 33157392, "affiliations": [ - "Florida", + "Florida", "United States of America" - ], + ], "old": [ "USA_Florida" ] } ] - }, + }, { - "id": "US_Georgia", + "id": "US_Georgia", "g": [ { - "id": "US_Georgia_Atlanta", - "s": 62424001, + "id": "US_Georgia_Atlanta", + "s": 62424001, "affiliations": [ - "Georgia", + "Georgia", "United States of America" - ], + ], "old": [ "USA_Georgia" ] - }, + }, { - "id": "US_Georgia_Macon", - "s": 45801198, + "id": "US_Georgia_Macon", + "s": 45801198, "affiliations": [ - "Georgia", + "Georgia", "United States of America" - ], + ], "old": [ "USA_Georgia" ] - }, + }, { - "id": "US_Georgia_North", - "s": 28516215, + "id": "US_Georgia_North", + "s": 28516215, "affiliations": [ - "Georgia", + "Georgia", "United States of America" - ], + ], "old": [ "USA_Georgia" ] - }, + }, { - "id": "US_Georgia_South", - "s": 42672328, + "id": "US_Georgia_South", + "s": 42672328, "affiliations": [ - "Georgia", + "Georgia", "United States of America" - ], + ], "old": [ "USA_Georgia" ] } ] - }, + }, { - "id": "US_Guam", - "s": 2432613, + "id": "US_Guam", + "s": 2432613, "affiliations": [ - "Guam", - "Northern Mariana Islands", + "Guam", + "Northern Mariana Islands", "United States of America" - ], + ], "old": [ - "Northern Mariana Islands", + "Northern Mariana Islands", "Guam" ] - }, + }, { - "id": "US_Hawaii", - "s": 9351202, + "id": "US_Hawaii", + "s": 9351202, "affiliations": [ - "Hawaii", + "Hawaii", "United States of America" - ], + ], "old": [ "USA_Hawaii" ] - }, + }, { - "id": "US_Idaho", + "id": "US_Idaho", "g": [ { - "id": "US_Idaho_North", - "s": 22633364, + "id": "US_Idaho_North", + "s": 22633364, "affiliations": [ - "Idaho", + "Idaho", "United States of America" - ], + ], "old": [ "USA_Idaho" ] - }, + }, { - "id": "US_Idaho_South", - "s": 35312505, + "id": "US_Idaho_South", + "s": 35312505, "affiliations": [ - "Idaho", + "Idaho", "United States of America" - ], + ], "old": [ "USA_Idaho" ] } ] - }, + }, { - "id": "Illinois", + "id": "Illinois", "g": [ { - "id": "US_Illinois_South", - "s": 38982461, + "id": "US_Illinois_South", + "s": 38982461, "affiliations": [ - "Illinois", + "Illinois", "United States of America" - ], + ], "old": [ "USA_Illinois" ] - }, + }, { - "id": "US_Illinois_Chickago", - "s": 67678809, + "id": "US_Illinois_Chickago", + "s": 67678809, "affiliations": [ - "Illinois", + "Illinois", "United States of America" - ], + ], "old": [ "USA_Illinois" ] - }, + }, { - "id": "US_Illinois_Elgin", - "s": 27363042, + "id": "US_Illinois_Elgin", + "s": 27363042, "affiliations": [ - "Illinois", + "Illinois", "United States of America" - ], + ], "old": [ "USA_Illinois" ] - }, + }, { - "id": "US_Illinois_Rockford", - "s": 19883027, + "id": "US_Illinois_Rockford", + "s": 19883027, "affiliations": [ - "Illinois", + "Illinois", "United States of America" - ], + ], "old": [ "USA_Illinois" ] - }, + }, { - "id": "US_Illinois_Springfield", - "s": 50204239, + "id": "US_Illinois_Springfield", + "s": 50204239, "affiliations": [ - "Illinois", + "Illinois", "United States of America" - ], + ], "old": [ "USA_Illinois" ] } ] - }, + }, { - "id": "Indiana", + "id": "Indiana", "g": [ { - "id": "US_Indiana_North", - "s": 46522158, + "id": "US_Indiana_North", + "s": 46522158, "affiliations": [ - "Indiana", + "Indiana", "United States of America" - ], + ], "old": [ "USA_Indiana" ] - }, + }, { - "id": "US_Indiana_Evansville", - "s": 23734267, + "id": "US_Indiana_Evansville", + "s": 23734267, "affiliations": [ - "Indiana", + "Indiana", "United States of America" - ], + ], "old": [ "USA_Indiana" ] - }, + }, { - "id": "US_Indiana_Indianapolis", - "s": 38228844, + "id": "US_Indiana_Indianapolis", + "s": 38228844, "affiliations": [ - "Indiana", + "Indiana", "United States of America" - ], + ], "old": [ "USA_Indiana" ] } ] - }, + }, { - "id": "Iowa", + "id": "Iowa", "g": [ { - "id": "US_Iowa_Des Moines", - "s": 33694838, + "id": "US_Iowa_Des Moines", + "s": 33694838, "affiliations": [ - "Iowa", + "Iowa", "United States of America" - ], + ], "old": [ "USA_Iowa" ] - }, + }, { - "id": "US_Iowa_Waterloo", - "s": 29912020, + "id": "US_Iowa_Waterloo", + "s": 29912020, "affiliations": [ - "Iowa", + "Iowa", "United States of America" - ], + ], "old": [ "USA_Iowa" ] - }, + }, { - "id": "US_Iowa_West", - "s": 37408209, + "id": "US_Iowa_West", + "s": 37408209, "affiliations": [ - "Iowa", + "Iowa", "United States of America" - ], + ], "old": [ "USA_Iowa" ] } ] - }, + }, { - "id": "Kansas", + "id": "Kansas", "g": [ { - "id": "US_Kansas_East", - "s": 39550837, + "id": "US_Kansas_East", + "s": 39550837, "affiliations": [ - "Kansas", + "Kansas", "United States of America" - ], + ], "old": [ "USA_Kansas" ] - }, + }, { - "id": "US_Kansas_West", - "s": 22464670, + "id": "US_Kansas_West", + "s": 22464670, "affiliations": [ - "Kansas", + "Kansas", "United States of America" - ], + ], "old": [ "USA_Kansas" ] - }, + }, { - "id": "US_Kansas_Wichita", - "s": 34988290, + "id": "US_Kansas_Wichita", + "s": 34988290, "affiliations": [ - "Kansas", + "Kansas", "United States of America" - ], + ], "old": [ "USA_Kansas" ] } ] - }, + }, { - "id": "Kentucky", + "id": "Kentucky", "g": [ { - "id": "US_Kentucky_East", - "s": 39305490, + "id": "US_Kentucky_East", + "s": 39305490, "affiliations": [ - "Kentucky", + "Kentucky", "United States of America" - ], + ], "old": [ "USA_Kentucky" ] - }, + }, { - "id": "US_Kentucky_West", - "s": 27905180, + "id": "US_Kentucky_West", + "s": 27905180, "affiliations": [ - "Kentucky", + "Kentucky", "United States of America" - ], + ], "old": [ "USA_Kentucky" ] - }, + }, { - "id": "US_Kentucky_Louisville", - "s": 33124131, + "id": "US_Kentucky_Louisville", + "s": 33124131, "affiliations": [ - "Kentucky", + "Kentucky", "United States of America" - ], + ], "old": [ "USA_Kentucky" ] } ] - }, + }, { - "id": "Louisiana", + "id": "Louisiana", "g": [ { - "id": "US_Louisiana_Central", - "s": 46564003, + "id": "US_Louisiana_Central", + "s": 46564003, "affiliations": [ - "Louisiana", + "Louisiana", "United States of America" - ], + ], "old": [ "USA_Louisiana" ] - }, + }, { - "id": "US_Louisiana_New Orleans", - "s": 51178867, + "id": "US_Louisiana_New Orleans", + "s": 51178867, "affiliations": [ - "Louisiana", + "Louisiana", "United States of America" - ], + ], "old": [ "USA_Louisiana" ] } ] - }, + }, { - "id": "US_Maine", - "s": 36382712, + "id": "US_Maine", + "s": 36382712, "affiliations": [ - "Maine", + "Maine", "United States of America" - ], + ], "old": [ "USA_Maine" ] - }, + }, { - "id": "Maryland", + "id": "Maryland", "g": [ { - "id": "US_Maryland_Baltimore", - "s": 82419364, + "id": "US_Maryland_Baltimore", + "s": 82419364, "affiliations": [ - "Maryland", + "Maryland", "United States of America" - ], + ], "old": [ "USA_Maryland" ] - }, + }, { - "id": "US_Maryland_and_DC", - "s": 45821988, + "id": "US_Maryland_and_DC", + "s": 45821988, "affiliations": [ - "District of Columbia", - "Maryland", + "District of Columbia", + "Maryland", "United States of America" - ], + ], "old": [ - "USA_Maryland", + "USA_Maryland", "USA_District of Columbia" ] } ] - }, + }, { - "id": "Massachusetts", + "id": "Massachusetts", "g": [ { - "id": "US_Massachusetts_Boston", - "s": 60528708, + "id": "US_Massachusetts_Boston", + "s": 60528708, "affiliations": [ - "Massachusetts", + "Massachusetts", "United States of America" - ], + ], "old": [ "USA_Massachusetts" ] - }, + }, { - "id": "US_Massachusetts_Central", - "s": 28119238, + "id": "US_Massachusetts_Central", + "s": 28119238, "affiliations": [ - "Massachusetts", + "Massachusetts", "United States of America" - ], + ], "old": [ "USA_Massachusetts" ] - }, + }, { - "id": "US_Massachusetts_Plymouth", - "s": 30593581, + "id": "US_Massachusetts_Plymouth", + "s": 30593581, "affiliations": [ - "Massachusetts", + "Massachusetts", "United States of America" - ], + ], "old": [ "USA_Massachusetts" ] - }, + }, { - "id": "US_Massachusetts_Southeastern", - "s": 15333383, + "id": "US_Massachusetts_Southeastern", + "s": 15333383, "affiliations": [ - "Massachusetts", + "Massachusetts", "United States of America" - ], + ], "old": [ "USA_Massachusetts" ] - }, + }, { - "id": "US_Massachusetts_West", - "s": 24232910, + "id": "US_Massachusetts_West", + "s": 24232910, "affiliations": [ - "Massachusetts", + "Massachusetts", "United States of America" - ], + ], "old": [ "USA_Massachusetts" ] } ] - }, + }, { - "id": "Michigan", + "id": "Michigan", "g": [ { - "id": "US_Michigan_Detroit", - "s": 42948568, + "id": "US_Michigan_Detroit", + "s": 42948568, "affiliations": [ - "Michigan", + "Michigan", "United States of America" - ], + ], "old": [ "USA_Michigan" ] - }, + }, { - "id": "US_Michigan_North", - "s": 32384557, + "id": "US_Michigan_North", + "s": 32384557, "affiliations": [ - "Michigan", + "Michigan", "United States of America" - ], + ], "old": [ "USA_Michigan" ] - }, + }, { - "id": "US_Michigan_Grand Rapids", - "s": 37695023, + "id": "US_Michigan_Grand Rapids", + "s": 37695023, "affiliations": [ - "Little Traverse Bay Band of Odawas Reservation", - "Little Traverse Bay Bands Of Odawa Reservation", - "Grand Traverse Reservation", - "Little Traverse Bay Bands of Odawas Reservation", - "Little Traverse Bay Band of Odawa Reservation", - "Little Traverse Bay Band of Odawas", - "Michigan", + "Little Traverse Bay Band of Odawas Reservation", + "Little Traverse Bay Bands Of Odawa Reservation", + "Grand Traverse Reservation", + "Little Traverse Bay Bands of Odawas Reservation", + "Little Traverse Bay Band of Odawa Reservation", + "Little Traverse Bay Band of Odawas", + "Michigan", "United States of America" - ], + ], "old": [ "USA_Michigan" ] - }, + }, { - "id": "US_Michigan_Lansing", - "s": 41517265, + "id": "US_Michigan_Lansing", + "s": 41517265, "affiliations": [ - "Little Traverse Bay Band of Odawas Reservation", - "Little Traverse Bay Bands of Odawas Reservation", - "Michigan", + "Little Traverse Bay Band of Odawas Reservation", + "Little Traverse Bay Bands of Odawas Reservation", + "Michigan", "United States of America" - ], + ], "old": [ "USA_Michigan" ] } ] - }, + }, { - "id": "Minnesota", + "id": "Minnesota", "g": [ { - "id": "US_Minnesota_Rochester", - "s": 39357617, + "id": "US_Minnesota_Rochester", + "s": 39357617, "affiliations": [ - "Minnesota", + "Minnesota", "United States of America" - ], + ], "old": [ "USA_Minnesota" ] - }, + }, { - "id": "US_Minnesota_Minneapolis", - "s": 38484605, + "id": "US_Minnesota_Minneapolis", + "s": 38484605, "affiliations": [ - "Minnesota", + "Minnesota", "United States of America" - ], + ], "old": [ "USA_Minnesota" ] - }, + }, { - "id": "US_Minnesota_North", - "s": 42987820, + "id": "US_Minnesota_North", + "s": 42987820, "affiliations": [ - "Minnesota", + "Minnesota", "United States of America" - ], + ], "old": [ "USA_Minnesota" ] - }, + }, { - "id": "US_Minnesota_Saint Cloud", - "s": 32937860, + "id": "US_Minnesota_Saint Cloud", + "s": 32937860, "affiliations": [ - "Minnesota", + "Minnesota", "United States of America" - ], + ], "old": [ "USA_Minnesota" ] } ] - }, + }, { - "id": "US_Mississippi", + "id": "US_Mississippi", "g": [ { - "id": "US_Mississippi_Gulfport", - "s": 21046468, + "id": "US_Mississippi_Gulfport", + "s": 21046468, "affiliations": [ - "Mississippi", + "Mississippi", "United States of America" - ], + ], "old": [ "USA_Mississippi" ] - }, + }, { - "id": "US_Mississippi_North", - "s": 46409781, + "id": "US_Mississippi_North", + "s": 46409781, "affiliations": [ - "Mississippi", + "Mississippi", "United States of America" - ], + ], "old": [ "USA_Mississippi" ] } ] - }, + }, { - "id": "Missouri", + "id": "Missouri", "g": [ { - "id": "US_Missouri_East", - "s": 15454820, + "id": "US_Missouri_East", + "s": 15454820, "affiliations": [ - "Missouri", + "Missouri", "United States of America" - ], + ], "old": [ "USA_Missouri" ] - }, + }, { - "id": "US_Missouri_Springfield", - "s": 34818562, + "id": "US_Missouri_Springfield", + "s": 34818562, "affiliations": [ - "Missouri", + "Missouri", "United States of America" - ], + ], "old": [ "USA_Missouri" ] - }, + }, { - "id": "US_Missouri_Kansas", - "s": 33135284, + "id": "US_Missouri_Kansas", + "s": 33135284, "affiliations": [ - "Missouri", + "Missouri", "United States of America" - ], + ], "old": [ "USA_Missouri" ] - }, + }, { - "id": "US_Missouri_St Louis", - "s": 38960791, + "id": "US_Missouri_St Louis", + "s": 38960791, "affiliations": [ - "Missouri", + "Missouri", "United States of America" - ], + ], "old": [ "USA_Missouri" ] } ] - }, + }, { - "id": "US_Montana", + "id": "US_Montana", "g": [ { - "id": "US_Montana_East", - "s": 31426715, + "id": "US_Montana_East", + "s": 31426715, "affiliations": [ - "Montana", + "Montana", "United States of America" - ], + ], "old": [ "USA_Montana" ] - }, + }, { - "id": "US_Montana_West", - "s": 29800162, + "id": "US_Montana_West", + "s": 29800162, "affiliations": [ - "Montana", + "Montana", "United States of America" - ], + ], "old": [ "USA_Montana" ] } ] - }, + }, { - "id": "US_Nebraska", + "id": "US_Nebraska", "g": [ { - "id": "US_Nebraska_East", - "s": 34297428, + "id": "US_Nebraska_East", + "s": 34297428, "affiliations": [ - "Nebraska", + "Nebraska", "United States of America" - ], + ], "old": [ "USA_Nebraska" ] - }, + }, { - "id": "US_Nebraska_West", - "s": 43157696, + "id": "US_Nebraska_West", + "s": 43157696, "affiliations": [ - "Nebraska", + "Nebraska", "United States of America" - ], + ], "old": [ "USA_Nebraska" ] } ] - }, + }, { - "id": "US_Nevada", - "s": 36854836, + "id": "US_Nevada", + "s": 36854836, "affiliations": [ - "Nevada", + "Nevada", "United States of America" - ], + ], "old": [ "USA_Nevada" ] - }, + }, { - "id": "US_New Hampshire", - "s": 33256169, + "id": "US_New Hampshire", + "s": 33256169, "affiliations": [ - "New Hampshire", + "New Hampshire", "United States of America" - ], + ], "old": [ "USA_New Hampshire" ] - }, + }, { - "id": "New Jersey", + "id": "New Jersey", "g": [ { - "id": "US_New Jersey_North", - "s": 36877085, + "id": "US_New Jersey_North", + "s": 36877085, "affiliations": [ - "New Jersey", + "New Jersey", "United States of America" - ], + ], "old": [ "USA_New Jersey" ] - }, + }, { - "id": "US_New Jersey_South", - "s": 48956180, + "id": "US_New Jersey_South", + "s": 48956180, "affiliations": [ - "New Jersey", + "New Jersey", "United States of America" - ], + ], "old": [ "USA_New Jersey" ] } ] - }, + }, { - "id": "US_New Mexico", + "id": "US_New Mexico", "g": [ { - "id": "US_New Mexico_Albuquerque", - "s": 35568006, + "id": "US_New Mexico_Albuquerque", + "s": 35568006, "affiliations": [ - "New Mexico", + "New Mexico", "United States of America" - ], + ], "old": [ "USA_New Mexico" ] - }, + }, { - "id": "US_New Mexico_Roswell", - "s": 39149633, + "id": "US_New Mexico_Roswell", + "s": 39149633, "affiliations": [ - "New Mexico", + "New Mexico", "United States of America" - ], + ], "old": [ "USA_New Mexico" ] } ] - }, + }, { - "id": "New York", + "id": "New York", "g": [ { - "id": "US_New York_East", - "s": 33085008, + "id": "US_New York_East", + "s": 33085008, "affiliations": [ - "Gardiners Island", - "New York", + "Gardiners Island", + "New York", "United States of America" - ], + ], "old": [ "USA_New York" ] - }, + }, { - "id": "US_New York_New York", - "s": 72094166, + "id": "US_New York_New York", + "s": 72094166, "affiliations": [ - "Ellis Island (historical)", - "Liberty Island", - "New York", + "Ellis Island (historical)", + "Liberty Island", + "New York", "United States of America" - ], + ], "old": [ "USA_New York" ] - }, + }, { - "id": "US_New York_North", - "s": 39265358, + "id": "US_New York_North", + "s": 39265358, "affiliations": [ - "New York", + "New York", "United States of America" - ], + ], "old": [ "USA_New York" ] - }, + }, { - "id": "US_New York_West", - "s": 57415056, + "id": "US_New York_West", + "s": 57415056, "affiliations": [ - "New York", + "New York", "United States of America" - ], + ], "old": [ "USA_New York" ] } ] - }, + }, { - "id": "North Carolina", + "id": "North Carolina", "g": [ { - "id": "US_North Carolina_Wilson", - "s": 30262003, + "id": "US_North Carolina_Wilson", + "s": 30262003, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] - }, + }, { - "id": "US_North Carolina_Asheville", - "s": 26907335, + "id": "US_North Carolina_Asheville", + "s": 26907335, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] - }, + }, { - "id": "US_North Carolina_Charlotte", - "s": 37465942, + "id": "US_North Carolina_Charlotte", + "s": 37465942, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] - }, + }, { - "id": "US_North Carolina_Greensboro", - "s": 32424456, + "id": "US_North Carolina_Greensboro", + "s": 32424456, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] - }, + }, { - "id": "US_North Carolina_Raleigh", - "s": 38033037, + "id": "US_North Carolina_Raleigh", + "s": 38033037, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] - }, + }, { - "id": "US_North Carolina_Wilmington", - "s": 29747126, + "id": "US_North Carolina_Wilmington", + "s": 29747126, "affiliations": [ - "North Carolina", + "North Carolina", "United States of America" - ], + ], "old": [ "USA_North Carolina" ] } ] - }, + }, { - "id": "North Dakota", + "id": "North Dakota", "g": [ { - "id": "US_North Dakota_Bismarck", - "s": 21398565, + "id": "US_North Dakota_Bismarck", + "s": 21398565, "affiliations": [ - "North Dakota", + "North Dakota", "United States of America" - ], + ], "old": [ "USA_North Dakota" ] - }, + }, { - "id": "US_North Dakota_East", - "s": 33793277, + "id": "US_North Dakota_East", + "s": 33793277, "affiliations": [ - "North Dakota", + "North Dakota", "United States of America" - ], + ], "old": [ "USA_North Dakota" ] - }, + }, { - "id": "US_North Dakota_Minot", - "s": 21170462, + "id": "US_North Dakota_Minot", + "s": 21170462, "affiliations": [ - "North Dakota", + "North Dakota", "United States of America" - ], + ], "old": [ "USA_North Dakota" ] } ] - }, + }, { - "id": "Ohio", + "id": "Ohio", "g": [ { - "id": "US_Ohio_Cleveland", - "s": 47909050, + "id": "US_Ohio_Cleveland", + "s": 47909050, "affiliations": [ - "Ohio", + "Ohio", "United States of America" - ], + ], "old": [ "USA_Ohio" ] - }, + }, { - "id": "US_Ohio_Cincinnati", - "s": 40718104, + "id": "US_Ohio_Cincinnati", + "s": 40718104, "affiliations": [ - "Ohio", + "Ohio", "United States of America" - ], + ], "old": [ "USA_Ohio" ] - }, + }, { - "id": "US_Ohio_Columbus", - "s": 31087362, + "id": "US_Ohio_Columbus", + "s": 31087362, "affiliations": [ - "Ohio", + "Ohio", "United States of America" - ], + ], "old": [ "USA_Ohio" ] - }, + }, { - "id": "US_Ohio_Toledo", - "s": 26733180, + "id": "US_Ohio_Toledo", + "s": 26733180, "affiliations": [ - "Ohio", + "Ohio", "United States of America" - ], + ], "old": [ "USA_Ohio" ] } ] - }, + }, { - "id": "Oklahoma", + "id": "Oklahoma", "g": [ { - "id": "US_Oklahoma_East", - "s": 19150818, + "id": "US_Oklahoma_East", + "s": 19150818, "affiliations": [ - "Oklahoma", + "Oklahoma", "United States of America" - ], + ], "old": [ "USA_Oklahoma" ] - }, + }, { - "id": "US_Oklahoma_West", - "s": 24120823, + "id": "US_Oklahoma_West", + "s": 24120823, "affiliations": [ - "Oklahoma", + "Oklahoma", "United States of America" - ], + ], "old": [ "USA_Oklahoma" ] - }, + }, { - "id": "US_Oklahoma_Tulsa", - "s": 37803131, + "id": "US_Oklahoma_Tulsa", + "s": 37803131, "affiliations": [ - "Oklahoma", + "Oklahoma", "United States of America" - ], + ], "old": [ "USA_Oklahoma" ] - }, + }, { - "id": "US_Oklahoma_Oklahoma", - "s": 35607626, + "id": "US_Oklahoma_Oklahoma", + "s": 35607626, "affiliations": [ - "Oklahoma", + "Oklahoma", "United States of America" - ], + ], "old": [ "USA_Oklahoma" ] } ] - }, + }, { - "id": "Oregon", + "id": "Oregon", "g": [ { - "id": "US_Oregon_Eugene", - "s": 27869416, + "id": "US_Oregon_Eugene", + "s": 27869416, "affiliations": [ - "Oregon", + "Oregon", "United States of America" - ], + ], "old": [ "USA_Oregon" ] - }, + }, { - "id": "US_Oregon_Portland", - "s": 73422271, + "id": "US_Oregon_Portland", + "s": 73422271, "affiliations": [ - "Oregon", + "Oregon", "United States of America" - ], + ], "old": [ "USA_Oregon" ] - }, + }, { - "id": "US_Oregon_West", - "s": 31379663, + "id": "US_Oregon_West", + "s": 31379663, "affiliations": [ - "Oregon", + "Oregon", "United States of America" - ], + ], "old": [ "USA_Oregon" ] } ] - }, + }, { - "id": "Pennsylvania", + "id": "Pennsylvania", "g": [ { - "id": "US_Pennsylvania_Central", - "s": 47645228, + "id": "US_Pennsylvania_Central", + "s": 47645228, "affiliations": [ - "Pennsylvania", + "Pennsylvania", "United States of America" - ], + ], "old": [ "USA_Pennsylvania" ] - }, + }, { - "id": "US_Pennsylvania_Pittsburgh", - "s": 41606143, + "id": "US_Pennsylvania_Pittsburgh", + "s": 41606143, "affiliations": [ - "Pennsylvania", + "Pennsylvania", "United States of America" - ], + ], "old": [ "USA_Pennsylvania" ] - }, + }, { - "id": "US_Pennsylvania_Reading", - "s": 39465897, + "id": "US_Pennsylvania_Reading", + "s": 39465897, "affiliations": [ - "Pennsylvania", + "Pennsylvania", "United States of America" - ], + ], "old": [ "USA_Pennsylvania" ] - }, + }, { - "id": "US_Pennsylvania_Scranton", - "s": 44685535, + "id": "US_Pennsylvania_Scranton", + "s": 44685535, "affiliations": [ - "Pennsylvania", + "Pennsylvania", "United States of America" - ], + ], "old": [ "USA_Pennsylvania" ] } ] - }, + }, { - "id": "US_Puerto Rico", - "s": 33183710, + "id": "US_Puerto Rico", + "s": 33183710, "affiliations": [ - "Puerto Rico", - "Rep\u00fablica Dominicana", + "Puerto Rico", + "Rep\u00fablica Dominicana", "United States of America" - ], + ], "old": [ "Puerto Rico" ] - }, + }, { - "id": "US_Rhode Island", - "s": 11049968, + "id": "US_Rhode Island", + "s": 11049968, "affiliations": [ - "Patience Island", - "Rhode Island", + "Patience Island", + "Rhode Island", "United States of America" - ], + ], "old": [ "USA_Rhode Island" ] - }, + }, { - "id": "South Carolina", + "id": "South Carolina", "g": [ { - "id": "US_South Carolina_Charleston", - "s": 22750478, + "id": "US_South Carolina_Charleston", + "s": 22750478, "affiliations": [ - "South Carolina", + "South Carolina", "United States of America" - ], + ], "old": [ "USA_South Carolina" ] - }, + }, { - "id": "US_South Carolina_Columbia", - "s": 41948459, + "id": "US_South Carolina_Columbia", + "s": 41948459, "affiliations": [ - "South Carolina", + "South Carolina", "United States of America" - ], + ], "old": [ "USA_South Carolina" ] - }, + }, { - "id": "US_South Carolina_Florence", - "s": 30545505, + "id": "US_South Carolina_Florence", + "s": 30545505, "affiliations": [ - "South Carolina", + "South Carolina", "United States of America" - ], + ], "old": [ "USA_South Carolina" ] } ] - }, + }, { - "id": "US_South Dakota", - "s": 38990447, + "id": "US_South Dakota", + "s": 38990447, "affiliations": [ - "South Dakota", + "South Dakota", "United States of America" - ], + ], "old": [ "USA_South Dakota" ] - }, + }, { - "id": "Tennessee", + "id": "Tennessee", "g": [ { - "id": "US_Tennessee_East", - "s": 54181489, + "id": "US_Tennessee_East", + "s": 54181489, "affiliations": [ - "Tennessee", + "Tennessee", "United States of America" - ], + ], "old": [ "USA_Tennessee" ] - }, + }, { - "id": "US_Tennessee_West", - "s": 40075779, + "id": "US_Tennessee_West", + "s": 40075779, "affiliations": [ - "Tennessee", + "Tennessee", "United States of America" - ], + ], "old": [ "USA_Tennessee" ] } ] - }, + }, { - "id": "Texas", + "id": "Texas", "g": [ { - "id": "US_Texas_Austin", - "s": 55274585, + "id": "US_Texas_Austin", + "s": 55274585, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Victoria", - "s": 17435537, + "id": "US_Texas_Victoria", + "s": 17435537, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Dallas", - "s": 56789363, + "id": "US_Texas_Dallas", + "s": 56789363, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Houston", - "s": 60419480, + "id": "US_Texas_Houston", + "s": 60419480, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Amarillo", - "s": 24568708, + "id": "US_Texas_Amarillo", + "s": 24568708, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Lubbock", - "s": 29395632, + "id": "US_Texas_Lubbock", + "s": 29395632, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_San Antonio", - "s": 39590468, + "id": "US_Texas_San Antonio", + "s": 39590468, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Southwest", - "s": 28652142, + "id": "US_Texas_Southwest", + "s": 28652142, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Tyler", - "s": 38877478, + "id": "US_Texas_Tyler", + "s": 38877478, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_Wako", - "s": 28151032, + "id": "US_Texas_Wako", + "s": 28151032, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] - }, + }, { - "id": "US_Texas_West", - "s": 42646521, + "id": "US_Texas_West", + "s": 42646521, "affiliations": [ - "Texas", + "Texas", "United States of America" - ], + ], "old": [ "USA_Texas" ] } ] - }, + }, { - "id": "US_United States Minor Outlying Islands", - "s": 456218, + "id": "US_United States Minor Outlying Islands", + "s": 456218, "affiliations": [ - "Navassa Island", + "Navassa Island", "United States Minor Outlying Islands" ] - }, + }, { - "id": "US_Utah", + "id": "US_Utah", "g": [ { - "id": "US_Utah_South", - "s": 17782333, + "id": "US_Utah_South", + "s": 17782333, "affiliations": [ - "United States of America", + "United States of America", "Utah" - ], + ], "old": [ "USA_Utah" ] - }, + }, { - "id": "US_Utah_North", - "s": 33809340, + "id": "US_Utah_North", + "s": 33809340, "affiliations": [ - "United States of America", + "United States of America", "Utah" - ], + ], "old": [ "USA_Utah" ] } ] - }, + }, { - "id": "US_Vermont", - "s": 16610581, + "id": "US_Vermont", + "s": 16610581, "affiliations": [ - "United States of America", + "United States of America", "Vermont" - ], + ], "old": [ "USA_Vermont" ] - }, + }, { - "id": "Virginia", + "id": "Virginia", "g": [ { - "id": "US_Virginia_Roanoke", - "s": 38226086, + "id": "US_Virginia_Roanoke", + "s": 38226086, "affiliations": [ - "Virginia", + "Virginia", "United States of America" - ], + ], "old": [ "USA_Virginia" ] - }, + }, { - "id": "US_Virginia_Norfolk", - "s": 65457990, + "id": "US_Virginia_Norfolk", + "s": 65457990, "affiliations": [ - "Virginia", + "Virginia", "United States of America" - ], + ], "old": [ "USA_Virginia" ] - }, + }, { - "id": "US_Virginia_Lynchburg", - "s": 45892207, + "id": "US_Virginia_Lynchburg", + "s": 45892207, "affiliations": [ - "Virginia", + "Virginia", "United States of America" - ], + ], "old": [ "USA_Virginia" ] - }, + }, { - "id": "US_Virginia_Richmond", - "s": 24739414, + "id": "US_Virginia_Richmond", + "s": 24739414, "affiliations": [ - "Virginia", + "Virginia", "United States of America" - ], + ], "old": [ "USA_Virginia" ] - }, + }, { - "id": "US_Virginia_Alexandria", - "s": 36137140, + "id": "US_Virginia_Alexandria", + "s": 36137140, "affiliations": [ - "Virginia", + "Virginia", "United States of America" - ], + ], "old": [ "USA_Virginia" ] } ] - }, + }, { - "id": "Washington", + "id": "Washington", "g": [ { - "id": "US_Washington_Coast", - "s": 50733123, + "id": "US_Washington_Coast", + "s": 50733123, "affiliations": [ - "Puyallup Tribe", - "Puyallup Tribe Reservation", - "United States of America", + "Puyallup Tribe", + "Puyallup Tribe Reservation", + "United States of America", "Washington" - ], + ], "old": [ "USA_Washington" ] - }, + }, { - "id": "US_Washington_Seattle", - "s": 45870627, + "id": "US_Washington_Seattle", + "s": 45870627, "affiliations": [ - "United States of America", + "United States of America", "Washington" - ], + ], "old": [ "USA_Washington" ] - }, + }, { - "id": "US_Washington_Yakima", - "s": 37705978, + "id": "US_Washington_Yakima", + "s": 37705978, "affiliations": [ - "United States of America", + "United States of America", "Washington" - ], + ], "old": [ "USA_Washington" ] } ] - }, + }, { - "id": "US_West Virginia", - "s": 37715549, + "id": "US_West Virginia", + "s": 37715549, "affiliations": [ - "United States of America", + "United States of America", "West Virginia" - ], + ], "old": [ "USA_West Virginia" ] - }, + }, { - "id": "Wisconsin", + "id": "Wisconsin", "g": [ { - "id": "US_Wisconsin_Milwaukee", - "s": 40636171, + "id": "US_Wisconsin_Milwaukee", + "s": 40636171, "affiliations": [ - "United States of America", + "United States of America", "Wisconsin" - ], + ], "old": [ "USA_Wisconsin" ] - }, + }, { - "id": "US_Wisconsin_North", - "s": 27193116, + "id": "US_Wisconsin_North", + "s": 27193116, "affiliations": [ - "United States of America", + "United States of America", "Wisconsin" - ], + ], "old": [ "USA_Wisconsin" ] - }, + }, { - "id": "US_Wisconsin_Madison", - "s": 28342761, + "id": "US_Wisconsin_Madison", + "s": 28342761, "affiliations": [ - "United States of America", + "United States of America", "Wisconsin" - ], + ], "old": [ "USA_Wisconsin" ] - }, + }, { - "id": "US_Wisconsin_Eau Claire", - "s": 27745211, + "id": "US_Wisconsin_Eau Claire", + "s": 27745211, "affiliations": [ - "United States of America", + "United States of America", "Wisconsin" - ], + ], "old": [ "USA_Wisconsin" ] } ] - }, + }, { - "id": "US_Wyoming", - "s": 38343471, + "id": "US_Wyoming", + "s": 38343471, "affiliations": [ - "United States of America", + "United States of America", "Wyoming" - ], + ], "old": [ "USA_Wyoming" ] } ] - }, + }, { - "id": "Uruguay", - "s": 28857742, + "id": "Uruguay", + "s": 28857742, "affiliations": [ - "Cerro Largo", - "Artigas", - "Canelones", - "Colonia", - "Durazno", - "Flores", - "Florida", - "Lavalleja", - "Maldonado", - "Montevideo", - "R\u00edo Negro", - "Paysand\u00fa", - "Rivera", - "Rocha", - "Salto", - "San Jos\u00e9", - "Soriano", - "Tacuaremb\u00f3", - "Treinta y Tres", + "Cerro Largo", + "Artigas", + "Canelones", + "Colonia", + "Durazno", + "Flores", + "Florida", + "Lavalleja", + "Maldonado", + "Montevideo", + "R\u00edo Negro", + "Paysand\u00fa", + "Rivera", + "Rocha", + "Salto", + "San Jos\u00e9", + "Soriano", + "Tacuaremb\u00f3", + "Treinta y Tres", "Uruguay" - ], + ], "old": [ "Uruguay" ] - }, + }, { - "id": "Uzbekistan", - "s": 42148993, + "id": "Uzbekistan", + "s": 42148993, "affiliations": [ - "Andijon Viloyati", - "Border Kyrgyzstan - Uzbekistan", - "Buxoro Viloyati", - "Farg'ona Viloyati", - "Jizzax Viloyati", - "Qaraqalpaqstan Respublikasi", - "Namangan Viloyati", - "Navoiy Viloyati", - "O\u02bbzbekiston", - "Qashqadaryo Viloyati", - "Toshkent Viloyati", - "Samarqand Viloyati", - "Sirdaryo Viloyati", - "Surxondaryo Viloyati", - "Toshkent", + "Andijon Viloyati", + "Border Kyrgyzstan - Uzbekistan", + "Buxoro Viloyati", + "Farg'ona Viloyati", + "Jizzax Viloyati", + "Qaraqalpaqstan Respublikasi", + "Namangan Viloyati", + "Navoiy Viloyati", + "O\u02bbzbekiston", + "Qashqadaryo Viloyati", + "Toshkent Viloyati", + "Samarqand Viloyati", + "Sirdaryo Viloyati", + "Surxondaryo Viloyati", + "Toshkent", "Xorazm Viloyati" - ], + ], "old": [ "Uzbekistan" ] - }, + }, { - "id": "Vanuatu", - "s": 3313485, + "id": "Vanuatu", + "s": 3313485, "affiliations": [ - "Malampa", - "Penama", - "Sanma", - "Shefa", - "Tafea", - "Vanuatu", + "Malampa", + "Penama", + "Sanma", + "Shefa", + "Tafea", + "Vanuatu", "Torba" - ], + ], "old": [ "Vanuatu" ] - }, + }, { - "id": "Venezuela", + "id": "Venezuela", "g": [ { - "id": "Venezuela_North", - "s": 27887561, + "id": "Venezuela_North", + "s": 27887561, "affiliations": [ - "Barinas", - "Carabobo", - "Cojedes", - "Distrito Capital", - "Dependencias Federales", - "Estado Anzo\u00e1tegui", - "Estado Aragua", - "Estado Delta Amacuro", - "Estado Gu\u00e1rico", - "Estado Miranda", - "Estado Monagas", - "Estado Sucre", - "Estado Vargas", - "Falc\u00f3n", - "Isla de Patos", - "Lara", - "Nueva Esparta", - "Portuguesa", - "Trujillo", - "Venezuela", - "Venezuela (territorial waters)", - "Yaracuy", + "Barinas", + "Carabobo", + "Cojedes", + "Distrito Capital", + "Dependencias Federales", + "Estado Anzo\u00e1tegui", + "Estado Aragua", + "Estado Delta Amacuro", + "Estado Gu\u00e1rico", + "Estado Miranda", + "Estado Monagas", + "Estado Sucre", + "Estado Vargas", + "Falc\u00f3n", + "Isla de Patos", + "Lara", + "Nueva Esparta", + "Portuguesa", + "Trujillo", + "Venezuela", + "Venezuela (territorial waters)", + "Yaracuy", "Zulia" - ], + ], "old": [ "Venezuela" ] - }, + }, { - "id": "Venezuela_South", - "s": 24313004, + "id": "Venezuela_South", + "s": 24313004, "affiliations": [ - "Amazonas", - "Apure", - "Barinas", - "Estado Bol\u00edvar", - "Estado Delta Amacuro", - "Estado Gu\u00e1rico", - "M\u00e9rida", - "Portuguesa", - "Trujillo", - "T\u00e1chira", - "Venezuela", + "Amazonas", + "Apure", + "Barinas", + "Estado Bol\u00edvar", + "Estado Delta Amacuro", + "Estado Gu\u00e1rico", + "M\u00e9rida", + "Portuguesa", + "Trujillo", + "T\u00e1chira", + "Venezuela", "Zulia" - ], + ], "old": [ "Venezuela" ] } ] - }, + }, { - "id": "Vietnam", - "s": 44483429, + "id": "Vietnam", + "s": 44483429, "affiliations": [ - "T\u1ec9nh H\u00e0 Nam", - "T\u1ec9nh H\u00e0 T\u0129nh", - "T\u1ec9nh H\u00f2a B\u00ecnh", - "T\u1ec9nh H\u1ea3i D\u01b0\u01a1ng", - "T\u1ec9nh H\u01b0ng Y\u00ean", - "T\u1ec9nh H\u1eadu Giang", - "T\u1ec9nh Kh\u00e1nh H\u00f2a", - "T\u1ec9nh Kon Tum", - "T\u1ec9nh Lai Ch\u00e2u", - "T\u1ec9nh Long An", - "T\u1ec9nh L\u00e0o Cai", - "T\u1ec9nh L\u00e2m \u0110\u1ed3ng", - "T\u1ec9nh L\u1ea1ng S\u01a1n", - "T\u1ec9nh Nam \u0110\u1ecbnh", - "T\u1ec9nh Ngh\u1ec7 An", - "T\u1ec9nh Ninh B\u00ecnh", - "T\u1ec9nh Ninh Thu\u1eadn", - "T\u1ec9nh Ph\u00fa Th\u1ecd", - "T\u1ec9nh Ph\u00fa Y\u00ean", - "T\u1ec9nh Qu\u1ea3ng B\u00ecnh", - "T\u1ec9nh Qu\u1ea3ng Nam", - "T\u1ec9nh Qu\u1ea3ng Ng\u00e3i", - "T\u1ec9nh Qu\u1ea3ng Tr\u1ecb", - "T\u1ec9nh S\u01a1n La", - "T\u1ec9nh Thanh H\u00f3a", - "T\u1ec9nh Th\u00e1i B\u00ecnh", - "T\u1ec9nh Th\u00e1i Nguy\u00ean", - "T\u1ec9nh Th\u1eeba Thi\u00ean - Hu\u1ebf", - "T\u1ec9nh Ti\u1ec1n Giang", - "T\u1ec9nh Tr\u00e0 Vinh", - "T\u1ec9nh Tuy\u00ean Quang", - "T\u1ec9nh T\u00e2y Ninh", - "T\u1ec9nh V\u0129nh Long", - "T\u1ec9nh V\u0129nh Ph\u00fac", - "T\u1ec9nh Y\u00ean B\u00e1i", - "T\u1ec9nh \u0110i\u1ec7n Bi\u00ean", - "T\u1ec9nh \u0110\u1eafk L\u1eafk", - "T\u1ec9nh \u0110\u1eafk N\u00f4ng", - "T\u1ec9nh \u0110\u1ed3ng Nai", - "T\u1ec9nh \u0110\u1ed3ng Th\u00e1p", - "B\u1ea1c Li\u00eau", - "Cao B\u1eb1ng", - "C\u00e0 Mau", - "Ki\u00ean Giang", - "Provinz T\u1ec9nh Qu\u1ea3ng Ninh", - "S\u00f3c Tr\u0103ng", - "Th\u00e0nh ph\u1ed1 C\u1ea7n Th\u01a1", - "Th\u00e0nh ph\u1ed1 H\u00e0 N\u1ed9i", - "Th\u00e0nh ph\u1ed1 H\u1ed3 Ch\u00ed Minh", - "Th\u00e0nh ph\u1ed1 H\u1ea3i Ph\u00f2ng", - "Th\u00e0nh ph\u1ed1 \u0110\u00e0 N\u1eb5ng", - "T\u1ec9nh An Giang", - "T\u1ec9nh B\u00e0 R\u1ecba \u2013 V\u0169ng T\u00e0u", - "T\u1ec9nh B\u00ecnh D\u01b0\u01a1ng", - "T\u1ec9nh B\u00ecnh Ph\u01b0\u1edbc", - "T\u1ec9nh B\u00ecnh Thu\u1eadn", - "T\u1ec9nh B\u00ecnh \u0110\u1ecbnh", - "T\u1ec9nh B\u1eafc Giang", - "T\u1ec9nh B\u1eafc K\u1ea1n", - "T\u1ec9nh B\u1eafc Ninh", - "T\u1ec9nh B\u1ebfn Tre", - "T\u1ec9nh Gia Lai", - "T\u1ec9nh H\u00e0 Giang", + "T\u1ec9nh H\u00e0 Nam", + "T\u1ec9nh H\u00e0 T\u0129nh", + "T\u1ec9nh H\u00f2a B\u00ecnh", + "T\u1ec9nh H\u1ea3i D\u01b0\u01a1ng", + "T\u1ec9nh H\u01b0ng Y\u00ean", + "T\u1ec9nh H\u1eadu Giang", + "T\u1ec9nh Kh\u00e1nh H\u00f2a", + "T\u1ec9nh Kon Tum", + "T\u1ec9nh Lai Ch\u00e2u", + "T\u1ec9nh Long An", + "T\u1ec9nh L\u00e0o Cai", + "T\u1ec9nh L\u00e2m \u0110\u1ed3ng", + "T\u1ec9nh L\u1ea1ng S\u01a1n", + "T\u1ec9nh Nam \u0110\u1ecbnh", + "T\u1ec9nh Ngh\u1ec7 An", + "T\u1ec9nh Ninh B\u00ecnh", + "T\u1ec9nh Ninh Thu\u1eadn", + "T\u1ec9nh Ph\u00fa Th\u1ecd", + "T\u1ec9nh Ph\u00fa Y\u00ean", + "T\u1ec9nh Qu\u1ea3ng B\u00ecnh", + "T\u1ec9nh Qu\u1ea3ng Nam", + "T\u1ec9nh Qu\u1ea3ng Ng\u00e3i", + "T\u1ec9nh Qu\u1ea3ng Tr\u1ecb", + "T\u1ec9nh S\u01a1n La", + "T\u1ec9nh Thanh H\u00f3a", + "T\u1ec9nh Th\u00e1i B\u00ecnh", + "T\u1ec9nh Th\u00e1i Nguy\u00ean", + "T\u1ec9nh Th\u1eeba Thi\u00ean - Hu\u1ebf", + "T\u1ec9nh Ti\u1ec1n Giang", + "T\u1ec9nh Tr\u00e0 Vinh", + "T\u1ec9nh Tuy\u00ean Quang", + "T\u1ec9nh T\u00e2y Ninh", + "T\u1ec9nh V\u0129nh Long", + "T\u1ec9nh V\u0129nh Ph\u00fac", + "T\u1ec9nh Y\u00ean B\u00e1i", + "T\u1ec9nh \u0110i\u1ec7n Bi\u00ean", + "T\u1ec9nh \u0110\u1eafk L\u1eafk", + "T\u1ec9nh \u0110\u1eafk N\u00f4ng", + "T\u1ec9nh \u0110\u1ed3ng Nai", + "T\u1ec9nh \u0110\u1ed3ng Th\u00e1p", + "B\u1ea1c Li\u00eau", + "Cao B\u1eb1ng", + "C\u00e0 Mau", + "Ki\u00ean Giang", + "Provinz T\u1ec9nh Qu\u1ea3ng Ninh", + "S\u00f3c Tr\u0103ng", + "Th\u00e0nh ph\u1ed1 C\u1ea7n Th\u01a1", + "Th\u00e0nh ph\u1ed1 H\u00e0 N\u1ed9i", + "Th\u00e0nh ph\u1ed1 H\u1ed3 Ch\u00ed Minh", + "Th\u00e0nh ph\u1ed1 H\u1ea3i Ph\u00f2ng", + "Th\u00e0nh ph\u1ed1 \u0110\u00e0 N\u1eb5ng", + "T\u1ec9nh An Giang", + "T\u1ec9nh B\u00e0 R\u1ecba \u2013 V\u0169ng T\u00e0u", + "T\u1ec9nh B\u00ecnh D\u01b0\u01a1ng", + "T\u1ec9nh B\u00ecnh Ph\u01b0\u1edbc", + "T\u1ec9nh B\u00ecnh Thu\u1eadn", + "T\u1ec9nh B\u00ecnh \u0110\u1ecbnh", + "T\u1ec9nh B\u1eafc Giang", + "T\u1ec9nh B\u1eafc K\u1ea1n", + "T\u1ec9nh B\u1eafc Ninh", + "T\u1ec9nh B\u1ebfn Tre", + "T\u1ec9nh Gia Lai", + "T\u1ec9nh H\u00e0 Giang", "Vi\u1ec7t Nam" - ], + ], "old": [ "Vietnam" ] - }, + }, { - "id": "Yemen", - "s": 18398823, + "id": "Yemen", + "s": 18398823, "affiliations": [ - "Abyan", - "Ad Dali'", - "Al Bay\u1e11\u0101\u2019", - "Al Mahrah", - "Al Jawf", - "Al Ma\u1e29w\u012bt", - "Al \u1e28udaydah", - "Dhamar", - "Ibb", - "La\u1e29ij", - "Ma'rib", - "Raymah", - "\u2018Adan", - "Sa'dah", - "San\u02bfa\u02be", - "Shawah", - "Socotra", - "Ta\u2018izz", - "\u2018Amr\u0101n", - "\u1e28ajjah", - "\u1e28a\u1e11ramawt", + "Abyan", + "Ad Dali'", + "Al Bay\u1e11\u0101\u2019", + "Al Mahrah", + "Al Jawf", + "Al Ma\u1e29w\u012bt", + "Al \u1e28udaydah", + "Dhamar", + "Ibb", + "La\u1e29ij", + "Ma'rib", + "Raymah", + "\u2018Adan", + "Sa'dah", + "San\u02bfa\u02be", + "Shawah", + "Socotra", + "Ta\u2018izz", + "\u2018Amr\u0101n", + "\u1e28ajjah", + "\u1e28a\u1e11ramawt", "\u0627\u0644\u064a\u0645\u0646" - ], + ], "old": [ "Yemen" ] - }, + }, { - "id": "Zambia", - "s": 21907162, + "id": "Zambia", + "s": 21907162, "affiliations": [ - "Central Province", - "Copperbelt Province", - "Eastern Province", - "Luapula Province", - "Lusaka Province", - "Muchinga", - "North-Western Province", - "Northern Province", - "Southern Province", - "Western Province", + "Central Province", + "Copperbelt Province", + "Eastern Province", + "Luapula Province", + "Lusaka Province", + "Muchinga", + "North-Western Province", + "Northern Province", + "Southern Province", + "Western Province", "Zambia" - ], + ], "old": [ "Zambia" ] - }, + }, { - "id": "Zimbabwe", - "s": 21003848, + "id": "Zimbabwe", + "s": 21003848, "affiliations": [ - "Bulawayo Province", - "Mashonaland Central", - "Mashonaland East", - "Mashonaland West", - "Masvingo Province", - "Matabeleland North", - "Matabeleland South", - "Harare Province", - "Manicaland", - "Midlands Province", + "Bulawayo Province", + "Mashonaland Central", + "Mashonaland East", + "Mashonaland West", + "Masvingo Province", + "Matabeleland North", + "Matabeleland South", + "Harare Province", + "Manicaland", + "Midlands Province", "Zimbabwe" - ], + ], "old": [ "Zimbabwe" ] - }, + }, { - "id": "Antarctica", - "s": 14619299, + "id": "Antarctica", + "s": 14619299, "affiliations": [ "South Georgia and South Sandwich Islands" ] - }, + }, { - "id": "New Zealand", + "id": "New Zealand", "g": [ { - "id": "Tokelau", - "s": 66893, + "id": "Tokelau", + "s": 66893, "affiliations": [ "Tokelau" - ], + ], "old": [ "Tokelau" ] - }, + }, { - "id": "New Zealand North_Auckland", - "s": 50486957, + "id": "New Zealand North_Auckland", + "s": 50486957, "affiliations": [ - "Auckland", - "Bay of Plenty", - "New Zealand/Aotearoa", - "Northland", + "Auckland", + "Bay of Plenty", + "New Zealand/Aotearoa", + "Northland", "Waikato" - ], + ], "old": [ "New Zealand" ] - }, + }, { - "id": "New Zealand North_Wellington", - "s": 39462693, + "id": "New Zealand North_Wellington", + "s": 39462693, "affiliations": [ - "Gisborne", - "Hawke's Bay", - "Manawatu-Wanganui", - "New Zealand/Aotearoa", - "Taranaki", + "Gisborne", + "Hawke's Bay", + "Manawatu-Wanganui", + "New Zealand/Aotearoa", + "Taranaki", "Wellington" - ], + ], "old": [ "New Zealand" ] - }, + }, { - "id": "New Zealand South_Canterbury", - "s": 40458233, + "id": "New Zealand South_Canterbury", + "s": 40458233, "affiliations": [ - "Canterbury", - "Chatham Islands", - "Marlborough", - "New Zealand/Aotearoa", - "Nelson", - "Tasman", + "Canterbury", + "Chatham Islands", + "Marlborough", + "New Zealand/Aotearoa", + "Nelson", + "Tasman", "West Coast" - ], + ], "old": [ "New Zealand" ] - }, + }, { - "id": "New Zealand South_Southland", - "s": 28834640, + "id": "New Zealand South_Southland", + "s": 28834640, "affiliations": [ - "New Zealand/Aotearoa", - "Otago", - "Southland", + "New Zealand/Aotearoa", + "Otago", + "Southland", "West Coast" - ], + ], "old": [ "New Zealand" ] } ] - }, + }, { - "id": "South Korea", + "id": "South Korea", "g": [ { - "id": "South Korea_North", - "s": 63686125, + "id": "South Korea_North", + "s": 63686125, "affiliations": [ - "\uac15\uc6d0\ub3c4", - "\uacbd\uae30\ub3c4", - "\ub300\uc804", - "\uc11c\uc6b8", - "\uc138\uc885", - "\uc778\ucc9c", - "\uacbd\uc0c1\ubd81\ub3c4", - "\ub300\ud55c\ubbfc\uad6d", - "\ucda9\uccad\ub0a8\ub3c4", + "\uac15\uc6d0\ub3c4", + "\uacbd\uae30\ub3c4", + "\ub300\uc804", + "\uc11c\uc6b8", + "\uc138\uc885", + "\uc778\ucc9c", + "\uacbd\uc0c1\ubd81\ub3c4", + "\ub300\ud55c\ubbfc\uad6d", + "\ucda9\uccad\ub0a8\ub3c4", "\ucda9\uccad\ubd81\ub3c4" - ], + ], "old": [ "South Korea" ] - }, + }, { - "id": "South Korea_South", - "s": 53619437, + "id": "South Korea_South", + "s": 53619437, "affiliations": [ - "\uc81c\uc8fc\ub3c4", - "Gyeongnam-Busan Border", - "\uad11\uc8fc", - "\ub300\uad6c", - "\ubd80\uc0b0", - "\uc6b8\uc0b0", - "\uacbd\uc0c1\ub0a8\ub3c4", - "\uacbd\uc0c1\ubd81\ub3c4", - "\ub300\ud55c\ubbfc\uad6d", - "\uc804\ub77c\ub0a8\ub3c4", + "\uc81c\uc8fc\ub3c4", + "Gyeongnam-Busan Border", + "\uad11\uc8fc", + "\ub300\uad6c", + "\ubd80\uc0b0", + "\uc6b8\uc0b0", + "\uacbd\uc0c1\ub0a8\ub3c4", + "\uacbd\uc0c1\ubd81\ub3c4", + "\ub300\ud55c\ubbfc\uad6d", + "\uc804\ub77c\ub0a8\ub3c4", "\uc804\ub77c\ubd81\ub3c4" - ], + ], "old": [ "South Korea" ] From bd2bd03ff6006e14b6efd169393e255cba335748 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 29 Apr 2016 11:09:49 +0300 Subject: [PATCH 05/87] Fixed stopping of kinetic scroll on tap --- drape_frontend/user_event_stream.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index 9126fd7419..6090979530 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -700,6 +700,9 @@ bool UserEventStream::TouchDown(array const & touches) { size_t touchCount = GetValidTouchesCount(touches); bool isMapTouch = true; + + // Interrupt kinetic scroll on touch down. + m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */); // Interrupt kinetic scroll on touch down. m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */); From 8ac15533c0d5a518e27b9f2f652ef2cefc7bc1ac Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 27 Apr 2016 19:44:11 +0300 Subject: [PATCH 06/87] [ios] Implemented new category search. --- indexer/new_feature_categories.cpp | 6 ++---- indexer/new_feature_categories.hpp | 4 ++-- .../NavigationDashboard/Sound/MWMTextToSpeech.mm | 1 - iphone/Maps/Classes/LocaleTranslator.mm | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/indexer/new_feature_categories.cpp b/indexer/new_feature_categories.cpp index 42cc6a2b7c..cded82d8f2 100644 --- a/indexer/new_feature_categories.cpp +++ b/indexer/new_feature_categories.cpp @@ -60,10 +60,8 @@ void NewFeatureCategories::AddLanguage(string lang) m_categoriesByLang[lang] = names; } -NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, - string const & queryLang) const +NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, string lang) const { - string lang = queryLang; auto langCode = CategoriesHolder::MapLocaleToInteger(lang); if (langCode == CategoriesHolder::kUnsupportedLocaleCode) { @@ -83,7 +81,7 @@ NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, my::SortUnique(result); alohalytics::TStringMap const stats = { - {"query", query}, {"queryLang", queryLang}, {"lang", lang}}; + {"query", query}, {"lang", lang}}; alohalytics::LogEvent("searchNewFeatureCategory", stats); return result; diff --git a/indexer/new_feature_categories.hpp b/indexer/new_feature_categories.hpp index 81f7aa7036..4148b87854 100644 --- a/indexer/new_feature_categories.hpp +++ b/indexer/new_feature_categories.hpp @@ -38,9 +38,9 @@ public: // Returns names (in language |queryLang|) and types of categories that have a synonym containing // the substring |query| (in any language that was added before). - // If |queryLang| is not supported, "en" is used. + // If |lang| is not supported, "en" is used. // The returned list is sorted. - TNames Search(string const & query, string const & queryLang) const; + TNames Search(string const & query, string lang) const; // Returns all registered names of categories in language |lang| and // types corresponding to these names. The language must have been added before. diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm index 2a58982d63..73a8ccb3fb 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm @@ -263,5 +263,4 @@ string translatedTwine(string const & twine) else return ""; } - } // namespace tts diff --git a/iphone/Maps/Classes/LocaleTranslator.mm b/iphone/Maps/Classes/LocaleTranslator.mm index 0b10049ebd..d3908308df 100644 --- a/iphone/Maps/Classes/LocaleTranslator.mm +++ b/iphone/Maps/Classes/LocaleTranslator.mm @@ -20,5 +20,4 @@ string bcp47ToTwineLanguage(NSString const * bcp47LangName) // Taking two first symbols of a language name. For example ru-RU -> ru return [[bcp47LangName substringToIndex:2] UTF8String]; } - } // namespace locale_translator From 6e58ba0abc25d4737036c3efe8ac80ee74ea5c4b Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Thu, 28 Apr 2016 16:28:01 +0300 Subject: [PATCH 07/87] Make editor a field of Framework. --- indexer/osm_editor.cpp | 12 ++++++++++-- indexer/osm_editor.hpp | 7 +++++-- map/framework.cpp | 27 ++++++++++++++------------- map/framework.hpp | 6 ++++++ 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 868a108f90..141f455ef6 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -137,10 +137,16 @@ namespace osm // (e.g. insert/remove spaces after ';' delimeter); Editor::Editor() : m_notes(editor::Notes::MakeNotes()) {} + Editor & Editor::Instance() { - static Editor instance; - return instance; + ASSERT(s_instance, ("nullptr dereference.")); + return *s_instance; +} + +void Editor::SetInstance(Editor * editor) +{ + s_instance = editor; } void Editor::LoadMapEdits() @@ -968,4 +974,6 @@ string DebugPrint(Editor::FeatureStatus fs) } const char * const Editor::kPlaceDoesNotExistMessage = "The place has gone or never existed. This is an auto-generated note from MAPS.ME application: a user reports a POI that is visible on a map (which can be outdated), but cannot be found on the ground."; + +Editor * Editor::s_instance = nullptr; } // namespace osm diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index 62c71ddf07..c1738912e2 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -24,8 +24,6 @@ namespace osm { class Editor final { - Editor(); - public: using TFeatureTypeFn = function; // Mimics Framework::TFeatureTypeFn. @@ -52,7 +50,10 @@ public: Created }; + Editor(); + static Editor & Instance(); + static void SetInstance(Editor * editor); void SetMwmIdByNameAndVersionFn(TMwmIdByMapNameFn const & fn) { m_mwmIdByMapNameFn = fn; } void SetInvalidateFn(TInvalidateFn const & fn) { m_invalidateFn = fn; } @@ -202,6 +203,8 @@ private: /// Notes to be sent to osm. shared_ptr m_notes; + + static Editor * s_instance; }; // class Editor string DebugPrint(Editor::FeatureStatus fs); diff --git a/map/framework.cpp b/map/framework.cpp index a756028db0..8dec491624 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -366,13 +366,13 @@ Framework::Framework() LOG(LINFO, ("System languages:", languages::GetPreferred())); - osm::Editor & editor = osm::Editor::Instance(); - editor.SetMwmIdByNameAndVersionFn([this](string const & name) -> MwmSet::MwmId + osm::Editor::SetInstance(&m_editor); + m_editor.SetMwmIdByNameAndVersionFn([this](string const & name) -> MwmSet::MwmId { return m_model.GetIndex().GetMwmIdByCountryFile(platform::CountryFile(name)); }); - editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); }); - editor.SetFeatureLoaderFn([this](FeatureID const & fid) -> unique_ptr + m_editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); }); + m_editor.SetFeatureLoaderFn([this](FeatureID const & fid) -> unique_ptr { unique_ptr feature(new FeatureType()); Index::FeaturesLoaderGuard const guard(m_model.GetIndex(), fid.m_mwmId); @@ -380,7 +380,7 @@ Framework::Framework() feature->ParseEverything(); return feature; }); - editor.SetFeatureOriginalStreetFn([this](FeatureType & ft) -> string + m_editor.SetFeatureOriginalStreetFn([this](FeatureType & ft) -> string { search::ReverseGeocoder const coder(m_model.GetIndex()); auto const streets = coder.GetNearbyFeatureStreets(ft); @@ -388,8 +388,8 @@ Framework::Framework() return streets.first[streets.second].m_name; return {}; }); - editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); - editor.LoadMapEdits(); + m_editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); + m_editor.LoadMapEdits(); } Framework::~Framework() @@ -397,6 +397,7 @@ Framework::~Framework() m_drapeEngine.reset(); m_model.SetOnMapDeregisteredCallback(nullptr); + m_editor.SetInstance(nullptr); } void Framework::DrawWatchFrame(m2::PointD const & center, int zoomModifier, @@ -2763,12 +2764,12 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em // Such a notification have been already sent. I.e at least one of // street of house number should differ in emo and editor. shouldNotify = !isCreatedFeature && - (editor.GetEditedFeature(emo.GetID(), editedFeature) && - !editedFeature.GetHouseNumber().empty() && - editedFeature.GetHouseNumber() != emo.GetHouseNumber()) || - (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) && - !editedFeatureStreet.empty() && - editedFeatureStreet != emo.GetStreet().m_defaultName); + ((editor.GetEditedFeature(emo.GetID(), editedFeature) && + !editedFeature.GetHouseNumber().empty() && + editedFeature.GetHouseNumber() != emo.GetHouseNumber()) || + (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) && + !editedFeatureStreet.empty() && + editedFeatureStreet != emo.GetStreet().m_defaultName)); } } while (0); diff --git a/map/framework.hpp b/map/framework.hpp index 9cb23b34d5..1abffb5863 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -639,14 +639,20 @@ public: public: /// @name Editor interface. //@{ + osm::Editor const & GetEditor() const { return m_editor; }; + /// Initializes feature for Create Object UI. /// @returns false in case when coordinate is in the ocean or mwm is not downloaded. bool CreateMapObject(m2::PointD const & mercator, uint32_t const featureType, osm::EditableMapObject & emo) const; /// @returns false if feature is invalid or can't be edited. bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo) const; osm::Editor::SaveResult SaveEditedMapObject(osm::EditableMapObject emo); + void DeleteFeature(FeatureID const & fid) const; osm::NewFeatureCategories GetEditorCategories() const; + +private: + osm::Editor m_editor; //@} private: From f5b8d2e12efce80832ad058f564bc9204013e247 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Fri, 29 Apr 2016 18:06:03 +0300 Subject: [PATCH 08/87] Reload edits on map update. --- indexer/osm_editor.cpp | 4 ++-- indexer/osm_editor.hpp | 8 +++++++- map/framework.cpp | 8 ++++++++ qt/editor_dialog.cpp | 9 ++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 141f455ef6..132eafbddb 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -138,6 +138,8 @@ namespace osm Editor::Editor() : m_notes(editor::Notes::MakeNotes()) {} +Editor * Editor::s_instance = nullptr; + Editor & Editor::Instance() { ASSERT(s_instance, ("nullptr dereference.")); @@ -974,6 +976,4 @@ string DebugPrint(Editor::FeatureStatus fs) } const char * const Editor::kPlaceDoesNotExistMessage = "The place has gone or never existed. This is an auto-generated note from MAPS.ME application: a user reports a POI that is visible on a map (which can be outdated), but cannot be found on the ground."; - -Editor * Editor::s_instance = nullptr; } // namespace osm diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index c1738912e2..ad7ed90a40 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -22,7 +22,7 @@ namespace osm { -class Editor final +class Editor final : public MwmSet::Observer { public: using TFeatureTypeFn = function; // Mimics Framework::TFeatureTypeFn. @@ -65,6 +65,12 @@ public: /// Resets editor to initial state: no any edits or created/deleted features. void ClearAllLocalEdits(); + void OnMapUpdated(platform::LocalCountryFile const &, + platform::LocalCountryFile const &) override + { + LoadMapEdits(); + } + using TFeatureIDFunctor = function; void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id, TFeatureIDFunctor const & f, diff --git a/map/framework.cpp b/map/framework.cpp index 8dec491624..7052b11cf2 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -390,6 +390,8 @@ Framework::Framework() }); m_editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); m_editor.LoadMapEdits(); + + m_model.GetIndex().AddObserver(m_editor); } Framework::~Framework() @@ -397,6 +399,7 @@ Framework::~Framework() m_drapeEngine.reset(); m_model.SetOnMapDeregisteredCallback(nullptr); + m_model.GetIndex().RemoveObserver(m_editor); m_editor.SetInstance(nullptr); } @@ -2743,6 +2746,11 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em // and emo.SetHouseNumber("") will be called in the following code. So OSM ends up // with incorrect data. + // There is (almost) always a street and/or house number set in emo. We must keep them from + // saving to editor and pushing to OSM if they ware not overidden. To be saved to editor + // emo is first converted to FeatureType and FeatureType is then saved to a file and editor. + // To keep street and house number from penetrating to FeatureType we set them to be empty. + // Do not save street if it was taken from hosting building. if ((originalFeatureStreet.empty() || isCreatedFeature) && !isStreetOverridden) emo.SetStreet({}); diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp index 7e105b9fba..f9e39a5eea 100644 --- a/qt/editor_dialog.cpp +++ b/qt/editor_dialog.cpp @@ -85,6 +85,10 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo) grid->addWidget(new QLabel(kStreetObjectName), row, 0); QComboBox * cmb = new QComboBox(); cmb->setEditable(true); + + if (emo.GetStreet().m_defaultName.empty()) + cmb->addItem(""); + for (int i = 0; i < nearbyStreets.size(); ++i) { string street = nearbyStreets[i].m_defaultName; @@ -199,7 +203,10 @@ void EditorDialog::OnSave() QString const editedStreet = findChild(kStreetObjectName)->currentText(); QStringList const names = editedStreet.split(" / ", QString::SkipEmptyParts); QString const localized = names.size() > 1 ? names.at(1) : QString(); - m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()}); + if (!names.empty()) + m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()}); + else + m_feature.SetStreet({}); m_feature.SetPostcode(findChild(kPostcodeObjectName)->text().toStdString()); } From f8f27e2700acce7f05c6486205922d9dead1a847 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Wed, 4 May 2016 10:57:23 +0300 Subject: [PATCH 09/87] Fixed my position behavior --- drape_frontend/animation_system.cpp | 4 +- drape_frontend/animation_system.hpp | 3 ++ drape_frontend/frontend_renderer.cpp | 2 +- drape_frontend/my_position_controller.cpp | 63 +++++++++++++++++------ drape_frontend/my_position_controller.hpp | 4 +- drape_frontend/user_event_stream.cpp | 5 ++ 6 files changed, 60 insertions(+), 21 deletions(-) diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp index 49fd982f19..4a7444fe5c 100644 --- a/drape_frontend/animation_system.cpp +++ b/drape_frontend/animation_system.cpp @@ -235,8 +235,8 @@ ScaleInterpolator::ScaleInterpolator(double delay, double startScale, double end // static double ScaleInterpolator::GetScaleDuration(double startScale, double endScale) { - // Resize 2.0 times should be done for 0.3 seconds. - double constexpr kPixelSpeed = 2.0 / 0.3; + // Resize 2.0 times should be done for 0.2 seconds. + double constexpr kPixelSpeed = 2.0 / 0.2; if (startScale > endScale) swap(startScale, endScale); diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp index 00796f3f2e..3503bdd3ca 100644 --- a/drape_frontend/animation_system.hpp +++ b/drape_frontend/animation_system.hpp @@ -140,6 +140,9 @@ public: void SetInterruptedOnCombine(bool enable) { m_interruptedOnCombine = enable; } bool GetInterruptedOnCombine() const { return m_interruptedOnCombine; } + void SetCouldBeInterrupted(bool enable) { m_couldBeInterrupted = enable; } + void SetCouldBeBlended(bool enable) { m_couldBeBlended = enable; } + protected: TAction m_onStartAction; TAction m_onFinishAction; diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index ac074b0adc..3ad6ecaa57 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -383,7 +383,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) switch (msg->GetChangeType()) { case ChangeMyPositionModeMessage::SwitchNextMode: - m_myPositionController->NextMode(); + m_myPositionController->NextMode(m_userEventStream.GetCurrentScreen()); break; case ChangeMyPositionModeMessage::StopFollowing: m_myPositionController->StopLocationFollow(); diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 259ff04dd9..fea72a4bd3 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -5,6 +5,8 @@ #include "drape_frontend/animation/base_interpolator.hpp" #include "drape_frontend/animation/interpolations.hpp" +#include "indexer/scales.hpp" + #include "geometry/mercator.hpp" #include "base/math.hpp" @@ -28,6 +30,9 @@ double const kMaxNotFollowRoutingTimeSec = 10.0; double const kMaxUpdateLocationInvervalSec = 30.0; double const kMaxWaitStartLocationSec = 5.0; +int const kZoomThreshold = 10; +int const kMaxScaleZoomLevel = 16; + int const kDoNotChangeZoom = -1; string LocationModeStatisticsName(location::EMyPositionMode mode) @@ -48,6 +53,19 @@ string LocationModeStatisticsName(location::EMyPositionMode mode) return "@UnknownMode"; } +int GetZoomLevel(ScreenBase const & screen) +{ + return my::clamp(fabs(log(screen.GetScale()) / log(2.0)), 1, scales::GetUpperStyleScale()); +} + +int GetZoomLevel(ScreenBase const & screen, m2::PointD const & position, double errorRadius) +{ + ScreenBase s = screen; + m2::PointD const size(errorRadius, errorRadius); + s.SetFromRect(m2::AnyRectD(position, screen.GetAngle(), m2::RectD(position - size, position + size))); + return GetZoomLevel(s); +} + } // namespace class MyPositionController::MyPositionAnim : public BaseInterpolator @@ -125,7 +143,7 @@ MyPositionController::~MyPositionController() void MyPositionController::OnNewPixelRect() { - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } void MyPositionController::UpdatePixelPosition(ScreenBase const & screen) @@ -173,7 +191,7 @@ void MyPositionController::DragEnded(m2::PointD const & distance) if (distance.Length() > kBindingDistance * min(m_pixelRect.SizeX(), m_pixelRect.SizeY())) StopLocationFollow(); - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } void MyPositionController::ScaleStarted() @@ -190,7 +208,7 @@ void MyPositionController::ScaleEnded() StopLocationFollow(); } - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } void MyPositionController::Rotated() @@ -226,7 +244,7 @@ void MyPositionController::SetRenderShape(drape_ptr && shape) m_shape = move(shape); } -void MyPositionController::NextMode() +void MyPositionController::NextMode(ScreenBase const & screen) { string const kAlohalyticsClickEvent = "$onClick"; @@ -248,11 +266,17 @@ void MyPositionController::NextMode() return; } + // Calculate preferred zoom level. + int const currentZoom = GetZoomLevel(screen); + int preferredZoomLevel = kDoNotChangeZoom; + if (currentZoom < kZoomThreshold) + preferredZoomLevel = min(GetZoomLevel(screen, m_position, m_errorRadius), kMaxScaleZoomLevel); + // In routing not-follow -> follow-and-rotate, otherwise not-follow -> follow. if (m_mode == location::NotFollow) { ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow); - UpdateViewport(); + UpdateViewport(preferredZoomLevel); return; } @@ -263,7 +287,7 @@ void MyPositionController::NextMode() if (IsRotationAvailable() || m_isInRouting) { ChangeMode(location::FollowAndRotate); - UpdateViewport(); + UpdateViewport(preferredZoomLevel); } return; } @@ -274,7 +298,7 @@ void MyPositionController::NextMode() if (!m_isInRouting) { ChangeMode(location::Follow); - UpdateViewport(); + ChangeModelView(m_position, 0.0, m_centerPixelPosition, preferredZoomLevel); } } } @@ -314,8 +338,15 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool ChangeMode(location::Follow); if (!m_isFirstLaunch) { - m2::PointD const size(m_errorRadius, m_errorRadius); - ChangeModelView(m2::RectD(m_position - size, m_position + size)); + if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel) + { + m2::PointD const size(m_errorRadius, m_errorRadius); + ChangeModelView(m2::RectD(m_position - size, m_position + size)); + } + else + { + ChangeModelView(m_position, kMaxScaleZoomLevel); + } } else { @@ -411,14 +442,14 @@ void MyPositionController::Render(uint32_t renderMode, ScreenBase const & screen m_routingNotFollowTimer.ElapsedSeconds() >= kMaxNotFollowRoutingTimeSec) { ChangeMode(location::FollowAndRotate); - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } if (m_shape != nullptr && IsVisible() && IsModeHasPosition()) { if (m_isDirtyViewport && !m_needBlockAnimation) { - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); m_isDirtyViewport = false; } @@ -504,7 +535,7 @@ void MyPositionController::SetTimeInBackground(double time) if (time >= kMaxTimeInBackgroundSec && m_mode == location::NotFollow) { ChangeMode(location::Follow); - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } } @@ -516,7 +547,7 @@ void MyPositionController::OnCompassTapped() if (m_mode == location::FollowAndRotate) { ChangeMode(location::Follow); - UpdateViewport(); + UpdateViewport(kDoNotChangeZoom); } } @@ -545,16 +576,16 @@ void MyPositionController::ChangeModelView(m2::PointD const & userPos, double az m_listener->ChangeModelView(userPos, azimuth, pxZero, zoomLevel); } -void MyPositionController::UpdateViewport() +void MyPositionController::UpdateViewport(int zoomLevel) { if (IsWaitingForLocation()) return; if (m_mode == location::Follow) - ChangeModelView(m_position, kDoNotChangeZoom); + ChangeModelView(m_position, zoomLevel); else if (m_mode == location::FollowAndRotate) ChangeModelView(m_position, m_drawDirection, - m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom); + m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, zoomLevel); } m2::PointD MyPositionController::GetRotationPixelCenter() const diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp index 788f2616c7..75cc83d95d 100644 --- a/drape_frontend/my_position_controller.hpp +++ b/drape_frontend/my_position_controller.hpp @@ -75,7 +75,7 @@ public: void DeactivateRouting(); void StopLocationFollow(); - void NextMode(); + void NextMode(ScreenBase const & screen); void LoseLocation(); void SetTimeInBackground(double time); @@ -113,7 +113,7 @@ private: void ChangeModelView(m2::RectD const & rect); void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero, int zoomLevel); - void UpdateViewport(); + void UpdateViewport(int zoomLevel); m2::PointD GetRotationPixelCenter() const; m2::PointD GetRoutingRotationPixelCenter() const; diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index 6090979530..d2fd119901 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -570,6 +570,11 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD auto anim = make_unique_dp(userPos, startScale, targetScale, screen.GlobalRect().Angle().val(), -azimuth, screen.GtoP(userPos), pixelPos, screen.PixelRect()); + if (preferredZoomLevel != kDoNotChangeZoom) + { + anim->SetCouldBeInterrupted(false); + anim->SetCouldBeBlended(false); + } anim->SetMaxDuration(kMaxAnimationTimeSec); anim->SetOnStartAction(onStartHandler); m_animationSystem.CombineAnimation(move(anim)); From 8996684c19ec3d94d4397f24ff15b1db0693960a Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 4 May 2016 15:53:23 +0300 Subject: [PATCH 10/87] Revert 67338f4b35a7eb8b139531449673724534bd0a03. --- indexer/osm_editor.cpp | 11 ++--------- indexer/osm_editor.hpp | 7 ++----- map/framework.cpp | 18 +++++++----------- map/framework.hpp | 6 ------ 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 132eafbddb..9efdf432f0 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -138,17 +138,10 @@ namespace osm Editor::Editor() : m_notes(editor::Notes::MakeNotes()) {} -Editor * Editor::s_instance = nullptr; - Editor & Editor::Instance() { - ASSERT(s_instance, ("nullptr dereference.")); - return *s_instance; -} - -void Editor::SetInstance(Editor * editor) -{ - s_instance = editor; + static Editor instance; + return instance; } void Editor::LoadMapEdits() diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index ad7ed90a40..8098ea077d 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -24,6 +24,8 @@ namespace osm { class Editor final : public MwmSet::Observer { + Editor(); + public: using TFeatureTypeFn = function; // Mimics Framework::TFeatureTypeFn. @@ -50,10 +52,7 @@ public: Created }; - Editor(); - static Editor & Instance(); - static void SetInstance(Editor * editor); void SetMwmIdByNameAndVersionFn(TMwmIdByMapNameFn const & fn) { m_mwmIdByMapNameFn = fn; } void SetInvalidateFn(TInvalidateFn const & fn) { m_invalidateFn = fn; } @@ -209,8 +208,6 @@ private: /// Notes to be sent to osm. shared_ptr m_notes; - - static Editor * s_instance; }; // class Editor string DebugPrint(Editor::FeatureStatus fs); diff --git a/map/framework.cpp b/map/framework.cpp index 7052b11cf2..3ab54062e7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -366,13 +366,13 @@ Framework::Framework() LOG(LINFO, ("System languages:", languages::GetPreferred())); - osm::Editor::SetInstance(&m_editor); - m_editor.SetMwmIdByNameAndVersionFn([this](string const & name) -> MwmSet::MwmId + osm::Editor & editor = osm::Editor::Instance(); + editor.SetMwmIdByNameAndVersionFn([this](string const & name) -> MwmSet::MwmId { return m_model.GetIndex().GetMwmIdByCountryFile(platform::CountryFile(name)); }); - m_editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); }); - m_editor.SetFeatureLoaderFn([this](FeatureID const & fid) -> unique_ptr + editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); }); + editor.SetFeatureLoaderFn([this](FeatureID const & fid) -> unique_ptr { unique_ptr feature(new FeatureType()); Index::FeaturesLoaderGuard const guard(m_model.GetIndex(), fid.m_mwmId); @@ -380,7 +380,7 @@ Framework::Framework() feature->ParseEverything(); return feature; }); - m_editor.SetFeatureOriginalStreetFn([this](FeatureType & ft) -> string + editor.SetFeatureOriginalStreetFn([this](FeatureType & ft) -> string { search::ReverseGeocoder const coder(m_model.GetIndex()); auto const streets = coder.GetNearbyFeatureStreets(ft); @@ -388,10 +388,8 @@ Framework::Framework() return streets.first[streets.second].m_name; return {}; }); - m_editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); - m_editor.LoadMapEdits(); - - m_model.GetIndex().AddObserver(m_editor); + editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); + editor.LoadMapEdits(); } Framework::~Framework() @@ -399,8 +397,6 @@ Framework::~Framework() m_drapeEngine.reset(); m_model.SetOnMapDeregisteredCallback(nullptr); - m_model.GetIndex().RemoveObserver(m_editor); - m_editor.SetInstance(nullptr); } void Framework::DrawWatchFrame(m2::PointD const & center, int zoomModifier, diff --git a/map/framework.hpp b/map/framework.hpp index 1abffb5863..9cb23b34d5 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -639,20 +639,14 @@ public: public: /// @name Editor interface. //@{ - osm::Editor const & GetEditor() const { return m_editor; }; - /// Initializes feature for Create Object UI. /// @returns false in case when coordinate is in the ocean or mwm is not downloaded. bool CreateMapObject(m2::PointD const & mercator, uint32_t const featureType, osm::EditableMapObject & emo) const; /// @returns false if feature is invalid or can't be edited. bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo) const; osm::Editor::SaveResult SaveEditedMapObject(osm::EditableMapObject emo); - void DeleteFeature(FeatureID const & fid) const; osm::NewFeatureCategories GetEditorCategories() const; - -private: - osm::Editor m_editor; //@} private: From cad96b042b8a89fa7021fe8ad6330279205df6a5 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Wed, 4 May 2016 16:18:07 +0300 Subject: [PATCH 11/87] Call Save in RollBackChanges. --- indexer/osm_editor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 9efdf432f0..d09791658f 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -475,7 +475,7 @@ bool Editor::RollBackChanges(FeatureID const & fid) RemoveFeatureFromStorageIfExists(fid.m_mwmId, fid.m_index); Invalidate(); - return true; + return Save(GetEditorFilePath()); } void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id, From 209672dffadec9a00dcb54b471c7a1488809e770 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 4 May 2016 17:21:29 +0300 Subject: [PATCH 12/87] [downloader] Recoverying auto-downloading in Storage. --- map/framework.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/map/framework.cpp b/map/framework.cpp index 3ab54062e7..e7655160cb 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -338,6 +338,7 @@ Framework::Framework() m_storage.Init( bind(&Framework::OnCountryFileDownloaded, this, _1, _2), bind(&Framework::OnCountryFileDelete, this, _1, _2)); + m_storage.SetDownloadingPolicy(&m_storageDownloadingPolicy); LOG(LDEBUG, ("Storage initialized")); auto const routingStatisticsFn = [](map const & statistics) From d0ed3ab490004575891b1baf95ef87ad62488bb3 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 4 May 2016 15:53:53 +0300 Subject: [PATCH 13/87] Added nice DebugPrint for search::Result. --- search/result.cpp | 9 ++------- search/search_integration_tests/search_query_v2_test.cpp | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/search/result.cpp b/search/result.cpp index 7ff49c5a54..0eaa4ed449 100644 --- a/search/result.cpp +++ b/search/result.cpp @@ -320,13 +320,8 @@ string DebugPrint(AddressInfo const & info) string DebugPrint(Result const & r) { - string s; - s.append(r.GetString()); - s.append("|"); - s.append(r.GetFeatureType()); - s.append("|"); - s.append(r.IsSuggest() ? "1" : "0"); - return s; + return "Result { Name: " + r.GetString() + "; Type: " + r.GetFeatureType() + + "; Info: " + DebugPrint(r.GetRankingInfo()) + " }"; } } // namespace search diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp index eacd9af05e..c61131dd76 100644 --- a/search/search_integration_tests/search_query_v2_test.cpp +++ b/search/search_integration_tests/search_query_v2_test.cpp @@ -334,7 +334,7 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo) for (auto const & result : request.Results()) { auto const & info = result.GetRankingInfo(); - TEST_EQUAL(NAME_SCORE_FULL_MATCH, info.m_nameScore, ()); + TEST_EQUAL(NAME_SCORE_FULL_MATCH, info.m_nameScore, (result)); TEST(my::AlmostEqualAbs(1.0, info.m_nameCoverage, 1e-6), (info.m_nameCoverage)); } } From 789f2abd8cea349d09f1bd3cb7430b107e7a263e Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 21:41:50 +0300 Subject: [PATCH 14/87] [android] UI for adding place from place page. --- android/jni/com/mapswithme/maps/Framework.cpp | 17 ++++++-- .../layout-w600dp-port/place_page_details.xml | 2 + android/res/layout/place_page_add.xml | 19 +++++++++ android/res/layout/place_page_details.xml | 2 + .../src/com/mapswithme/maps/Framework.java | 9 ++++- .../src/com/mapswithme/maps/MwmActivity.java | 22 ++++++---- .../maps/widget/placepage/PlacePageView.java | 40 +++++++++++++------ 7 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 android/res/layout/place_page_add.xml diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index edf88c245f..896c2e3e6e 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -980,10 +980,15 @@ Java_com_mapswithme_maps_Framework_nativeOnBookmarkCategoryChanged(JNIEnv * env, } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeTurnChoosePositionMode(JNIEnv *, jclass, jboolean turnOn, jboolean isBusiness) +Java_com_mapswithme_maps_Framework_nativeTurnOnChoosePositionMode(JNIEnv *, jclass, jboolean isBusiness, jboolean applyPosition) { - //TODO(Android team): implement positioning - g_framework->SetChoosePositionMode(turnOn, isBusiness, false /* hasPosition */, m2::PointD()); + g_framework->SetChoosePositionMode(true, isBusiness, applyPosition, applyPosition ? g_framework->GetPlacePageInfo().GetMercator() : m2::PointD()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_Framework_nativeTurnOffChoosePositionMode(JNIEnv *, jclass) +{ + g_framework->SetChoosePositionMode(false, false, false, m2::PointD()); } JNIEXPORT jboolean JNICALL @@ -1004,4 +1009,10 @@ Java_com_mapswithme_maps_Framework_nativeIsActiveObjectABuilding(JNIEnv * env, j { return g_framework->GetPlacePageInfo().IsBuilding(); } + +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_Framework_nativeCanAddPlaceFromPlacePage(JNIEnv * env, jclass clazz) +{ + return g_framework->GetPlacePageInfo().ShouldShowAddPlace(); +} } // extern "C" diff --git a/android/res/layout-w600dp-port/place_page_details.xml b/android/res/layout-w600dp-port/place_page_details.xml index 851a2a809b..33f1f3fcdf 100644 --- a/android/res/layout-w600dp-port/place_page_details.xml +++ b/android/res/layout-w600dp-port/place_page_details.xml @@ -57,6 +57,8 @@ + + + + + + + + \ No newline at end of file diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index 24eb01f851..68c64c54a6 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -55,6 +55,8 @@ + + diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 93b64dedef..be6584ada8 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -197,11 +197,18 @@ public class Framework public static native void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate); - public static native void nativeTurnChoosePositionMode(boolean turnedOn, boolean isBusiness); + /** + * @param isBusiness selection area will be bounded by building borders, if its true(eg. true for businesses in buildings). + * @param applyPosition if true, map'll be animated to currently selected object. + */ + public static native void nativeTurnOnChoosePositionMode(boolean isBusiness, boolean applyPosition); + public static native void nativeTurnOffChoosePositionMode(); public static native boolean nativeIsDownloadedMapAtScreenCenter(); public static native String nativeGetActiveObjectFormattedCuisine(); public static native boolean nativeIsActiveObjectABuilding(); + + public static native boolean nativeCanAddPlaceFromPlacePage(); } diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index d40a5f3d73..cebb60bdf9 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -383,7 +383,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onClick(View v) { - showPositionChooser(false); + hidePositionChooser(); } }); mPositionChooser.findViewById(R.id.done).setOnClickListener(new OnClickListener() @@ -392,7 +392,7 @@ public class MwmActivity extends BaseMwmFragmentActivity public void onClick(View v) { Statistics.INSTANCE.trackEditorLaunch(true); - showPositionChooser(false); + hidePositionChooser(); if (Framework.nativeIsDownloadedMapAtScreenCenter()) startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class)); else @@ -402,15 +402,21 @@ public class MwmActivity extends BaseMwmFragmentActivity UiUtils.hide(mPositionChooser); } - public void showPositionChooser(boolean show) + public void showPositionChooser(boolean isBusiness, boolean applyPosition) { - UiUtils.showIf(show, mPositionChooser); - setFullscreen(show); - Framework.nativeTurnChoosePositionMode(show, false /* isBusiness */); //TODO(Android team): set isBusiness correctly + UiUtils.show(mPositionChooser); + setFullscreen(true); + Framework.nativeTurnOnChoosePositionMode(isBusiness, applyPosition); closePlacePage(); mSearchController.hide(); } + public void hidePositionChooser() + { + UiUtils.hide(mPositionChooser); + Framework.nativeTurnOffChoosePositionMode(); + } + private void initMap() { mMapFrame = findViewById(R.id.map_fragment_container); @@ -501,7 +507,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { if (UiUtils.isVisible(mPositionChooser)) { - showPositionChooser(false); + hidePositionChooser(); return true; } @@ -577,7 +583,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK, Statistics.params().add(Statistics.EventParam.FROM, "main_menu")); - showPositionChooser(true); + showPositionChooser(false, false); } }); break; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 787f54a3f3..ab16c8d9f3 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -112,8 +112,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private View mWiki; private View mEntrance; private TextView mTvEntrance; - private View mEditor; + private View mEditPlace; private View mAddOrganisation; + private View mAddPlace; // Bookmark private ImageView mIvColor; private EditText mEtBookmarkName; @@ -204,10 +205,12 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene mWiki.setOnClickListener(this); mEntrance = mDetails.findViewById(R.id.ll__place_entrance); mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance); - mEditor = mDetails.findViewById(R.id.ll__place_editor); - mEditor.setOnClickListener(this); + mEditPlace = mDetails.findViewById(R.id.ll__place_editor); + mEditPlace.setOnClickListener(this); mAddOrganisation = mDetails.findViewById(R.id.ll__add_organisation); mAddOrganisation.setOnClickListener(this); + mAddPlace = mDetails.findViewById(R.id.ll__place_add); + mAddPlace.setOnClickListener(this); latlon.setOnLongClickListener(this); address.setOnLongClickListener(this); mPhone.setOnLongClickListener(this); @@ -439,13 +442,17 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_INTERNET), mWifi, null); refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance); refreshOpeningHours(); - UiUtils.showIf(mMapObject != null && Editor.nativeIsFeatureEditable() && - !RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode(), - mEditor); - UiUtils.showIf(!RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode() && - !MapObject.isOfType(MapObject.MY_POSITION, mMapObject) && - Framework.nativeIsActiveObjectABuilding(), - mAddOrganisation); + + if (RoutingController.get().isNavigating() || MapManager.nativeIsLegacyMode()) + { + UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace); + } + else + { + UiUtils.showIf(Editor.nativeIsFeatureEditable(), mEditPlace); + UiUtils.showIf(Framework.nativeIsActiveObjectABuilding(), mAddOrganisation); + UiUtils.showIf(Framework.nativeCanAddPlaceFromPlacePage(), mAddPlace); + } } private void refreshOpeningHours() @@ -526,7 +533,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene if (RoutingController.get().isPlanning()) { UiUtils.show(mRouteButtonsFrame); - UiUtils.hide(mGeneralButtonsFrame, mEditor); + UiUtils.hide(mGeneralButtonsFrame, mEditPlace); } else { @@ -679,7 +686,13 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene { Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK, Statistics.params().add(Statistics.EventParam.FROM, "placepage")); - ((MwmActivity) getContext()).showPositionChooser(true); + ((MwmActivity) getContext()).showPositionChooser(true, false); + } + + private void addPlace() + { + // TODO add statistics + ((MwmActivity) getContext()).showPositionChooser(false, true); } @Override @@ -693,6 +706,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene case R.id.ll__add_organisation: addOrganisation(); break; + case R.id.ll__place_add: + addPlace(); + break; case R.id.iv__bookmark_color: saveBookmarkTitle(); selectBookmarkColor(); From 9f05fefdb40fafb8c7bcfe46764d76efa5653133 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 21:42:12 +0300 Subject: [PATCH 15/87] [android] Removed old method. --- android/jni/com/mapswithme/maps/MwmApplication.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/android/jni/com/mapswithme/maps/MwmApplication.cpp b/android/jni/com/mapswithme/maps/MwmApplication.cpp index d3d461764d..161e23400a 100644 --- a/android/jni/com/mapswithme/maps/MwmApplication.cpp +++ b/android/jni/com/mapswithme/maps/MwmApplication.cpp @@ -29,12 +29,6 @@ extern "C" android::Platform::Instance().ProcessFunctor(functorPointer); } - JNIEXPORT jboolean JNICALL - Java_com_mapswithme_maps_MwmApplication_nativeHasFreeSpace(JNIEnv * env, jclass clazz, jlong size) - { - return android::Platform::Instance().HasAvailableSpaceForWriting(size); - } - JNIEXPORT void JNICALL Java_com_mapswithme_maps_MwmApplication_nativeAddLocalization(JNIEnv * env, jclass clazz, jstring name, jstring value) { From a93154ea33a79621352d8710179beb12069f80ed Mon Sep 17 00:00:00 2001 From: "i.tomko" Date: Thu, 5 May 2016 09:49:56 +0300 Subject: [PATCH 16/87] White background waste basket bugfix. --- .../style-clear/symbols/firehydrant-l.svg | 16 +++++++++----- .../style-clear/symbols/parking-ticket-l.svg | 14 +++++++++---- .../style-clear/symbols/waste-basket-l.svg | 18 ++++++++++++---- .../style-clear/symbols/waste-basket-s.svg | 19 ++++++++++------- .../style-night/symbols/firehydrant-l.svg | 14 +++++++++---- .../style-night/symbols/parking-ticket-l.svg | 12 ++++++++--- .../style-night/symbols/seafood-shop-l.svg | 15 ++++++++----- .../style-night/symbols/seafood-shop-m.svg | 21 ++++++++++++------- .../style-night/symbols/waste-basket-l.svg | 13 ++++++++---- .../style-night/symbols/waste-basket-s.svg | 19 ++++++++++------- 10 files changed, 110 insertions(+), 51 deletions(-) diff --git a/data/styles/clear/style-clear/symbols/firehydrant-l.svg b/data/styles/clear/style-clear/symbols/firehydrant-l.svg index 8f61851839..11cc2c5669 100644 --- a/data/styles/clear/style-clear/symbols/firehydrant-l.svg +++ b/data/styles/clear/style-clear/symbols/firehydrant-l.svg @@ -1,12 +1,18 @@ - + - firehydrant-l + firehydrant-l copy Created with Sketch. - - - + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/parking-ticket-l.svg b/data/styles/clear/style-clear/symbols/parking-ticket-l.svg index 0b033c1c55..482ced2db0 100644 --- a/data/styles/clear/style-clear/symbols/parking-ticket-l.svg +++ b/data/styles/clear/style-clear/symbols/parking-ticket-l.svg @@ -1,10 +1,16 @@ - + - parking-ticket-l + parking-ticket-l copy Created with Sketch. - - + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/waste-basket-l.svg b/data/styles/clear/style-clear/symbols/waste-basket-l.svg index cc313d7d27..749795ed48 100644 --- a/data/styles/clear/style-clear/symbols/waste-basket-l.svg +++ b/data/styles/clear/style-clear/symbols/waste-basket-l.svg @@ -4,10 +4,20 @@ waste-basket-l Created with Sketch. - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/waste-basket-s.svg b/data/styles/clear/style-clear/symbols/waste-basket-s.svg index 8e966f5703..132a871aee 100644 --- a/data/styles/clear/style-clear/symbols/waste-basket-s.svg +++ b/data/styles/clear/style-clear/symbols/waste-basket-s.svg @@ -1,13 +1,18 @@ - + - waste-basket-l + waste-basket-s Created with Sketch. - - - - + + + + + + + + + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/firehydrant-l.svg b/data/styles/clear/style-night/symbols/firehydrant-l.svg index fdcadf2908..a27806c74b 100644 --- a/data/styles/clear/style-night/symbols/firehydrant-l.svg +++ b/data/styles/clear/style-night/symbols/firehydrant-l.svg @@ -1,12 +1,18 @@ - + firehydrant-l Created with Sketch. - - - + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/parking-ticket-l.svg b/data/styles/clear/style-night/symbols/parking-ticket-l.svg index e8e4399da0..0b6bc23bf2 100644 --- a/data/styles/clear/style-night/symbols/parking-ticket-l.svg +++ b/data/styles/clear/style-night/symbols/parking-ticket-l.svg @@ -1,10 +1,16 @@ - + parking-ticket-l Created with Sketch. - - + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/seafood-shop-l.svg b/data/styles/clear/style-night/symbols/seafood-shop-l.svg index 0f01b889f5..075c757101 100644 --- a/data/styles/clear/style-night/symbols/seafood-shop-l.svg +++ b/data/styles/clear/style-night/symbols/seafood-shop-l.svg @@ -4,11 +4,16 @@ seefood-shop-l copy Created with Sketch. - - - - + + + + + + + + + + - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/seafood-shop-m.svg b/data/styles/clear/style-night/symbols/seafood-shop-m.svg index 8e9504429c..1ee611dc83 100644 --- a/data/styles/clear/style-night/symbols/seafood-shop-m.svg +++ b/data/styles/clear/style-night/symbols/seafood-shop-m.svg @@ -1,14 +1,19 @@ - + - seefood-shop-l copy + seafood-shop-m Created with Sketch. - - - - + + + + + + + + + + - - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/waste-basket-l.svg b/data/styles/clear/style-night/symbols/waste-basket-l.svg index a860c9dfb0..487c74e8d7 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-l.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-l.svg @@ -4,10 +4,15 @@ waste-basket-l Created with Sketch. - - - - + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/clear/style-night/symbols/waste-basket-s.svg index ea271d8d28..e1ee1370be 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-s.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-s.svg @@ -1,13 +1,18 @@ - + - waste-basket-l + waste-basket-s Created with Sketch. - - - - + + + + + + + + + - + \ No newline at end of file From 6d674553e8da6e39fea7af7b3916ade9bb8cd5a9 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 5 May 2016 11:53:53 +0300 Subject: [PATCH 17/87] Fixed my-position state machine in case of routing and app launching --- drape_frontend/my_position_controller.cpp | 78 ++++++++++++----------- drape_frontend/my_position_controller.hpp | 2 +- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index fea72a4bd3..58e3b5f1e7 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -28,7 +28,6 @@ double const kMaxPendingLocationTimeSec = 60.0; double const kMaxTimeInBackgroundSec = 60.0 * 60; double const kMaxNotFollowRoutingTimeSec = 10.0; double const kMaxUpdateLocationInvervalSec = 30.0; -double const kMaxWaitStartLocationSec = 5.0; int const kZoomThreshold = 10; int const kMaxScaleZoomLevel = 16; @@ -109,7 +108,8 @@ private: MyPositionController::MyPositionController(location::EMyPositionMode initMode, double timeInBackground, bool isFirstLaunch) - : m_mode(initMode) + : m_mode(location::PendingPosition) + , m_desiredInitMode(initMode) , m_isFirstLaunch(isFirstLaunch) , m_isInRouting(false) , m_needBlockAnimation(false) @@ -129,11 +129,14 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode, , m_isDirectionAssigned(false) { if (isFirstLaunch) + { m_mode = location::NotFollowNoPosition; + m_desiredInitMode = location::NotFollowNoPosition; + } else if (timeInBackground >= kMaxTimeInBackgroundSec) - m_mode = location::Follow; - - m_startLocationTimer.Reset(); + { + m_desiredInitMode = location::Follow; + } } MyPositionController::~MyPositionController() @@ -333,36 +336,44 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool m_isDirtyViewport = true; } - if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition) + if (!m_isPositionAssigned) { - ChangeMode(location::Follow); - if (!m_isFirstLaunch) - { - if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel) - { - m2::PointD const size(m_errorRadius, m_errorRadius); - ChangeModelView(m2::RectD(m_position - size, m_position + size)); - } - else - { - ChangeModelView(m_position, kMaxScaleZoomLevel); - } - } - else - { - if (!AnimationSystem::Instance().AnimationExists(Animation::MapPlane)) - ChangeModelView(m_position, kDoNotChangeZoom); - } - } - else if (!m_isPositionAssigned) - { - ChangeMode(m_mode); + ChangeMode(m_desiredInitMode); if (m_mode == location::Follow) ChangeModelView(m_position, kDoNotChangeZoom); else if (m_mode == location::FollowAndRotate) ChangeModelView(m_position, m_drawDirection, m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom); } + else if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition) + { + if (m_isInRouting) + { + ChangeMode(location::FollowAndRotate); + UpdateViewport(kMaxScaleZoomLevel); + } + else + { + ChangeMode(location::Follow); + if (!m_isFirstLaunch) + { + if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel) + { + m2::PointD const size(m_errorRadius, m_errorRadius); + ChangeModelView(m2::RectD(m_position - size, m_position + size)); + } + else + { + ChangeModelView(m_position, kMaxScaleZoomLevel); + } + } + else + { + if (!AnimationSystem::Instance().AnimationExists(Animation::MapPlane)) + ChangeModelView(m_position, kDoNotChangeZoom); + } + } + } m_isPositionAssigned = true; SetIsVisible(true); @@ -429,15 +440,6 @@ void MyPositionController::Render(uint32_t renderMode, ScreenBase const & screen ChangeMode(location::NotFollowNoPosition); } - // We do not have assigned position but mode requires location. - // Go to Pending state if the time is up. - if (!m_isPositionAssigned && IsInStateWithPosition() && - m_startLocationTimer.ElapsedSeconds() >= kMaxWaitStartLocationSec) - { - m_pendingTimer.Reset(); - ChangeMode(location::PendingPosition); - } - if (IsInRouting() && m_mode == location::NotFollow && m_routingNotFollowTimer.ElapsedSeconds() >= kMaxNotFollowRoutingTimeSec) { @@ -534,7 +536,7 @@ void MyPositionController::SetTimeInBackground(double time) { if (time >= kMaxTimeInBackgroundSec && m_mode == location::NotFollow) { - ChangeMode(location::Follow); + ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow); UpdateViewport(kDoNotChangeZoom); } } diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp index 75cc83d95d..66bbed4f93 100644 --- a/drape_frontend/my_position_controller.hpp +++ b/drape_frontend/my_position_controller.hpp @@ -126,6 +126,7 @@ private: private: location::EMyPositionMode m_mode; + location::EMyPositionMode m_desiredInitMode; bool m_isFirstLaunch; bool m_isInRouting; @@ -147,7 +148,6 @@ private: my::Timer m_pendingTimer; my::Timer m_routingNotFollowTimer; my::Timer m_updateLocationTimer; - my::Timer m_startLocationTimer; double m_lastLocationTimestamp; m2::RectD m_pixelRect; From 0c7c5c75411f527ecff0736e7327a85f8316ecfe Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 5 May 2016 13:29:22 +0300 Subject: [PATCH 18/87] Fixed zoom changing on add business --- drape_frontend/frontend_renderer.cpp | 6 ++++-- drape_frontend/my_position_controller.cpp | 3 +-- drape_frontend/user_event_stream.cpp | 2 -- drape_frontend/user_event_stream.hpp | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 3ad6ecaa57..0ea79a4c5b 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -927,7 +927,9 @@ void FrontendRenderer::PullToBoundArea(bool randomPlace, bool applyZoom) { m2::PointD const dest = randomPlace ? m2::GetRandomPointInsideTriangles(m_dragBoundArea) : m2::ProjectPointToTriangles(center, m_dragBoundArea); - int const zoom = applyZoom ? scales::GetAddNewPlaceScale() : m_currentZoomLevel; + int zoom = kDoNotChangeZoom; + if (applyZoom && m_currentZoomLevel < scales::GetAddNewPlaceScale()) + zoom = scales::GetAddNewPlaceScale(); AddUserEvent(SetCenterEvent(dest, zoom, true)); } } @@ -1609,7 +1611,7 @@ void FrontendRenderer::ChangeModelView(double azimuth) void FrontendRenderer::ChangeModelView(m2::RectD const & rect) { - AddUserEvent(SetRectEvent(rect, true, -1, true)); + AddUserEvent(SetRectEvent(rect, true, kDoNotChangeZoom, true)); } void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimuth, diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 58e3b5f1e7..a3d3b14d50 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -2,6 +2,7 @@ #include "drape_frontend/animation_system.hpp" #include "drape_frontend/animation_utils.hpp" #include "drape_frontend/visual_params.hpp" +#include "drape_frontend/user_event_stream.hpp" #include "drape_frontend/animation/base_interpolator.hpp" #include "drape_frontend/animation/interpolations.hpp" @@ -32,8 +33,6 @@ double const kMaxUpdateLocationInvervalSec = 30.0; int const kZoomThreshold = 10; int const kMaxScaleZoomLevel = 16; -int const kDoNotChangeZoom = -1; - string LocationModeStatisticsName(location::EMyPositionMode mode) { switch (mode) diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index d2fd119901..f0fa9a9bfa 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -29,8 +29,6 @@ uint64_t const kKineticDelayMs = 500; float const kForceTapThreshold = 0.75; -int const kDoNotChangeZoom = -1; - size_t GetValidTouchesCount(array const & touches) { size_t result = 0; diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp index e36318e777..6a3fae63bd 100644 --- a/drape_frontend/user_event_stream.hpp +++ b/drape_frontend/user_event_stream.hpp @@ -20,6 +20,8 @@ namespace df { +int const kDoNotChangeZoom = -1; + struct Touch { m2::PointF m_location = m2::PointF::Zero(); From 8b5964ab8e2caea4e26ea34f10a6c48bd4e2768e Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 5 May 2016 15:29:15 +0300 Subject: [PATCH 19/87] Fixed turning on/off perspective animation --- drape_frontend/animation_system.cpp | 49 +++++++++++++++------------- drape_frontend/animation_system.hpp | 16 +++++---- drape_frontend/user_event_stream.cpp | 29 +++++++++------- drape_frontend/user_event_stream.hpp | 3 +- 4 files changed, 55 insertions(+), 42 deletions(-) diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp index 4a7444fe5c..8b31d874e1 100644 --- a/drape_frontend/animation_system.cpp +++ b/drape_frontend/animation_system.cpp @@ -1034,7 +1034,8 @@ void AnimationSystem::PushAnimation(drape_ptr animation) m_animationChain.emplace_back(move(list)); } -void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind) +void AnimationSystem::FinishAnimations(function const &)> const & predicate, + bool rewind, bool finishAll) { if (m_animationChain.empty()) return; @@ -1043,7 +1044,7 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind) for (auto it = frontList.begin(); it != frontList.end();) { auto & anim = *it; - if (anim->GetType() == type) + if (predicate(anim)) { if (rewind) anim->Finish(); @@ -1055,33 +1056,35 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind) ++it; } } + + if (finishAll) + { + for (auto & lst : m_animationChain) + { + for (auto it = lst.begin(); it != lst.end();) + { + if (predicate(*it)) + it = lst.erase(it); + else + ++it; + } + } + } + if (frontList.empty()) StartNextAnimations(); } -void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind) +void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind, bool finishAll) { - if (m_animationChain.empty()) - return; + FinishAnimations([&type](drape_ptr const & anim) { return anim->GetType() == type; }, + rewind, finishAll); +} - TAnimationList & frontList = m_animationChain.front(); - for (auto it = frontList.begin(); it != frontList.end();) - { - auto & anim = *it; - if (anim->HasObject(object)) - { - if (rewind) - anim->Finish(); - SaveAnimationResult(*anim); - it = frontList.erase(it); - } - else - { - ++it; - } - } - if (frontList.empty()) - StartNextAnimations(); +void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll) +{ + FinishAnimations([&object](drape_ptr const & anim) { return anim->HasObject(object); }, + rewind, finishAll); } void AnimationSystem::Advance(double elapsedSeconds) diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp index 3503bdd3ca..f1afc959ac 100644 --- a/drape_frontend/animation_system.hpp +++ b/drape_frontend/animation_system.hpp @@ -568,21 +568,23 @@ public: void CombineAnimation(drape_ptr animation); void PushAnimation(drape_ptr animation); - void FinishAnimations(Animation::Type type, bool rewind); - void FinishObjectAnimations(Animation::TObject object, bool rewind); + void FinishAnimations(Animation::Type type, bool rewind, bool finishAll); + void FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll); void Advance(double elapsedSeconds); ScreenBase const & GetLastScreen() { return m_lastScreen; } void SaveAnimationResult(Animation const & animation); -private: - bool GetProperty(Animation::TObject object, Animation::TProperty property, Animation::PropertyValue & value) const; - void StartNextAnimations(); - +private: AnimationSystem(); -private: + bool GetProperty(Animation::TObject object, Animation::TProperty property, + Animation::PropertyValue & value) const; + void StartNextAnimations(); + void FinishAnimations(function const &)> const & predicate, + bool rewind, bool finishAll); + using TAnimationList = list>; using TAnimationChain = deque; using TPropertyCache = map, Animation::PropertyValue>; diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index f0fa9a9bfa..4f0f9d6000 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -252,8 +252,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool & m_discardedFOV = m_discardedAngle = 0.0; break; case UserEvent::EVENT_DISABLE_PERSPECTIVE: - if (m_navigator.Screen().isPerspective()) - SetDisable3dModeAnimation(); + SetDisable3dModeAnimation(); m_discardedFOV = m_discardedAngle = 0.0; break; case UserEvent::EVENT_SWITCH_VIEW_MODE: @@ -587,14 +586,16 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD bool UserEventStream::FilterEventWhile3dAnimation(UserEvent::EEventType type) const { - return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT; + return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT && + type != UserEvent::EVENT_ENABLE_PERSPECTIVE && + type != UserEvent::EVENT_DISABLE_PERSPECTIVE && + type != UserEvent::EVENT_SWITCH_VIEW_MODE; } void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV, bool isAnim, bool immediatelyStart) { - ResetCurrentAnimations(Animation::MapLinear); - ResetCurrentAnimations(Animation::MapScale); + ResetAnimationsBeforeSwitch3D(); double const startAngle = isAnim ? 0.0 : maxRotationAngle; double const endAngle = maxRotationAngle; @@ -616,8 +617,7 @@ void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV, void UserEventStream::SetDisable3dModeAnimation() { - ResetCurrentAnimations(Animation::MapLinear); - ResetCurrentAnimations(Animation::MapScale); + ResetAnimationsBeforeSwitch3D(); double const startAngle = m_navigator.Screen().GetRotationAngle(); double const endAngle = 0.0; @@ -634,10 +634,10 @@ void UserEventStream::SetDisable3dModeAnimation() m_animationSystem.CombineAnimation(move(anim)); } -void UserEventStream::ResetCurrentAnimations(Animation::Type animType) +void UserEventStream::ResetAnimations(Animation::Type animType, bool finishAll) { bool const hasAnimations = m_animationSystem.HasAnimations(); - m_animationSystem.FinishAnimations(animType, true /* rewind */); + m_animationSystem.FinishAnimations(animType, true /* rewind */, finishAll); if (hasAnimations) { m2::AnyRectD rect; @@ -649,7 +649,7 @@ void UserEventStream::ResetCurrentAnimations(Animation::Type animType) void UserEventStream::ResetMapPlaneAnimations() { bool const hasAnimations = m_animationSystem.HasAnimations(); - m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* finishAll */); + m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* rewind */, false /* finishAll */); if (hasAnimations) { m2::AnyRectD rect; @@ -658,6 +658,13 @@ void UserEventStream::ResetMapPlaneAnimations() } } +void UserEventStream::ResetAnimationsBeforeSwitch3D() +{ + ResetAnimations(Animation::MapLinear); + ResetAnimations(Animation::MapScale); + ResetAnimations(Animation::MapPerspective, true /* finishAll */); +} + m2::AnyRectD UserEventStream::GetCurrentRect() const { return m_navigator.Screen().GlobalRect(); @@ -705,7 +712,7 @@ bool UserEventStream::TouchDown(array const & touches) bool isMapTouch = true; // Interrupt kinetic scroll on touch down. - m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */); + m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */, true /* finishAll */); // Interrupt kinetic scroll on touch down. m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */); diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp index 6a3fae63bd..d0c21deae9 100644 --- a/drape_frontend/user_event_stream.hpp +++ b/drape_frontend/user_event_stream.hpp @@ -352,8 +352,9 @@ private: void CancelFilter(Touch const & t); void ApplyAnimations(bool & modelViewChanged, bool & viewportChanged); - void ResetCurrentAnimations(Animation::Type animType); + void ResetAnimations(Animation::Type animType, bool finishAll = false); void ResetMapPlaneAnimations(); + void ResetAnimationsBeforeSwitch3D(); list m_events; mutable mutex m_lock; From a3aa2d7d318cea43c8e82a7bce1850cfb0dc87b4 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Thu, 5 May 2016 16:19:16 +0300 Subject: [PATCH 20/87] [android] Fixed osm login crash. --- .../maps/editor/AuthDialogFragment.java | 15 +++++++++++---- .../com/mapswithme/maps/editor/AuthFragment.java | 14 ++++++++++---- .../mapswithme/maps/editor/OsmAuthFragment.java | 10 +++++++++- .../maps/editor/OsmAuthFragmentDelegate.java | 10 +++------- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java index e639e9ab8b..5884bf4401 100644 --- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java @@ -1,5 +1,6 @@ package com.mapswithme.maps.editor; +import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.LayoutInflater; @@ -11,8 +12,6 @@ import com.mapswithme.maps.base.BaseMwmDialogFragment; public class AuthDialogFragment extends BaseMwmDialogFragment { - private OsmAuthFragmentDelegate mOsmAuthDelegate; - @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) @@ -30,7 +29,15 @@ public class AuthDialogFragment extends BaseMwmDialogFragment public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mOsmAuthDelegate = new OsmAuthFragmentDelegate(this); - mOsmAuthDelegate.onViewCreated(view, savedInstanceState); + OsmAuthFragmentDelegate osmAuthDelegate = new OsmAuthFragmentDelegate(this) + { + @Override + protected void loginOsm() + { + startActivity(new Intent(getContext(), OsmAuthActivity.class)); + dismiss(); + } + }; + osmAuthDelegate.onViewCreated(view, savedInstanceState); } } diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java index 2d91e4d9f8..4eb87fee58 100644 --- a/android/src/com/mapswithme/maps/editor/AuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java @@ -8,14 +8,13 @@ import android.view.View; import android.view.ViewGroup; import com.mapswithme.maps.R; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.util.statistics.Statistics; public class AuthFragment extends BaseMwmToolbarFragment { - private OsmAuthFragmentDelegate mOsmAuthDelegate; - @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) @@ -28,8 +27,15 @@ public class AuthFragment extends BaseMwmToolbarFragment { super.onViewCreated(view, savedInstanceState); mToolbarController.setTitle(R.string.thank_you); - mOsmAuthDelegate = new OsmAuthFragmentDelegate(this); - mOsmAuthDelegate.onViewCreated(view, savedInstanceState); + OsmAuthFragmentDelegate osmAuthDelegate = new OsmAuthFragmentDelegate(this) + { + @Override + protected void loginOsm() + { + ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null); + } + }; + osmAuthDelegate.onViewCreated(view, savedInstanceState); } @Override diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java index cdabc1ae7d..9d7bd286dc 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java @@ -16,6 +16,7 @@ import android.widget.TextView; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.util.Constants; @@ -64,7 +65,14 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mDelegate = new OsmAuthFragmentDelegate(this); + mDelegate = new OsmAuthFragmentDelegate(this) + { + @Override + protected void loginOsm() + { + ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null); + } + }; mDelegate.onViewCreated(view, savedInstanceState); mToolbarController.setTitle(R.string.login); mEtLogin = (EditText) view.findViewById(R.id.osm_username); diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java index dae9661680..2cd4f3818a 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java @@ -15,7 +15,6 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.widget.InputWebView; import com.mapswithme.util.Constants; import com.mapswithme.util.Utils; @@ -23,10 +22,12 @@ import com.mapswithme.util.concurrency.ThreadPool; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.statistics.Statistics; -public class OsmAuthFragmentDelegate implements View.OnClickListener +public abstract class OsmAuthFragmentDelegate implements View.OnClickListener { private final Fragment mFragment; + protected abstract void loginOsm(); + public OsmAuthFragmentDelegate(Fragment fragment) { mFragment = fragment; @@ -92,11 +93,6 @@ public class OsmAuthFragmentDelegate implements View.OnClickListener Statistics.params().add(Statistics.EventParam.IS_SUCCESS, true).add(Statistics.EventParam.TYPE, type.name)); } - protected void loginOsm() - { - ((BaseMwmFragmentActivity) mFragment.getActivity()).replaceFragment(OsmAuthFragment.class, null, null); - } - @SuppressLint("SetJavaScriptEnabled") protected void loginWebview(final OsmOAuth.AuthType type) { From 8590ad8a416d16b1e9084134b3d30071163520d2 Mon Sep 17 00:00:00 2001 From: Timofey Date: Thu, 5 May 2016 17:21:39 +0300 Subject: [PATCH 21/87] Increased the version. --- android/gradle.properties | 4 ++-- iphone/Maps/Maps.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index cf3b0fbe1c..325aa0f257 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -3,8 +3,8 @@ propMinSdkVersion=15 # https://code.google.com/p/android/issues/detail?id=184567 propTargetSdkVersion=22 propBuildToolsVersion=22.0.1 -propVersionCode=610 -propVersionName=6.1.0 +propVersionCode=613 +propVersionName=6.1.3 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1 diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 6e55913d7a..037831967e 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4276,7 +4276,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -4395,7 +4395,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -4515,7 +4515,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4639,7 +4639,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4763,7 +4763,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -4885,7 +4885,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.1; + CURRENT_PROJECT_VERSION = 6.1.3; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; From f3dd7280e090c9065899c7e30682f471d414b5fe Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 5 May 2016 17:53:50 +0300 Subject: [PATCH 22/87] Fixed selection on Android --- drape_frontend/frontend_renderer.cpp | 50 +++++++++++++++++----------- drape_frontend/frontend_renderer.hpp | 6 +++- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 0ea79a4c5b..a97077f9f6 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -374,6 +374,11 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) ref_ptr msg = message; m_myPositionController->SetRenderShape(msg->AcceptShape()); m_selectionShape = msg->AcceptSelection(); + if (m_selectObjectMessage != nullptr) + { + ProcessSelection(make_ref(m_selectObjectMessage)); + m_selectObjectMessage.reset(); + } } break; @@ -430,28 +435,13 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) case Message::SelectObject: { ref_ptr msg = message; - if (m_selectionShape == nullptr) + { + m_selectObjectMessage = make_unique_dp(msg->GetSelectedObject(), msg->GetPosition(), + msg->IsAnim()); break; - - if (msg->IsDismiss()) - { - m_selectionShape->Hide(); - } - else - { - double offsetZ = 0.0; - if (m_userEventStream.GetCurrentScreen().isPerspective()) - { - dp::TOverlayContainer selectResult; - if (m_overlayTree->IsNeedUpdate()) - BuildOverlayTree(m_userEventStream.GetCurrentScreen()); - m_overlayTree->Select(msg->GetPosition(), selectResult); - for (ref_ptr handle : selectResult) - offsetZ = max(offsetZ, handle->GetPivotZ()); - } - m_selectionShape->Show(msg->GetSelectedObject(), msg->GetPosition(), offsetZ, msg->IsAnim()); } + ProcessSelection(msg); break; } @@ -934,6 +924,28 @@ void FrontendRenderer::PullToBoundArea(bool randomPlace, bool applyZoom) } } +void FrontendRenderer::ProcessSelection(ref_ptr msg) +{ + if (msg->IsDismiss()) + { + m_selectionShape->Hide(); + } + else + { + double offsetZ = 0.0; + if (m_userEventStream.GetCurrentScreen().isPerspective()) + { + dp::TOverlayContainer selectResult; + if (m_overlayTree->IsNeedUpdate()) + BuildOverlayTree(m_userEventStream.GetCurrentScreen()); + m_overlayTree->Select(msg->GetPosition(), selectResult); + for (ref_ptr handle : selectResult) + offsetZ = max(offsetZ, handle->GetPivotZ()); + } + m_selectionShape->Show(msg->GetSelectedObject(), msg->GetPosition(), offsetZ, msg->IsAnim()); + } +} + void FrontendRenderer::BeginUpdateOverlayTree(ScreenBase const & modelView) { if (m_overlayTree->Frame()) diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp index 79e1baf00b..657ecd9de4 100755 --- a/drape_frontend/frontend_renderer.hpp +++ b/drape_frontend/frontend_renderer.hpp @@ -50,6 +50,7 @@ namespace df class SelectionShape; class Framebuffer; class TransparentLayer; +class SelectObjectMessage; struct TapInfo { @@ -233,7 +234,8 @@ private: void PullToBoundArea(bool randomPlace, bool applyZoom); -private: + void ProcessSelection(ref_ptr msg); + drape_ptr m_gpuProgramManager; struct RenderLayer @@ -317,6 +319,8 @@ private: vector m_dragBoundArea; + drape_ptr m_selectObjectMessage; + #ifdef DEBUG bool m_isTeardowned; #endif From da0ddc5d9ac442a93994c40a08d70222ab6d3430 Mon Sep 17 00:00:00 2001 From: Timofey Date: Thu, 5 May 2016 18:41:23 +0300 Subject: [PATCH 23/87] Pulled the updtaed categories.txt file --- data/categories.txt | 496 ++++++++++++++++++++++++++++++++------------ 1 file changed, 367 insertions(+), 129 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 6ef291c56a..858710a8d4 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -389,7 +389,7 @@ tr:Pub|bar|Bira|içki|yemek uk:Паб|Бар|пиво|напої|їжа vi:Quán rượu|Quán bar|quán rượu|đồ uống|ẩm thực zh-Hans:酒吧์|酒馆์|啤酒|饮料|食物 -zh-Hant:啤酒吧|酒吧|酒館|飲酒|PUB|吧台|飲食 +zh-Hant:酒館|啤酒吧|酒吧|飲酒|PUB|吧台|飲食 amenity-cafe en:3Cafe|3restaurant|3food|U+2615|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B|U+1F375 @@ -521,7 +521,7 @@ es:3Panadería|tienda fi:3Leipomo|kauppa fr:3Boulangerie|magasin hu:3Pékség|bolt -id:Toko roti|toko +id:Toko roti|toko|Roti it:3Panetteria|negozio ja:1パン屋|ベーカリー|パン|軽食|持ち帰り|買い物 ko:1베이커리|쇼핑 @@ -575,7 +575,7 @@ en:4Beauty Care|home care|shop|U+1F3EC|U+1F3EA ar:ﻞﻴﻤﺠﺘﻟﺍ ﺕﺍﺮﻀﺤﺘﺴﻣ|تجميل|المتجر cs:4Kosmetika|domácí péče|obchod da:4Kosmetik|hjemmepleje|butik -de:4Kosmetik|Geschäft +de:4Kosmetik|Geschäft|Schönheitspflege el:Καλλυντικά|Μαγαζί es:4Productos cosméticos|tienda fi:Kosmetiikka|kotihoito|kauppa @@ -1012,7 +1012,7 @@ en:Beauty Shop|beautician|U+1F484 ar:ﻞﻴﻤﺠﺗ ﻥﻮﻟﺎﺻ cs:Kosmetický salon da:Skønhedssalon -de:Schönheitssalon +de:Schönheitssalon|Schönheitsshop el:Ινστιτούτο αισθητικής es:Salón de belleza fi:Kauneushoitola @@ -1254,7 +1254,7 @@ es:Confitería|confitería|tienda fi:Makeiskauppa|kauppa fr:Pâtisserie|confiserie|magasin hu:Cukrászüzlet|édességbolt|bolt -id:Penganan|toko +id:Penganan|toko|manisan it:Pasticceria|drogheria|negozio ja:菓子類|菓子屋|買い物 ko:제과점|베이커리|쇼핑 @@ -1445,7 +1445,7 @@ tr:Bisiklet|mağaza sv:4Cykelaffär|cykel|cykel|butik vi:3Cửa hàng xe đạp|cửa hàng id:3Toko sepeda|toko -ro:3Bicicletă|magazin +ro:3Bicicletă|magazin|Magazin biciclete nb:3Sykkel|butikk fi:3Polkupyörä|kauppa sw:Duka la baiskeli|baiskeli @@ -1765,7 +1765,7 @@ nl:3Kunstwerk|3toerisme zh-Hant:1藝術品|3旅遊景點 pl:3Rzeźba|turystyka|osobliwości miasta pt:3Artwork|turismo|vistas -hu:3Szobor|3látnivaló +hu:3Szobor|3látnivaló|Műalkotás th:งานศิลปะ|3การท่องเที่ยว|สถานที่ท่องเที่ยว zh-Hans:1旅游|景点 ar:سياحة|مناظر @@ -2171,7 +2171,7 @@ fr:Mémorial|monument|attraction|tourisme|site touristique it:Memoriale|monumento|turistico es:Memorial|turismo ko:1기념물|관광 -ja:追悼|1記念碑|観光 +ja:追悼|1記念碑|観光|追悼碑 cs:Pomník|památka|zajímavost|pamětihodnost sk:Pomník|pamiatka|atrakcia|zaujímavosť|pamätihodnosť nl:Gedenkteken|monument|attractie|toerisme @@ -2367,7 +2367,7 @@ tr:Bank sv:Bänk vi:Xe đạp id:Bangku panjang -ro:Banchetă|Bancă +ro:Banchetă|Bancă|Bancă parc nb:Benk fi:Penkki sw:Benchi @@ -2396,7 +2396,7 @@ da:4Cykel tr:Bisiklet kiralama|4Bisiklet sv:4Cykeluthyrning|cykel|cykel|3uthyrning vi:Cho thuê xe đạp -id:Menyewa sepeda +id:Penyewaan Sepeda ro:Închiriere de biciclete|Bicicletă nb:Sykkelutleie fi:Polkupyöränvuokraus @@ -2766,7 +2766,7 @@ en:Clinic|1hospital|doctor|U+1F3E5|U+1F489 ar:عيادة|مستشفى|المستشفى cs:Klinika|nemocnice da:Klinik|hospital -de:Krankenhaus|Klinik +de:Klinik|Krankenhaus es:Clínica|hospital fi:Klinikka|sairaala fr:Clinique|hôpital @@ -4055,7 +4055,7 @@ sk:3Hostel|hotel|ubytovňa|motel nl:3Hostel|jeugdherberg|hotel|motel zh-Hant:1旅舍|旅館|青年旅舍|青年旅館|住宿|飯店|3汽車旅館|3motel pl:4Hostel|4hotel|4motel -pt:3Hostel|3Pousada|4hotel|motel +pt:3Hostel|3Pousada|4hotel|motel|Albergue hu:3Hostel|szálloda|szállás th:3หอพัก|โรงแรม|โมเทล zh-Hans:2旅社|旅店 @@ -4168,8 +4168,8 @@ fr:Hôtel de montagne|hôtel|auberge de jeunesse|cabane alpine it:Hotel di montagna|baita|capanna|capanna di montagna|capanna alpina|hotel es:4Cabaña|cabaña de los Alpes|hotel de montaña|hotel ko:1고산 오두막|산 호텔|호텔 -ja:1山小屋|高山小屋|ヒュッテ -cs:4Horská chata|horský hotel|hotel +ja:1山小屋|高山小屋|ヒュッテ|山の宿泊施設 +cs:4Ubytování v horách|Horská chata|horský hotel|hotel sk:4Horská chata|horský hotel|hotel nl:3Berghut|alpenhut|hotel zh-Hant:1山上住宿|飯店|旅館|住宿|旅舍|2高山住宿 @@ -5074,7 +5074,7 @@ fi:Suutari fr:Cordonnier hu:Cipész id:Tukang sepatu -it:Calzolaio +it:Calzolaio|Riparazione di calzature ja:靴修理 ko:구두수선 nl:Schoenmaker|schoenmakerij @@ -5269,20 +5269,61 @@ sw:Pwani highway-speed_camera en:3Speed Camera -ru:3Камера скорости -vi:Camera tốc độ -id:Kamera kecepatan -ro:Radar -nb:Fartskamera -nl:Flitscamera|snelheidscamera -de:Blitzer|Radarkontrolle|Radarfalle -fi:Nopeuskamera +ru:Камера скорости +fr:Radar de vitesse +da:Automatisk Trafikkontrol +id:Kamera Kecepatan +ko:스피드 카메라 +sv:Hastighetskamera +tr:Hız Kamerası +uk:Камера безпеки дорожнього руху +vi:Camera bắn tốc độ +hu:Traffipax +de:Blitzer +fi:Nopeusvalvontakamera +cs:Rychlostní kamera +it:Autovelox +nb:Fotoboks +zh-Hant:測速照相機 +zh-Hans:测速照相机 +th:กล้องตรวจจับความเร็ว +ja:オービス +ro:Detector de viteză +ar:كاميرا لرصد السرعة +sk:Rýchlostná kamera +es:Radar de velocidad +pl:Fotoradar +nl:Flitspaal +pt:Radar de velocidade man_made-lighthouse en:Lighthouse -nl:Vuurtoren ru:Маяк +fr:Phare +da:Fyrtårn +id:Mercusuar +ko:등대 +sv:Fyr +tr:Deniz Feneri +uk:Маяк +vi:Hải đăng +hu:Világítótorony de:Leuchtturm +fi:Majakka +cs:Maják +it:Faro +nb:Fyr +zh-Hant:燈塔 +zh-Hans:灯塔 +th:ประภาคาร +ja:灯台 +ro:Far +ar:منارة +sk:Maják +es:Faro +pl:Latarnia morska +nl:Vuurtoren +pt:Farol shop-copyshop en:Copy Shop|Printer @@ -5550,7 +5591,7 @@ ru:Детская комната|ясли ar:حضانة|رعاية أطفال cs:Jesle|Péče o děti da:Vuggestue|Børnehave -de:Kinderzimmer|Kindergarten|Kinderbetreuung +de:Kindertagesstätte|Kinderzimmer|Kindergarten|Kinderbetreuung es:Habitación infantil|guardería fi:Päivähoito|Lastenhoito fr:Garderie|Garde d'enfant @@ -5584,7 +5625,7 @@ es:Estacionamiento de bicis fi:Polkupyöräpysäköinti fr:Parking à vélo hu:Kerékpárparkoló -id:Cykelparkering +id:Parkir Sepeda it:Parcheggio biciclette ja:駐輪場 ko:자전거보관소 @@ -5599,7 +5640,8 @@ th:ที่จอดจักรยาน tr:Parking à vélo uk:Велозупинка vi:Chỗ Đậu Xe Đạp -zh-Hant:自行车存放处 +zh-Hans:自行车存放处 +zh-Hant:腳踏車停放區 amenity-waste_basket en:Trash Bin|Litter Bin|Waste Basket @@ -5612,7 +5654,7 @@ es:Papelera fi:Roska-astia fr:Poubelle hu:Szemétkosár -id:Pepperskorg +id:Kotak sampah it:Contenitore per rifiuti ja:くずかご ko:쓰레기통 @@ -5627,37 +5669,38 @@ th:ถังขยะ tr:Poubelle uk:Бак для сміття vi:Thùng rác -zh-Hant:垃圾篓 +zh-Hans:垃圾篓 +zh-Hant:垃圾箱 emergency-phone en:Emergency Phone ru:Телефон для экстренных вызовов ar:هاتف الطوارئ -cs:tísňového volání +cs:Tísňového volání da:Emergency telefon de:Nottelefon el:τηλεφώνου έκτακτης ανάγκης es:Teléfono de emergencia -fi:hätänumero -fr:téléphone d'urgence +fi:Hätänumero +fr:Téléphone d'urgence he:טלפון חירום -hu:sürgősségi telefon -id:telepon darurat -it:telefono di emergenza +hu:Sürgősségi telefon +id:Telepon +it:Telefono di emergenza ja:緊急電話 ko:긴급 전화 -nb:nødtelefon -nl:praatpaal -pl:telefon alarmowy -pt:telefone de emergência -ro:telefon de urgență -sk:tiesňového volania -sv:nödtelefon -sw:simu ya dharura +nb:Nødtelefon +nl:Praatpaal +pl:Telefon alarmowy +pt:Telefone de emergência +ro:Telefon de urgență +sk:Tiesňového volania +sv:Nödtelefon +sw:Simu ya dharura th:โทรศัพท์ฉุกเฉิน -tr:acil telefon -uk:аварійний телефон -vi:điện thoại khẩn cấp +tr:Acil telefon +uk:Аварійний телефон +vi:Điện thoại khẩn cấp zh-Hans:紧急电话 zh-Hant:緊急電話 @@ -5672,7 +5715,7 @@ es:Centro de fitness|gimnasio fi:Kuntosali fr:Centre fitness|salle de gym hu:Fitnesz-terem -id:Gym +id:Pusat kebugaran|senam it:Centro benessere|palestra ja:フィットネスセンター、ジム ko:피트니스센터|체육관 @@ -5687,6 +5730,7 @@ th:ฟิตเนสเซ็นเตอร์|ยิม tr:Centre fitness|salle de gym uk:Фітнес-зал vi:Phòng Tập +zh-Hans:健身中心|健身房 zh-Hant:健身中心|健身房 leisure-sauna @@ -5700,7 +5744,7 @@ es:Sauna fi:Sauna fr:Sauna hu:Szauna -id:Bastu +id:Sauna it:Sauna ja:サウナ ko:사우나 @@ -5715,6 +5759,7 @@ th:ซาวน่า tr:Sauna uk:Лазня vi:Phòng xông hơi +zh-Hans:桑拿 zh-Hant:桑拿 man_made-water_well @@ -5728,7 +5773,7 @@ es:Pozo fi:Vesikaivo fr:Puits à eau hu:Ivókút -id:Brunn +id:Sumur air it:Pozzo d'acqua ja:井戸 ko:우물 @@ -5743,6 +5788,7 @@ th:บ่อน้ำ tr:Puits à eau uk:Криниця vi:Giếng Nước +zh-Hans:水井 zh-Hant:水井 shop-car_repair-tyres @@ -5756,7 +5802,7 @@ es:Reparación de neumáticos fi:Rengashuolto fr:Réparation de pneus hu:Gumiszerviz -id:Däckverkstad +id:Tambal ban it:Gommista ja:タイヤ修理 ko:타이어수리점 @@ -5771,11 +5817,37 @@ th:ร้านปะยาง tr:Réparation de pneus uk:Шиномонтаж vi:Vá Lốp -zh-Hant:轮胎修理 +zh-Hans:轮胎修理 +zh-Hant:輪胎修補 shop-chemist|@shop en:Chemist Shop ru:Бытовая химия +ar:صيدلية +cs:Drogerie +da:Medicinbutik|Drugstore +de:Drogerie +es:Droguería +fi:Apteekki +fr:Pharmacie +hu:Drogéria +id:Toko bahan kimia +it:Farmacia +ja:化学薬品店 +ko:화학자 상점 +nl:Drogisterij +nb:Dagligvareforretning +pl:Drogeria +pt:Farmácia +ro:Mercerie +sk:Drogéria +sv:Apotek +th:ร้านขายผลิตภัณฑ์ทางเคมี +tr:Zincir eczane +uk:Магазин побутової хімії +vi:Cửa hàng Dược phẩm +zh-Hant:藥妝店 +zh-Hans:药妆店 shop-pet|@shop en:Petshop @@ -5788,7 +5860,7 @@ es:Tienda de mascotas fi:Eläinkauppa fr:Animalerie hu:Házikedvenc-üzlet -id:Djuraffär +id:Toko hewan it:Negozio di animali ja:ペットショップ ko:애완동물점 @@ -5803,7 +5875,8 @@ th:เพ็ทชอป tr:Animalerie uk:Зоотовари vi:Cửa Hàng Vật Nuôi -zh-Hant:宠物店 +zh-Hans:宠物店 +zh-Hant:寵物店 tourism-information-office|@tourism en:Tourist Office @@ -5816,7 +5889,7 @@ es:Oficina de turismo fi:Turistitoimisto fr:Office de tourisme hu:Idegenforgalmi iroda -id:Turistcenter +id:Kantor wisata it:Ufficio turistico ja:観光案内所 ko:관광정보센터 @@ -5831,7 +5904,8 @@ th:ศูนย์บริการนักท่องเที่ยว tr:Office de tourisme uk:Туристичний офіс vi:Văn Phòng Du Lịch -zh-Hant:旅游服务处 +zh-Hans:旅游服务处 +zh-Hant:旅遊辦事處 amenity-community_centre en:Community Centre @@ -5844,7 +5918,7 @@ es:Centro comunitario fi:Monitoimitalo fr:Centre communautaire hu:Közösségi központ -id:Stadshus +id:Pusat komunitas it:Centro ricreativo ja:コミュニティセンター ko:커뮤니티센터 @@ -5859,7 +5933,8 @@ th:ศูนย์ชุมชน tr:Centre communautaire uk:Центр культури та дозвілля, Дім культури vi:Trung Tâm Cộng Đồng -zh-Hant:社区中心 +zh-Hans:社区中心 +zh-Hant:社區活動中心 amenity-courthouse en:Courthouse @@ -5872,7 +5947,7 @@ es:Juzgado fi:Oikeustalo fr:Palais de justice hu:Bíróság -id:Domstol +id:Gedung pengadilan it:Tribunale ja:裁判所 ko:법원 @@ -5887,6 +5962,7 @@ th:ศาล tr:Palais de justice uk:Суд vi:Tòa án +zh-Hans:法院 zh-Hant:法院 amenity-vending_machine-cigarettes @@ -5900,7 +5976,7 @@ es:Máquina de tabaco fi:Savukeautomaatti fr:Distributeur de cigarettes hu:Cigarettaautomata -id:Cigarettmaskin +id:Mesin rokok it:Distributore automatico di sigarette ja:たばこ自動販売機 ko:담배자판기 @@ -5915,7 +5991,8 @@ th:เครื่องขายบุหรี่ tr:Distributeur de cigarettes uk:Автомат з продажу сигарет vi:Máy bán thuốc lá -zh-Hant:自动售烟机 +zh-Hans:自动售烟机 +zh-Hant:香菸自動販賣機 amenity-vending_machine-drinks en:Drink Dispenser @@ -5928,7 +6005,7 @@ es:Máquina de bebidas fi:Juoma-automaatti fr:Distributeur de boissons hu:Italautomata -id:Läskautomat +id:Mesin penjual minuman it:Distributore automatico di bibite ja:飲料自動販売機 ko:음료자동판매기 @@ -5943,7 +6020,8 @@ th:เครื่องขายเครื่องดื่มอัตโ tr:Distributeur de boissons uk:Автомат з напоями vi:Máy bán thức uống -zh-Hant:饮料售卖机 +zh-Hans:饮料售卖机 +zh-Hant:飲料自動販賣機 building-garage en:Garage @@ -5956,7 +6034,7 @@ es:Taller mecánico fi:Autotalli fr:Garage hu:Garázs -id:Garage +id:Garasi it:Garage ja:車庫 ko:정비소 @@ -5971,7 +6049,8 @@ th:อาคารจอดรถ tr:Garage uk:Гараж vi:Gara -zh-Hant:车库 +zh-Hans:车库 +zh-Hant:車庫 highway-rest_area en:Highway Rest Area @@ -5984,7 +6063,7 @@ es:Zona de descanso fi:Levähdyspaikka fr:Aire de repos hu:Pihenőzóna -id:Viloplats +id:Tempat istirahat it:Area di sosta ja:休憩所 ko:휴게소 @@ -5999,7 +6078,8 @@ th:บริเวณพักผ่อน tr:Aire de repos uk:Зона відпочинку vi:Khu Vực Thụt Vào Để Đỗ Xe -zh-Hant:休息区 +zh-Hans:休息区 +zh-Hant:休息區 highway-traffic_signals en:Traffic Lights @@ -6012,7 +6092,7 @@ es:Semáforos fi:Liikennevalot fr:Feux de circulation hu:Közlekedési lámpák -id:Trafikljus +id:Lampu lalu lintas it:Semaforo ja:交通信号 ko:신호등 @@ -6027,7 +6107,8 @@ th:สัญญาณไฟจราจร tr:Feux de circulation uk:Світлофор vi:Đèn Giao Thông -zh-Hant:交通信号灯 +zh-Hans:交通信号灯 +zh-Hant:紅綠燈 man_made-chimney en:Factory Chimney @@ -6040,7 +6121,7 @@ es:Chimenea de fábrica fi:Tehtaan piippu fr:Cheminée d'usine hu:Gyárkémény -id:Fabriksskorsten +id:Cerobong asap pabrik it:Ciminiera industriale ja:工場煙突 ko:공장 굴뚝 @@ -6055,7 +6136,8 @@ th:ปล่องควันโรงงาน tr:Cheminée d'usine uk:Заводська труба vi:Ống Khói Nhà Máy -zh-Hant:工厂烟囱 +zh-Hans:工厂烟囱 +zh-Hant:工廠煙囪 man_made-tower en:Tower @@ -6068,7 +6150,7 @@ es:Torre fi:Torni fr:Tour hu:Torony -id:Torn +id:Menara it:Torre ja:タワー ko:타워 @@ -6083,7 +6165,8 @@ th:หอคอย tr:Tour uk:Вежа vi:Tháp -zh-Hant:高塔 +zh-Hans:高塔 +zh-Hant:塔 power-substation en:Substation @@ -6096,7 +6179,7 @@ es:Subestación fi:Muuntoasema fr:Sous-station hu:Kapcsolószekrény -id:Understation +id:Stasiun bawah tanah it:Sottostazione elettrica ja:変電所 ko:변전소 @@ -6111,7 +6194,8 @@ th:สถานีไฟฟ้า tr:Sous-station uk:Підстанція vi:Trạm biến áp -zh-Hant:变电站 +zh-Hans:变电站 +zh-Hant:變電所 shop-bookmaker en:Bookmaker @@ -6124,7 +6208,7 @@ es:Casa de apuestas fi:Kustantaja fr:Bookmaker hu:Fogadóiroda -id:Bokbindare +id:Bandar judi it:Centro scommesse ja:ブックメーカー ko:마권판매소 @@ -6139,7 +6223,8 @@ th:ร้านรับแทงพนัน tr:Bookmaker uk:Букмекерська контора vi:Người nhận cá cược -zh-Hant:书店 +zh-Hans:书店 +zh-Hant:賭博業者 shop-seafood|@shop en:Seafood Shop @@ -6152,7 +6237,7 @@ es:Pescadería fi:Kalakauppias fr:Poissonnier hu:Halüzlet -id:Fiskhandlare +id:Penjual Ikan it:Pescivendolo ja:魚屋 ko:생선가게 @@ -6167,7 +6252,8 @@ th:ร้านขายปลา tr:Poissonnier uk:Рибна крамниця vi:Người bán cá -zh-Hant:鱼商 +zh-Hans:鱼商 +zh-Hant:魚販 shop-ticket|@shop en:Ticket Shop @@ -6180,7 +6266,7 @@ es:Oficina de venta de entradas fi:Lippumyymälä fr:Billetterie hu:Jegyiroda -id:Biljettkontor +id:Tempat penjualan karcis it:Biglietteria ja:チケット売り場 ko:매표소 @@ -6195,7 +6281,8 @@ th:จุดจำหน่ายตั๋ว tr:Billetterie uk:Білетна каса vi:Phòng vé -zh-Hant:售票处 +zh-Hans:售票处 +zh-Hant:售票處 shop-wine|@shop en:Wine Shop @@ -6208,14 +6295,14 @@ es:Establecimiento de bebidas alcohólicas fi:Alkoholimyymälä fr:Hors licence hu:Szeszesital-üzlet -id:Spritförsäljning +id:Toko minuman keras it:Negozio di alcolici -ja:ワイン|酒屋 +ja:ワイン|酒屋|ワインショップ ko:주류 판매점 nl:Wijn|Slijterij nb:Alkoholutsalg pl:Sklep monopolowy -pt:Vinho|Loja de bebidas +pt:Vinho|Loja de Vinhos ro:Magazin de băuturi alcolice sk:Vinotéka sv:Spritförsäljning @@ -6223,7 +6310,8 @@ th:ร้านขายไวน์ tr:Caviste uk:Винна крамниця vi:Rượu|Cửa hàng rượu -zh-Hant:酒店 +zh-Hans:酒店 +zh-Hant:販酒處 shop-car_parts|@shop en:Car Parts @@ -6268,7 +6356,7 @@ es:Chalé fi:Alppimaja fr:Chalet hu:Turistaház -id:Stuga +id:Chalet it:Chalet ja:シャレー|山小屋 ko:별장 @@ -6283,6 +6371,7 @@ th:ชาเลต์ tr:Chalet uk:Шале vi:Nhà vệ sinh công cộng +zh-Hans:木屋 zh-Hant:木屋 tourism-information-board|@tourism @@ -6296,7 +6385,7 @@ es:Tablón de información fi:Informaatio fr:Panneau d'informations hu:Információs tábla -id:Anslagstavla +id:Papan informasi it:Tabellone informativo ja:案内板 ko:안내소 @@ -6311,7 +6400,8 @@ th:บอร์ดประชาสัมพันธ์ tr:Panneau d'informations uk:Інформаційний щит vi:Bảng Thông Tin -zh-Hant:公告板 +zh-Hans:公告板 +zh-Hant:資訊中心 tourism-information-map|@tourism en:Tourist Map @@ -6324,7 +6414,7 @@ es:Mapa turístico fi:Turistikartta fr:Carte touristique hu:Turistatérkép -id:Turistkarta +id:Peta wisata it:Mappa turistica ja:観光マップ ko:관광안내도 @@ -6339,7 +6429,8 @@ th:แผนที่ท่องเที่ยว tr:Carte touristique uk:Мапа vi:Bản Đồ Du Lịch -zh-Hant:旅游地图 +zh-Hans:旅游地图 +zh-Hant:旅遊地圖 aerialway-station en:Aerialway Station|Cable Car Station @@ -6352,7 +6443,7 @@ es:Estación de teleférico fi:Köysirata-asema fr:Remontées mécaniques hu:Felvonóállomás -id:Linbanestation +id:Stasiun kereta gantung it:Stazione di rifornimento per auto elettriche ja:ケーブルカー駅 ko:케이블카 역 @@ -6367,7 +6458,8 @@ th:สถานีกระเช้าลอยฟ้า tr:Remontées mécaniques uk:Канатна дорога vi:Trạm Cáp Treo -zh-Hant:缆车车站 +zh-Hans:缆车车站 +zh-Hant:纜車站 aeroway-helipad en:Helipad @@ -6380,7 +6472,7 @@ es:Helipuerto fi:Helikopterialusta fr:Hélisurface hu:Helikopterleszálló -id:Helikopterplatta +id:Landasan helikopter it:Piattaforma per elicotteri ja:ヘリポート ko:헬기착륙장 @@ -6395,7 +6487,8 @@ th:ที่จอดเฮลิคอปเตอร์ tr:Hélisurface uk:Майданчик для гелікоптерів vi:Bãi đỗ trực thăng -zh-Hant:直升机停机坪 +zh-Hans:直升机停机坪 +zh-Hant:直升機停機坪 amenity-vending_machine-parking_tickets en:Parking Tickets @@ -6408,7 +6501,7 @@ es:Máquina de pago de tique de aparcamiento fi:Pysäköintimaksuautomaatti fr:Horodateur hu:Parkolóautomata -id:Parkeringsautomat +id:Mesin pembayaran tiket parkir it:Parcometro ja:駐車券支払機 ko:주차티켓판매기 @@ -6423,7 +6516,8 @@ th:เครื่องชำระค่าที่จอดรถอัต tr:Horodateur uk:Паркомат vi:Máy trả tiền vé đậu xe -zh-Hant:停车场付费机 +zh-Hans:停车场付费机 +zh-Hant:違規停車罰單繳費機 barrier-block en:Block @@ -6436,7 +6530,7 @@ es:Bloqueo fi:Este fr:Bloc hu:Blokk -id:Byggnad +id:Blok it:Blocco ja:ブロック ko:블록 @@ -6451,7 +6545,8 @@ th:บล็อก tr:Bloc uk:Блок vi:Khối -zh-Hant:障碍 +zh-Hans:障碍 +zh-Hant:街區 barrier-bollard en:Pillar @@ -6464,7 +6559,7 @@ es:Pilar fi:Tolppa fr:Pilier hu:Oszlop -id:Stolpe +id:Pilar it:Pilastro ja:柱 ko:기둥 @@ -6479,7 +6574,8 @@ th:เสา tr:Pilier uk:Стовпчик vi:Trụ -zh-Hant:柱子 +zh-Hans:柱子 +zh-Hant:柱 barrier-border_control en:Border Control @@ -6492,7 +6588,7 @@ es:Control de fronteras fi:Rajavalvonta fr:Contrôle aux frontières hu:Határállomás -id:Gränskontroll +id:Gerbang perbatasan it:Controllo di frontiera ja:国境管理 ko:국경통제소 @@ -6507,7 +6603,8 @@ th:ด่านตรวจคนเข้าเมือง tr:Contrôle aux frontières uk:Прикордонний контроль vi:Biên Phòng -zh-Hant:边检 +zh-Hans:边检 +zh-Hant:邊境管制 barrier-entrance en:Entrance @@ -6520,7 +6617,7 @@ es:Entrada fi:Sisäänkäynti fr:Entrée hu:Bejárat -id:Ingång +id:Pintu masuk it:Ingresso ja:エントランス ko:입구 @@ -6535,6 +6632,7 @@ th:ทางเข้า tr:Entrée uk:Прохід vi:Lối vào +zh-Hans:入口 zh-Hant:入口 barrier-gate @@ -6548,7 +6646,7 @@ es:Puerta fi:Portti fr:Porte hu:Kapu -id:Grind +id:Gerbang it:Cancello ja:ゲート ko:게이트 @@ -6563,7 +6661,8 @@ th:ประตู tr:Porte uk:Ворота vi:Cổng -zh-Hant:门 +zh-Hans:门 +zh-Hant:大門 barrier-lift_gate en:Lift Gate @@ -6576,7 +6675,7 @@ es:Barrera fi:Puomieste fr:Barrière levante hu:Sorompó -id:Перелаз +id:Polisi tidur it:Barriera ferroviaria ja:ブームバリア ko:차량차단기 @@ -6586,12 +6685,13 @@ pl:Szlaban pt:Barreira ro:Barieră cu braț sk:Závora -sv:Перелаз +sv:Bom th:ไม้กั้น tr:Barrière levante uk:Шлагбаум vi:Thanh Chắn -zh-Hant:水栅门 +zh-Hans:水栅门 +zh-Hant:遮斷機 barrier-stile en:Stile @@ -6604,7 +6704,7 @@ es:Escalón fi:Portaat fr:Échalier hu:Átjáró -id:Stätta +id:Undakan it:Scaletta per recinzioni ja:回転扉 ko:디딤대 @@ -6619,7 +6719,8 @@ th:บันไดข้าม tr:Échalier uk:Перелаз vi:Trụ chắn -zh-Hant:台阶 +zh-Hans:台阶 +zh-Hant:梯磴 barrier-toll_booth en:Toll Booth @@ -6632,7 +6733,7 @@ es:Cabina de peaje fi:Tietulliasema fr:Poste de péage hu:Díjfizető kapu -id:Tullhus +id:Gerbang tol it:Casello di pedaggio ja:料金所 ko:톨게이트 @@ -6647,7 +6748,8 @@ th:ด่านเก็บเงิน tr:Poste de péage uk:Пункт оплати vi:Quầy Soát Vé -zh-Hant:收费亭 +zh-Hans:收费亭 +zh-Hant:收費站 entrance en:Entrance @@ -6660,7 +6762,7 @@ es:Entrada fi:Sisäänkäynti fr:Entrée hu:Bejárat -id:Entré +id:Pintu masuk it:Ingresso ja:エントランス ko:입구 @@ -6675,6 +6777,7 @@ th:ทางเข้า tr:Entrée uk:Вхід vi:Lối vào +zh-Hans:入口 zh-Hant:入口 leisure-water_park @@ -6688,7 +6791,7 @@ es:Parque acuático fi:Vesipuisto fr:Centre aquatique hu:Aquapark -id:Äventyrspark +id:Taman air it:Parco acquatico ja:ウォーターパーク ko:워터파크 @@ -6703,7 +6806,8 @@ th:สวนน้ำ tr:Centre aquatique uk:Аквапарк vi:Công Viên Nước -zh-Hant:水上乐园 +zh-Hans:水上乐园 +zh-Hant:水上樂園 man_made-water_tower en:Water Tower @@ -6716,7 +6820,7 @@ es:Depósito de agua fi:Vesitorni fr:Château d'eau hu:Víztorony -id:Vattentorn +id:Menara air it:Cisterna per acqua ja:給水塔 ko:급수탑 @@ -6731,6 +6835,7 @@ th:อ่างเก็บน้ำ tr:Château d'eau uk:Водонапірна вежа vi:Tháp Nước +zh-Hans:水塔 zh-Hant:水塔 man_made-windmill @@ -6744,7 +6849,7 @@ es:Molino fi:Tuulimylly fr:Moulin hu:Szélmalom -id:Väderkvarn +id:Kincir angin it:Mulino a vento ja:風車 ko:풍차 @@ -6759,7 +6864,8 @@ th:กังหันลม tr:Moulin uk:Вітряк vi:Cối xay gió -zh-Hant:风车 +zh-Hans:风车 +zh-Hant:風車 military-bunker en:Bunker @@ -6787,6 +6893,7 @@ th:บังเกอร์ tr:Bunker uk:Бункер vi:Boongke +zh-Hans:地堡 zh-Hant:地堡 natural-cave_entrance @@ -6800,7 +6907,7 @@ es:Entrada a cueva fi:Luolan sisäänkäynti fr:Entrée de la cave hu:Barlangbejárat -id:Grottöppning +id:Mulut gua it:Ingresso grotta ja:洞穴入口 ko:동굴입구 @@ -6815,7 +6922,8 @@ th:ทางเข้าถ้ำ tr:Entrée de la cave uk:Печера vi:Cửa Hang -zh-Hant:山洞入口 +zh-Hans:山洞入口 +zh-Hant:洞穴入口 natural-tree en:Tree @@ -6828,7 +6936,7 @@ es:Árbol fi:Puu fr:Arbre hu:Fa -id:Träd +id:Pohon it:Albero ja:木 ko:나무 @@ -6843,7 +6951,8 @@ th:ต้นไม้ tr:Arbre uk:Дерево vi:Cây -zh-Hant:树 +zh-Hans:树 +zh-Hant:樹 natural-volcano en:Volcano @@ -6856,7 +6965,7 @@ es:Volcán fi:Tulivuori fr:Volcan hu:Tűzhányó -id:Vulkan +id:Gunung berapi it:Vulcano ja:火山 ko:화산 @@ -6871,6 +6980,7 @@ th:ภูเขาไฟ tr:Volcan uk:Вулкан vi:Núi lửa +zh-Hans:火山 zh-Hant:火山 office-estate_agent @@ -6884,7 +6994,7 @@ es:Agente inmobiliario fi:Kiinteistönvälittäjä fr:Agent immobilier hu:Ingatlanügynök -id:Fastighetsmäklare +id:Agen ril estat it:Agenzia immobiliare ja:不動産業者 ko:부동산중개소 @@ -6899,7 +7009,8 @@ th:นายหน้าอสังหาริมทรัพย์ tr:Agent immobilier uk:Агенція нерухомості/ріелтор vi:Đại Lý Bất Động Sản -zh-Hant:房屋中介 +zh-Hans:房屋中介 +zh-Hant:地產代理 power-pole|power-tower en:Power Tower @@ -6912,7 +7023,7 @@ es:Poste eléctrico fi:Sähköpylväs fr:Poteau électrique hu:Villanyoszlop -id:Elstolpe +id:Menara listrik it:Palo elettrico ja:電柱 ko:전봇대 @@ -6927,7 +7038,8 @@ th:เสาไฟฟ้า tr:Poteau électrique uk:Стовп ЛЕП vi:Trụ Điện -zh-Hant:电线杆 +zh-Hans:电线杆 +zh-Hant:電塔 waterway-lock_gate en:Lock Gate @@ -6940,7 +7052,7 @@ es:Compuerta fi:Kanavasulku fr:Écluse hu:Zsilip -id:Slussport +id:Gerbang pengunci it:Sbarramento ja:水門 ko:수문 @@ -6955,24 +7067,150 @@ th:ประตูระบายน้ำ tr:Écluse uk:Шлюз vi:Cổng Khóa -zh-Hant:锁门 +zh-Hans:锁门 +zh-Hant:閘門 amenity-public_bookcase -en:Book Exchange|Bookcase +en:Book Exchange|Bookcase|Book swapping ru:Книжный шкаф|Обмен книг +fr:Bibliothèque +id:Rak Buku|Bursa Buku +ko:책장, 도서 교환 +sv:Bokskåp|bokutbyte +tr:Kütüphane|Kitap Değişimi +uk:Книги|обмін книгами +vi:Kệ sách|Trao đổi sách +hu:Nyilvános könyvespolc|könyvcsere +de:Bücherregal|Büchertausch +fi:Kirjahylly|Kirjakauppa +cs:Knihovna|Směnárna knih +it:Libreria|Scambio libri +nb:Bokhylle|bokbytte +zh-Hant:書架|書本交換 +zh-Hans:书架|书本交换 +th:ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ +ja:書棚|図書交換 +ro:Bibliotecă|Schimb de cărți +ar:مكتبة، تبادل كتب +sk:Knižnica|možnosť výmeny kníh +es:Intercambio de libros|librería +pl:Biblioteka|wymiana książek +nl:Boekenkast|Boekuitwisseling +da:Bog udveksling +pt:Biblioteca livre|troca de livros leisure-sports_centre-climbing en:Climbing Centre ru:Скалодром +fr:Centre d'escalade +da:Klatring center +id:Pusat Peralatan Mendaki +ko:등반 센터 +sv:Klättercentrum +tr:Tırmanma Merkezi +uk:Спортивний скеледром +vi:Trung tâm leo núi +hu:Hegymászó központ +de:Kletterzentrum +fi:Kiipeilykeskus +cs:Horolezecké centrum +it:Centro di arrampicata +nb:Klatresenter +zh-Hant:攀登中心 +zh-Hans:攀登中心 +th:ศูนย์ปีนเขา +ja:クライミングセンター +ro:Centru cățărare +ar:مركز تسلق +sk:Lezecké centrum +es:Centro de escalada +pl:Centrum wspinaczkowe +nl:Klimhal +pt:Ginásio de escalada leisure-sports_centre-shooting en:Shooting Range ru:Тир|стрельбище +fr:Centre de tir +da:Skydebane +id:Lapangan tembak +ko:발사 범위 +sv:Skjutbana +tr:Poligon +uk:Тир +vi:Nơi bắn súng +hu:Lőtér +de:Schießanlage +fi:Ampumarata +cs:Střelnice +it:Poligono di tiro +nb:Skytebane +zh-Hant:射擊域 +zh-Hans:射击域 +th:สนามยิงปืน +ja:射撃場 +ro:Tir +ar:ملعب رماية +sk:Strelnica +es:Campo de tiro +pl:Strzelnica +nl:Schietbaan +pt:Clube de tiro leisure-sports_centre-swimming en:Swimming Centre ru:Плавательный бассейн +fr:Piscine +da:Svømmecenter +id:Kolam Renang +ko:수영 센터 +sv:Simhall +tr:Yüzme Merkezi +uk:Басейн +vi:Trung tâm Bơi lội +hu:Uszoda +de:Schwimmhalle +fi:Uimahalli +cs:Plavecký bazén +it:Centro natatorio +nb:Svømmehall +zh-Hant:遊泳中心 +zh-Hans:游泳中心 +th:ศูนย์ว่ายน้ำ +ja:スイミングセンター +ro:Piscină +ar:مركز سباحة +sk:Plavecký areál +es:Centro de natación +pl:Basen +nl:Zwembad +pt:Centro de natação leisure-sports_centre-yoga en:Yoga Studio ru:Йога-центр|Студия йоги +fr:Yoga +da: Yoga center +id:Studio Yoga +ko:요가 스튜디오 +sv:Yogastudio +tr:Yoga Stüdyosu +uk:Студія йоги +vi:Phòng tập yoga +hu:Jógastúdió +de:Yoga Studio +fi:Joogastudio +cs:Studio jógy +it:Centro Yoga +nb:Yogastudio +zh-Hant:瑜伽工作室 +zh-Hans:瑜伽工作室 +th:โยคะสตูดิโอ +ja:ヨガスタジオ +ro:Studio yoga +ar:نادي يوغا +sk:Štúdio jogy +es:Estudio de yoga +pl:Studio jogi +nl:Yogastudio +pt:Estúdio de ioga \ No newline at end of file From 89643d6fc0a78b2e1b38de43418090aef603a3fd Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 4 May 2016 18:18:58 +0300 Subject: [PATCH 24/87] [ios] Disabled editing and adding place while routing is active. --- iphone/Maps/Classes/MWMPlacePageEntity.mm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index 272df0e853..1d057ee07f 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -1,7 +1,8 @@ -#import "MWMFrameworkListener.h" +#import "MapsAppDelegate.h" +#import "MapViewController.h" +#import "MWMMapViewControlsManager.h" #import "MWMPlacePageEntity.h" #import "MWMPlacePageViewManager.h" -#import "MapViewController.h" #include "Framework.h" @@ -140,7 +141,9 @@ void initFieldsMap() - (NSString *)getCellValue:(MWMPlacePageCellType)cellType { - bool const isNewMWM = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion()); + auto const s = MapsAppDelegate.theApp.mapViewController.controlsManager.navigationState; + BOOL const editOrAddAreAvailable = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion()) && + s == MWMNavigationDashboardStateHidden; switch (cellType) { case MWMPlacePageCellTypeName: @@ -148,14 +151,14 @@ void initFieldsMap() case MWMPlacePageCellTypeCoordinate: return [self coordinate]; case MWMPlacePageCellTypeAddPlaceButton: - return m_info.ShouldShowAddPlace() && isNewMWM ? @"" : nil; + return editOrAddAreAvailable && m_info.ShouldShowAddPlace() ? @"" : nil; case MWMPlacePageCellTypeBookmark: return m_info.IsBookmark() ? @"" : nil; case MWMPlacePageCellTypeEditButton: // TODO(Vlad): It's a really strange way to "display" cell if returned text is not nil. - return isNewMWM && !m_info.IsMyPosition() && m_info.IsFeature() ? @"": nil; + return editOrAddAreAvailable && !m_info.IsMyPosition() && m_info.IsFeature() ? @"": nil; case MWMPlacePageCellTypeAddBusinessButton: - return m_info.IsBuilding() ? @"" : nil; + return editOrAddAreAvailable && m_info.IsBuilding() ? @"" : nil; default: { auto const it = m_values.find(cellType); From 16164023ded4fa4da4c206228f8b0e3c766c1ec3 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 12:30:37 +0300 Subject: [PATCH 25/87] [android] Fixed night theme colors in editor. --- android/res/layout/fragment_editor.xml | 6 ++-- android/res/layout/fragment_osm_login.xml | 8 ++--- android/res/layout/item_editor_input.xml | 3 +- android/res/values/styles-editor.xml | 13 ++++--- android/res/values/themes.xml | 34 +++++++++++++------ .../maps/editor/EditorHostFragment.java | 4 +-- 6 files changed, 40 insertions(+), 28 deletions(-) diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml index 221dc2168a..d8f765380a 100644 --- a/android/res/layout/fragment_editor.xml +++ b/android/res/layout/fragment_editor.xml @@ -21,9 +21,8 @@ android:id="@+id/category" style="@style/MwmWidget.Editor.MetadataBlock.Clickable" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="@dimen/editor_height_field" android:layout_marginBottom="0dp" - android:minHeight="@dimen/editor_height_field" android:padding="@dimen/margin_half_plus"> diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml index cf1f9f63e3..e00e7228e3 100644 --- a/android/res/layout/fragment_osm_login.xml +++ b/android/res/layout/fragment_osm_login.xml @@ -31,8 +31,7 @@ tools:ignore="ScrollViewSize"> @@ -45,8 +44,7 @@ @@ -69,7 +67,7 @@ style="@style/MwmWidget.Button.Accent" android:layout_width="match_parent" android:layout_height="@dimen/editor_auth_btn_height" - android:text="Log in" + android:text="@string/login" android:textAppearance="@style/MwmTextAppearance.Body1.Light"/> diff --git a/android/res/values/styles-editor.xml b/android/res/values/styles-editor.xml index 88509aed45..24ed287d22 100644 --- a/android/res/values/styles-editor.xml +++ b/android/res/values/styles-editor.xml @@ -57,19 +57,24 @@ vertical + + - \ No newline at end of file diff --git a/android/res/layout/tab_timepicker.xml b/android/res/layout/tab_timepicker.xml index 23da60db86..b0598da056 100644 --- a/android/res/layout/tab_timepicker.xml +++ b/android/res/layout/tab_timepicker.xml @@ -4,6 +4,5 @@ xmlns:tools="http://schemas.android.com/tools" style="@style/MwmWidget.Tab" android:textAppearance="@style/MwmTextAppearance.Body3" - android:textColor="@color/color_timepicker_tab" tools:drawableLeft="@drawable/ic_menu_open" tools:text="Some tab"/> diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index ddd2256645..ce0cd00b8f 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -86,7 +86,7 @@ @color/bg_window_night @drawable/card_frame_night @color/bg_cards_night - @style/MwmTheme.DialogFragment.Fullscreen + @style/MwmTheme.DialogFragment.Fullscreen.Night @color/bg_statusbar_night @color/bg_primary_night diff --git a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java index 46a052b54e..a729c4f677 100644 --- a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java +++ b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.res.ColorStateList; import android.os.Bundle; import android.support.annotation.IntRange; import android.support.annotation.NonNull; @@ -14,12 +15,14 @@ import android.support.v7.app.AlertDialog; import android.text.format.DateFormat; import android.view.LayoutInflater; import android.view.View; +import android.widget.Button; import android.widget.TextView; import android.widget.TimePicker; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; import com.mapswithme.maps.editor.data.HoursMinutes; +import com.mapswithme.util.ThemeUtils; public class HoursMinutesPickerFragment extends BaseMwmDialogFragment { @@ -39,6 +42,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment private TabLayout mTabs; private int mId; + private Button mOkButton; public interface OnPickListener { @@ -64,25 +68,45 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment { readArgs(); final View root = createView(); - refreshPicker(); //noinspection ConstantConditions mTabs.getTabAt(mSelectedTab).select(); + final int theme = ThemeUtils.isNightTheme() ? R.style.MwmMain_DialogFragment_TimePicker_Night + : R.style.MwmMain_DialogFragment_TimePicker; + final AlertDialog dialog = new AlertDialog.Builder(getActivity(), theme) + .setView(root) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton(android.R.string.ok, null) + .setCancelable(true) + .create(); - return new AlertDialog.Builder(getActivity(), R.style.MwmMain_DialogFragment_TimePicker) - .setView(root) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - saveHoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute()); - if (getParentFragment() instanceof OnPickListener) - ((OnPickListener) getParentFragment()).onHoursMinutesPicked(mFrom, mTo, mId); - } - }) - .setCancelable(true) - .create(); + dialog.setOnShowListener(new DialogInterface.OnShowListener() + { + @Override + public void onShow(DialogInterface dialogInterface) + { + mOkButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE); + mOkButton.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + if (mSelectedTab == TAB_FROM) + { + //noinspection ConstantConditions + mTabs.getTabAt(TAB_TO).select(); + return; + } + + dismiss(); + if (getParentFragment() instanceof OnPickListener) + ((OnPickListener) getParentFragment()).onHoursMinutesPicked(mFrom, mTo, mId); + } + }); + refreshPicker(); + } + }); + + return dialog; } private void readArgs() @@ -104,24 +128,29 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false); // TODO @yunik add translations tabView.setText("From"); + final ColorStateList textColor = getResources().getColorStateList(ThemeUtils.isNightTheme() ? R.color.tab_text_night + : R.color.tab_text); + tabView.setTextColor(textColor); mTabs.addTab(mTabs.newTab().setCustomView(tabView), true); tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false); tabView.setText("To"); + tabView.setTextColor(textColor); mTabs.addTab(mTabs.newTab().setCustomView(tabView), true); mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { + if (!isInit()) + return; + + saveHoursMinutes(); mSelectedTab = tab.getPosition(); refreshPicker(); } @Override - public void onTabUnselected(TabLayout.Tab tab) - { - saveHoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute()); - } + public void onTabUnselected(TabLayout.Tab tab) {} @Override public void onTabReselected(TabLayout.Tab tab) {} @@ -129,30 +158,42 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment mPicker = (TimePicker) root.findViewById(R.id.picker); mPicker.setIs24HourView(DateFormat.is24HourFormat(getActivity())); - mPicker.setOnTimeChangedListener(new TimePicker.OnTimeChangedListener() - { - @Override - public void onTimeChanged(TimePicker view, int hourOfDay, int minute) - { - saveHoursMinutes(hourOfDay, minute); - } - }); - return root; } - private void saveHoursMinutes(int hourOfDay, int minute) + private void saveHoursMinutes() { + final HoursMinutes hoursMinutes = new HoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute()); if (mSelectedTab == TAB_FROM) - mFrom = new HoursMinutes(hourOfDay, minute); + mFrom = hoursMinutes; else - mTo = new HoursMinutes(hourOfDay, minute); + mTo = hoursMinutes; + } + + private boolean isInit() + { + return mOkButton != null && mPicker != null; } private void refreshPicker() { - final HoursMinutes hoursMinutes = mSelectedTab == TAB_FROM ? mFrom : mTo; + if (!isInit()) + return; + + HoursMinutes hoursMinutes; + int okBtnRes; + if (mSelectedTab == TAB_FROM) + { + hoursMinutes = mFrom; + okBtnRes = R.string.whats_new_next_button; + } + else + { + hoursMinutes = mTo; + okBtnRes = R.string.ok; + } mPicker.setCurrentMinute((int) hoursMinutes.minutes); mPicker.setCurrentHour((int) hoursMinutes.hours); + mOkButton.setText(okBtnRes); } } From e956ba3c5b585dfd7cb8310aa0a50931dae7d386 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Fri, 6 May 2016 13:31:23 +0300 Subject: [PATCH 27/87] Unbind VAO after each binding. --- drape/vertex_array_buffer.cpp | 30 +++++++++++++++++++++++------- drape/vertex_array_buffer.hpp | 3 ++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp index ba836c9e59..fa7d78d114 100644 --- a/drape/vertex_array_buffer.cpp +++ b/drape/vertex_array_buffer.cpp @@ -79,14 +79,14 @@ void VertexArrayBuffer::RenderRange(IndicesRange const & range) ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad")); /// if OES_vertex_array_object is supported than all bindings already saved in VAO /// and we need only bind VAO. - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - Bind(); - else + if (!Bind()) BindStaticBuffers(); BindDynamicBuffers(); GetIndexBuffer()->Bind(); GLFunctions::glDrawElements(dp::IndexStorage::SizeOfIndex(), range.m_idxCount, range.m_idxStart); + + Unbind(); } } @@ -111,6 +111,7 @@ void VertexArrayBuffer::Build(ref_ptr program) m_VAO = GLFunctions::glGenVertexArray(); Bind(); BindStaticBuffers(); + Unbind(); } void VertexArrayBuffer::UploadData(BindingInfo const & bindingInfo, void const * data, uint32_t count) @@ -232,8 +233,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, { /// We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is supported. /// Otherwise we risk affecting a previously binded VAO. - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - Bind(); + Bind(); if (indexMutator != nullptr) { @@ -247,7 +247,10 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, } if (attrMutator == nullptr) + { + Unbind(); return; + } typedef AttributeBufferMutator::TMutateData TMutateData; typedef AttributeBufferMutator::TMutateNodes TMutateNodes; @@ -266,12 +269,25 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, mapper.UpdateData(node.m_data.get(), node.m_region.m_offset, node.m_region.m_count); } } + + Unbind(); } -void VertexArrayBuffer::Bind() const +bool VertexArrayBuffer::Bind() const { ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render")); - GLFunctions::glBindVertexArray(m_VAO); + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + { + GLFunctions::glBindVertexArray(m_VAO); + return true; + } + return false; +} + +void VertexArrayBuffer::Unbind() const +{ + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + GLFunctions::glBindVertexArray(0); } void VertexArrayBuffer::BindStaticBuffers() const diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp index 2ac9c1fb09..8ba2db50f2 100644 --- a/drape/vertex_array_buffer.hpp +++ b/drape/vertex_array_buffer.hpp @@ -76,7 +76,8 @@ private: ref_ptr GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic); ref_ptr GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const; - void Bind() const; + bool Bind() const; + void Unbind() const; void BindStaticBuffers() const; void BindDynamicBuffers() const; void BindBuffers(TBuffersMap const & buffers) const; From b03bc2683b337021a85ff67291e36da860cd05ef Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 6 May 2016 13:58:51 +0300 Subject: [PATCH 28/87] [Android] Fixed routing recovering after entering foreground --- drape_frontend/drape_engine.cpp | 2 +- drape_frontend/drape_engine.hpp | 5 ++++- drape_frontend/frontend_renderer.cpp | 4 ++-- drape_frontend/frontend_renderer.hpp | 5 ++++- drape_frontend/my_position_controller.cpp | 6 +++--- drape_frontend/my_position_controller.hpp | 3 ++- map/framework.cpp | 3 ++- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index 992c35ec54..d176bbcda5 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -55,7 +55,7 @@ DrapeEngine::DrapeEngine(Params && params) bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2), mode, make_ref(m_requestedTiles), timeInBackground, params.m_allow3dBuildings, params.m_blockTapEvents, - params.m_isFirstLaunch); + params.m_isFirstLaunch, params.m_isRoutingActive); m_frontend = make_unique_dp(frParams); diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index dbfecf1933..d8be9f54db 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -45,7 +45,8 @@ public: bool blockTapEvents, bool showChoosePositionMark, vector && boundAreaTriangles, - bool firstLaunch) + bool firstLaunch, + bool isRoutingActive) : m_factory(factory) , m_stringsBundle(stringBundle) , m_viewport(viewport) @@ -58,6 +59,7 @@ public: , m_showChoosePositionMark(showChoosePositionMark) , m_boundAreaTriangles(move(boundAreaTriangles)) , m_isFirstLaunch(firstLaunch) + , m_isRoutingActive(isRoutingActive) {} ref_ptr m_factory; @@ -72,6 +74,7 @@ public: bool m_showChoosePositionMark; vector m_boundAreaTriangles; bool m_isFirstLaunch; + bool m_isRoutingActive; }; DrapeEngine(Params && params); diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index a97077f9f6..7217c1f715 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -140,8 +140,8 @@ FrontendRenderer::FrontendRenderer(Params const & params) ASSERT(m_tapEventInfoFn, ()); ASSERT(m_userPositionChangedFn, ()); - m_myPositionController.reset(new MyPositionController(params.m_initMyPositionMode, - params.m_timeInBackground, params.m_firstLaunch)); + m_myPositionController.reset(new MyPositionController(params.m_initMyPositionMode, params.m_timeInBackground, + params.m_firstLaunch, params.m_isRoutingActive)); m_myPositionController->SetModeListener(params.m_myPositionModeCallback); StartThread(); diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp index 657ecd9de4..636f2304b7 100755 --- a/drape_frontend/frontend_renderer.hpp +++ b/drape_frontend/frontend_renderer.hpp @@ -84,7 +84,8 @@ public: double timeInBackground, bool allow3dBuildings, bool blockTapEvents, - bool firstLaunch) + bool firstLaunch, + bool isRoutingActive) : BaseRenderer::Params(commutator, factory, texMng) , m_viewport(viewport) , m_modelViewChangedFn(modelViewChangedFn) @@ -97,6 +98,7 @@ public: , m_allow3dBuildings(allow3dBuildings) , m_blockTapEvents(blockTapEvents) , m_firstLaunch(firstLaunch) + , m_isRoutingActive(isRoutingActive) {} Viewport m_viewport; @@ -110,6 +112,7 @@ public: bool m_allow3dBuildings; bool m_blockTapEvents; bool m_firstLaunch; + bool m_isRoutingActive; }; FrontendRenderer(Params const & params); diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index a3d3b14d50..eabe85ce60 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -105,12 +105,12 @@ private: double m_rotateDuration; }; -MyPositionController::MyPositionController(location::EMyPositionMode initMode, - double timeInBackground, bool isFirstLaunch) +MyPositionController::MyPositionController(location::EMyPositionMode initMode, double timeInBackground, + bool isFirstLaunch, bool isRoutingActive) : m_mode(location::PendingPosition) , m_desiredInitMode(initMode) , m_isFirstLaunch(isFirstLaunch) - , m_isInRouting(false) + , m_isInRouting(isRoutingActive) , m_needBlockAnimation(false) , m_wasRotationInScaling(false) , m_errorRadius(0.0) diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp index 66bbed4f93..46469c6f73 100644 --- a/drape_frontend/my_position_controller.hpp +++ b/drape_frontend/my_position_controller.hpp @@ -43,7 +43,8 @@ public: RenderMyPosition = 0x2 }; - MyPositionController(location::EMyPositionMode initMode, double timeInBackground, bool isFirstLaunch); + MyPositionController(location::EMyPositionMode initMode, double timeInBackground, + bool isFirstLaunch, bool isRoutingActive); ~MyPositionController(); void OnNewPixelRect(); diff --git a/map/framework.cpp b/map/framework.cpp index e7655160cb..fdbcd7af5d 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1491,7 +1491,8 @@ void Framework::CreateDrapeEngine(ref_ptr contextFactory, params.m_visualScale, move(params.m_widgetsInitInfo), make_pair(params.m_initialMyPositionState, params.m_hasMyPositionState), allow3dBuildings, params.m_isChoosePositionMode, - params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), params.m_isFirstLaunch); + params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), params.m_isFirstLaunch, + m_routingSession.IsActive() && m_routingSession.IsFollowing()); m_drapeEngine = make_unique_dp(move(p)); AddViewportListener([this](ScreenBase const & screen) From 667532357b0de7299dd0ddbe1df8859a1a06e52f Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Fri, 6 May 2016 14:39:17 +0300 Subject: [PATCH 29/87] Fixed follow animation after the start of navigation. --- drape_frontend/animation_system.cpp | 7 ++++++- drape_frontend/animation_system.hpp | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp index 8b31d874e1..a2a74a2b48 100644 --- a/drape_frontend/animation_system.cpp +++ b/drape_frontend/animation_system.cpp @@ -987,7 +987,7 @@ void AnimationSystem::CombineAnimation(drape_ptr animation) { for (auto & lst : m_animationChain) { - bool couldBeBlended = true; + bool couldBeBlended = animation->CouldBeBlended(); for (auto it = lst.begin(); it != lst.end();) { auto & anim = *it; @@ -1013,12 +1013,17 @@ void AnimationSystem::CombineAnimation(drape_ptr animation) ++it; } } + if (couldBeBlended) { animation->OnStart(); lst.emplace_back(move(animation)); return; } + else if (m_animationChain.size() > 1 && animation->CouldBeInterrupted()) + { + return; + } } PushAnimation(move(animation)); } diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp index f1afc959ac..e61162a166 100644 --- a/drape_frontend/animation_system.hpp +++ b/drape_frontend/animation_system.hpp @@ -134,6 +134,7 @@ public: void SetOnFinishAction(TAction const & action) { m_onFinishAction = action; } void SetOnInterruptAction(TAction const & action) { m_onInterruptAction = action; } + bool CouldBeBlended() const { return m_couldBeBlended; } bool CouldBeInterrupted() const { return m_couldBeInterrupted; } bool CouldBeBlendedWith(Animation const & animation) const; From 1fc801c58e7bb4ad51a0d16dc393ea340af8441c Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 6 May 2016 15:56:41 +0300 Subject: [PATCH 30/87] Fixed my-position rendering on first launch --- drape_frontend/my_position_controller.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index eabe85ce60..dceb3ff0ab 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -127,7 +127,7 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode, d , m_isPositionAssigned(false) , m_isDirectionAssigned(false) { - if (isFirstLaunch) + if (m_isFirstLaunch) { m_mode = location::NotFollowNoPosition; m_desiredInitMode = location::NotFollowNoPosition; @@ -337,12 +337,15 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool if (!m_isPositionAssigned) { - ChangeMode(m_desiredInitMode); - if (m_mode == location::Follow) - ChangeModelView(m_position, kDoNotChangeZoom); - else if (m_mode == location::FollowAndRotate) - ChangeModelView(m_position, m_drawDirection, - m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom); + ChangeMode(m_isFirstLaunch ? location::Follow : m_desiredInitMode); + if (!m_isFirstLaunch || !AnimationSystem::Instance().AnimationExists(Animation::MapPlane)) + { + if (m_mode == location::Follow) + ChangeModelView(m_position, kDoNotChangeZoom); + else if (m_mode == location::FollowAndRotate) + ChangeModelView(m_position, m_drawDirection, + m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom); + } } else if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition) { From 9926514c1434d0e0dcadfd283567f1514fbafc08 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Fri, 6 May 2016 16:32:25 +0300 Subject: [PATCH 31/87] [downloader] Disputed territory duplication bugfix. --- storage/storage.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/storage/storage.cpp b/storage/storage.cpp index 5a8f4b1ac1..79f2b55fea 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -1198,10 +1198,7 @@ void Storage::GetChildrenInGroups(TCountryId const & parent, for (auto const & disputed : disputedTerritoriesAndStatus) allDisputedTerritories.push_back(disputed.first); - if (childStatus.status != NodeStatus::NotDownloaded) - downloadedChildren.push_back(childValue); - - if (keepAvailableChildren || childStatus.status == NodeStatus::NotDownloaded) + if (childStatus.status == NodeStatus::NotDownloaded) { availChildren.push_back(childValue); for (auto const & disputed : disputedTerritoriesAndStatus) @@ -1210,6 +1207,12 @@ void Storage::GetChildrenInGroups(TCountryId const & parent, disputedTerritoriesWithoutSiblings.push_back(disputed.first); } } + else + { + downloadedChildren.push_back(childValue); + if (keepAvailableChildren) + availChildren.push_back(childValue); + } }); TCountriesVec uniqueDisputed(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end()); From 98c9dcd5c0d0956f39f74355c3b96ec659eaa18f Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Fri, 6 May 2016 17:09:51 +0300 Subject: [PATCH 32/87] Reverting. Copy Nagorny Karabakh to the top level. --- data/countries.txt | 18 ------------------ data/hierarchy.txt | 1 - 2 files changed, 19 deletions(-) diff --git a/data/countries.txt b/data/countries.txt index 74debc3883..c0add7a84a 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -797,24 +797,6 @@ } ] }, - { - "id": "Nagorno-Karabakh", - "s": 2004950, - "affiliations": [ - "Az\u0259rbaycan", - "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", - "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)", - "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)", - "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)", - "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)", - "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576", - "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)", - "\u054d\u057f\u0565\u0583\u0561\u0576\u0561\u056f\u0565\u0580\u057f (Stepanakert - Khankendi)" - ], - "old": [ - "Azerbaijan" - ] - }, { "id": "Azerbaijan Region", "g": [ diff --git a/data/hierarchy.txt b/data/hierarchy.txt index 06aabe8de7..a4b8fa4cc2 100644 --- a/data/hierarchy.txt +++ b/data/hierarchy.txt @@ -59,7 +59,6 @@ Australia;Q408;au;en Australia_Western Australia;Q3206 Australia_Brisbane;Q34932 Australia_Sydney;Q3130 -Nagorno-Karabakh;Q44302 Azerbaijan Region;Q227;az;az Nagorno-Karabakh;Q44302 Azerbaijan;Q227;;az From 35603ab0659a8957198e2d57e91dfc0d2d790e7b Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 17:50:54 +0300 Subject: [PATCH 33/87] [android] Show dialog to enable location services if its disabled. ONLY for google play services mode currently. --- .../src/com/mapswithme/maps/MwmActivity.java | 50 +++++++++--- .../maps/location/AndroidNativeProvider.java | 12 +-- .../location/GoogleFusedLocationProvider.java | 63 +++++++++++++-- .../maps/location/LocationHelper.java | 80 ++++++++++++------- .../maps/widget/menu/MyPositionButton.java | 2 + .../com/mapswithme/util/LocationUtils.java | 29 +++++++ .../src/com/mapswithme/util/ThemeUtils.java | 1 - 7 files changed, 180 insertions(+), 57 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index cebb60bdf9..66441f7eee 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -116,6 +116,8 @@ public class MwmActivity extends BaseMwmFragmentActivity private static final String STATE_PP_OPENED = "PpOpened"; private static final String STATE_MAP_OBJECT = "MapObject"; + public static final int REQUEST_CHECK_SETTINGS = 101; + // Map tasks that we run AFTER rendering initialized private final Stack mTasks = new Stack<>(); private final StoragePathManager mPathManager = new StoragePathManager(); @@ -845,6 +847,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { case LocationState.PENDING_POSITION: resumeLocation(); + LocationHelper.INSTANCE.restart(); // restart to check settings again break; case LocationState.NOT_FOLLOW_NO_POSITION: @@ -867,19 +870,22 @@ public class MwmActivity extends BaseMwmFragmentActivity break; } - String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message), - getString(R.string.current_location_unknown_title)); - new AlertDialog.Builder(this) - .setMessage(message) - .setNegativeButton(R.string.current_location_unknown_stop_button, null) - .setPositiveButton(R.string.current_location_unknown_continue_button, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - LocationState.INSTANCE.switchToNextMode(); - } - }).show(); + if (LocationHelper.INSTANCE.shouldResolveErrors()) + { + String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message), + getString(R.string.current_location_unknown_title)); + new AlertDialog.Builder(this) + .setMessage(message) + .setNegativeButton(R.string.current_location_unknown_stop_button, null) + .setPositiveButton(R.string.current_location_unknown_continue_button, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + LocationState.INSTANCE.switchToNextMode(); + } + }).show(); + } break; default: @@ -890,6 +896,24 @@ public class MwmActivity extends BaseMwmFragmentActivity sColdStart = false; } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) + { + if (requestCode == REQUEST_CHECK_SETTINGS) + { + if (resultCode == RESULT_OK) + { + LocationHelper.INSTANCE.setShouldResolveErrors(true); + LocationHelper.INSTANCE.restart(); + return; + } + + LocationHelper.INSTANCE.setShouldResolveErrors(false); + } + + super.onActivityResult(requestCode, resultCode, data); + } + @Override protected void onResume() { diff --git a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java index 70fff3e79e..0233ba8d7d 100644 --- a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java +++ b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java @@ -1,6 +1,5 @@ package com.mapswithme.maps.location; - import android.content.Context; import android.location.Location; import android.location.LocationManager; @@ -60,7 +59,8 @@ class AndroidNativeProvider extends BaseLocationProvider mIsActive = false; } - @Nullable Location findBestNotExpiredLocation(List providers, long expirationMs) + @Nullable + Location findBestNotExpiredLocation(List providers, long expirationMs) { Location res = null; for (final String pr : providers) @@ -85,14 +85,14 @@ class AndroidNativeProvider extends BaseLocationProvider if (LocationManager.PASSIVE_PROVIDER.equals(prov)) continue; - if (!mLocationManager.isProviderEnabled(prov)) + if (mLocationManager.isProviderEnabled(prov)) { - if (LocationManager.GPS_PROVIDER.equals(prov)) - LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_GPS_OFF); + acceptedProviders.add(prov); continue; } - acceptedProviders.add(prov); + if (LocationManager.GPS_PROVIDER.equals(prov)) // warn about turned off gps + LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_GPS_OFF); } return acceptedProviders; diff --git a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java index 6f2c5b0768..5da748ad13 100644 --- a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java +++ b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java @@ -2,12 +2,19 @@ package com.mapswithme.maps.location; import android.location.Location; import android.os.Bundle; +import android.support.annotation.NonNull; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; +import com.google.android.gms.common.api.PendingResult; +import com.google.android.gms.common.api.ResultCallback; +import com.google.android.gms.common.api.Status; import com.google.android.gms.location.LocationListener; import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationServices; +import com.google.android.gms.location.LocationSettingsRequest; +import com.google.android.gms.location.LocationSettingsResult; +import com.google.android.gms.location.LocationSettingsStatusCodes; import com.mapswithme.maps.MwmApplication; class GoogleFusedLocationProvider extends BaseLocationProvider @@ -59,21 +66,63 @@ class GoogleFusedLocationProvider extends BaseLocationProvider @Override protected boolean isLocationBetterThanLast(Location newLocation, Location lastLocation) { - // We believe that google service always returns good locations. - return GS_LOCATION_PROVIDER.equalsIgnoreCase(newLocation.getProvider()) || - !GS_LOCATION_PROVIDER.equalsIgnoreCase(lastLocation.getProvider()) && super.isLocationBetterThanLast(newLocation, lastLocation); + // We believe that google services always returns good locations. + return isFromFusedProvider(newLocation) || + !isFromFusedProvider(lastLocation) && super.isLocationBetterThanLast(newLocation, lastLocation); } + private boolean isFromFusedProvider(Location location) + { + return GS_LOCATION_PROVIDER.equalsIgnoreCase(location.getProvider()); + } + @Override public void onConnected(Bundle bundle) { sLogger.d("Fused onConnected. Bundle " + bundle); + checkSettingsAndRequestUpdates(); + } + + private void checkSettingsAndRequestUpdates() + { + LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder().addLocationRequest(mLocationRequest); + builder.setAlwaysShow(true); // hides 'never' button in resolve dialog afterwards. + PendingResult result = + LocationServices.SettingsApi.checkLocationSettings(mGoogleApiClient, builder.build()); + + result.setResultCallback(new ResultCallback() + { + @Override + public void onResult(@NonNull LocationSettingsResult locationSettingsResult) + { + final Status status = locationSettingsResult.getStatus(); + switch (status.getStatusCode()) + { + case LocationSettingsStatusCodes.SUCCESS: + LocationHelper.INSTANCE.setShouldResolveErrors(true); + requestLocationUpdates(); + break; + case LocationSettingsStatusCodes.RESOLUTION_REQUIRED: + // Location settings are not satisfied, but this can be fixed by showing the user a dialog. + LocationHelper.INSTANCE.resolveLocationError(status); + break; + case LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE: + // Location settings are not satisfied. However, we have no way to fix the settings so we won't show the dialog. + break; + } + } + }); + } + + private void requestLocationUpdates() + { LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this); LocationHelper.INSTANCE.registerSensorListeners(); - final Location l = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); - if (l != null) - LocationHelper.INSTANCE.saveLocation(l); + final Location last = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); + if (last != null) + LocationHelper.INSTANCE.saveLocation(last); + } @Override @@ -83,7 +132,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider } @Override - public void onConnectionFailed(ConnectionResult connectionResult) + public void onConnectionFailed(@NonNull ConnectionResult connectionResult) { sLogger.d("Fused onConnectionFailed. Fall back to native provider. ConnResult " + connectionResult); // TODO handle error in a smarter way diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index fca83bb081..fa8ba92786 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -1,7 +1,10 @@ package com.mapswithme.maps.location; +import android.app.Activity; import android.content.ContentResolver; import android.content.Context; +import android.content.IntentSender; +import android.content.SharedPreferences; import android.hardware.GeomagneticField; import android.hardware.Sensor; import android.hardware.SensorEvent; @@ -20,12 +23,16 @@ import java.util.List; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; +import com.google.android.gms.common.api.Status; import com.mapswithme.maps.Framework; import com.mapswithme.maps.LocationState; +import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; +import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.routing.RoutingController; +import com.mapswithme.util.Config; import com.mapswithme.util.Listeners; import com.mapswithme.util.LocationUtils; import com.mapswithme.util.concurrency.UiThread; @@ -54,6 +61,8 @@ public enum LocationHelper implements SensorEventListener private static final float DISTANCE_TO_RECREATE_MAGNETIC_FIELD_M = 1000; private static final long STOP_DELAY_MS = 5000; + private static final String PREF_RESOLVE_ERRORS = "ResolveLocationErrors"; + public interface LocationListener { void onLocationUpdated(final Location l); @@ -123,36 +132,14 @@ public enum LocationHelper implements SensorEventListener } } - @SuppressWarnings("deprecation") public void initLocationProvider(boolean forceNativeProvider) { - boolean isLocationTurnedOn = false; - final MwmApplication application = MwmApplication.get(); - // If location is turned off(by user in system settings), google client( = fused provider) api doesn't work at all - // but external gps receivers still can work. In that case we prefer native provider instead of fused - it works. - final ContentResolver resolver = application.getContentResolver(); - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) - { - final String providers = Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED); - isLocationTurnedOn = !TextUtils.isEmpty(providers); - } - else - { - try - { - final int mode = Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE); - isLocationTurnedOn = mode != Settings.Secure.LOCATION_MODE_OFF; - } catch (Settings.SettingNotFoundException e) - { - e.printStackTrace(); - } - } - - if (isLocationTurnedOn && - !forceNativeProvider && - GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(application) == ConnectionResult.SUCCESS && - PreferenceManager.getDefaultSharedPreferences(application).getBoolean(application.getString(R.string.pref_play_services), false)) + final boolean containsGoogleServices = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(application) == ConnectionResult.SUCCESS; + final boolean googleServicesTurnedInSettings = prefs().getBoolean(application.getString(R.string.pref_play_services), false); + if (!forceNativeProvider && + containsGoogleServices && + googleServicesTurnedInSettings) { mLogger.d("Use fused provider."); mLocationProvider = new GoogleFusedLocationProvider(); @@ -220,6 +207,35 @@ public enum LocationHelper implements SensorEventListener mListeners.finishIterate(); } + public boolean shouldResolveErrors() + { + return prefs().getBoolean(PREF_RESOLVE_ERRORS, true); + } + + public void setShouldResolveErrors(boolean shouldResolve) + { + prefs().edit().putBoolean(PREF_RESOLVE_ERRORS, shouldResolve).apply(); + } + + protected void resolveLocationError(Status status) + { + if (!shouldResolveErrors()) + return; + + for (LocationListener listener : mListeners) + { + if (listener instanceof Activity) + { + // Show the dialog and check the result in onActivityResult(). + try + { + status.startResolutionForResult((Activity) listener, MwmActivity.REQUEST_CHECK_SETTINGS); + } catch (IntentSender.SendIntentException ignored) {} + } + } + mListeners.finishIterate(); + } + private void notifyCompassUpdated(long time, double magneticNorth, double trueNorth, double accuracy) { for (LocationListener listener : mListeners) @@ -364,8 +380,7 @@ public enum LocationHelper implements SensorEventListener public void restart() { - Log.d("LOCATION", "restart"); - + mLogger.d("restart"); mLocationProvider.stopUpdates(); mActive &= !mListeners.isEmpty(); @@ -378,7 +393,7 @@ public enum LocationHelper implements SensorEventListener mActive = true; calcParams(); - Log.d("LOCATION", "start. Params: " + mInterval + ", high: " + mHighAccuracy); + mLogger.d("start. Params: " + mInterval + ", high: " + mHighAccuracy); mLocationProvider.startUpdates(); } @@ -416,6 +431,11 @@ public enum LocationHelper implements SensorEventListener return getLastKnownLocation(LocationUtils.LOCATION_EXPIRATION_TIME_MILLIS_LONG); } + private SharedPreferences prefs() + { + return PreferenceManager.getDefaultSharedPreferences(MwmApplication.get()); + } + public static native void nativeOnLocationError(int errorCode); private static native void nativeLocationUpdated(long time, double lat, double lon, float accuracy, double altitude, float speed, float bearing); private static native float[] nativeUpdateCompassSensor(int ind, float[] arr); diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java index c0ad951343..d0ab310217 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java +++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java @@ -7,6 +7,7 @@ import android.widget.ImageView; import com.mapswithme.maps.LocationState; import com.mapswithme.maps.R; +import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.Graphics; import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.statistics.AlohaHelper; @@ -26,6 +27,7 @@ public class MyPositionButton { Statistics.INSTANCE.trackEvent(Statistics.EventName.TOOLBAR_MY_POSITION); AlohaHelper.logClick(AlohaHelper.TOOLBAR_MY_POSITION); + LocationHelper.INSTANCE.setShouldResolveErrors(true); LocationState.INSTANCE.switchToNextMode(); } }); diff --git a/android/src/com/mapswithme/util/LocationUtils.java b/android/src/com/mapswithme/util/LocationUtils.java index a3066689ad..8982609ca8 100644 --- a/android/src/com/mapswithme/util/LocationUtils.java +++ b/android/src/com/mapswithme/util/LocationUtils.java @@ -1,10 +1,14 @@ package com.mapswithme.util; +import android.content.ContentResolver; import android.location.Location; import android.os.Build; import android.os.SystemClock; +import android.provider.Settings; +import android.text.TextUtils; import android.view.Surface; +import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.location.LocationHelper; @@ -107,4 +111,29 @@ public class LocationUtils return Math.abs(first.getLat() - second.getLat()) < LocationUtils.LAT_LON_EPSILON && Math.abs(first.getLon() - second.getLon()) < LocationUtils.LAT_LON_EPSILON; } + + @SuppressWarnings("deprecation") + public static boolean isLocationServicesTurnedOn() + { + // If location is turned off(by user in system settings), google client( = fused provider) api doesn't work at all + // but external gps receivers still can work. In that case we prefer native provider instead of fused - it works. + final ContentResolver resolver = MwmApplication.get().getContentResolver(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) + { + final String providers = Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED); + return !TextUtils.isEmpty(providers); + } + else + { + try + { + final int mode = Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE); + return mode != Settings.Secure.LOCATION_MODE_OFF; + } catch (Settings.SettingNotFoundException e) + { + e.printStackTrace(); + return false; + } + } + } } diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java index 784914b3eb..412329bda5 100644 --- a/android/src/com/mapswithme/util/ThemeUtils.java +++ b/android/src/com/mapswithme/util/ThemeUtils.java @@ -50,7 +50,6 @@ public final class ThemeUtils return VALUE_BUFFER.resourceId; } - public static LayoutInflater themedInflater(LayoutInflater src, @StyleRes int theme) { Context wrapper = new ContextThemeWrapper(src.getContext(), theme); From 8ab0aa74c4d77f28327639ad123d3c720c188117 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 18:36:12 +0300 Subject: [PATCH 34/87] [android] Save operator. --- android/src/com/mapswithme/maps/editor/EditorFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index ba323eb96d..71a75c26b1 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -162,6 +162,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe Editor.nativeSetWebsite(mWebsite.getText().toString()); Editor.nativeSetEmail(mEmail.getText().toString()); Editor.nativeSetHasWifi(mWifi.isChecked()); + Editor.nativeSetOperator(mOperator.getText().toString()); // TODO set localizated names return true; From b92ecc9e082e3628396377f9ce8d5c421350cb9a Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 29 Apr 2016 16:08:27 +0300 Subject: [PATCH 35/87] [android] Feature status JNI. --- .../jni/com/mapswithme/maps/editor/Editor.cpp | 14 ++++++++++++++ .../src/com/mapswithme/maps/editor/Editor.java | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index b1a5697699..547344c12e 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -509,4 +509,18 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass cl { return jni::ToJavaString(env, g_editableMapObject.GetLocalizedType()); } + +// @FeatureStatus +// static native int nativeGetMapObjectStatus(); +JNIEXPORT jint JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) +{ + return osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index); +} + +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz) +{ + return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index); +} } // extern "C" diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index 62c08cabca..3513cc23b8 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -1,9 +1,13 @@ package com.mapswithme.maps.editor; +import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Size; import android.support.annotation.WorkerThread; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; @@ -20,6 +24,16 @@ import com.mapswithme.maps.editor.data.LocalizedStreet; */ public final class Editor { + // Should correspond to core osm::FeatureStatus. + @Retention(RetentionPolicy.SOURCE) + @IntDef({UNTOUCHED, DELETED, MODIFIED, CREATED}) + public @interface FeatureStatus {} + + public static final int UNTOUCHED = 0; + public static final int DELETED = 1; + public static final int MODIFIED = 2; + public static final int CREATED = 3; + private static final AppBackgroundTracker.OnTransitionListener sOsmUploader = new AppBackgroundTracker.OnTransitionListener() { @Override @@ -158,4 +172,8 @@ public final class Editor public static native void nativePlaceDoesNotExist(); public static native boolean nativeIsHouseValid(String houseNumber); + + @FeatureStatus + public static native int nativeGetMapObjectStatus(); + public static native boolean nativeIsMapObjectUploaded(); } From 6eebc64ddf8bc7e19d0993af00b9854dcdc70ec4 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Tue, 3 May 2016 14:40:17 +0300 Subject: [PATCH 36/87] Fixed strings. --- strings.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strings.txt b/strings.txt index 48091fcb93..f429129aa0 100644 --- a/strings.txt +++ b/strings.txt @@ -16258,8 +16258,8 @@ uk = Кількість поверхів (максимум %d) vi = Số tầng (tối đa %d) hu = Az emeletek száma (legfeljebb %d) - de = Anzahl der Etagen (%2d maximal) - fi = Kerrosten määrä (maks. %2d) + de = Anzahl der Etagen (%d maximal) + fi = Kerrosten määrä (maks. %d) cs = Počet poschodí (max. %d) it = Numero di piani (massimo %d) nb = Antall etasjer (maks. %d) @@ -16932,7 +16932,7 @@ nl = Huidige locatie is onbekend. [current_location_unknown_error_message] - en = An error occured while searching for your location. Check that your device is working properly and try again later. + en = An error occurred while searching for your location. Check that your device is working properly and try again later. ru = При поиске местоположения произошла неизвестная ошибка. Проверьте работоспособность устройства и попробуйте найти местоположение позднее. fr = Une erreur est survenue lors de la recherche de votre emplacement. Vérifiez que le périphérique fonctionne correctement et réessayez ultérieurement da = Der opstod en fejl under søgning efter din position. Kontrollér at din enhed fungerer korrekt, og prøv igen senere. From 1e9c57b2e87fde9fb5d06d15e1f4747f42506be0 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 13:55:48 +0300 Subject: [PATCH 37/87] Gen strings. --- android/res/values-de/strings.xml | 2 +- android/res/values-fi/strings.xml | 2 +- android/res/values/strings.xml | 2 +- iphone/Maps/de.lproj/Localizable.strings | 2 +- iphone/Maps/en.lproj/Localizable.strings | 2 +- iphone/Maps/fi.lproj/Localizable.strings | 2 +- iphone/Maps/pt.lproj/Localizable.strings | 2 +- iphone/Maps/zh-Hant.lproj/Localizable.strings | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index bd1cc41155..30360523a4 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -827,7 +827,7 @@ Über eine Mobilfunknetzverbindung herunterladen? Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden. Richtige Hausnummer eingeben - Anzahl der Etagen (%2d maximal) + Anzahl der Etagen (%d maximal) Bearbeiten Sie die Gebäude mit maximal 25 Etagen Postleitzahl Geben Sie die korrekte Postleitzahl ein diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 8b17c1f23b..8ad31519c2 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -797,7 +797,7 @@ Lataa käyttämällä puhelinverkkoyhteyttä? Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä. Syötä oikea talon numero - Kerrosten määrä (maks. %2d) + Kerrosten määrä (maks. %d) Muokkaa kerroksia, enintään 25 kerrosta Postinumero Anna kelvollinen postinumero diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 4bdc7aad30..62a26edc4e 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -863,7 +863,7 @@ Continue Stop Current location is unknown. - An error occured while searching for your location. Check that your device is working properly and try again later. + An error occurred while searching for your location. Check that your device is working properly and try again later. We\'ve updated the map editor MAPS.ME users have made 50 000 map changes. Together we are making the most detailed maps in the World. Join us! diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index 3662098720..85c3b9526c 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -1376,7 +1376,7 @@ "error_enter_correct_house_number" = "Richtige Hausnummer eingeben"; -"editor_storey_number" = "Anzahl der Etagen (%2d maximal)"; +"editor_storey_number" = "Anzahl der Etagen (%d maximal)"; "error_enter_correct_storey_number" = "Bearbeiten Sie die Gebäude mit maximal 25 Etagen"; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 80bec8febb..a3ba8f0aa1 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -1429,7 +1429,7 @@ "current_location_unknown_error_title" = "Current location is unknown."; -"current_location_unknown_error_message" = "An error occured while searching for your location. Check that your device is working properly and try again later."; +"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later."; "whatsnew_update_editor_title" = "We've updated the map editor"; diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings index 95e024b437..23ef88818a 100644 --- a/iphone/Maps/fi.lproj/Localizable.strings +++ b/iphone/Maps/fi.lproj/Localizable.strings @@ -1376,7 +1376,7 @@ "error_enter_correct_house_number" = "Syötä oikea talon numero"; -"editor_storey_number" = "Kerrosten määrä (maks. %2d)"; +"editor_storey_number" = "Kerrosten määrä (maks. %d)"; "error_enter_correct_storey_number" = "Muokkaa kerroksia, enintään 25 kerrosta"; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index 1dd247a4f6..3d5214b844 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -1429,7 +1429,7 @@ "current_location_unknown_error_title" = "Current location is unknown."; -"current_location_unknown_error_message" = "An error occured while searching for your location. Check that your device is working properly and try again later."; +"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later."; "whatsnew_update_editor_title" = "We've updated the map editor"; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 069788dfcd..ffc6391a85 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -1429,7 +1429,7 @@ "current_location_unknown_error_title" = "Current location is unknown."; -"current_location_unknown_error_message" = "An error occured while searching for your location. Check that your device is working properly and try again later."; +"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later."; "whatsnew_update_editor_title" = "We've updated the map editor"; From 990eea1bf1eeedc32ea459d89d0d554efb8e5412 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 13:57:55 +0300 Subject: [PATCH 38/87] [editor] Clear selected feature on rollback. --- map/framework.cpp | 13 +++++++++++++ map/framework.hpp | 1 + 2 files changed, 14 insertions(+) diff --git a/map/framework.cpp b/map/framework.cpp index fdbcd7af5d..643b42ba0b 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2796,9 +2796,22 @@ void Framework::DeleteFeature(FeatureID const & fid) const { // TODO(AlexZ): Use FeatureID in the editor interface. osm::Editor::Instance().DeleteFeature(*GetFeatureByID(fid)); + if (m_selectedFeature == fid) + m_selectedFeature = FeatureID(); } osm::NewFeatureCategories Framework::GetEditorCategories() const { return osm::Editor::Instance().GetNewFeatureCategories(); } + +bool Framework::RollBackChanges(FeatureID const & fid) +{ + if (m_selectedFeature == fid) + m_selectedFeature = FeatureID(); + if (osm::Editor::Instance().GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created) + DeactivateMapSelection(false); + else + UpdatePlacePageInfoForCurrentSelection(); + return osm::Editor::Instance().RollBackChanges(fid); +} diff --git a/map/framework.hpp b/map/framework.hpp index 9cb23b34d5..52b51e423b 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -647,6 +647,7 @@ public: osm::Editor::SaveResult SaveEditedMapObject(osm::EditableMapObject emo); void DeleteFeature(FeatureID const & fid) const; osm::NewFeatureCategories GetEditorCategories() const; + bool RollBackChanges(FeatureID const & fid); //@} private: From 2bce4f8c2e2e19506310b5831bef98c35a3fa00f Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 14:24:47 +0300 Subject: [PATCH 39/87] [ios] Used correct method for feature rollback. --- iphone/Maps/Classes/Editor/MWMEditorViewController.mm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm index 95c9efab2e..dceae2db16 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm @@ -817,14 +817,9 @@ void registerCellsForTableView(vector const & cells, UITab kStatEditorMWMName : @(fid.GetMwmName().c_str()), kStatEditorMWMVersion : @(fid.GetMwmVersion()), kStatLat : @(latLon.lat), kStatLon : @(latLon.lon)}]; - if (!osm::Editor::Instance().RollBackChanges(fid)) - NSAssert(false, @"We shouldn't call this if we can't roll back!"); - auto & f = GetFramework(); - if (isCreated) - f.DeactivateMapSelection(true); - else - f.UpdatePlacePageInfoForCurrentSelection(); + if (!f.RollBackChanges(fid)) + NSAssert(false, @"We shouldn't call this if we can't roll back!"); [self backTap]; }; From 92e317f77a33648317e6278f53e5403d1fd3e0bb Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 14:04:41 +0300 Subject: [PATCH 40/87] [android] Remove unnecessary warning. --- android/jni/com/mapswithme/platform/Platform.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index b64cf1308d..91521d69e0 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -121,11 +121,9 @@ namespace android m_settingsDir = jni::ToNativeString(env, storagePath); m_tmpDir = jni::ToNativeString(env, tmpPath); + // Custom storage isn't set. Use primary storage. if (!settings::Get("StoragePath", m_writableDir)) - { - LOG(LINFO, ("Could not read writable dir. Use primary storage.")); m_writableDir = m_settingsDir; - } string const obbPath = jni::ToNativeString(env, obbGooglePath); Platform::FilesList files; From 51368b10550ce731c3d0d1237cc6491dfd3de160 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 4 May 2016 15:30:34 +0300 Subject: [PATCH 41/87] [android] Reset changes UI ('doesn't exist', 'delete added feature' is added, too). --- .../jni/com/mapswithme/maps/editor/Editor.cpp | 40 +++--- android/res/layout/dialog_edit_text.xml | 8 +- android/res/layout/fragment_editor.xml | 21 ++- .../maps/dialog/EditTextDialogFragment.java | 57 +++++--- .../com/mapswithme/maps/editor/Editor.java | 9 +- .../maps/editor/EditorFragment.java | 134 +++++++++++++++++- .../maps/editor/EditorHostFragment.java | 5 + .../maps/editor/ReportFragment.java | 2 +- .../src/com/mapswithme/util/Constants.java | 1 + 9 files changed, 221 insertions(+), 56 deletions(-) diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index 547344c12e..8384ca5dd7 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -401,6 +401,28 @@ Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv *, jclass, j ("Couldn't create mapobject, wrong coordinates of missing mwm")); } +// static void nativeCreateNote(String text); +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) +{ + Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), + osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); +} + +// static void nativePlaceDoesNotExist(String comment); +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) +{ + Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), + osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment)); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz) +{ + g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID()); +} + JNIEXPORT jobjectArray JNICALL Java_com_mapswithme_maps_editor_Editor_nativeGetAllFeatureCategories(JNIEnv * env, jclass clazz, jstring jLang) { @@ -481,22 +503,6 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass return g_editableMapObject.GetID().GetMwmVersion(); } -// static void nativeCreateNote(String text); -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) -{ - Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), - osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); -} - -// static void nativePlaceDoesNotExist(); -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz) -{ - Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), - osm::Editor::NoteProblemType::PlaceDoesNotExist, ""); -} - // static boolean nativeIsHouseValid(String houseNumber); JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber) @@ -515,7 +521,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass cl JNIEXPORT jint JNICALL Java_com_mapswithme_maps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) { - return osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index); + return static_cast(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index)); } JNIEXPORT jboolean JNICALL diff --git a/android/res/layout/dialog_edit_text.xml b/android/res/layout/dialog_edit_text.xml index 30a346dbaa..8c6c31e3d4 100644 --- a/android/res/layout/dialog_edit_text.xml +++ b/android/res/layout/dialog_edit_text.xml @@ -1,8 +1,8 @@ @@ -13,7 +13,8 @@ android:layout_marginBottom="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Title"/> - @@ -22,9 +23,8 @@ style="@style/MwmWidget.PlacePage.EditText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/name" android:singleLine="true"/> - + diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml index d8f765380a..41352f2f8c 100644 --- a/android/res/layout/fragment_editor.xml +++ b/android/res/layout/fragment_editor.xml @@ -309,9 +309,12 @@ android:textAppearance="@style/MwmTextAppearance.Body4"/> + + + + + \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java index e33c5b0002..e011d6060a 100644 --- a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java +++ b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java @@ -6,6 +6,7 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.design.widget.TextInputLayout; import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; import android.text.TextUtils; @@ -23,9 +24,11 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment public static final String EXTRA_INITIAL = "InitialText"; public static final String EXTRA_POSITIVE_BUTTON = "PositiveText"; public static final String EXTRA_NEGATIVE_BUTTON = "NegativeText"; + public static final String EXTRA_HINT = "Hint"; private String mTitle; private String mInitialText; + private String mHint; private EditText mEtInput; public interface OnTextSaveListener @@ -34,12 +37,18 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment } public static void show(String title, String initialText, String positiveBtn, String negativeBtn, Fragment parent) + { + show(title, initialText, "", positiveBtn, negativeBtn, parent); + } + + public static void show(String title, String initialText, String hint, String positiveBtn, String negativeBtn, Fragment parent) { final Bundle args = new Bundle(); args.putString(EXTRA_TITLE, title); args.putString(EXTRA_INITIAL, initialText); - args.putString(EXTRA_POSITIVE_BUTTON, positiveBtn); - args.putString(EXTRA_NEGATIVE_BUTTON, negativeBtn); + args.putString(EXTRA_POSITIVE_BUTTON, positiveBtn.toUpperCase()); + args.putString(EXTRA_NEGATIVE_BUTTON, negativeBtn.toUpperCase()); + args.putString(EXTRA_HINT, hint); final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(parent.getActivity(), EditTextDialogFragment.class.getName()); fragment.setArguments(args); fragment.show(parent.getChildFragmentManager(), EditTextDialogFragment.class.getName()); @@ -56,30 +65,34 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment { mTitle = args.getString(EXTRA_TITLE); mInitialText = args.getString(EXTRA_INITIAL); + mHint = args.getString(EXTRA_HINT); positiveButtonText = args.getString(EXTRA_POSITIVE_BUTTON); negativeButtonText = args.getString(EXTRA_NEGATIVE_BUTTON); } - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()).setView(buildView()). - setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - final Fragment parentFragment = getParentFragment(); - final String result = mEtInput.getText().toString(); - if (parentFragment instanceof OnTextSaveListener) - { - ((OnTextSaveListener) parentFragment).onSaveText(result); - return; - } + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) + .setView(buildView()) + .setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + final Fragment parentFragment = getParentFragment(); + final String result = mEtInput.getText().toString(); + if (parentFragment instanceof OnTextSaveListener) + { + dismiss(); + ((OnTextSaveListener) parentFragment).onSaveText(result); + return; + } - final Activity activity = getActivity(); - if (activity instanceof OnTextSaveListener) - ((OnTextSaveListener) activity).onSaveText(result); - } - }).setNegativeButton(negativeButtonText, null); + final Activity activity = getActivity(); + if (activity instanceof OnTextSaveListener) + ((OnTextSaveListener) activity).onSaveText(result); + } + }) + .setNegativeButton(negativeButtonText, null); return builder.create(); } @@ -87,7 +100,9 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment private View buildView() { @SuppressLint("InflateParams") final View root = getActivity().getLayoutInflater().inflate(R.layout.dialog_edit_text, null); - mEtInput = (EditText) root.findViewById(R.id.et__input); + TextInputLayout inputLayout = (TextInputLayout) root.findViewById(R.id.input); + inputLayout.setHint(TextUtils.isEmpty(mHint) ? getString(R.string.name) : mHint); + mEtInput = (EditText) inputLayout.findViewById(R.id.et__input); if (!TextUtils.isEmpty(mInitialText)) { mEtInput.setText(mInitialText); diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index 3513cc23b8..c3ca815328 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -111,6 +111,7 @@ public final class Editor public static native String nativeGetHouseNumber(); public static native void nativeSetHouseNumber(String houseNumber); + public static native boolean nativeIsHouseValid(String houseNumber); public static native boolean nativeHasSomethingToUpload(); @WorkerThread @@ -148,6 +149,9 @@ public final class Editor nativeCreateMapObject(category.category); } public static native void nativeCreateMapObject(int categoryId); + public static native void nativeCreateNote(String text); + public static native void nativePlaceDoesNotExist(String comment); + public static native void nativeRollbackMapObject(); /** * @return all cuisines keys. @@ -168,11 +172,6 @@ public final class Editor public static native String nativeGetMwmName(); public static native long nativeGetMwmVersion(); - public static native void nativeCreateNote(String text); - public static native void nativePlaceDoesNotExist(); - - public static native boolean nativeIsHouseValid(String houseNumber); - @FeatureStatus public static native int nativeGetMapObjectStatus(); public static native boolean nativeIsMapObjectUploaded(); diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index 71a75c26b1..23fc0b2bef 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -1,11 +1,15 @@ package com.mapswithme.maps.editor; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.design.widget.TextInputLayout; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SwitchCompat; import android.util.SparseArray; @@ -16,19 +20,22 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.bookmarks.data.Metadata.MetadataType; +import com.mapswithme.maps.dialog.EditTextDialogFragment; import com.mapswithme.maps.editor.data.LocalizedStreet; import com.mapswithme.maps.editor.data.TimeFormatUtils; import com.mapswithme.maps.editor.data.Timetable; +import com.mapswithme.util.Constants; import com.mapswithme.util.Graphics; import com.mapswithme.util.InputUtils; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; import org.solovyev.android.views.llm.LinearLayoutManager; -public class EditorFragment extends BaseMwmFragment implements View.OnClickListener +public class EditorFragment extends BaseMwmFragment implements View.OnClickListener, EditTextDialogFragment.OnTextSaveListener { private TextView mCategory; private View mCardName; @@ -90,6 +97,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private View mEditOpeningHours; private EditText mDescription; private final SparseArray mMetaBlocks = new SparseArray<>(7); + private TextView mReset; protected EditorHostFragment mParent; @@ -140,6 +148,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe mWifi.setChecked(Editor.nativeHasWifi()); refreshOpeningTime(); refreshEditableFields(); + refreshResetButton(); } @Override @@ -243,7 +252,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe mCardMetadata = view.findViewById(R.id.cv__metadata); mName = findInput(mCardName); // TODO uncomment and finish localized name -// view.findViewById(R.id.add_langs).setOnClickListener(this); + // view.findViewById(R.id.add_langs).setOnClickListener(this); UiUtils.hide(view.findViewById(R.id.add_langs)); mLocalizedShow = (TextView) view.findViewById(R.id.show_langs); mLocalizedShow.setOnClickListener(this); @@ -263,8 +272,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe View blockZipcode = view.findViewById(R.id.block_zipcode); mZipcode = findInputAndInitBlock(blockZipcode, 0, R.string.editor_zip_code); mBlockLevels = view.findViewById(R.id.block_levels); - // TODO set levels limit (25 or more, get it from the core) - mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0, R.string.editor_storey_number); + // TODO set level limits from core + mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0, getString(R.string.editor_storey_number, 25)); // Details View blockPhone = view.findViewById(R.id.block_phone); mPhone = findInputAndInitBlock(blockPhone, R.drawable.ic_phone, R.string.phone); @@ -287,7 +296,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe mEmptyOpeningHours.setOnClickListener(this); mOpeningHours = (TextView) blockOpeningHours.findViewById(R.id.opening_hours); mOpeningHours.setOnClickListener(this); - mDescription = findInput(view.findViewById(R.id.cv__more)); + final View cardMore = view.findViewById(R.id.cv__more); + mDescription = findInput(cardMore); + cardMore.findViewById(R.id.about_osm).setOnClickListener(this); + mReset = (TextView) view.findViewById(R.id.reset); + mReset.setOnClickListener(this); mMetaBlocks.append(MetadataType.FMD_OPEN_HOURS.toInt(), blockOpeningHours); mMetaBlocks.append(MetadataType.FMD_PHONE_NUMBER.toInt(), blockPhone); @@ -304,10 +317,15 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe } private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, @StringRes int hint) + { + return findInputAndInitBlock(blockWithInput, icon, getString(hint)); + } + + private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, String hint) { ((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon); final TextInputLayout input = (TextInputLayout) blockWithInput.findViewById(R.id.custom_input); - input.setHint(getString(hint)); + input.setHint(hint); return (EditText) input.findViewById(R.id.input); } @@ -339,13 +357,19 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe case R.id.add_langs: mParent.addLocalizedLanguage(); break; + case R.id.about_osm: + startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT))); + break; + case R.id.reset: + reset(); + break; } } private void refreshLocalizedNames() { // TODO uncomment and finish localized names -// UiUtils.showIf(mLocalizedNamesAdapter.getItemCount() > 0, mLocalizedShow); + // UiUtils.showIf(mLocalizedNamesAdapter.getItemCount() > 0, mLocalizedShow); UiUtils.hide(mLocalizedNames, mLocalizedShow); } @@ -368,4 +392,100 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe { mLocalizedShow.setCompoundDrawablesWithIntrinsicBounds(null, null, Graphics.tint(getActivity(), right, R.attr.iconTint), null); } + + private void refreshResetButton() + { + if (mParent.addingNewObject()) + { + UiUtils.hide(mReset); + return; + } + + if (Editor.nativeIsMapObjectUploaded()) + { + mReset.setText(R.string.editor_place_doesnt_exist); + return; + } + + switch (Editor.nativeGetMapObjectStatus()) + { + case Editor.CREATED: + mReset.setText(R.string.editor_remove_place_button); + break; + case Editor.MODIFIED: + mReset.setText(R.string.editor_reset_edits_button); + break; + case Editor.UNTOUCHED: + mReset.setText(R.string.editor_place_doesnt_exist); + break; + case Editor.DELETED: + throw new IllegalStateException("Can't delete already deleted feature."); + } + } + + private void reset() + { + if (Editor.nativeIsMapObjectUploaded()) + { + placeDoesntExist(); + return; + } + + switch (Editor.nativeGetMapObjectStatus()) + { + case Editor.CREATED: + resetCreated(Editor.CREATED); + break; + case Editor.MODIFIED: + resetCreated(Editor.MODIFIED); + break; + case Editor.UNTOUCHED: + placeDoesntExist(); + break; + case Editor.DELETED: + throw new IllegalStateException("Can't delete already deleted feature."); + } + } + + private void resetCreated(@Editor.FeatureStatus int status) + { + int title; + int message; + if (status == Editor.CREATED) + { + title = R.string.editor_remove_place_button; + message = R.string.editor_remove_place_message; + } + else + { + title = R.string.editor_reset_edits_button; + message = R.string.editor_reset_edits_message; + } + + new AlertDialog.Builder(getActivity()).setTitle(message) + .setPositiveButton(getString(title).toUpperCase(), new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + Editor.nativeRollbackMapObject(); + mParent.onBackPressed(); + } + }) + .setNegativeButton(getString(R.string.cancel).toUpperCase(), null) + .show(); + } + + private void placeDoesntExist() + { + EditTextDialogFragment.show(getString(R.string.editor_place_doesnt_exist), "", getString(R.string.editor_comment_hint), + getString(R.string.editor_report_problem_send_button), getString(R.string.cancel), this); + } + + @Override + public void onSaveText(String text) + { + Editor.nativePlaceDoesNotExist(text); + mParent.onBackPressed(); + } } diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index c4178c281f..f253b55c25 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -244,4 +244,9 @@ public class EditorHostFragment extends BaseMwmToolbarFragment Editor.nativeSetStreet(street); editMapObject(); } + + public boolean addingNewObject() + { + return mIsNewObject; + } } diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java index d392cc4f0e..44d2bf8f50 100644 --- a/android/src/com/mapswithme/maps/editor/ReportFragment.java +++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java @@ -63,7 +63,7 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli private void sendNotExist() { - Editor.nativePlaceDoesNotExist(); + Editor.nativePlaceDoesNotExist(""); mToolbarController.onUpClick(); } diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java index 249f3495db..933ec7b95f 100644 --- a/android/src/com/mapswithme/util/Constants.java +++ b/android/src/com/mapswithme/util/Constants.java @@ -35,6 +35,7 @@ public final class Constants public static final String OSM_REGISTER = "https://www.openstreetmap.org/user/new"; public static final String OSM_RECOVER_PASSWORD = "https://www.openstreetmap.org/user/forgot-password"; + public static final String OSM_ABOUT = "https://wiki.openstreetmap.org/wiki/Main_Page"; private Url() {} } From abb449bc7fa2b1ad70fb237f7296115f9dcf730b Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 18:20:03 +0300 Subject: [PATCH 42/87] Review fixes. --- android/src/com/mapswithme/maps/editor/EditorFragment.java | 7 +++---- map/framework.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index 23fc0b2bef..2330b4f9cc 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -20,7 +20,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.bookmarks.data.Metadata.MetadataType; @@ -434,10 +433,10 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe switch (Editor.nativeGetMapObjectStatus()) { case Editor.CREATED: - resetCreated(Editor.CREATED); + rollback(Editor.CREATED); break; case Editor.MODIFIED: - resetCreated(Editor.MODIFIED); + rollback(Editor.MODIFIED); break; case Editor.UNTOUCHED: placeDoesntExist(); @@ -447,7 +446,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe } } - private void resetCreated(@Editor.FeatureStatus int status) + private void rollback(@Editor.FeatureStatus int status) { int title; int message; diff --git a/map/framework.cpp b/map/framework.cpp index 643b42ba0b..74370a8075 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2807,11 +2807,12 @@ osm::NewFeatureCategories Framework::GetEditorCategories() const bool Framework::RollBackChanges(FeatureID const & fid) { - if (m_selectedFeature == fid) + if (m_selectedFeature == fid) // reset selected feature since it becomes invalid after rollback m_selectedFeature = FeatureID(); - if (osm::Editor::Instance().GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created) + auto const & editor = osm::Editor::Instance(); + if (editor.GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created) DeactivateMapSelection(false); else UpdatePlacePageInfoForCurrentSelection(); - return osm::Editor::Instance().RollBackChanges(fid); + return editor.RollBackChanges(fid); } From 1a467a1b97b913f6f0fe680c29d5943f486990d8 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Thu, 5 May 2016 11:02:28 +0300 Subject: [PATCH 43/87] Fix buildings from xml loading. --- indexer/edits_migration.cpp | 18 +++--------------- map/framework.cpp | 24 +++++++++++++++++++----- map/framework.hpp | 3 ++- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/indexer/edits_migration.cpp b/indexer/edits_migration.cpp index c1577b786f..fc58779527 100644 --- a/indexer/edits_migration.cpp +++ b/indexer/edits_migration.cpp @@ -10,19 +10,6 @@ #include "std/algorithm.hpp" #include "std/unique_ptr.hpp" -namespace -{ -m2::PointD CalculateCenter(vector const & geometry) -{ - ASSERT(!geometry.empty() && geometry.size() % 3 == 0, - ("Invalid geometry should be handled in caller. geometry.size() =", geometry.size())); - - auto const boundingBox = ApplyCalculator(begin(geometry), end(geometry), - m2::CalculateBoundingBox()); - return ApplyCalculator(begin(geometry), end(geometry), m2::CalculatePointOnSurface(boundingBox)); -} -} // namespace - namespace editor { FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach, @@ -57,10 +44,11 @@ FeatureID MigrateWayFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach auto bestScore = 0.6; // initial score is used as a threshold. auto geometry = xml.GetGeometry(); - if (geometry.empty() || geometry.size() % 3 != 0) + if (geometry.empty()) MYTHROW(MigrationError, ("Feature has invalid geometry", xml)); - auto const someFeaturePoint = CalculateCenter(geometry); + // This can be any point on a feature. + auto const someFeaturePoint = geometry[0]; sort(begin(geometry), end(geometry)); // Sort to use in set_intersection. auto count = 0; diff --git a/map/framework.cpp b/map/framework.cpp index 74370a8075..3a2fedecd1 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -389,8 +389,14 @@ Framework::Framework() return streets.first[streets.second].m_name; return {}; }); - editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2)); + // Due to floating points accuracy issues (geometry is saved in editor up to 7 digits + // after dicimal poin) some feature vertexes are threated as external to a given feature. + auto const pointToFeatureDistanceToleranceInMeters = 1e-3; + editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2, + pointToFeatureDistanceToleranceInMeters)); editor.LoadMapEdits(); + + m_model.GetIndex().AddObserver(editor); } Framework::~Framework() @@ -1741,7 +1747,8 @@ bool Framework::ShowMapForURL(string const & url) return false; } -void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator) const +void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator, + double featureDistanceToleranceInMeters) const { constexpr double kSelectRectWidthInMeters = 1.1; constexpr double kMetersToLinearFeature = 3; @@ -1760,10 +1767,17 @@ void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & m fn(ft); break; case feature::GEOM_AREA: - if (ft.GetLimitRect(kScale).IsPointInside(mercator) && - feature::GetMinDistanceMeters(ft, mercator) == 0.0) { - fn(ft); + auto limitRect = ft.GetLimitRect(kScale); + // Be a little more tolerant. When used by editor mercator is given + // with some error, so we must extend limit rect a bit. + limitRect.Inflate(MercatorBounds::GetCellID2PointAbsEpsilon(), + MercatorBounds::GetCellID2PointAbsEpsilon()); + if (limitRect.IsPointInside(mercator) && + feature::GetMinDistanceMeters(ft, mercator) <= featureDistanceToleranceInMeters) + { + fn(ft); + } } break; case feature::GEOM_UNDEFINED: diff --git a/map/framework.hpp b/map/framework.hpp index 52b51e423b..8869518c1f 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -523,7 +523,8 @@ public: /// @returns nullptr if no feature was found at the given mercator point. unique_ptr GetFeatureAtPoint(m2::PointD const & mercator) const; using TFeatureTypeFn = function; - void ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator) const; + void ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator, + double featureDistanceToleranceInMeters = 0.0) const; /// Set parse to false if you don't need all feature fields ready. /// TODO(AlexZ): Refactor code which uses this method to get rid of it. /// FeatureType instances shoud not be used outside ForEach* core methods. From 8852c86585ec018fda98f9330a0e3475b3d14a7c Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 6 May 2016 19:12:23 +0300 Subject: [PATCH 44/87] Fixed tap on compass in F&R mode --- drape_frontend/my_position_controller.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index dceb3ff0ab..95067fc342 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -547,11 +547,14 @@ void MyPositionController::OnCompassTapped() { alohalytics::LogEvent("$compassClicked", {{"mode", LocationModeStatisticsName(m_mode)}, {"routing", strings::to_string(IsInRouting())}}); - ChangeModelView(0.0); if (m_mode == location::FollowAndRotate) { ChangeMode(location::Follow); - UpdateViewport(kDoNotChangeZoom); + ChangeModelView(m_position, 0.0, m_centerPixelPosition, kDoNotChangeZoom); + } + else + { + ChangeModelView(0.0); } } From 2b2e022a6367eed1fd8f11039bb41b58c14c356b Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 19:19:37 +0300 Subject: [PATCH 45/87] [android] Fixed build. --- map/framework.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map/framework.cpp b/map/framework.cpp index 3a2fedecd1..4745742729 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2823,7 +2823,7 @@ bool Framework::RollBackChanges(FeatureID const & fid) { if (m_selectedFeature == fid) // reset selected feature since it becomes invalid after rollback m_selectedFeature = FeatureID(); - auto const & editor = osm::Editor::Instance(); + auto & editor = osm::Editor::Instance(); if (editor.GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created) DeactivateMapSelection(false); else From 246c73896af66e228cbd7687c06526dcfb01ad56 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 6 May 2016 23:50:58 +0300 Subject: [PATCH 46/87] Revert "Unbind VAO after each binding." This reverts commit 8be9abf53bcd960b22f899918793cbc6bd62fe14. --- drape/vertex_array_buffer.cpp | 30 +++++++----------------------- drape/vertex_array_buffer.hpp | 3 +-- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp index fa7d78d114..ba836c9e59 100644 --- a/drape/vertex_array_buffer.cpp +++ b/drape/vertex_array_buffer.cpp @@ -79,14 +79,14 @@ void VertexArrayBuffer::RenderRange(IndicesRange const & range) ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad")); /// if OES_vertex_array_object is supported than all bindings already saved in VAO /// and we need only bind VAO. - if (!Bind()) + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + Bind(); + else BindStaticBuffers(); BindDynamicBuffers(); GetIndexBuffer()->Bind(); GLFunctions::glDrawElements(dp::IndexStorage::SizeOfIndex(), range.m_idxCount, range.m_idxStart); - - Unbind(); } } @@ -111,7 +111,6 @@ void VertexArrayBuffer::Build(ref_ptr program) m_VAO = GLFunctions::glGenVertexArray(); Bind(); BindStaticBuffers(); - Unbind(); } void VertexArrayBuffer::UploadData(BindingInfo const & bindingInfo, void const * data, uint32_t count) @@ -233,7 +232,8 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, { /// We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is supported. /// Otherwise we risk affecting a previously binded VAO. - Bind(); + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + Bind(); if (indexMutator != nullptr) { @@ -247,10 +247,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, } if (attrMutator == nullptr) - { - Unbind(); return; - } typedef AttributeBufferMutator::TMutateData TMutateData; typedef AttributeBufferMutator::TMutateNodes TMutateNodes; @@ -269,25 +266,12 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, mapper.UpdateData(node.m_data.get(), node.m_region.m_offset, node.m_region.m_count); } } - - Unbind(); } -bool VertexArrayBuffer::Bind() const +void VertexArrayBuffer::Bind() const { ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render")); - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - { - GLFunctions::glBindVertexArray(m_VAO); - return true; - } - return false; -} - -void VertexArrayBuffer::Unbind() const -{ - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - GLFunctions::glBindVertexArray(0); + GLFunctions::glBindVertexArray(m_VAO); } void VertexArrayBuffer::BindStaticBuffers() const diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp index 8ba2db50f2..2ac9c1fb09 100644 --- a/drape/vertex_array_buffer.hpp +++ b/drape/vertex_array_buffer.hpp @@ -76,8 +76,7 @@ private: ref_ptr GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic); ref_ptr GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const; - bool Bind() const; - void Unbind() const; + void Bind() const; void BindStaticBuffers() const; void BindDynamicBuffers() const; void BindBuffers(TBuffersMap const & buffers) const; From b6a8335de707d00713687516b0630f24d2dfa3bb Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Fri, 6 May 2016 23:01:31 +0300 Subject: [PATCH 47/87] Clear m_edits when reload. --- indexer/osm_editor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index d09791658f..3a0b8879e1 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -174,6 +174,8 @@ void Editor::LoadMapEdits() bool needRewriteEdits = false; + // TODO(mgsergio): synchronize access to m_features. + m_features.clear(); for (xml_node mwm : doc.child(kXmlRootNode).children(kXmlMwmNode)) { string const mapName = mwm.attribute("name").as_string(""); From 6252c6d2601ebeb354226eb9eeae0d137d50dea9 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Sat, 7 May 2016 09:51:17 +0300 Subject: [PATCH 48/87] Migrate created features. --- indexer/edits_migration.cpp | 26 +++++++++++++++++++------- indexer/edits_migration.hpp | 8 +++++++- indexer/osm_editor.cpp | 7 +++++-- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/indexer/edits_migration.cpp b/indexer/edits_migration.cpp index fc58779527..bf56ec971f 100644 --- a/indexer/edits_migration.cpp +++ b/indexer/edits_migration.cpp @@ -13,7 +13,9 @@ namespace editor { FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach, - XMLFeature const & xml) + XMLFeature const & xml, + osm::Editor::FeatureStatus const featureStatus, + TGenerateIDFn const & generateID) { unique_ptr feature; auto count = 0; @@ -27,8 +29,12 @@ FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEac ++count; }, MercatorBounds::FromLatLon(xml.GetCenter())); - if (!feature) + + if (!feature && featureStatus != osm::Editor::FeatureStatus::Created) MYTHROW(MigrationError, ("No pointed features returned.")); + if (featureStatus == osm::Editor::FeatureStatus::Created) + return generateID(); + if (count > 1) { LOG(LWARNING, @@ -37,8 +43,10 @@ FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEac return feature->GetID(); } -FeatureID MigrateWayFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach, - XMLFeature const & xml) +FeatureID MigrateWayFeatureIndex( + osm::Editor::TForEachFeaturesNearByFn & forEach, XMLFeature const & xml, + osm::Editor::FeatureStatus const /* Unused for now (we don't create/delete area features)*/, + TGenerateIDFn const & /*Unused for the same reason*/) { unique_ptr feature; auto bestScore = 0.6; // initial score is used as a threshold. @@ -101,12 +109,16 @@ FeatureID MigrateWayFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach } FeatureID MigrateFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach, - XMLFeature const & xml) + XMLFeature const & xml, + osm::Editor::FeatureStatus const featureStatus, + TGenerateIDFn const & generateID) { switch (xml.GetType()) { - case XMLFeature::Type::Node: return MigrateNodeFeatureIndex(forEach, xml); - case XMLFeature::Type::Way: return MigrateWayFeatureIndex(forEach, xml); + case XMLFeature::Type::Node: + return MigrateNodeFeatureIndex(forEach, xml, featureStatus, generateID); + case XMLFeature::Type::Way: + return MigrateWayFeatureIndex(forEach, xml, featureStatus, generateID); } } } // namespace editor diff --git a/indexer/edits_migration.hpp b/indexer/edits_migration.hpp index 53e6ba9f8e..c36c74e697 100644 --- a/indexer/edits_migration.hpp +++ b/indexer/edits_migration.hpp @@ -7,12 +7,18 @@ #include "base/exception.hpp" +#include "std/functional.hpp" + namespace editor { DECLARE_EXCEPTION(MigrationError, RootException); +using TGenerateIDFn = function; + /// Tries to match xml feature with one on a new mwm and retruns FeatrueID /// of a found feature, thows MigrationError if migration fails. FeatureID MigrateFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach, - XMLFeature const & xml); + XMLFeature const & xml, + osm::Editor::FeatureStatus const featureStatus, + TGenerateIDFn const & generateID); } // namespace editor diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 3a0b8879e1..976024ab82 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -194,11 +194,14 @@ void Editor::LoadMapEdits() { XMLFeature const xml(nodeOrWay.node()); + // TODO(mgsergio): Deleted features are not properly handled yet. auto const fid = needMigrateEdits - ? editor::MigrateFeatureIndex(m_forEachFeatureAtPointFn, xml) + ? editor::MigrateFeatureIndex( + m_forEachFeatureAtPointFn, xml, section.first, + [this, &mwmId] { return GenerateNewFeatureId(mwmId); }) : FeatureID(mwmId, xml.GetMWMFeatureIndex()); - // Remove obsolete edit during migration. + // Remove obsolete changes during migration. if (needMigrateEdits && IsObsolete(xml, fid)) continue; From d5b640da9c2fcd6ea411d7f98be0081c2508d8f3 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Sun, 8 May 2016 07:17:06 +0300 Subject: [PATCH 49/87] Storage test fix. --- storage/storage_tests/storage_tests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index f5bd747ef8..9c4f1b87ce 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -1107,12 +1107,12 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap) storage.GetChildrenInGroups(rootCountryId, downloaded, available); TEST_EQUAL(downloaded.size(), 1, (downloaded)); - TEST_EQUAL(available.size(), 224, ()); + TEST_EQUAL(available.size(), 223, ()); storage.GetChildrenInGroups(rootCountryId, downloadedWithKeep, availableWithKeep, true /* keepAvailableChildren*/); TEST_EQUAL(downloadedWithKeep.size(), 1, (downloadedWithKeep)); - TEST_EQUAL(availableWithKeep.size(), 225, ()); + TEST_EQUAL(availableWithKeep.size(), 224, ()); storage.GetChildrenInGroups("Algeria", downloaded, available); TEST_EQUAL(downloaded.size(), 2, (downloaded)); From 317a9c0d2de5407e12fbbd634769fcd478e03913 Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Tue, 10 May 2016 12:07:46 +0300 Subject: [PATCH 50/87] [android] fix: Paddings in placeholder. --- android/res/layout/placeholder.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/res/layout/placeholder.xml b/android/res/layout/placeholder.xml index ad00f51d24..6418eeb5ef 100644 --- a/android/res/layout/placeholder.xml +++ b/android/res/layout/placeholder.xml @@ -5,6 +5,8 @@ android:id="@+id/placeholder" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingLeft="@dimen/margin_half" + android:paddingRight="@dimen/margin_half" android:visibility="gone" tools:visibility="visible"> Date: Tue, 10 May 2016 12:42:42 +0300 Subject: [PATCH 51/87] [android][editor] fix: Turn invalid building number into red. --- .../src/com/mapswithme/maps/editor/EditorFragment.java | 6 +++--- android/src/com/mapswithme/util/UiUtils.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index 2330b4f9cc..5a05741508 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -98,7 +98,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private final SparseArray mMetaBlocks = new SparseArray<>(7); private TextView mReset; - protected EditorHostFragment mParent; + private EditorHostFragment mParent; @Nullable @Override @@ -130,11 +130,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe if (!Editor.nativeIsHouseValid(text)) { - mInputHouseNumber.setError(getString(R.string.error_enter_correct_house_number)); + UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number); return; } - mInputHouseNumber.setError(null); + UiUtils.setInputError(mInputHouseNumber, 0); } }); mZipcode.setText(Editor.nativeGetZipCode()); diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index a635a69189..6000008b98 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -15,6 +15,7 @@ import android.support.annotation.DrawableRes; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.StringRes; +import android.support.design.widget.TextInputLayout; import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.text.TextUtils; @@ -315,6 +316,13 @@ public final class UiUtils + resources.getResourceEntryName(resId)); } + public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error) + { + layout.setError(error == 0 ? null : layout.getContext().getString(error)); + layout.getEditText().setTextColor(error == 0 ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary) + : layout.getContext().getResources().getColor(R.color.base_red)); + } + // utility class private UiUtils() {} } From d55bc5d652f3ad4d04f934cc77e70592da6f658e Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Fri, 6 May 2016 13:31:23 +0300 Subject: [PATCH 52/87] Unbind VAO after each binding. --- drape/vertex_array_buffer.cpp | 30 +++++++++++++++++++++++------- drape/vertex_array_buffer.hpp | 3 ++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp index ba836c9e59..fa7d78d114 100644 --- a/drape/vertex_array_buffer.cpp +++ b/drape/vertex_array_buffer.cpp @@ -79,14 +79,14 @@ void VertexArrayBuffer::RenderRange(IndicesRange const & range) ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad")); /// if OES_vertex_array_object is supported than all bindings already saved in VAO /// and we need only bind VAO. - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - Bind(); - else + if (!Bind()) BindStaticBuffers(); BindDynamicBuffers(); GetIndexBuffer()->Bind(); GLFunctions::glDrawElements(dp::IndexStorage::SizeOfIndex(), range.m_idxCount, range.m_idxStart); + + Unbind(); } } @@ -111,6 +111,7 @@ void VertexArrayBuffer::Build(ref_ptr program) m_VAO = GLFunctions::glGenVertexArray(); Bind(); BindStaticBuffers(); + Unbind(); } void VertexArrayBuffer::UploadData(BindingInfo const & bindingInfo, void const * data, uint32_t count) @@ -232,8 +233,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, { /// We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is supported. /// Otherwise we risk affecting a previously binded VAO. - if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) - Bind(); + Bind(); if (indexMutator != nullptr) { @@ -247,7 +247,10 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, } if (attrMutator == nullptr) + { + Unbind(); return; + } typedef AttributeBufferMutator::TMutateData TMutateData; typedef AttributeBufferMutator::TMutateNodes TMutateNodes; @@ -266,12 +269,25 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr indexMutator, mapper.UpdateData(node.m_data.get(), node.m_region.m_offset, node.m_region.m_count); } } + + Unbind(); } -void VertexArrayBuffer::Bind() const +bool VertexArrayBuffer::Bind() const { ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render")); - GLFunctions::glBindVertexArray(m_VAO); + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + { + GLFunctions::glBindVertexArray(m_VAO); + return true; + } + return false; +} + +void VertexArrayBuffer::Unbind() const +{ + if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject)) + GLFunctions::glBindVertexArray(0); } void VertexArrayBuffer::BindStaticBuffers() const diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp index 2ac9c1fb09..8ba2db50f2 100644 --- a/drape/vertex_array_buffer.hpp +++ b/drape/vertex_array_buffer.hpp @@ -76,7 +76,8 @@ private: ref_ptr GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic); ref_ptr GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const; - void Bind() const; + bool Bind() const; + void Unbind() const; void BindStaticBuffers() const; void BindDynamicBuffers() const; void BindBuffers(TBuffersMap const & buffers) const; From f4866551aa710971135c1ed39c125a0b154310b0 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 May 2016 13:11:48 +0300 Subject: [PATCH 53/87] [ios] Fixed duplicate our & system location forbidden alert. --- iphone/Maps/Platform/LocationManager.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm index 344d745204..237ff53431 100644 --- a/iphone/Maps/Platform/LocationManager.mm +++ b/iphone/Maps/Platform/LocationManager.mm @@ -166,7 +166,7 @@ map const kGeoSettings{ } } else - [self observer:observer onLocationError:location::EDenied]; + [self observer:observer onLocationError:location::EGPSIsOff]; } else { From a1edf3069ad7dea776ffb9d39de5f355e6c7794a Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Tue, 10 May 2016 13:13:48 +0300 Subject: [PATCH 54/87] Refuse to save or fix wrong closing spans. --- .../MWMOpeningHoursAddClosedTableViewCell.xib | 8 ++-- .../OpeningHours/MWMOpeningHoursSection.mm | 39 ++++++++++++------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib index f5ef84d8f4..166d9fd8b7 100644 --- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib +++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib @@ -16,16 +16,14 @@