From b3a74387aafdfff963e50de77f6febb5a565c9f4 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 10:12:48 +0300 Subject: =?UTF-8?q?[ios]=20Updated=20what=E2=80=99s=20new=20images.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIcon.appiconset/Contents.json | 20 ++++++++++++++++++ .../Contents.json | 23 --------------------- .../img_bikecycle_navigation.png | Bin 17944 -> 0 bytes .../img_bikecycle_navigation@2x.png | Bin 36380 -> 0 bytes .../img_bikecycle_navigation@3x.png | Bin 86232 -> 0 bytes .../Whats New/img_booking.imageset/Contents.json | 23 --------------------- .../Whats New/img_booking.imageset/img_booking.png | Bin 20797 -> 0 bytes .../img_booking.imageset/img_booking@2x.png | Bin 39980 -> 0 bytes .../img_booking.imageset/img_booking@3x.png | Bin 88149 -> 0 bytes .../img_editor_upd.imageset/Contents.json | 23 --------------------- .../img_editor_upd.imageset/img_editor_upd.png | Bin 22761 -> 0 bytes .../img_editor_upd.imageset/img_editor_upd@2x.png | Bin 48733 -> 0 bytes .../img_editor_upd.imageset/img_editor_upd@3x.png | Bin 80567 -> 0 bytes .../Whats New/img_nightmode.imageset/Contents.json | 23 --------------------- .../img_nightmode.imageset/img_nightmode.png | Bin 26144 -> 0 bytes .../img_nightmode.imageset/img_nightmode@2x.png | Bin 70672 -> 0 bytes .../img_nightmode.imageset/img_nightmode@3x.png | Bin 137200 -> 0 bytes .../Contents.json | 23 --------------------- .../img_whatsnew_car_navigation.png | Bin 25221 -> 0 bytes .../img_whatsnew_car_navigation@2x.png | Bin 51286 -> 0 bytes .../img_whatsnew_car_navigation@3x.png | Bin 80604 -> 0 bytes .../Contents.json | 23 --------------------- .../img_whatsnew_cycle_navigation_improved.png | Bin 31295 -> 0 bytes .../img_whatsnew_cycle_navigation_improved@2x.png | Bin 66047 -> 0 bytes .../img_whatsnew_cycle_navigation_improved@3x.png | Bin 106350 -> 0 bytes .../Contents.json | 23 +++++++++++++++++++++ .../imgWhatsnewRouteProfile.png | Bin 0 -> 37157 bytes .../imgWhatsnewRouteProfile@2x.png | Bin 0 -> 80068 bytes .../imgWhatsnewRouteProfile@3x.png | Bin 0 -> 128615 bytes 29 files changed, 43 insertions(+), 138 deletions(-) delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.png create mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.png create mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.png create mode 100644 iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.png diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json index 6cbda5854e..4710409257 100644 --- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -36,6 +46,16 @@ "filename" : "60x60@3x.png", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", diff --git a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json deleted file mode 100644 index 429f4f075a..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_bikecycle_navigation.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_bikecycle_navigation@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_bikecycle_navigation@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.png b/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.png deleted file mode 100644 index 19a933fad4..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.png deleted file mode 100644 index 2bb7f1e9cc..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.png deleted file mode 100644 index 13681f59ed..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json deleted file mode 100644 index d758a56231..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_booking.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_booking@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_booking@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.png b/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.png deleted file mode 100644 index c3610ee802..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.png deleted file mode 100644 index 233f6599c1..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.png deleted file mode 100644 index 8449de153b..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/Contents.json deleted file mode 100644 index ddcf422c70..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_editor_upd.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_editor_upd@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_editor_upd@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.png b/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.png deleted file mode 100644 index a88e0172be..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.png deleted file mode 100644 index 6f25a4e6f7..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.png deleted file mode 100644 index 8187fe6d26..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/Contents.json deleted file mode 100644 index 47ad4fd7a6..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_nightmode.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_nightmode@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_nightmode@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.png b/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.png deleted file mode 100644 index 713daa082d..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.png deleted file mode 100644 index c4bf575ae4..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.png deleted file mode 100644 index a31af11dfb..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/Contents.json deleted file mode 100644 index 1c4efc0376..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_whatsnew_car_navigation.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_whatsnew_car_navigation@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_whatsnew_car_navigation@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.png deleted file mode 100644 index 6bce547629..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.png deleted file mode 100644 index 9c5533a3b7..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.png deleted file mode 100644 index 897c940ea4..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/Contents.json deleted file mode 100644 index 88064ec561..0000000000 --- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_whatsnew_cycle_navigation_improved.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_whatsnew_cycle_navigation_improved@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_whatsnew_cycle_navigation_improved@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.png deleted file mode 100644 index f987a160b9..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.png deleted file mode 100644 index 16f8e96546..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.png deleted file mode 100644 index bd44ded4c1..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json new file mode 100644 index 0000000000..aa8ec701ce --- /dev/null +++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "imgWhatsnewRouteProfile.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "imgWhatsnewRouteProfile@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "imgWhatsnewRouteProfile@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.png new file mode 100644 index 0000000000..f8d56278c1 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.png new file mode 100644 index 0000000000..e1c2314ac4 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.png new file mode 100644 index 0000000000..1deb14c97a Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.png differ -- cgit v1.2.3 From b515cd3e38e8a35cd810a162554f782a3a7f1e2f Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 10:13:27 +0300 Subject: =?UTF-8?q?[ios]=20Added=20profile=20&=20booking=20what=E2=80=99s?= =?UTF-8?q?=20new.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Welcome/MWMWhatsNewProfileBookingController.h | 5 + .../Welcome/MWMWhatsNewProfileBookingController.mm | 68 +++++ .../MapViewControls/Welcome/Welcome.storyboard | 324 ++++++++++++++------- iphone/Maps/Classes/MapViewController.mm | 4 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 8 + 5 files changed, 294 insertions(+), 115 deletions(-) create mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h create mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h new file mode 100644 index 0000000000..99a345c269 --- /dev/null +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h @@ -0,0 +1,5 @@ +#import "MWMWelcomeController.h" + +@interface MWMWhatsNewProfileBookingController : MWMWelcomeController + +@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm new file mode 100644 index 0000000000..f24c1cb611 --- /dev/null +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm @@ -0,0 +1,68 @@ +#import "MWMWhatsNewProfileBookingController.h" +#import "MWMPageController.h" + +@interface MWMWhatsNewProfileBookingController () + +@property(weak, nonatomic) IBOutlet UIView * containerView; +@property(weak, nonatomic) IBOutlet UIImageView * image; +@property(weak, nonatomic) IBOutlet UILabel * alertTitle; +@property(weak, nonatomic) IBOutlet UILabel * alertText; +@property(weak, nonatomic) IBOutlet UIButton * nextPageButton; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; + +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; + +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; + +@end + +namespace +{ +NSArray * pagesConfigBlocks = @[ + [^(MWMWhatsNewProfileBookingController * controller) { + controller.image.image = [UIImage imageNamed:@"img_whatsnew_route_profile"]; + controller.alertTitle.text = L(@"whats_new_route_profile_title"); + controller.alertText.text = L(@"whats_new_route_profile_message"); + [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; + [controller.nextPageButton addTarget:controller.pageController + action:@selector(nextPage) + forControlEvents:UIControlEventTouchUpInside]; + } copy], + [^(MWMWhatsNewProfileBookingController * controller) { + controller.image.image = [UIImage imageNamed:@"img_whatsnew_booking_improved"]; + controller.alertTitle.text = L(@"whats_new_booking_improve_title"); + controller.alertText.text = L(@"whats_new_booking_improve_message"); + [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; + [controller.nextPageButton addTarget:controller.pageController + action:@selector(close) + forControlEvents:UIControlEventTouchUpInside]; + } copy] +]; + +} // namespace + +@implementation MWMWhatsNewProfileBookingController + ++ (NSString *)udWelcomeWasShownKey { return @"WhatsNewProfileBookingWasShown"; } ++ (NSArray *)pagesConfig { return pagesConfigBlocks; } +- (IBAction)close { [self.pageController close]; } +#pragma mark - Properties + +- (void)setSize:(CGSize)size +{ + super.size = size; + CGSize const newSize = super.size; + CGFloat const width = newSize.width; + CGFloat const height = newSize.height; + BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); + self.titleImageOffset.priority = + hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; + self.image.hidden = hideImage; + self.containerWidth.constant = width; + self.containerHeight.constant = height; +} + +@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard index bf20c31837..75bc9d3674 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard @@ -1,20 +1,16 @@ - + - + + - + HelveticaNeue-Medium - HelveticaNeue-Medium - HelveticaNeue-Medium - HelveticaNeue-Medium - HelveticaNeue-Medium - HelveticaNeue-Medium - + @@ -26,20 +22,16 @@ - + - - - - @@ -47,9 +39,8 @@ - + @@ -84,7 +74,7 @@ - + @@ -95,16 +85,15 @@ - + @@ -179,20 +168,16 @@ - + - - - - @@ -200,9 +185,8 @@ - + @@ -237,7 +220,7 @@ - + @@ -248,16 +231,15 @@ - + @@ -320,20 +302,16 @@ - + - - - - @@ -341,9 +319,8 @@ - + @@ -378,7 +354,7 @@ - + @@ -389,16 +365,15 @@ - + @@ -461,20 +436,16 @@ - + - - - - @@ -482,9 +453,8 @@ - + @@ -519,7 +488,7 @@ - + @@ -530,16 +499,15 @@ - + @@ -633,20 +600,16 @@ - + - - - - @@ -654,9 +617,8 @@ - + @@ -691,7 +652,7 @@ - + @@ -702,16 +663,15 @@ - + @@ -739,12 +699,11 @@ - + @@ -894,12 +846,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 6f074f3ed5..1e2d6c1a27 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -25,7 +25,7 @@ #import "MWMSettings.h" #import "MWMStorage.h" #import "MWMTableViewController.h" -#import "MWMWhatsNewNavigationController.h" +#import "MWMWhatsNewProfileBookingController.h" #import "MapsAppDelegate.h" #import "Statistics.h" #import "UIColor+MapsMeColor.h" @@ -301,7 +301,7 @@ BOOL gIsFirstMyPositionMode = YES; if (isIOS7) return; - Class whatsNewClass = [MWMWhatsNewNavigationController class]; + Class whatsNewClass = [MWMWhatsNewProfileBookingController class]; BOOL const isFirstSession = [Alohalytics isFirstSession]; Class welcomeClass = isFirstSession ? [MWMFirstLaunchController class] : whatsNewClass; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 3b8e1a7e43..35bc12552c 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -217,6 +217,8 @@ 349C3AED1D33A933002AC7A9 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349C3AEB1D33A933002AC7A9 /* MWMNavigationInfoView.mm */; }; 349C3AEF1D33A96B002AC7A9 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349C3AEE1D33A96B002AC7A9 /* MWMNavigationInfoView.xib */; }; 349C3AF01D33A96B002AC7A9 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349C3AEE1D33A96B002AC7A9 /* MWMNavigationInfoView.xib */; }; + 349CCECE1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */; }; + 349CCECF1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */; }; 34A62D4E1C903533007FDCB7 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4C1C903533007FDCB7 /* Fabric.framework */; }; 34A62D4F1C903533007FDCB7 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4C1C903533007FDCB7 /* Fabric.framework */; }; 34A62D501C903533007FDCB7 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A62D4D1C903533007FDCB7 /* Crashlytics.framework */; }; @@ -1116,6 +1118,8 @@ 349C3AEB1D33A933002AC7A9 /* MWMNavigationInfoView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationInfoView.mm; sourceTree = ""; }; 349C3AEE1D33A96B002AC7A9 /* MWMNavigationInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationInfoView.xib; sourceTree = ""; }; 349C3AF11D33C6EE002AC7A9 /* MWMNavigationDashboardInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardInfoProtocol.h; sourceTree = ""; }; + 349CCECC1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMWhatsNewProfileBookingController.h; path = Welcome/MWMWhatsNewProfileBookingController.h; sourceTree = ""; }; + 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewProfileBookingController.mm; path = Welcome/MWMWhatsNewProfileBookingController.mm; sourceTree = ""; }; 34A62D4C1C903533007FDCB7 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = ""; }; 34A62D4D1C903533007FDCB7 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = ""; }; 34AA7D9D1D63543E00254037 /* MWMRouterSavedState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterSavedState.h; sourceTree = ""; }; @@ -2932,6 +2936,8 @@ 345A2DCA1D0B0EB600A7DD39 /* MWMWhatsNewBookingBicycleRoutingController.mm */, 34664CF81D4A0262003D7096 /* MWMWhatsNewNavigationController.h */, 34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */, + 349CCECC1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.h */, + 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */, ); name = Welcome; sourceTree = ""; @@ -3867,6 +3873,7 @@ 348C26051D701B9F00813924 /* MWMHelpController.mm in Sources */, 348868EB1D8721650069BBA3 /* MWMSearchNoResults.mm in Sources */, 341F99D91C6B1165001C67B8 /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */, + 349CCECE1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm in Sources */, 345FD7E71CEC7D8400F58045 /* MWMEditorAdditionalNamesHeader.mm in Sources */, 341F99D51C6B1165001C67B8 /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */, 347FD86F1C60B2CE002FB65E /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, @@ -4101,6 +4108,7 @@ 348C26061D701B9F00813924 /* MWMHelpController.mm in Sources */, 348868EC1D8721650069BBA3 /* MWMSearchNoResults.mm in Sources */, 6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */, + 349CCECF1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm in Sources */, 345FD7E81CEC7D8400F58045 /* MWMEditorAdditionalNamesHeader.mm in Sources */, 347FD8701C60B2CE002FB65E /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, 6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */, -- cgit v1.2.3 From 48b03897fa60bd67e7aa3636fcadc06434f9a8a2 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 13:05:06 +0300 Subject: [ios] Added elevation icon. --- .../ic_elevation.imageset/Contents.json | 26 +++++++++++++++++++++ .../ic_elevation.imageset/ic_elevation.png | Bin 0 -> 106 bytes .../ic_elevation.imageset/ic_elevation@2x.png | Bin 0 -> 130 bytes .../ic_elevation.imageset/ic_elevation@3x.png | Bin 0 -> 153 bytes 4 files changed, 26 insertions(+) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.png diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json new file mode 100644 index 0000000000..91f4d2540c --- /dev/null +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_elevation.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_elevation@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_elevation@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.png new file mode 100644 index 0000000000..4015d7f1ab Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.png differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.png new file mode 100644 index 0000000000..e910dc9340 Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.png differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.png new file mode 100644 index 0000000000..082633c3dd Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.png differ -- cgit v1.2.3 From a727d67ffe7a67190cac7dfa95fad9f9b4189a9d Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 13:05:27 +0300 Subject: [ios] Added elevation support. --- .../BottomMenu/MWMBottomMenuView.mm | 20 ++- .../BottomMenu/MWMBottomMenuViewController.xib | 139 +++++++++++---------- .../MapViewControls/MWMMapViewControlsManager.mm | 3 +- .../Views/RoutePreview/MWMRoutePreview.mm | 16 ++- .../Views/RoutePreview/MWMRoutePreview.xib | 28 ++--- .../Views/RoutePreview/MWMiPadRoutePreview.xib | 112 +++++++++-------- iphone/Maps/Classes/MWMTypes.h | 1 - iphone/Maps/Classes/Routing/MWMRouter.h | 4 +- iphone/Maps/Classes/Routing/MWMRouter.mm | 11 +- 9 files changed, 191 insertions(+), 143 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index d51c2e4a75..1e3b2be005 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -8,6 +8,7 @@ #import "UIButton+RuntimeAttributes.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" +#import "UIImageView+Coloring.h" #import "UIView+RuntimeAttributes.h" #include "Framework.h" @@ -84,6 +85,9 @@ CGFloat constexpr kTimeWidthRegular = 128; @property(weak, nonatomic) IBOutlet UILabel * estimateLabel; @property(weak, nonatomic) IBOutlet UIView * heightProfileContainer; @property(weak, nonatomic) IBOutlet UIImageView * heightProfileImage; +@property(weak, nonatomic) IBOutlet UIView * heightProfileElevation; +@property(weak, nonatomic) IBOutlet UIImageView * elevationImage; +@property(weak, nonatomic) IBOutlet UILabel * elevationHeight; @property(weak, nonatomic) IBOutlet UIPageControl * pageControl; @property(weak, nonatomic) IBOutlet NSLayoutConstraint * pageControlTopOffset; @@ -112,6 +116,7 @@ CGFloat constexpr kTimeWidthRegular = 128; self.goButton.hidden = YES; self.estimateLabel.hidden = YES; self.heightProfileContainer.hidden = YES; + self.heightProfileElevation.hidden = YES; self.toggleInfoButton.hidden = YES; self.speedView.hidden = YES; self.timeView.hidden = YES; @@ -123,6 +128,7 @@ CGFloat constexpr kTimeWidthRegular = 128; [self.goButton setBackgroundColor:[UIColor linkBlue] forState:UIControlStateNormal]; [self.goButton setBackgroundColor:[UIColor linkBlueHighlighted] forState:UIControlStateHighlighted]; + self.elevationImage.mwm_coloring = MWMImageColoringBlue; } - (void)layoutSubviews @@ -253,8 +259,9 @@ CGFloat constexpr kTimeWidthRegular = 128; return; dispatch_async(dispatch_get_main_queue(), ^{ [[MWMRouter router] routeAltitudeImageForSize:self.heightProfileImage.frame.size - completion:^(UIImage * image) { + completion:^(UIImage * image, NSString * altitudeElevation) { self.heightProfileImage.image = image; + self.elevationHeight.text = altitudeElevation; }]; }); } @@ -331,6 +338,8 @@ CGFloat constexpr kTimeWidthRegular = 128; if (isLandscape) { self.mainButtonsHeight.constant = kBicyclePlanningMainButtonsHeightLandscape; + if ([MWMRouter hasRouteAltitude]) + self.estimateLabelTopOffset.priority = UILayoutPriorityDefaultHigh; } else { @@ -611,6 +620,7 @@ CGFloat constexpr kTimeWidthRegular = 128; self.goButton.hidden = NO; self.estimateLabel.hidden = YES; self.heightProfileContainer.hidden = YES; + self.heightProfileElevation.hidden = YES; self.toggleInfoButton.hidden = YES; self.speedView.hidden = YES; self.timeView.hidden = YES; @@ -620,10 +630,13 @@ CGFloat constexpr kTimeWidthRegular = 128; self.routingAdditionalView.hidden = YES; break; case MWMBottomMenuStateGo: + { self.goButton.enabled = YES; self.goButton.hidden = NO; self.estimateLabel.hidden = NO; - self.heightProfileContainer.hidden = ![MWMRouter hasRouteAltitude]; + BOOL const hasAltitude = [MWMRouter hasRouteAltitude]; + self.heightProfileContainer.hidden = !hasAltitude; + self.heightProfileElevation.hidden = !hasAltitude; self.toggleInfoButton.hidden = YES; self.speedView.hidden = YES; self.timeView.hidden = YES; @@ -632,11 +645,13 @@ CGFloat constexpr kTimeWidthRegular = 128; self.routingView.hidden = NO; self.routingAdditionalView.hidden = YES; break; + } case MWMBottomMenuStateRouting: self.menuButton.hidden = NO; self.goButton.hidden = YES; self.estimateLabel.hidden = YES; self.heightProfileContainer.hidden = YES; + self.heightProfileElevation.hidden = YES; self.toggleInfoButton.hidden = NO; self.speedView.hidden = NO; self.timeView.hidden = NO; @@ -650,6 +665,7 @@ CGFloat constexpr kTimeWidthRegular = 128; self.goButton.hidden = YES; self.estimateLabel.hidden = YES; self.heightProfileContainer.hidden = YES; + self.heightProfileElevation.hidden = YES; self.toggleInfoButton.hidden = NO; self.speedView.hidden = NO; self.timeView.hidden = NO; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib index e58db73e85..210d40691b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib @@ -1,9 +1,10 @@ - + - + + @@ -32,11 +33,9 @@ - - - - + @@ -270,6 +275,7 @@ + @@ -283,21 +289,23 @@ + - + + + - - + @@ -325,7 +332,7 @@ - + @@ -352,8 +359,7 @@ - - + @@ -362,8 +368,7 @@ - - + @@ -374,10 +379,8 @@ - - + @@ -442,7 +443,7 @@ - + @@ -470,11 +471,14 @@ + + + @@ -507,10 +511,13 @@ + + + diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index fde4de0659..3c87ec2b15 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -240,8 +240,7 @@ extern NSString * const kAlohalyticsTapEventKey; { if (!self.searchHidden) self.searchManager.state = MWMSearchManagerStateHidden; - else if (MapsAppDelegate.theApp.routingPlaneMode != MWMRoutingPlaneModeNone) - [[MWMRouter router] stop]; + [[MWMRouter router] stop]; } else { diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index 1d6890c305..8e07ef3f8a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -7,6 +7,7 @@ #import "MWMRouter.h" #import "Statistics.h" #import "UIButton+Orientation.h" +#import "UIImageView+Coloring.h" static CGFloat constexpr kAdditionalHeight = 20.; @@ -33,6 +34,9 @@ static CGFloat constexpr kAdditionalHeight = 20.; @property(weak, nonatomic) IBOutlet NSLayoutConstraint * resultsBoxHeight; @property(weak, nonatomic) IBOutlet NSLayoutConstraint * heightBoxHeight; @property(weak, nonatomic) IBOutlet UIImageView * heightProfileImage; +@property(weak, nonatomic) IBOutlet UIView * heightProfileElevation; +@property(weak, nonatomic) IBOutlet UIImageView * elevationImage; +@property(weak, nonatomic) IBOutlet UILabel * elevationHeight; @property(nonatomic) UIImageView * movingCellImage; @@ -57,6 +61,8 @@ static CGFloat constexpr kAdditionalHeight = 20.; [self setupProgresses]; [self.backButton matchInterfaceOrientation]; + + self.elevationImage.mwm_coloring = MWMImageColoringBlue; } - (void)setupProgresses @@ -111,6 +117,7 @@ static CGFloat constexpr kAdditionalHeight = 20.; self.statusBox.hidden = YES; self.resultsBox.hidden = YES; self.heightBox.hidden = YES; + self.heightProfileElevation.hidden = YES; self.planningBox.hidden = YES; self.errorBox.hidden = YES; } @@ -123,6 +130,7 @@ static CGFloat constexpr kAdditionalHeight = 20.; self.statusBox.hidden = NO; self.resultsBox.hidden = YES; self.heightBox.hidden = YES; + self.heightProfileElevation.hidden = YES; self.errorBox.hidden = YES; self.planningBox.hidden = NO; [self reloadData]; @@ -138,6 +146,7 @@ static CGFloat constexpr kAdditionalHeight = 20.; self.planningBox.hidden = YES; self.resultsBox.hidden = YES; self.heightBox.hidden = YES; + self.heightProfileElevation.hidden = YES; self.errorBox.hidden = NO; if (IPAD) [self iPadNotReady]; @@ -151,7 +160,9 @@ static CGFloat constexpr kAdditionalHeight = 20.; self.planningBox.hidden = YES; self.errorBox.hidden = YES; self.resultsBox.hidden = NO; - self.heightBox.hidden = ![MWMRouter hasRouteAltitude]; + BOOL const hasAltitude = [MWMRouter hasRouteAltitude]; + self.heightBox.hidden = !hasAltitude; + self.heightProfileElevation.hidden = !hasAltitude; if (IPAD) [self iPadReady]; } @@ -183,8 +194,9 @@ static CGFloat constexpr kAdditionalHeight = 20.; return; dispatch_async(dispatch_get_main_queue(), ^{ [[MWMRouter router] routeAltitudeImageForSize:self.heightProfileImage.frame.size - completion:^(UIImage * image) { + completion:^(UIImage * image, NSString * altitudeElevation) { self.heightProfileImage.image = image; + self.elevationHeight.text = altitudeElevation; }]; }); } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib index 3598f19243..66c4aea348 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib @@ -1,8 +1,9 @@ - + - + + @@ -16,10 +17,8 @@ - - - - + - - + - - + - + @@ -70,21 +65,18 @@ - - - + @@ -99,7 +91,7 @@ - + @@ -121,7 +113,7 @@ - + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib index e008a705db..7452dc54a8 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib @@ -1,14 +1,15 @@ - + - + + - + HelveticaNeue-Medium - + @@ -22,10 +23,8 @@ - - - - + - - + - - + - + @@ -75,8 +70,7 @@ - - + @@ -96,7 +90,7 @@ - + @@ -113,15 +107,12 @@ - - - + - - + - + + + + + + + + + + + + + + + + + + + + - + - + + + - - - - - + - + @@ -211,7 +223,7 @@ - + @@ -221,7 +233,7 @@ - + @@ -241,7 +253,7 @@ - + @@ -250,15 +262,13 @@ - - + @@ -282,7 +292,7 @@ - + @@ -291,7 +301,7 @@ - + @@ -310,7 +320,7 @@ - + @@ -326,10 +336,13 @@ + + + @@ -345,6 +358,7 @@ + diff --git a/iphone/Maps/Classes/MWMTypes.h b/iphone/Maps/Classes/MWMTypes.h index 83ba4cdbe9..07c22bd11f 100644 --- a/iphone/Maps/Classes/MWMTypes.h +++ b/iphone/Maps/Classes/MWMTypes.h @@ -1,3 +1,2 @@ typedef void (^TMWMVoidBlock)(); typedef void (^MWMStringBlock)(NSString *); -typedef void (^MWMImageBlock)(UIImage *); diff --git a/iphone/Maps/Classes/Routing/MWMRouter.h b/iphone/Maps/Classes/Routing/MWMRouter.h index 0f93fb5ef3..6db63518cb 100644 --- a/iphone/Maps/Classes/Routing/MWMRouter.h +++ b/iphone/Maps/Classes/Routing/MWMRouter.h @@ -2,6 +2,8 @@ #include "routing/router.hpp" +typedef void (^MWMImageHeightBlock)(UIImage *, NSString *); + @interface MWMRouter : NSObject + (MWMRouter *)router; @@ -21,7 +23,7 @@ - (void)rebuildWithBestRouter:(BOOL)bestRouter; - (void)start; - (void)stop; -- (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageBlock)block; +- (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageHeightBlock)block; - (instancetype)init __attribute__((unavailable("call +router instead"))); - (instancetype)copy __attribute__((unavailable("call +router instead"))); diff --git a/iphone/Maps/Classes/Routing/MWMRouter.mm b/iphone/Maps/Classes/Routing/MWMRouter.mm index 1f5e9ccb97..bd8d722012 100644 --- a/iphone/Maps/Classes/Routing/MWMRouter.mm +++ b/iphone/Maps/Classes/Routing/MWMRouter.mm @@ -19,6 +19,7 @@ #include "Framework.h" #include "platform/local_country_file_utils.hpp" +#include "platform/measurement_utils.hpp" using namespace routing; @@ -41,6 +42,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi @property(nonatomic, readwrite) MWMRoutePoint finishPoint; @property(nonatomic) NSMutableDictionary * altitudeImagesData; +@property(nonatomic) NSString * altitudeElevation; @property(nonatomic) dispatch_queue_t renderAltitudeImagesQueue; @end @@ -270,7 +272,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi [[MWMNavigationDashboardManager manager] updateFollowingInfo:info]; } -- (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageBlock)block +- (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageHeightBlock)block { dispatch_async(self.renderAltitudeImagesQueue, ^{ if (![MWMRouter hasRouteAltitude]) @@ -300,13 +302,17 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi return; imageData = [NSData dataWithBytes:imageRGBAData.data() length:imageRGBAData.size()]; self.altitudeImagesData[sizeValue] = imageData; + + string heightString; + measurement_utils::FormatDistance(maxRouteAltitude - minRouteAltitude, heightString); + self.altitudeElevation = @(heightString.c_str()); } UIImage * altitudeImage = [UIImage imageWithRGBAData:imageData width:width height:height]; if (altitudeImage) { dispatch_async(dispatch_get_main_queue(), ^{ - block(altitudeImage); + block(altitudeImage, self.altitudeElevation); }); } }); @@ -316,6 +322,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi { dispatch_async(self.renderAltitudeImagesQueue, ^{ [self.altitudeImagesData removeAllObjects]; + self.altitudeElevation = nil; }); } -- cgit v1.2.3 From 3aa1988c93d1324de70d8fb098d02d65ac59d5fc Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 15:28:19 +0300 Subject: [ios] Fixed project settings. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 35bc12552c..b0f38f645b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -276,8 +276,8 @@ 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; 34BF68601D74585D001752F6 /* MWMSearch+CoreSpotlight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF685F1D74585D001752F6 /* MWMSearch+CoreSpotlight.mm */; }; 34BF68611D74585D001752F6 /* MWMSearch+CoreSpotlight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF685F1D74585D001752F6 /* MWMSearch+CoreSpotlight.mm */; }; - 34BF68631D7459E6001752F6 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BF68621D7459E6001752F6 /* CoreSpotlight.framework */; }; - 34BF68641D7459EF001752F6 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BF68621D7459E6001752F6 /* CoreSpotlight.framework */; }; + 34BF68631D7459E6001752F6 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BF68621D7459E6001752F6 /* CoreSpotlight.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 34BF68641D7459EF001752F6 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BF68621D7459E6001752F6 /* CoreSpotlight.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 34C2431B1CEDBDBA0006B7DC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C2431A1CEDBDBA0006B7DC /* MWMEditorAdditionalNamesTableViewController.mm */; }; 34C2431C1CEDBDBA0006B7DC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C2431A1CEDBDBA0006B7DC /* MWMEditorAdditionalNamesTableViewController.mm */; }; 34C659471BD12A77009DC20A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; }; @@ -3291,6 +3291,7 @@ }; 6741A93D1BF340DE002C974C = { DevelopmentTeam = 3T6FSDE8C7; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Push = { enabled = 1; @@ -4234,7 +4235,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_ENTITLEMENTS = Entitlements/me.maps.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", @@ -4262,6 +4264,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", @@ -4290,6 +4294,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", @@ -4321,6 +4327,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", @@ -4349,6 +4357,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", @@ -4380,6 +4390,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/PushNotifications", -- cgit v1.2.3 From 123aca5cc216c7133a4ba81e4d7e500a120d9dad Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 16 Sep 2016 15:57:03 +0300 Subject: [ios] Remove keyboard on category search. --- .../Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm | 1 + .../Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm | 1 + .../MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h | 1 + 3 files changed, 3 insertions(+) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm index 58293bb5ea..7dbfe0f33c 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm @@ -182,6 +182,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey"; self.state = MWMSearchManagerStateHidden; } +- (void)dismissKeyboard { [self.searchTextField resignFirstResponder]; } - (void)processSearchWithResult:(search::Result const &)result { MapsAppDelegate * a = MapsAppDelegate.theApp; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm index 0301853ce3..7a9af94411 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm @@ -70,6 +70,7 @@ static NSString * const kCellIdentifier = @"MWMSearchCategoryCell"; withParameters:@{kStatValue : string, kStatScreen : kStatCategories}]; [self.delegate searchText:[L(string) stringByAppendingString:@" "] forInputLocale:[[AppInfo sharedInfo] languageId]]; + [self.delegate dismissKeyboard]; } @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h index c57a00dd46..27efb1932f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h @@ -4,5 +4,6 @@ - (void)searchText:(NSString *)text forInputLocale:(NSString *)locale; - (void)tapMyPositionFromHistory; +- (void)dismissKeyboard; @end -- cgit v1.2.3 From 0a9dd53dfe0c0ea6e21a5367ddff9bf5459d4a9b Mon Sep 17 00:00:00 2001 From: Timofey Date: Fri, 16 Sep 2016 19:34:58 +0300 Subject: Added the L() macro --- iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index a62e7a33b9..ce71576b6b 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -121,7 +121,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; + (instancetype)noWiFiAlertWithOkBlock:(TMWMVoidBlock)okBlock { kStatisticsEvent = @"No WiFi Alert"; - MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"download_over_mobile_header" + MWMDefaultAlert * alert = [self defaultAlertWithTitle:L(@"download_over_mobile_header") message:L(@"download_over_mobile_message") rightButtonTitle:L(@"use_cellular_data") leftButtonTitle:L(@"cancel") -- cgit v1.2.3 From 972a42945b6ba22c9cd355d9e7e3eef1e9478dcf Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Mon, 19 Sep 2016 13:23:38 +0300 Subject: [ios] Fixed about screen name & data version. --- iphone/Maps/MWMAboutController.mm | 6 +- iphone/Maps/Mapsme.storyboard | 1035 ++++++++++++++++++------------------- 2 files changed, 502 insertions(+), 539 deletions(-) diff --git a/iphone/Maps/MWMAboutController.mm b/iphone/Maps/MWMAboutController.mm index fae42359da..a5c82fd5f1 100644 --- a/iphone/Maps/MWMAboutController.mm +++ b/iphone/Maps/MWMAboutController.mm @@ -7,6 +7,8 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" +#include "Framework.h" + #include "platform/platform.hpp" extern NSString * const kAlohalyticsTapEventKey; @@ -40,8 +42,8 @@ extern NSString * const kAlohalyticsTapEventKey; NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init]; dateFormatter.dateStyle = NSDateFormatterShortStyle; dateFormatter.timeStyle = NSDateFormatterNoStyle; - self.dateLabel.text = [NSString - stringWithFormat:@"%@ %@", L(@"date"), [dateFormatter stringFromDate:appInfo.buildDate]]; + auto const dataVersion = GetFramework().GetCurrentDataVersion(); + self.dateLabel.text = [NSString stringWithFormat:L(@"date"), dataVersion]; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard index 5a95fed4a9..d6fd76059e 100644 --- a/iphone/Maps/Mapsme.storyboard +++ b/iphone/Maps/Mapsme.storyboard @@ -1,17 +1,17 @@ - + - + + - + HelveticaNeue-Medium - HelveticaNeue-Medium - + @@ -23,9 +23,9 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -68,23 +68,22 @@ - + - + - + - + - + - + - - + @@ -218,17 +212,16 @@ - + - + - - + @@ -263,17 +255,16 @@ - + - + - - + @@ -308,16 +298,15 @@ - + - + - + - + - - + @@ -400,17 +386,16 @@ - + - + - - + @@ -449,16 +433,15 @@ - + - + - + - + - - + @@ -541,17 +521,16 @@ - + - + - - + @@ -586,16 +564,15 @@ - + - + - + @@ -1494,11 +1467,11 @@ - - + + - - - + + @@ -1521,8 +1494,8 @@ - - + + @@ -1531,7 +1504,7 @@ - + @@ -1549,7 +1522,7 @@ - + @@ -1593,15 +1566,15 @@ - + - - + + - - - + + + @@ -1609,8 +1582,8 @@ - - + + @@ -1624,9 +1597,9 @@ - - - + + + @@ -1634,8 +1607,8 @@ - - + + @@ -1649,9 +1622,9 @@ - - - + + + @@ -1660,7 +1633,7 @@ - + @@ -1685,8 +1658,8 @@ - - - - + @@ -1784,21 +1757,21 @@ - + - - + + - - + @@ -1972,21 +1943,21 @@ - - + + - - + + - - + @@ -2037,27 +2008,26 @@ - - + + - - - + + + - - - + + + - + @@ -2108,8 +2076,8 @@ - - + @@ -2146,7 +2114,7 @@ - + @@ -2192,26 +2160,26 @@ - + - - - + + + - - - + + + - + @@ -2235,29 +2203,29 @@ - + - + - + - + @@ -2279,9 +2247,9 @@ - + - + @@ -2302,12 +2270,12 @@ - + - - - + + + @@ -2316,10 +2284,10 @@ - - - - + + + + @@ -2329,7 +2297,7 @@ - + @@ -2339,20 +2307,20 @@ - - - + + + - + - + @@ -2388,12 +2356,12 @@ - + - - - + + + @@ -2402,10 +2370,10 @@ - - - - + + + + @@ -2415,7 +2383,7 @@ - + @@ -2425,20 +2393,20 @@ - - - + + + - + - + @@ -2473,12 +2441,12 @@ - + - - - + + + @@ -2488,21 +2456,21 @@ - - + + - - - + + + - - - + @@ -2555,10 +2523,10 @@ - - - - + + + + @@ -2568,7 +2536,7 @@ - + @@ -2578,26 +2546,26 @@ - - - + + + - + - - + @@ -2651,12 +2619,12 @@ - + - - - + + + @@ -2666,21 +2634,21 @@ - - + + - - - + + + - - - + @@ -2733,9 +2701,9 @@ - - - + + + @@ -2745,7 +2713,7 @@ - + @@ -2756,7 +2724,7 @@ - + @@ -2809,16 +2777,12 @@ - - - - @@ -2826,9 +2790,8 @@ - + @@ -2867,7 +2829,7 @@ - + @@ -2878,15 +2840,14 @@ - + @@ -2932,7 +2893,7 @@ - + @@ -2958,30 +2919,30 @@ - + - - + + - - + + - - + + - - + + - - + @@ -3018,7 +2979,7 @@ - + @@ -3028,28 +2989,28 @@ - - + @@ -3129,7 +3090,7 @@ - + @@ -3164,23 +3125,23 @@ - + - + - + - + - - + - + - diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index da1d5aae35..1d1b971cb2 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -722,6 +722,10 @@ Název místa Další jazyky + + Zobrazit více + + Zobrazit méně Přidat jazyk Ulice @@ -946,4 +950,8 @@ Přijmout Odmítnout + Nejlepší je vyřešit to jednou pro vždy + U pěších a cyklistických tras nyní zobrazujeme výškový profil. + Ušetřete při rezervaci hotelů + Výsledky hledání hotelů nyní obsahují cenové kategorie. \nTaké jsme přidali více než 110 000 hotelů. diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 3057dd3772..70d5d958cc 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -719,6 +719,10 @@ Navn på sted Andre sprog + + Vis mere + + Vis mindre Tilføj et sprog Gade @@ -943,4 +947,8 @@ Accepter Afvis + Spring over hvor gærdet er lavest + Vi viser nu højdeprofilen for fodgænger- og cykelruter. + Spar penge når du bestiller hotelværelser + Søgeresultater for hoteller viser nu også priskategorien.\nVi har desuden tilføjet mere end 110.000 hoteller. diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index b157950c52..e17fb1e9b2 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -961,4 +961,8 @@ Annehmen Ablehnen + Am besten den leichtesten Weg gehen + Für Fußgänger- und Fahrradrouten zeigen wir nun das Höhenprofil an. + Beim Buchen von Hotels sparen + Suchergebnisse für Hotels enthalten jetzt die Kategorie Preis.\nAußerdem haben wir über 110.000 Hotels hinzugefügt. diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 100af46457..d37eb7f25a 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -710,6 +710,10 @@ Nombre del lugar Otros idiomas + + Mostrar más + + Mostrar menos Añadir un idioma Calle @@ -934,4 +938,8 @@ Aceptar Declinar + Más vale rodear que no ahogar + Ahora se muestra el perfil de elevación en los itinerarios pedestres y en bicicleta. + Ahorrar al reservar hoteles + La búsqueda de resultados de hoteles ahora contiene la categoría de precios.\nHemos añadido más de 110 000 hoteles. diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index cdaf4edbe6..41c00c221f 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -715,6 +715,10 @@ Paikan nimi Muut Kielet + + Näytä lisää + + Näytä vähemmän Lisää kieli Katu @@ -939,4 +943,8 @@ Hyväksy Hylkää + Parempi katsoa kuin katua + Näytämme nyt maaston korkeuden kävely- ja pyöräilyreittejä varten. + Säästä hotellivarauksissa + Hotellien hakutuloksissa näkyy nyt hintakategoria.\nLisäsimme myös yli 110 000 hotellia. diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 60d5e43cb8..4b2710382d 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -735,9 +735,9 @@ Autres langues - Voir plus + Afficher plus - Voir moins + Afficher moins Ajouter une langue Rue @@ -962,4 +962,8 @@ Accepter Refuser + C\'est en se bougeant que l\'on trouve des solutions + Pour les routes pédestres et cyclables nous affichons maintenant le profil d\'élévation. + Économisez de l\'argent en réservant des hôtels + Les résultats des recherches d\'hôtels comprennent maintenant la catégorie de prix.\nNous avons aussi ajouté plus de 110.000 hôtels. diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 2e14afdfb8..b4cfcb6d5a 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -716,6 +716,10 @@ Hely neve Más nyelv + + Továbbiak megjelenítése + + Kevesebb megjelenítése Nyelv hozzáadása Utca @@ -939,4 +943,8 @@ Elfogadja Elutasítja + Az árkot jobb megkerülni, mint beleesni + A gyalogos és kerékpáros utakat most már emelkedési profillal jelenítjük meg. + Takarékoskodjon szálláshely foglalásakor + A szálláshely keresési eredménye már tartalmazza az árkategóriát. \nEmellett kiegészítettük több mint 110.000 szálláshellyel. diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index c03987611f..2afe1fc12d 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -714,6 +714,10 @@ Nama tempat Bahasa lainnya + + Selengkapnya + + Kurangi Tambahkan bahasa Jalan @@ -938,4 +942,8 @@ Terima Tolak + Jalan-jalan dengan lebih aman dan nyaman + Untuk rute pejalan kaki dan sepeda, kami kini menampilkan profil elevasi. + Berhemat saat memesan hotel + Hasil pencarian untuk hotel kini disertai kategori harga.\nKami juga menambahkan lebih dari 110.000 hotel. diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index ef8fb0de5c..217cfb05a2 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -714,6 +714,10 @@ Nome del luogo Altre lingue + + Mostra altro + + Mostra meno Aggiungi una lingua Via @@ -938,4 +942,8 @@ Accetta Rifiuta + Meglio è tornar indietro, che correr male avanti + Per gli itinerari pedonali e ciclabili, è ora visualizzato il profilo altimetrico. + Risparmia alla prenotazione degli hotel + I risultati della ricerca per gli hotel contengono ora la categoria di prezzo.\nInoltre, abbiamo aggiunto più di 110.000 hotel. diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index e2b81f1642..97967b1a79 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -714,6 +714,10 @@ 場所の名前 その他の言語 + + 表示を増やす + + 表示を減らす 言語を追加 通り @@ -938,4 +942,8 @@ 了解 拒否 + 時は金なり。古きを捨て新しきを得よう。 + 歩行者とバイク用のルートに高度プロファイルが表示されるようになりました。 + ホテル予約時に節約しましょう + ホテルの検索結果に価格のカテゴリーが表示されるようになりました。\nさらに、 110,000 軒を超えるホテルを追加しました。 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 9e3dc0ebc9..716b809475 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -711,6 +711,10 @@ 지명 다른 언어 + + 자세히 표시 + + 간단히 표시 언어 추가 거리 @@ -935,4 +939,8 @@ 동의 거부 + 문제가 있으면 계속 어려움을 겪는 것보다 그만두는 게 낫습니다. + 보행자 및 자전거 도로를 위해 이제 고도 단면을 표시합니다. + 호텔 예약 시 절약 + 이제 가격 범주를 포함하는 호텔에 대한 결과를 검색하세요.\n또한 110,000곳 이상의 호텔이 추가되었습니다. diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 9ae44682ee..0689fa8dab 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -715,6 +715,10 @@ Stedsnavn Andre språk + + Vis mer + + Vis mindre Legg til et språk Gate @@ -937,4 +941,8 @@ Godta Avvis + Range vegen vert ikkje rett om det er mange som går han + Vi viser nå høydeprofilen med tanke på gå- og sykkelruter. + Spar penger når du bestiller hotell + Søkeresultatene for hoteller inneholder nå priskategori.\nVi har også lagt til flere enn 110.000 hoteller. diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 9a28fa2c12..a36ec444e0 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -715,6 +715,10 @@ Locatienaam Overige talen + + Meer Tonen + + Minder Tonen Een taal toevoegen Straat @@ -939,4 +943,8 @@ Aanvaarden Weigeren + Beter ten halve gekeerd, dan ten hele gedwaald + Voor wandel- en fietsroutes geven we nu het hoogteprofiel weer. + Bespaar op het boeken van hotels + Zoekresultaten voor hotels bevatten nu de prijscategorie.\nWe hebben ook meer dan 110.000 hotels toegevoegd. diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index c756b9f033..3063687ecb 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -724,6 +724,10 @@ Nazwa miejsca Inne języki + + Pokaż więcej + + Pokaż mniej Dodaj język Ulica @@ -948,4 +952,8 @@ Zaakceptuj Odrzuć + Kto drogi prostuje, ten w domu nie nocuje + Dla tras pieszych i rowerowych pokazujemy teraz też profil wysokościowy. + Oszczędzaj przy rezerwacji hotelów + Wyniki wyszukiwania hoteli zawierają teraz kategorię cenową. \nDodaliśmy też ponad 110 000 hoteli. diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 8a713a0c33..1f552cf58d 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -714,6 +714,10 @@ Nome do local Outros idiomas + + Mostrar mais + + Mostrar Menos Adicionar um idioma Rua @@ -938,4 +942,8 @@ Aceitar Declinar + Circular é viver + Nas rotas para peões e ciclovias apresentamos agora o perfil de elevação. + Poupe nas reservas de hotéis + Agora, os resultados da pesquisa de hotéis contêm a categoria de preços.\nAdicinámos mais de 110.000 hotéis. diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 7e9c81be72..7f37b07bfa 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -712,6 +712,10 @@ Denumire loc Alte limbi + + Arată mai multe + + Arată mai puține Adăugare limbă Stradă @@ -935,4 +939,8 @@ Acceptați Refuzați + Mai bine căutați soluții decât să greșiți + Pentru rutele pentru pietoni și bicicliști, afișam acum profilul de elevație. + Economisiți bani când rezervați hoteluri + Rezultatele de căutare pentru hoteluri conțin acum categoria de preț. \nAm mai adăugat și peste 110.000 de hoteluri. diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 2bcca5c4b2..05915fed30 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -963,4 +963,8 @@ Принять Отклонить + Умный в гору не пойдет + На пеших и веломаршрутах отображается профиль рельефа. + Экономь на бронировании отеля + Результаты поиска отелей на карте показывают ценовую категорию.\nОтелей для бронирования стало на 110 000 больше. diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 2d47829ec8..68902dce43 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -718,6 +718,10 @@ Názov miesta Iné jazyky + + Ukázať viac + + Ukázať menej Pridať jazyk Ulica @@ -942,4 +946,8 @@ Prijať Odmietnuť + Radšej dlhšia cesta, ale bezpečná + Pre pešie trasy a cyklotrasy sa odteraz zobrazuje aj výškový profil. + Ušetriť pri rezervácii hotelov + Výsledky vyhľadávania hotelov odteraz obsahujú aj cenové kategórie. \nTiež sme pridali viac ako 110 000 hotelov. diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 30c9fa2974..3d903d0880 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -719,6 +719,10 @@ Platsens namn Övriga språk + + Visa mer + + Visa mindre Lägg till ett språk Gata @@ -943,4 +947,8 @@ Acceptera Neka + Genvägar är senvägar + För gångvägar och cykelturer visar vi nu höjdprofilen. + Spara pengar när du bokar hotell + Sökresultat för hotell innehåller nu priskategorin.\nVi har även lagt till över 110 000 hotell. diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 754183b7a4..5e9df22fe4 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -721,6 +721,10 @@ ชื่อสถานที่ ภาษาอื่น ๆ + + แสดงเพิ่มเติม + + แสดงน้อยลง เพิ่มภาษา ถนน @@ -945,4 +949,8 @@ ยอมรับ ปฏิเสธ + ทำให้มันจบดีกว่าปล่อยให้มันรบกวนอยู่ + สำหรับเส้นทางคนเดินเท้าและจักรยาน ตอนนี้เราแสดงโปรไฟล์ระดับความสูงแล้ว + ประหยัดเมื่อจองโรงแรม + การค้นหาโรงแรมตอนนี้มีหมวดหมู่ราคาแล้ว\nเรายังได้เพิ่มโรงแรมเข้ามากว่า 110,000 โรงแรมอีกด้วย diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 718f804b2f..105126142d 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -721,6 +721,10 @@ Yer ismi Diğer Diller + + Daha fazla göster + + Daha az göster Bir dil ekle Sokak @@ -945,4 +949,8 @@ Kabul Ret + Düz yoldan gitmek çukura düşmekten daha iyidir + Yürüyüş ve bisiklet yolları şimdi yükseklik profilli olarak görüntüleniyor. + Otel rezervasyonlarınızdan tasarruf edin + Artık otel arama sonuçlarında fiyat kategorisi de gösteriliyor.\nVe 110,000\'den fazla oteli sistemimize ekledik. diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 0aa18a73e1..9bccd19249 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -719,6 +719,10 @@ Назва Інші мови + + Показати більше + + Показати менше Додати мову Вулиця @@ -943,4 +947,8 @@ Прийняти Відхилити + Мудрий в гори б не звернув, мудрий гори б обминув + Для пішохідних і велосипедних маршрутів тепер відображається профіль рельєфу. + Заощаджуйте на бронюванні готелів + В результатах пошуку готелів на карті відображається цінова категорія.\nКрім того, тепер у нашій базі даних з\'явилося 110 000 нових готелів. diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 5f665fed96..e3564c1d31 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -715,6 +715,10 @@ Tên địa điểm Ngôn ngữ khác + + Hiển thị nhiều hơn + + Hiển thị ít hơn Thêm ngôn ngữ Đường @@ -939,4 +943,8 @@ Chấp nhận Từ chối + Đi đường vòng vẫn tốt hơn là rơi xuống hố + Đối với các đường đi bộ và đi xe đạp, chúng tôi hiện đã hiển thị mặt cắt tầng. + Tiết kiệm khi đặt khách sạn + Kết quả tìm kiếm cho khách sạn giờ đã có bậc giá cả.\nChúng tôi cũng đã bổ sung hơn 110.000 khách sạn. diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 45f21cf5ee..8a01c4d82c 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -730,7 +730,7 @@ 顯示更多 - 顯示較少 + 顯示更少 新增語言 街道 @@ -955,4 +955,8 @@ 接受 拒絕 + 與其長年勞而無功，不如奮起振作 + 對於行人和自行車路線，我們現在顯示海拔剖面圖。 + 優惠預訂飯店 + 飯店搜尋結果現在還包含價格類別。\n我們還加入了超過 110,000 間飯店。 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index 17f5e32aef..de56c9f9d6 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -721,6 +721,10 @@ 地点名 其他语言 + + 显示更多 + + 显示更少 添加语言 街道 @@ -945,4 +949,8 @@ 接受 拒绝 + 与其循规蹈矩，不如奋起改变 + 对于行人和自行车路线，我们现在显示纵剖面。 + 优惠预订酒店 + 酒店的搜索结果现在包含价格类别。\n我们还添加了超过 110,000 家酒店。 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 5e7bd185a1..79a04bf47e 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -967,4 +967,8 @@ Accept Decline + Better go about than fall into the ditch + For pedestrian and bike routes we now display the elevation profile. + Save when booking hotels + Search results for hotels now contain the price category.\nWe also added more than 110,000 hotels. diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings index 5975a928f6..bb750339de 100644 --- a/iphone/Maps/ar.lproj/Localizable.strings +++ b/iphone/Maps/ar.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "لغات أخرى"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "إظهار المزيد"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "إظهار أقل"; "add_language" = "إضافة لغة"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "رفض"; + +"whats_new_route_profile_title" = "الأفضل العثور على حل بدلا من السقوط في خندق"; + +"whats_new_route_profile_message" = "بالنسبة لمسارات المشاة والدراجات نحن الآن نعرض تشكيل الارتفاع."; + +"whats_new_booking_improve_title" = "توفير عند حجز الفنادق"; + +"whats_new_booking_improve_message" = "تحتوي نتائج البحث عن الفنادق الآن على فئة السعر.\nوأضفنا أيضًا أكثر من 110000 فندق."; diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings index b1db00de28..e8685d34a7 100644 --- a/iphone/Maps/cs.lproj/Localizable.strings +++ b/iphone/Maps/cs.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Další jazyky"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Zobrazit více"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Zobrazit méně"; "add_language" = "Přidat jazyk"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Odmítnout"; + +"whats_new_route_profile_title" = "Nejlepší je vyřešit to jednou pro vždy"; + +"whats_new_route_profile_message" = "U pěších a cyklistických tras nyní zobrazujeme výškový profil."; + +"whats_new_booking_improve_title" = "Ušetřete při rezervaci hotelů"; + +"whats_new_booking_improve_message" = "Výsledky hledání hotelů nyní obsahují cenové kategorie. \nTaké jsme přidali více než 110 000 hotelů."; diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings index 26efe0b435..6230fb1434 100644 --- a/iphone/Maps/da.lproj/Localizable.strings +++ b/iphone/Maps/da.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Andre sprog"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Vis mere"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Vis mindre"; "add_language" = "Tilføj et sprog"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Afvis"; + +"whats_new_route_profile_title" = "Spring over hvor gærdet er lavest"; + +"whats_new_route_profile_message" = "Vi viser nu højdeprofilen for fodgænger- og cykelruter."; + +"whats_new_booking_improve_title" = "Spar penge når du bestiller hotelværelser"; + +"whats_new_booking_improve_message" = "Søgeresultater for hoteller viser nu også priskategorien.\nVi har desuden tilføjet mere end 110.000 hoteller."; diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index fe58b255e8..86a56cc799 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Ablehnen"; + +"whats_new_route_profile_title" = "Am besten den leichtesten Weg gehen"; + +"whats_new_route_profile_message" = "Für Fußgänger- und Fahrradrouten zeigen wir nun das Höhenprofil an."; + +"whats_new_booking_improve_title" = "Beim Buchen von Hotels sparen"; + +"whats_new_booking_improve_message" = "Suchergebnisse für Hotels enthalten jetzt die Kategorie Preis.\nAußerdem haben wir über 110.000 Hotels hinzugefügt."; diff --git a/iphone/Maps/en-GB.lproj/Localizable.strings b/iphone/Maps/en-GB.lproj/Localizable.strings index eabadf7890..8e5bcebb29 100644 --- a/iphone/Maps/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/en-GB.lproj/Localizable.strings @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Decline"; + +"whats_new_route_profile_title" = "Better to go about than to fall into the ditch"; + +"whats_new_route_profile_message" = "For pedestrian and bike routes we now display the elevation profile."; + +"whats_new_booking_improve_title" = "Save when booking hotels"; + +"whats_new_booking_improve_message" = "Search results for hotels now contain the price category.\nWe also added more than 110,000 hotels."; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 88729c6374..f2c6aa9cd5 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Decline"; + +"whats_new_route_profile_title" = "Better go about than fall into the ditch"; + +"whats_new_route_profile_message" = "For pedestrian and bike routes we now display the elevation profile."; + +"whats_new_booking_improve_title" = "Save when booking hotels"; + +"whats_new_booking_improve_message" = "Search results for hotels now contain the price category.\nWe also added more than 110,000 hotels."; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index d736563ea9..5fb18cc385 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Otros idiomas"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Mostrar más"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Mostrar menos"; "add_language" = "Añadir un idioma"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Declinar"; + +"whats_new_route_profile_title" = "Más vale rodear que no ahogar"; + +"whats_new_route_profile_message" = "Ahora se muestra el perfil de elevación en los itinerarios pedestres y en bicicleta."; + +"whats_new_booking_improve_title" = "Ahorrar al reservar hoteles"; + +"whats_new_booking_improve_message" = "La búsqueda de resultados de hoteles ahora contiene la categoría de precios.\nHemos añadido más de 110 000 hoteles."; diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings index 4b09704f77..38b3cd5dc1 100644 --- a/iphone/Maps/fi.lproj/Localizable.strings +++ b/iphone/Maps/fi.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Muut Kielet"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Näytä lisää"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Näytä vähemmän"; "add_language" = "Lisää kieli"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Hylkää"; + +"whats_new_route_profile_title" = "Parempi katsoa kuin katua"; + +"whats_new_route_profile_message" = "Näytämme nyt maaston korkeuden kävely- ja pyöräilyreittejä varten."; + +"whats_new_booking_improve_title" = "Säästä hotellivarauksissa"; + +"whats_new_booking_improve_message" = "Hotellien hakutuloksissa näkyy nyt hintakategoria.\nLisäsimme myös yli 110 000 hotellia."; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index feed9c8313..3a19dbd63a 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Autres langues"; /* small button to open list with names in different languages */ -"show_more" = "Voir plus"; +"show_more" = "Afficher plus"; /* small button to close list with names in different languages */ -"show_less" = "Voir moins"; +"show_less" = "Afficher moins"; "add_language" = "Ajouter une langue"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Refuser"; + +"whats_new_route_profile_title" = "C'est en se bougeant que l'on trouve des solutions"; + +"whats_new_route_profile_message" = "Pour les routes pédestres et cyclables nous affichons maintenant le profil d'élévation."; + +"whats_new_booking_improve_title" = "Économisez de l'argent en réservant des hôtels"; + +"whats_new_booking_improve_message" = "Les résultats des recherches d'hôtels comprennent maintenant la catégorie de prix.\nNous avons aussi ajouté plus de 110.000 hôtels."; diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings index 190f061e49..9acf495dba 100644 --- a/iphone/Maps/hu.lproj/Localizable.strings +++ b/iphone/Maps/hu.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Más nyelv"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Továbbiak megjelenítése"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Kevesebb megjelenítése"; "add_language" = "Nyelv hozzáadása"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Elutasítja"; + +"whats_new_route_profile_title" = "Az árkot jobb megkerülni, mint beleesni"; + +"whats_new_route_profile_message" = "A gyalogos és kerékpáros utakat most már emelkedési profillal jelenítjük meg."; + +"whats_new_booking_improve_title" = "Takarékoskodjon szálláshely foglalásakor"; + +"whats_new_booking_improve_message" = "A szálláshely keresési eredménye már tartalmazza az árkategóriát. \nEmellett kiegészítettük több mint 110.000 szálláshellyel."; diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings index 4314d239de..582068245d 100644 --- a/iphone/Maps/id.lproj/Localizable.strings +++ b/iphone/Maps/id.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Bahasa lainnya"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Selengkapnya"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Kurangi"; "add_language" = "Tambahkan bahasa"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Tolak"; + +"whats_new_route_profile_title" = "Jalan-jalan dengan lebih aman dan nyaman"; + +"whats_new_route_profile_message" = "Untuk rute pejalan kaki dan sepeda, kami kini menampilkan profil elevasi."; + +"whats_new_booking_improve_title" = "Berhemat saat memesan hotel"; + +"whats_new_booking_improve_message" = "Hasil pencarian untuk hotel kini disertai kategori harga.\nKami juga menambahkan lebih dari 110.000 hotel."; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index e4afd32b95..9800d1f220 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Altre lingue"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Mostra altro"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Mostra meno"; "add_language" = "Aggiungi una lingua"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Rifiuta"; + +"whats_new_route_profile_title" = "Meglio è tornar indietro, che correr male avanti"; + +"whats_new_route_profile_message" = "Per gli itinerari pedonali e ciclabili, è ora visualizzato il profilo altimetrico."; + +"whats_new_booking_improve_title" = "Risparmia alla prenotazione degli hotel"; + +"whats_new_booking_improve_message" = "I risultati della ricerca per gli hotel contengono ora la categoria di prezzo.\nInoltre, abbiamo aggiunto più di 110.000 hotel."; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index d2785cd686..9b977e4e57 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "その他の言語"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "表示を増やす"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "表示を減らす"; "add_language" = "言語を追加"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "拒否"; + +"whats_new_route_profile_title" = "時は金なり。古きを捨て新しきを得よう。"; + +"whats_new_route_profile_message" = "歩行者とバイク用のルートに高度プロファイルが表示されるようになりました。"; + +"whats_new_booking_improve_title" = "ホテル予約時に節約しましょう"; + +"whats_new_booking_improve_message" = "ホテルの検索結果に価格のカテゴリーが表示されるようになりました。\nさらに、 110,000 軒を超えるホテルを追加しました。"; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index 2f585034c1..a80efc21a9 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "다른 언어"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "자세히 표시"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "간단히 표시"; "add_language" = "언어 추가"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "거부"; + +"whats_new_route_profile_title" = "문제가 있으면 계속 어려움을 겪는 것보다 그만두는 게 낫습니다."; + +"whats_new_route_profile_message" = "보행자 및 자전거 도로를 위해 이제 고도 단면을 표시합니다."; + +"whats_new_booking_improve_title" = "호텔 예약 시 절약"; + +"whats_new_booking_improve_message" = "이제 가격 범주를 포함하는 호텔에 대한 결과를 검색하세요.\n또한 110,000곳 이상의 호텔이 추가되었습니다."; diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings index 1b0ef5d59b..ddc849c5e3 100644 --- a/iphone/Maps/nb.lproj/Localizable.strings +++ b/iphone/Maps/nb.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Andre språk"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Vis mer"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Vis mindre"; "add_language" = "Legg til et språk"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Avvis"; + +"whats_new_route_profile_title" = "Range vegen vert ikkje rett om det er mange som går han"; + +"whats_new_route_profile_message" = "Vi viser nå høydeprofilen med tanke på gå- og sykkelruter."; + +"whats_new_booking_improve_title" = "Spar penger når du bestiller hotell"; + +"whats_new_booking_improve_message" = "Søkeresultatene for hoteller inneholder nå priskategori.\nVi har også lagt til flere enn 110.000 hoteller."; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index da90d65e0b..a86870baaa 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Overige talen"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Meer Tonen"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Minder Tonen"; "add_language" = "Een taal toevoegen"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Weigeren"; + +"whats_new_route_profile_title" = "Beter ten halve gekeerd, dan ten hele gedwaald"; + +"whats_new_route_profile_message" = "Voor wandel- en fietsroutes geven we nu het hoogteprofiel weer."; + +"whats_new_booking_improve_title" = "Bespaar op het boeken van hotels"; + +"whats_new_booking_improve_message" = "Zoekresultaten voor hotels bevatten nu de prijscategorie.\nWe hebben ook meer dan 110.000 hotels toegevoegd."; diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings index 0ccffd036e..07723f74a7 100644 --- a/iphone/Maps/pl.lproj/Localizable.strings +++ b/iphone/Maps/pl.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Inne języki"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Pokaż więcej"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Pokaż mniej"; "add_language" = "Dodaj język"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Odrzuć"; + +"whats_new_route_profile_title" = "Kto drogi prostuje, ten w domu nie nocuje"; + +"whats_new_route_profile_message" = "Dla tras pieszych i rowerowych pokazujemy teraz też profil wysokościowy."; + +"whats_new_booking_improve_title" = "Oszczędzaj przy rezerwacji hotelów"; + +"whats_new_booking_improve_message" = "Wyniki wyszukiwania hoteli zawierają teraz kategorię cenową. \nDodaliśmy też ponad 110 000 hoteli."; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index 20f240c024..fcb25c47f5 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Outros idiomas"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Mostrar mais"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Mostrar Menos"; "add_language" = "Adicionar um idioma"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Declinar"; + +"whats_new_route_profile_title" = "Circular é viver"; + +"whats_new_route_profile_message" = "Nas rotas para peões e ciclovias apresentamos agora o perfil de elevação."; + +"whats_new_booking_improve_title" = "Poupe nas reservas de hotéis"; + +"whats_new_booking_improve_message" = "Agora, os resultados da pesquisa de hotéis contêm a categoria de preços.\nAdicinámos mais de 110.000 hotéis."; diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings index c62cccc805..115a126eeb 100644 --- a/iphone/Maps/ro.lproj/Localizable.strings +++ b/iphone/Maps/ro.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Alte limbi"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Arată mai multe"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Arată mai puține"; "add_language" = "Adăugare limbă"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Refuzați"; + +"whats_new_route_profile_title" = "Mai bine căutați soluții decât să greșiți"; + +"whats_new_route_profile_message" = "Pentru rutele pentru pietoni și bicicliști, afișam acum profilul de elevație."; + +"whats_new_booking_improve_title" = "Economisiți bani când rezervați hoteluri"; + +"whats_new_booking_improve_message" = "Rezultatele de căutare pentru hoteluri conțin acum categoria de preț. \nAm mai adăugat și peste 110.000 de hoteluri."; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index 7f1b125fdf..0d81dae310 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Отклонить"; + +"whats_new_route_profile_title" = "Умный в гору не пойдет"; + +"whats_new_route_profile_message" = "На пеших и веломаршрутах отображается профиль рельефа."; + +"whats_new_booking_improve_title" = "Экономь на бронировании отеля"; + +"whats_new_booking_improve_message" = "Результаты поиска отелей на карте показывают ценовую категорию.\nОтелей для бронирования стало на 110 000 больше."; diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings index 3526b0857d..30ec214553 100644 --- a/iphone/Maps/sk.lproj/Localizable.strings +++ b/iphone/Maps/sk.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Iné jazyky"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Ukázať viac"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Ukázať menej"; "add_language" = "Pridať jazyk"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Odmietnuť"; + +"whats_new_route_profile_title" = "Radšej dlhšia cesta, ale bezpečná"; + +"whats_new_route_profile_message" = "Pre pešie trasy a cyklotrasy sa odteraz zobrazuje aj výškový profil."; + +"whats_new_booking_improve_title" = "Ušetriť pri rezervácii hotelov"; + +"whats_new_booking_improve_message" = "Výsledky vyhľadávania hotelov odteraz obsahujú aj cenové kategórie. \nTiež sme pridali viac ako 110 000 hotelov."; diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings index d52037f0da..3a94aca6e6 100644 --- a/iphone/Maps/sv.lproj/Localizable.strings +++ b/iphone/Maps/sv.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Övriga språk"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Visa mer"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Visa mindre"; "add_language" = "Lägg till ett språk"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Neka"; + +"whats_new_route_profile_title" = "Genvägar är senvägar"; + +"whats_new_route_profile_message" = "För gångvägar och cykelturer visar vi nu höjdprofilen."; + +"whats_new_booking_improve_title" = "Spara pengar när du bokar hotell"; + +"whats_new_booking_improve_message" = "Sökresultat för hotell innehåller nu priskategorin.\nVi har även lagt till över 110 000 hotell."; diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings index 5a08eb49b1..f4bb0add13 100644 --- a/iphone/Maps/th.lproj/Localizable.strings +++ b/iphone/Maps/th.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "ภาษาอื่น ๆ"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "แสดงเพิ่มเติม"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "แสดงน้อยลง"; "add_language" = "เพิ่มภาษา"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "ปฏิเสธ"; + +"whats_new_route_profile_title" = "ทำให้มันจบดีกว่าปล่อยให้มันรบกวนอยู่"; + +"whats_new_route_profile_message" = "สำหรับเส้นทางคนเดินเท้าและจักรยาน ตอนนี้เราแสดงโปรไฟล์ระดับความสูงแล้ว"; + +"whats_new_booking_improve_title" = "ประหยัดเมื่อจองโรงแรม"; + +"whats_new_booking_improve_message" = "การค้นหาโรงแรมตอนนี้มีหมวดหมู่ราคาแล้ว\nเรายังได้เพิ่มโรงแรมเข้ามากว่า 110,000 โรงแรมอีกด้วย"; diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings index 7d614a9300..af765d0166 100644 --- a/iphone/Maps/tr.lproj/Localizable.strings +++ b/iphone/Maps/tr.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Diğer Diller"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Daha fazla göster"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Daha az göster"; "add_language" = "Bir dil ekle"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Ret"; + +"whats_new_route_profile_title" = "Düz yoldan gitmek çukura düşmekten daha iyidir"; + +"whats_new_route_profile_message" = "Yürüyüş ve bisiklet yolları şimdi yükseklik profilli olarak görüntüleniyor."; + +"whats_new_booking_improve_title" = "Otel rezervasyonlarınızdan tasarruf edin"; + +"whats_new_booking_improve_message" = "Artık otel arama sonuçlarında fiyat kategorisi de gösteriliyor.\nVe 110,000'den fazla oteli sistemimize ekledik."; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index aef96d5a86..6173e5da24 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Інші мови"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Показати більше"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Показати менше"; "add_language" = "Додати мову"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Відхилити"; + +"whats_new_route_profile_title" = "Мудрий в гори б не звернув, мудрий гори б обминув"; + +"whats_new_route_profile_message" = "Для пішохідних і велосипедних маршрутів тепер відображається профіль рельєфу."; + +"whats_new_booking_improve_title" = "Заощаджуйте на бронюванні готелів"; + +"whats_new_booking_improve_message" = "В результатах пошуку готелів на карті відображається цінова категорія.\nКрім того, тепер у нашій базі даних з'явилося 110 000 нових готелів."; diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings index 495b6da1a4..85e0479fe5 100644 --- a/iphone/Maps/vi.lproj/Localizable.strings +++ b/iphone/Maps/vi.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "Ngôn ngữ khác"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "Hiển thị nhiều hơn"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "Hiển thị ít hơn"; "add_language" = "Thêm ngôn ngữ"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "Từ chối"; + +"whats_new_route_profile_title" = "Đi đường vòng vẫn tốt hơn là rơi xuống hố"; + +"whats_new_route_profile_message" = "Đối với các đường đi bộ và đi xe đạp, chúng tôi hiện đã hiển thị mặt cắt tầng."; + +"whats_new_booking_improve_title" = "Tiết kiệm khi đặt khách sạn"; + +"whats_new_booking_improve_message" = "Kết quả tìm kiếm cho khách sạn giờ đã có bậc giá cả.\nChúng tôi cũng đã bổ sung hơn 110.000 khách sạn."; diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings index bc9bb40573..72b7e693d1 100644 --- a/iphone/Maps/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings @@ -1198,10 +1198,10 @@ "other_languages" = "其他语言"; /* small button to open list with names in different languages */ -"show_more" = "Show More"; +"show_more" = "显示更多"; /* small button to close list with names in different languages */ -"show_less" = "Show Less"; +"show_less" = "显示更少"; "add_language" = "添加语言"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "拒绝"; + +"whats_new_route_profile_title" = "与其循规蹈矩，不如奋起改变"; + +"whats_new_route_profile_message" = "对于行人和自行车路线，我们现在显示纵剖面。"; + +"whats_new_booking_improve_title" = "优惠预订酒店"; + +"whats_new_booking_improve_message" = "酒店的搜索结果现在包含价格类别。\n我们还添加了超过 110,000 家酒店。"; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 84160df6af..ea8a9f5b89 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -1201,7 +1201,7 @@ "show_more" = "顯示更多"; /* small button to close list with names in different languages */ -"show_less" = "顯示較少"; +"show_less" = "顯示更少"; "add_language" = "新增語言"; @@ -1623,3 +1623,11 @@ /* For the first routing */ "decline" = "拒絕"; + +"whats_new_route_profile_title" = "與其長年勞而無功，不如奮起振作"; + +"whats_new_route_profile_message" = "對於行人和自行車路線，我們現在顯示海拔剖面圖。"; + +"whats_new_booking_improve_title" = "優惠預訂飯店"; + +"whats_new_booking_improve_message" = "飯店搜尋結果現在還包含價格類別。\n我們還加入了超過 110,000 間飯店。"; -- cgit v1.2.3 From 7e9dca071efd4884004b92fae8810d35ee38355d Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 20 Sep 2016 17:55:41 +0300 Subject: [ios] Fixed Spotlight search. --- iphone/Maps/Classes/MapsAppDelegate.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index dfa15422ff..3cee6feda8 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -670,7 +670,7 @@ using namespace osm_auth_ios; { if (![userActivity.activityType isEqualToString:CSSearchableItemActionType]) return NO; - NSString * searchString = userActivity.title; + NSString * searchString = L(userActivity.userInfo[CSSearchableItemActivityIdentifier]); if (!searchString) return NO; -- cgit v1.2.3 From b3f50f59e69467bac09544a0ee877fd53fcf18ac Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 20 Sep 2016 17:56:05 +0300 Subject: Minor review fixes. Comments were edited. --- routing/routing_integration_tests/osrm_route_test.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp index a8444c2ee7..33d783fa88 100644 --- a/routing/routing_integration_tests/osrm_route_test.cpp +++ b/routing/routing_integration_tests/osrm_route_test.cpp @@ -283,11 +283,9 @@ namespace } // There are road ids in osrm which don't have appropriate features ids in mwm. - // When the route goes through such osrm id a code line with LOG(LERROR, ... is executed: - // on route reconstruction stage. As a result some item of |segments| vector could have an empty - // |m_path|. - // This test shows such case. It's commented because if to uncomment it debug version of - // routing_integration_tests would crash. + // When the route goes through such osrm id a code line with LOG(LERROR, ...) is executed + // on route reconstruction stage. As a result some items of |segments| vector could have an empty + // |m_path|. This test shows such case. // UNIT_TEST(RussiaSpbPloschadBekhterevaToKomendantskiyProspekt) // { // TRouteResult const routeResult = integration::CalculateRoute( -- cgit v1.2.3 From baba7b7953f6b0d2eb81b238fa9322caeb5239e9 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 20 Sep 2016 18:32:58 +0300 Subject: Route recaching fixed. --- drape_frontend/backend_renderer.cpp | 6 +++--- drape_frontend/frontend_renderer.cpp | 22 +++++++++++++++++++--- drape_frontend/frontend_renderer.hpp | 2 ++ drape_frontend/message_subclasses.hpp | 22 ++++++++++++++++++++++ drape_frontend/route_builder.cpp | 9 ++++++--- drape_frontend/route_builder.hpp | 6 +++--- drape_frontend/route_shape.hpp | 3 +++ 7 files changed, 58 insertions(+), 12 deletions(-) diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp index 94a9f16654..c768037666 100644 --- a/drape_frontend/backend_renderer.cpp +++ b/drape_frontend/backend_renderer.cpp @@ -242,19 +242,19 @@ void BackendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; m_routeBuilder->Build(msg->GetRoutePolyline(), msg->GetTurns(), - msg->GetColor(), msg->GetPattern(), m_texMng); + msg->GetColor(), msg->GetPattern(), m_texMng, msg->GetRechacheId()); break; } case Message::CacheRouteSign: { ref_ptr msg = message; - m_routeBuilder->BuildSign(msg->GetPosition(), msg->IsStart(), msg->IsValid(), m_texMng); + m_routeBuilder->BuildSign(msg->GetPosition(), msg->IsStart(), msg->IsValid(), m_texMng, msg->GetRechacheId()); break; } case Message::CacheRouteArrows: { ref_ptr msg = message; - m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng); + m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng, msg->GetRechacheId()); break; } case Message::RemoveRoute: diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 94d0e14362..61182eee24 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -476,6 +476,10 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; drape_ptr routeData = msg->AcceptRouteData(); + + if (routeData->m_recacheId > 0 && routeData->m_recacheId < m_lastRecacheRouteId) + break; + m2::PointD const finishPoint = routeData->m_sourcePolyline.Back(); m_routeRenderer->SetRouteData(move(routeData), make_ref(m_gpuProgramManager)); if (!m_routeRenderer->GetFinishPoint()) @@ -499,6 +503,10 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; drape_ptr routeSignData = msg->AcceptRouteSignData(); + + if (routeSignData->m_recacheId > 0 && routeSignData->m_recacheId < m_lastRecacheRouteId) + break; + m_routeRenderer->SetRouteSign(move(routeSignData), make_ref(m_gpuProgramManager)); break; } @@ -507,6 +515,10 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; drape_ptr routeArrowsData = msg->AcceptRouteArrowsData(); + + if (routeArrowsData->m_recacheId > 0 && routeArrowsData->m_recacheId < m_lastRecacheRouteId) + break; + m_routeRenderer->SetRouteArrows(move(routeArrowsData), make_ref(m_gpuProgramManager)); break; } @@ -515,6 +527,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; m_routeRenderer->Clear(); + ++m_lastRecacheRouteId; if (msg->NeedDeactivateFollowing()) { m_myPositionController->DeactivateRouting(); @@ -724,13 +737,15 @@ unique_ptr FrontendRenderer::CreateRoutine() void FrontendRenderer::UpdateGLResources() { + ++m_lastRecacheRouteId; + // Invalidate route. if (m_routeRenderer->GetStartPoint()) { m2::PointD const & position = m_routeRenderer->GetStartPoint()->m_position; m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp(position, true /* isStart */, - true /* isValid */), + true /* isValid */, m_lastRecacheRouteId), MessagePriority::High); } @@ -739,7 +754,7 @@ void FrontendRenderer::UpdateGLResources() m2::PointD const & position = m_routeRenderer->GetFinishPoint()->m_position; m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp(position, false /* isStart */, - true /* isValid */), + true /* isValid */, m_lastRecacheRouteId), MessagePriority::High); } @@ -749,7 +764,8 @@ void FrontendRenderer::UpdateGLResources() auto recacheRouteMsg = make_unique_dp(routeData->m_sourcePolyline, routeData->m_sourceTurns, routeData->m_color, - routeData->m_pattern); + routeData->m_pattern, + m_lastRecacheRouteId); m_routeRenderer->ClearGLDependentResources(); m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, move(recacheRouteMsg), MessagePriority::Normal); diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp index fd19a10e81..47c443e668 100755 --- a/drape_frontend/frontend_renderer.hpp +++ b/drape_frontend/frontend_renderer.hpp @@ -309,6 +309,8 @@ private: uint64_t m_maxGeneration; int m_mergeBucketsCounter = 0; + int m_lastRecacheRouteId = 0; + struct FollowRouteData { FollowRouteData(int preferredZoomLevel, diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index e2263ee5fa..1eb8253915 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -595,10 +595,16 @@ class AddRouteMessage : public Message public: AddRouteMessage(m2::PolylineD const & routePolyline, vector const & turns, df::ColorConstant color, df::RoutePattern const & pattern) + : AddRouteMessage(routePolyline, turns, color, pattern, -1 /* invalid recache id */) + {} + + AddRouteMessage(m2::PolylineD const & routePolyline, vector const & turns, + df::ColorConstant color, df::RoutePattern const & pattern, int recacheId) : m_routePolyline(routePolyline) , m_color(color) , m_turns(turns) , m_pattern(pattern) + , m_recacheId(recacheId) {} Type GetType() const override { return Message::AddRoute; } @@ -607,21 +613,28 @@ public: df::ColorConstant GetColor() const { return m_color; } vector const & GetTurns() const { return m_turns; } df::RoutePattern const & GetPattern() const { return m_pattern; } + int GetRechacheId() const { return m_recacheId; } private: m2::PolylineD m_routePolyline; df::ColorConstant m_color; vector m_turns; df::RoutePattern m_pattern; + int const m_recacheId; }; class CacheRouteSignMessage : public Message { public: CacheRouteSignMessage(m2::PointD const & pos, bool isStart, bool isValid) + : CacheRouteSignMessage(pos, isStart, isValid, -1 /* invalid recache id */) + {} + + CacheRouteSignMessage(m2::PointD const & pos, bool isStart, bool isValid, int recacheId) : m_position(pos) , m_isStart(isStart) , m_isValid(isValid) + , m_recacheId(recacheId) {} Type GetType() const override { return Message::CacheRouteSign; } @@ -629,29 +642,38 @@ public: m2::PointD const & GetPosition() const { return m_position; } bool IsStart() const { return m_isStart; } bool IsValid() const { return m_isValid; } + int GetRechacheId() const { return m_recacheId; } private: m2::PointD const m_position; bool const m_isStart; bool const m_isValid; + int const m_recacheId; }; class CacheRouteArrowsMessage : public Message { public: CacheRouteArrowsMessage(int routeIndex, vector const & borders) + : CacheRouteArrowsMessage(routeIndex, borders, -1 /* invalid recache id */) + {} + + CacheRouteArrowsMessage(int routeIndex, vector const & borders, int recacheId) : m_routeIndex(routeIndex) , m_borders(borders) + , m_recacheId(recacheId) {} Type GetType() const override { return Message::CacheRouteArrows; } int GetRouteIndex() const { return m_routeIndex; } vector const & GetBorders() const { return m_borders; } + int GetRechacheId() const { return m_recacheId; } private: int m_routeIndex; vector m_borders; + int const m_recacheId; }; class RemoveRouteMessage : public Message diff --git a/drape_frontend/route_builder.cpp b/drape_frontend/route_builder.cpp index 95946eb44f..e167ea8003 100644 --- a/drape_frontend/route_builder.cpp +++ b/drape_frontend/route_builder.cpp @@ -15,7 +15,7 @@ RouteBuilder::RouteBuilder(TFlushRouteFn const & flushRouteFn, void RouteBuilder::Build(m2::PolylineD const & routePolyline, vector const & turns, df::ColorConstant color, df::RoutePattern const & pattern, - ref_ptr textures) + ref_ptr textures, int recacheId) { drape_ptr routeData = make_unique_dp(); routeData->m_routeIndex = m_routeIndex++; @@ -24,6 +24,7 @@ void RouteBuilder::Build(m2::PolylineD const & routePolyline, vector con routeData->m_sourceTurns = turns; routeData->m_pattern = pattern; routeData->m_pivot = routePolyline.GetLimitRect().Center(); + routeData->m_recacheId = recacheId; RouteShape::CacheRoute(textures, *routeData.get()); m_routeCache.insert(make_pair(routeData->m_routeIndex, routePolyline)); @@ -40,12 +41,13 @@ void RouteBuilder::ClearRouteCache() } void RouteBuilder::BuildSign(m2::PointD const & pos, bool isStart, bool isValid, - ref_ptr textures) + ref_ptr textures, int recacheId) { drape_ptr routeSignData = make_unique_dp(); routeSignData->m_isStart = isStart; routeSignData->m_position = pos; routeSignData->m_isValid = isValid; + routeSignData->m_recacheId = recacheId; if (isValid) RouteShape::CacheRouteSign(textures, *routeSignData.get()); @@ -57,7 +59,7 @@ void RouteBuilder::BuildSign(m2::PointD const & pos, bool isStart, bool isValid, } void RouteBuilder::BuildArrows(int routeIndex, vector const & borders, - ref_ptr textures) + ref_ptr textures, int recacheId) { auto it = m_routeCache.find(routeIndex); if (it == m_routeCache.end()) @@ -65,6 +67,7 @@ void RouteBuilder::BuildArrows(int routeIndex, vector const & bord drape_ptr routeArrowsData = make_unique_dp(); routeArrowsData->m_pivot = it->second.GetLimitRect().Center(); + routeArrowsData->m_recacheId = recacheId; RouteShape::CacheRouteArrows(textures, it->second, borders, *routeArrowsData.get()); // Flush route arrows geometry. diff --git a/drape_frontend/route_builder.hpp b/drape_frontend/route_builder.hpp index 6851988644..9c74653ce1 100644 --- a/drape_frontend/route_builder.hpp +++ b/drape_frontend/route_builder.hpp @@ -27,13 +27,13 @@ public: void Build(m2::PolylineD const & routePolyline, vector const & turns, df::ColorConstant color, df::RoutePattern const & pattern, - ref_ptr textures); + ref_ptr textures, int recacheId); void BuildArrows(int routeIndex, vector const & borders, - ref_ptr textures); + ref_ptr textures, int recacheId); void BuildSign(m2::PointD const & pos, bool isStart, bool isValid, - ref_ptr textures); + ref_ptr textures, int recacheId); void ClearRouteCache(); diff --git a/drape_frontend/route_shape.hpp b/drape_frontend/route_shape.hpp index 8495826f02..a8afbc0fc4 100644 --- a/drape_frontend/route_shape.hpp +++ b/drape_frontend/route_shape.hpp @@ -67,6 +67,7 @@ struct RouteData double m_length; RouteRenderProperty m_route; RoutePattern m_pattern; + int m_recacheId; }; struct RouteSignData @@ -75,12 +76,14 @@ struct RouteSignData bool m_isStart; bool m_isValid; m2::PointD m_position; + int m_recacheId; }; struct RouteArrowsData { RouteRenderProperty m_arrows; m2::PointD m_pivot; + int m_recacheId; }; class RouteShape -- cgit v1.2.3 From a1b0d6cd609692a57026bb4d980856a84756639d Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 20 Sep 2016 18:56:49 +0300 Subject: Review fixes. --- drape_frontend/backend_renderer.cpp | 6 +++--- drape_frontend/message_subclasses.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp index c768037666..a93ba86fda 100644 --- a/drape_frontend/backend_renderer.cpp +++ b/drape_frontend/backend_renderer.cpp @@ -242,19 +242,19 @@ void BackendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; m_routeBuilder->Build(msg->GetRoutePolyline(), msg->GetTurns(), - msg->GetColor(), msg->GetPattern(), m_texMng, msg->GetRechacheId()); + msg->GetColor(), msg->GetPattern(), m_texMng, msg->GetRecacheId()); break; } case Message::CacheRouteSign: { ref_ptr msg = message; - m_routeBuilder->BuildSign(msg->GetPosition(), msg->IsStart(), msg->IsValid(), m_texMng, msg->GetRechacheId()); + m_routeBuilder->BuildSign(msg->GetPosition(), msg->IsStart(), msg->IsValid(), m_texMng, msg->GetRecacheId()); break; } case Message::CacheRouteArrows: { ref_ptr msg = message; - m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng, msg->GetRechacheId()); + m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng, msg->GetRecacheId()); break; } case Message::RemoveRoute: diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 1eb8253915..67ad21e1f1 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -613,7 +613,7 @@ public: df::ColorConstant GetColor() const { return m_color; } vector const & GetTurns() const { return m_turns; } df::RoutePattern const & GetPattern() const { return m_pattern; } - int GetRechacheId() const { return m_recacheId; } + int GetRecacheId() const { return m_recacheId; } private: m2::PolylineD m_routePolyline; @@ -642,7 +642,7 @@ public: m2::PointD const & GetPosition() const { return m_position; } bool IsStart() const { return m_isStart; } bool IsValid() const { return m_isValid; } - int GetRechacheId() const { return m_recacheId; } + int GetRecacheId() const { return m_recacheId; } private: m2::PointD const m_position; @@ -668,7 +668,7 @@ public: int GetRouteIndex() const { return m_routeIndex; } vector const & GetBorders() const { return m_borders; } - int GetRechacheId() const { return m_recacheId; } + int GetRecacheId() const { return m_recacheId; } private: int m_routeIndex; -- cgit v1.2.3 From ed3cb7510030548fe975b557701f831db2c6bec4 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Tue, 20 Sep 2016 19:15:31 +0300 Subject: Fixed the 'Start' button size for vehicle routing in landscape mode --- android/res/layout-land/altitude_chart_panel.xml | 4 ++-- android/res/values/dimens.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/res/layout-land/altitude_chart_panel.xml b/android/res/layout-land/altitude_chart_panel.xml index afbd885e70..d3815807a2 100644 --- a/android/res/layout-land/altitude_chart_panel.xml +++ b/android/res/layout-land/altitude_chart_panel.xml @@ -12,6 +12,7 @@ android:paddingStart="@dimen/altitude_chart_container_padding_left" android:paddingRight="@dimen/altitude_chart_container_padding_left" android:paddingEnd="@dimen/altitude_chart_container_padding_left" + android:paddingBottom="@dimen/altitude_chart_container_padding_bottom" android:orientation="horizontal" tools:showIn="@layout/fragment_routing"> @@ -24,6 +25,5 @@ + android:layout_height="@dimen/altitude_chart_image_height"/> diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index 3a1640adaf..3639d21f51 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -135,6 +135,7 @@ 16dp + 10dp 4dp 14dp 20dp -- cgit v1.2.3 From 637fde52edbad21b9f2b487bdabaf7ac630da987 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Tue, 20 Sep 2016 16:02:30 +0300 Subject: [android] Fixed review notes --- .../mapswithme/maps/location/TrackRecorder.java | 2 +- android/src/com/mapswithme/util/StorageUtils.java | 24 ++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java index 65baf8b27b..468aa9f765 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorder.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java @@ -222,7 +222,7 @@ public final class TrackRecorder { if (sLogger == null) { - String externalDir = StorageUtils.getExternalFilesDir(MwmApplication.get().getApplicationContext()); + String externalDir = StorageUtils.getExternalFilesDir(); if (!TextUtils.isEmpty(externalDir)) sLogger = new FileLogger(externalDir + "/gps-tracker.log"); } diff --git a/android/src/com/mapswithme/util/StorageUtils.java b/android/src/com/mapswithme/util/StorageUtils.java index c758750a4a..0664c8cac3 100644 --- a/android/src/com/mapswithme/util/StorageUtils.java +++ b/android/src/com/mapswithme/util/StorageUtils.java @@ -5,6 +5,7 @@ import android.os.Environment; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.SimpleLogger; @@ -12,8 +13,6 @@ import java.io.File; public class StorageUtils { - private final static Logger LOGGER = SimpleLogger.get(StorageUtils.class.getSimpleName()); - /** * Checks if external storage is available for read and write * @@ -29,21 +28,20 @@ public class StorageUtils * Safely returns the external files directory path with the preliminary * checking the availability of the mentioned directory * - * @param context the application context - * @return the absolute path of external files directory or null if directory cannot be gotten + * @return the absolute path of external files directory or null if directory can not be obtained * @see Context#getExternalFilesDir(String) */ @Nullable - public static String getExternalFilesDir(final @NonNull Context context) + public static String getExternalFilesDir() { - if (isExternalStorageWritable()) - { - File dir = context.getExternalFilesDir(null); - if (dir != null) - return dir.getAbsolutePath(); - else - LOGGER.e("Cannot get the external files directory for some reasons", new Throwable()); - } + if (!isExternalStorageWritable()) + return null; + + File dir = MwmApplication.get().getExternalFilesDir(null); + if (dir != null) + return dir.getAbsolutePath(); + + SimpleLogger.get().e("Cannot get the external files directory for some reasons", new Throwable()); return null; } } -- cgit v1.2.3 From a38351a4a09915ecc65fbd64771bfcac4c9fdf96 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Tue, 20 Sep 2016 19:48:56 +0300 Subject: [planet] New data from 19.09.2016 --- data/World.mwm | Bin 35166831 -> 35208957 bytes data/WorldCoasts.mwm | Bin 4631224 -> 4635218 bytes data/countries.txt | 2248 +++++++++++++++++++++---------------------- data/external_resources.txt | 4 +- 4 files changed, 1126 insertions(+), 1126 deletions(-) diff --git a/data/World.mwm b/data/World.mwm index dada9edf08..d238d0db77 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index d7b9853764..67b1e98a32 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/countries.txt b/data/countries.txt index 5a14b29cdd..b4c84362d0 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,10 +1,10 @@ { "id": "Countries", - "v": 160911, + "v": 160919, "g": [ { "id": "Abkhazia", - "s": 5239162, + "s": 5245738, "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", @@ -16,7 +16,7 @@ }, { "id": "Afghanistan", - "s": 28808840, + "s": 29047088, "affiliations": [ "Badakhshan", "Badghis", @@ -60,7 +60,7 @@ }, { "id": "Albania", - "s": 17613931, + "s": 17661691, "affiliations": [ "Shqip\u00ebria" ], @@ -73,7 +73,7 @@ "g": [ { "id": "Algeria_Central", - "s": 32087857, + "s": 32271745, "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", @@ -100,7 +100,7 @@ }, { "id": "Algeria_Coast", - "s": 81310779, + "s": 81615811, "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", @@ -143,7 +143,7 @@ }, { "id": "Andorra", - "s": 1082542, + "s": 1083934, "affiliations": [ "Andorra" ], @@ -153,7 +153,7 @@ }, { "id": "Angola", - "s": 18927789, + "s": 19019146, "affiliations": [ "Angola", "Bengo", @@ -181,7 +181,7 @@ }, { "id": "Anguilla", - "s": 464119, + "s": 463919, "affiliations": [ "Anguilla" ], @@ -191,7 +191,7 @@ }, { "id": "Antigua and Barbuda", - "s": 1351684, + "s": 1351644, "affiliations": [ "Antigua and Barbuda", "Montserrat" @@ -202,7 +202,7 @@ }, { "id": "Barbados", - "s": 2429053, + "s": 2432957, "affiliations": [ "Barbados" ], @@ -222,7 +222,7 @@ }, { "id": "Caribisch Nederland", - "s": 5619984, + "s": 5619456, "affiliations": [ "Caribisch Nederland", "Nederland", @@ -236,7 +236,7 @@ }, { "id": "Dominica", - "s": 1849307, + "s": 1849755, "affiliations": [ "Dominica", "Saint Andrew Parish", @@ -256,7 +256,7 @@ }, { "id": "Grenada", - "s": 1005377, + "s": 1035193, "affiliations": [ "Grenada" ], @@ -266,7 +266,7 @@ }, { "id": "Guadeloupe", - "s": 13070852, + "s": 13098436, "affiliations": [ "France", "Guadeloupe", @@ -278,7 +278,7 @@ }, { "id": "Martinique", - "s": 11133630, + "s": 11131286, "affiliations": [ "France", "Martinique", @@ -290,7 +290,7 @@ }, { "id": "Montserrat", - "s": 248587, + "s": 239722, "affiliations": [ "Montserrat" ], @@ -300,7 +300,7 @@ }, { "id": "Saint Barthelemy", - "s": 319290, + "s": 319306, "affiliations": [ "France" ], @@ -310,7 +310,7 @@ }, { "id": "Saint Kitts and Nevis", - "s": 673039, + "s": 673327, "affiliations": [ "Saint Kitts and Nevis" ], @@ -320,7 +320,7 @@ }, { "id": "Saint Lucia", - "s": 1615075, + "s": 1614619, "affiliations": [ "Saint Lucia", "Saint Vincent and the Grenadines" @@ -331,7 +331,7 @@ }, { "id": "Saint Martin", - "s": 1531732, + "s": 1531772, "affiliations": [ "Anguilla", "France", @@ -343,7 +343,7 @@ }, { "id": "Saint Vincent and the Grenadines", - "s": 654625, + "s": 666105, "affiliations": [ "Saint Vincent and the Grenadines" ], @@ -353,7 +353,7 @@ }, { "id": "Trinidad and Tobago", - "s": 12385539, + "s": 12398595, "affiliations": [ "Trinidad and Tobago" ], @@ -363,7 +363,7 @@ }, { "id": "United States Virgin Islands", - "s": 1516649, + "s": 1524505, "affiliations": [ "British Virgin Islands", "Puerto Rico", @@ -388,7 +388,7 @@ }, { "id": "Argentina_Buenos Aires_Buenos Aires", - "s": 60731808, + "s": 60865216, "affiliations": [ "Argentina", "Ciudad Aut\u00f3noma de Buenos Aires", @@ -400,7 +400,7 @@ }, { "id": "Argentina_Buenos Aires_North", - "s": 20923432, + "s": 20928800, "affiliations": [ "Argentina", "Buenos Aires" @@ -411,7 +411,7 @@ }, { "id": "Argentina_Buenos Aires_South", - "s": 25364991, + "s": 25378887, "affiliations": [ "Argentina", "Buenos Aires" @@ -422,7 +422,7 @@ }, { "id": "Argentina_Patagonia", - "s": 38404600, + "s": 38638760, "affiliations": [ "Argentina", "Chubut", @@ -437,7 +437,7 @@ }, { "id": "Argentina_Cuyo", - "s": 20687579, + "s": 20724427, "affiliations": [ "Argentina", "La Rioja", @@ -451,7 +451,7 @@ }, { "id": "Argentina_Mesopotamia", - "s": 39997848, + "s": 40012331, "affiliations": [ "Argentina", "Corrientes", @@ -472,7 +472,7 @@ }, { "id": "Argentina_Northwest", - "s": 45413094, + "s": 45457406, "affiliations": [ "Chaco", "Argentina", @@ -489,7 +489,7 @@ }, { "id": "Argentina_Pampas", - "s": 37450717, + "s": 37539341, "affiliations": [ "Argentina", "C\u00f3rdoba", @@ -501,7 +501,7 @@ }, { "id": "Argentina_Santa Fe", - "s": 27180011, + "s": 27183859, "affiliations": [ "Argentina", "Santa Fe" @@ -514,7 +514,7 @@ }, { "id": "Armenia", - "s": 16227603, + "s": 16277819, "affiliations": [ "Border Azerbaijan - Armenia (Enclave AZE)", "Qazax rayonu", @@ -540,7 +540,7 @@ "g": [ { "id": "Austria_Burgenland", - "s": 13081895, + "s": 13101287, "affiliations": [ "Burgenland", "\u00d6sterreich" @@ -551,7 +551,7 @@ }, { "id": "Austria_Carinthia", - "s": 35185411, + "s": 35280779, "affiliations": [ "K\u00e4rnten", "\u00d6sterreich" @@ -562,7 +562,7 @@ }, { "id": "Austria_Lower Austria_Wien", - "s": 62125635, + "s": 62279163, "affiliations": [ "\u00d6sterreich", "Nieder\u00f6sterreich", @@ -574,7 +574,7 @@ }, { "id": "Austria_Styria_Graz", - "s": 50450991, + "s": 50712686, "affiliations": [ "\u00d6sterreich", "Steiermark" @@ -585,7 +585,7 @@ }, { "id": "Austria_Styria_Leoben", - "s": 27827926, + "s": 27983166, "affiliations": [ "\u00d6sterreich", "Steiermark" @@ -596,7 +596,7 @@ }, { "id": "Austria_Upper Austria_Linz", - "s": 37592384, + "s": 37732288, "affiliations": [ "\u00d6sterreich", "Ober\u00f6sterreich" @@ -607,7 +607,7 @@ }, { "id": "Austria_Upper Austria_Wels", - "s": 47739230, + "s": 47786854, "affiliations": [ "\u00d6sterreich", "Ober\u00f6sterreich" @@ -618,7 +618,7 @@ }, { "id": "Austria_Lower Austria_West", - "s": 46514974, + "s": 46600638, "affiliations": [ "\u00d6sterreich", "Nieder\u00f6sterreich" @@ -629,7 +629,7 @@ }, { "id": "Austria_Tyrol", - "s": 52754356, + "s": 52815676, "affiliations": [ "\u00d6sterreich", "Tirol" @@ -640,7 +640,7 @@ }, { "id": "Austria_Salzburg", - "s": 34393692, + "s": 34449972, "affiliations": [ "\u00d6sterreich", "Salzburg" @@ -651,7 +651,7 @@ }, { "id": "Austria_Vorarlberg", - "s": 19286966, + "s": 19350438, "affiliations": [ "\u00d6sterreich", "Vorarlberg" @@ -676,7 +676,7 @@ }, { "id": "Australia_Melbourne", - "s": 53559842, + "s": 53638594, "affiliations": [ "Australia", "Victoria" @@ -687,7 +687,7 @@ }, { "id": "Australia_New South Wales", - "s": 31670706, + "s": 32162010, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -701,7 +701,7 @@ }, { "id": "Australia_Northern Territory", - "s": 7816093, + "s": 7879117, "affiliations": [ "Australia", "Northern Territory" @@ -712,7 +712,7 @@ }, { "id": "Australia_Queensland", - "s": 24398141, + "s": 24397237, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -724,7 +724,7 @@ }, { "id": "Australia_South Australia", - "s": 38230991, + "s": 38234359, "affiliations": [ "Australia", "South Australia" @@ -735,7 +735,7 @@ }, { "id": "Australia_Tasmania", - "s": 22214154, + "s": 22225698, "affiliations": [ "Australia", "Tasmania" @@ -746,7 +746,7 @@ }, { "id": "Australia_Victoria", - "s": 40561803, + "s": 40608035, "affiliations": [ "Australia", "Victoria" @@ -757,7 +757,7 @@ }, { "id": "Australia_Western Australia", - "s": 53196493, + "s": 53266253, "affiliations": [ "Ashmore and Cartier Islands", "Christmas Island", @@ -773,7 +773,7 @@ }, { "id": "Australia_Brisbane", - "s": 42260001, + "s": 42383265, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -786,7 +786,7 @@ }, { "id": "Australia_Sydney", - "s": 60025774, + "s": 60531758, "affiliations": [ "Australia", "Australian Capital Territory", @@ -804,7 +804,7 @@ "g": [ { "id": "Nagorno-Karabakh", - "s": 2340770, + "s": 2344450, "affiliations": [ "Az\u0259rbaycan", "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", @@ -822,7 +822,7 @@ }, { "id": "Azerbaijan", - "s": 26870948, + "s": 26903140, "affiliations": [ "Ab\u015feron rayonu", "A\u011fcab\u0259di rayonu", @@ -904,7 +904,7 @@ }, { "id": "Bahrain", - "s": 4245667, + "s": 4259180, "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", @@ -919,7 +919,7 @@ }, { "id": "Bangladesh", - "s": 20826160, + "s": 20936810, "affiliations": [ "Border India - Bangladesh", "\u09b0\u09be\u099c\u09b6\u09be\u09b9\u09c0 \u09ac\u09bf\u09ad\u09be\u0997", @@ -940,7 +940,7 @@ "g": [ { "id": "Belarus_Vitebsk Region", - "s": 36417868, + "s": 36562892, "affiliations": [ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -951,7 +951,7 @@ }, { "id": "Belarus_Hrodna Region", - "s": 22713050, + "s": 22786706, "affiliations": [ "\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" @@ -962,7 +962,7 @@ }, { "id": "Belarus_Brest Region", - "s": 18410153, + "s": 18469737, "affiliations": [ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -973,7 +973,7 @@ }, { "id": "Belarus_Homiel Region", - "s": 26220902, + "s": 26252182, "affiliations": [ "\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" @@ -984,7 +984,7 @@ }, { "id": "Belarus_Maglieu Region", - "s": 21547291, + "s": 21583251, "affiliations": [ "\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" @@ -995,7 +995,7 @@ }, { "id": "Belarus_Minsk Region", - "s": 43362795, + "s": 43496091, "affiliations": [ "\u0413\u043e\u043b\u044c\u0444-\u043a\u043b\u0443\u0431", "\u041c\u0438\u043d\u0441\u043a", @@ -1015,7 +1015,7 @@ "g": [ { "id": "Belgium_West Flanders", - "s": 32773537, + "s": 32786393, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1027,7 +1027,7 @@ }, { "id": "Belgium_Antwerp", - "s": 44208318, + "s": 44300846, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Nederland - Belgique / Belgi\u00eb / Belgien", @@ -1039,7 +1039,7 @@ }, { "id": "Belgium_East Flanders", - "s": 30295431, + "s": 30315463, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1050,7 +1050,7 @@ }, { "id": "Belgium_Hainaut", - "s": 21989184, + "s": 22047256, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1061,7 +1061,7 @@ }, { "id": "Belgium_Walloon Brabant", - "s": 6950173, + "s": 6960061, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1072,7 +1072,7 @@ }, { "id": "Belgium_Namur", - "s": 11216255, + "s": 11226895, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1083,7 +1083,7 @@ }, { "id": "Belgium_Limburg", - "s": 27136448, + "s": 27140528, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1094,7 +1094,7 @@ }, { "id": "Belgium_Luxembourg", - "s": 11089582, + "s": 11119622, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1105,7 +1105,7 @@ }, { "id": "Belgium_Flemish Brabant", - "s": 47058380, + "s": 47079532, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", @@ -1117,7 +1117,7 @@ }, { "id": "Belgium_Liege", - "s": 28918985, + "s": 28933991, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1130,7 +1130,7 @@ }, { "id": "Belize", - "s": 4239367, + "s": 4261775, "affiliations": [ "Belize District", "Belize", @@ -1148,7 +1148,7 @@ }, { "id": "Benin", - "s": 21747984, + "s": 21826892, "affiliations": [ "Alibori", "Atakora", @@ -1170,7 +1170,7 @@ }, { "id": "Bermuda", - "s": 1005897, + "s": 1005905, "affiliations": [ "Bermuda" ], @@ -1180,7 +1180,7 @@ }, { "id": "Bhutan", - "s": 3317685, + "s": 3328802, "affiliations": [ "\u0f60\u0f56\u0fb2\u0f74\u0f42\u0f61\u0f74\u0f63\u0f0b", "\u0f58\u0f42\u0f62\u0f0b\u0f66\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", @@ -1213,7 +1213,7 @@ "g": [ { "id": "Bolivia_North", - "s": 48155884, + "s": 48508748, "affiliations": [ "Bolivia", "Beni", @@ -1227,7 +1227,7 @@ }, { "id": "Bolivia_South", - "s": 36284432, + "s": 36446016, "affiliations": [ "Bolivia", "Chuquisaca", @@ -1247,7 +1247,7 @@ "g": [ { "id": "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina", - "s": 39642896, + "s": 39659216, "affiliations": [ "Bosna i Hercegovina", "Federacija Bosne i Hercegovine" @@ -1258,7 +1258,7 @@ }, { "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", - "s": 898913, + "s": 898921, "affiliations": [ "Br\u010dko distrikt Bosne i Hercegovine", "Bosna i Hercegovina", @@ -1270,7 +1270,7 @@ }, { "id": "Bosnia and Herzegovina_Republic of Srpska", - "s": 32687965, + "s": 32639637, "affiliations": [ "Bosna i Hercegovina", "Republika Srpska" @@ -1283,7 +1283,7 @@ }, { "id": "Botswana", - "s": 25481281, + "s": 25758912, "affiliations": [ "Botswana", "Central District", @@ -1305,7 +1305,7 @@ "g": [ { "id": "Brazil_Bahia", - "s": 50282538, + "s": 50547511, "affiliations": [ "Bahia", "Brasil" @@ -1316,7 +1316,7 @@ }, { "id": "Brazil_Goias_North", - "s": 14246528, + "s": 14265416, "affiliations": [ "Brasil", "Goi\u00e1s" @@ -1327,7 +1327,7 @@ }, { "id": "Brazil_Goias_Brasilia", - "s": 45322129, + "s": 45368401, "affiliations": [ "Brasil", "Distrito Federal", @@ -1339,7 +1339,7 @@ }, { "id": "Brazil_Mato Grosso Do Sul", - "s": 21345756, + "s": 21407636, "affiliations": [ "Brasil", "Mato Grosso do Sul" @@ -1350,7 +1350,7 @@ }, { "id": "Brazil_Mato Grosso", - "s": 25239648, + "s": 25252576, "affiliations": [ "Brasil", "Mato Grosso" @@ -1361,7 +1361,7 @@ }, { "id": "Brazil_North Region_East", - "s": 42690442, + "s": 42724303, "affiliations": [ "Amap\u00e1", "Brasil", @@ -1374,7 +1374,7 @@ }, { "id": "Brazil_North Region_West", - "s": 33045566, + "s": 33306020, "affiliations": [ "Acre", "Amazonas", @@ -1388,7 +1388,7 @@ }, { "id": "Brazil_Northeast Region_East", - "s": 38404048, + "s": 38634760, "affiliations": [ "Alagoas", "Brasil", @@ -1401,7 +1401,7 @@ }, { "id": "Brazil_Northeast Region_West", - "s": 65437386, + "s": 65796965, "affiliations": [ "Brasil", "Cear\u00e1", @@ -1415,7 +1415,7 @@ }, { "id": "Brazil_Paraiba", - "s": 15953122, + "s": 16044381, "affiliations": [ "Brasil", "Para\u00edba" @@ -1426,7 +1426,7 @@ }, { "id": "Brazil_Parana_East", - "s": 31269004, + "s": 31261453, "affiliations": [ "Brasil", "Paran\u00e1" @@ -1437,7 +1437,7 @@ }, { "id": "Brazil_Parana_West", - "s": 40954349, + "s": 41015528, "affiliations": [ "Brasil", "Paran\u00e1" @@ -1448,7 +1448,7 @@ }, { "id": "Brazil_Rio Grande do Norte", - "s": 12414551, + "s": 12418991, "affiliations": [ "Brasil", "Pernambuco", @@ -1460,7 +1460,7 @@ }, { "id": "Brazil_Santa Catarina", - "s": 50162463, + "s": 50423369, "affiliations": [ "Brasil", "Santa Catarina" @@ -1471,7 +1471,7 @@ }, { "id": "Brazil_South Region_East", - "s": 53894871, + "s": 53966383, "affiliations": [ "Brasil", "Rio Grande do Sul" @@ -1482,7 +1482,7 @@ }, { "id": "Brazil_South Region_West", - "s": 31813035, + "s": 31809891, "affiliations": [ "Brasil", "Rio Grande do Sul" @@ -1493,7 +1493,7 @@ }, { "id": "Brazil_Southeast Region_Espirito Santo", - "s": 24561450, + "s": 24997794, "affiliations": [ "Brasil", "Esp\u00edrito Santo" @@ -1504,7 +1504,7 @@ }, { "id": "Brazil_Southeast Region_Minas Gerais_Contagem", - "s": 65148089, + "s": 65327345, "affiliations": [ "Brasil", "Minas Gerais" @@ -1515,7 +1515,7 @@ }, { "id": "Brazil_Southeast Region_Minas Gerais_North", - "s": 44017944, + "s": 44240264, "affiliations": [ "Brasil", "Minas Gerais" @@ -1526,7 +1526,7 @@ }, { "id": "Brazil_Southeast Region_Rio de Janeiro", - "s": 50856447, + "s": 50945519, "affiliations": [ "Brasil", "Rio de Janeiro" @@ -1537,7 +1537,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_Campinas", - "s": 57959729, + "s": 57964081, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1548,7 +1548,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_City", - "s": 71462315, + "s": 71616403, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1559,7 +1559,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_West", - "s": 52100975, + "s": 52114919, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1572,7 +1572,7 @@ }, { "id": "Brunei", - "s": 1780507, + "s": 1814163, "affiliations": [ "Brunei Darussalam" ], @@ -1585,7 +1585,7 @@ "g": [ { "id": "Bulgaria_East", - "s": 38305329, + "s": 38433649, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], @@ -1595,7 +1595,7 @@ }, { "id": "Bulgaria_West", - "s": 55577226, + "s": 55777370, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], @@ -1607,7 +1607,7 @@ }, { "id": "Burkina Faso", - "s": 27849751, + "s": 28091823, "affiliations": [ "Boucle du Mouhoun", "Burkina Faso", @@ -1630,7 +1630,7 @@ }, { "id": "Burundi", - "s": 10152537, + "s": 10153313, "affiliations": [ "Cibitoke", "Bubanza", @@ -1657,7 +1657,7 @@ }, { "id": "Cambodia", - "s": 13679672, + "s": 13726648, "affiliations": [ "Bantey Meanchey", "Battambang", @@ -1695,7 +1695,7 @@ "g": [ { "id": "Cameroon_Central", - "s": 59679020, + "s": 59722164, "affiliations": [ "Adamaoua", "Cameroun", @@ -1711,7 +1711,7 @@ }, { "id": "Cameroon_West", - "s": 45081565, + "s": 45121485, "affiliations": [ "Cameroun", "Littoral", @@ -1733,7 +1733,7 @@ "g": [ { "id": "Canada_Alberta_Edmonton", - "s": 71943229, + "s": 71993789, "affiliations": [ "Alberta", "Canada" @@ -1744,7 +1744,7 @@ }, { "id": "Canada_Alberta_North", - "s": 29066891, + "s": 29076811, "affiliations": [ "Alberta", "Canada" @@ -1755,7 +1755,7 @@ }, { "id": "Canada_Alberta_South", - "s": 35244792, + "s": 35270368, "affiliations": [ "Alberta", "Canada" @@ -1771,7 +1771,7 @@ "g": [ { "id": "Canada_British Columbia_Central", - "s": 48244440, + "s": 48248944, "affiliations": [ "British Columbia", "Canada" @@ -1782,7 +1782,7 @@ }, { "id": "Canada_British Columbia_Far_North", - "s": 27941045, + "s": 27941621, "affiliations": [ "British Columbia", "Canada" @@ -1793,7 +1793,7 @@ }, { "id": "Canada_British Columbia_Islands", - "s": 40783090, + "s": 40794626, "affiliations": [ "British Columbia", "Canada" @@ -1804,7 +1804,7 @@ }, { "id": "Canada_British Columbia_North", - "s": 41675901, + "s": 41682709, "affiliations": [ "British Columbia", "Canada" @@ -1815,7 +1815,7 @@ }, { "id": "Canada_British Columbia_Northeast", - "s": 47915469, + "s": 47917117, "affiliations": [ "British Columbia", "Canada" @@ -1826,7 +1826,7 @@ }, { "id": "Canada_British Columbia_Southeast", - "s": 50900882, + "s": 50925346, "affiliations": [ "British Columbia", "Canada" @@ -1837,7 +1837,7 @@ }, { "id": "Canada_British Columbia_Vancouver", - "s": 48482459, + "s": 48517731, "affiliations": [ "British Columbia", "Canada" @@ -1876,7 +1876,7 @@ }, { "id": "Canada_Labrador_West", - "s": 49662264, + "s": 49662329, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1892,7 +1892,7 @@ "g": [ { "id": "Canada_Manitoba_Northeast", - "s": 34428620, + "s": 34430316, "affiliations": [ "Canada", "Manitoba", @@ -1905,7 +1905,7 @@ }, { "id": "Canada_Manitoba_Northwest", - "s": 39203379, + "s": 39177323, "affiliations": [ "Canada", "Manitoba" @@ -1916,7 +1916,7 @@ }, { "id": "Canada_Manitoba_South", - "s": 42272810, + "s": 42280202, "affiliations": [ "Canada", "Manitoba" @@ -1927,7 +1927,7 @@ }, { "id": "Canada_Manitoba_Winnipeg", - "s": 39903433, + "s": 39891689, "affiliations": [ "Canada", "Manitoba" @@ -1940,7 +1940,7 @@ }, { "id": "Canada_New Brunswick", - "s": 50596630, + "s": 50510566, "affiliations": [ "Canada", "Devon Indian Reserve NO. 30", @@ -1956,7 +1956,7 @@ "g": [ { "id": "Canada_Newfoundland_East", - "s": 20448926, + "s": 20451974, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1978,7 +1978,7 @@ }, { "id": "Canada_Newfoundland_South", - "s": 18094013, + "s": 18145797, "affiliations": [ "Canada", "France", @@ -2019,7 +2019,7 @@ }, { "id": "Canada_Northwest Territories_North", - "s": 29013256, + "s": 29032976, "affiliations": [ "Canada", "Northwest Territories" @@ -2030,7 +2030,7 @@ }, { "id": "Canada_Northwest Territories_Yellowknife", - "s": 42591955, + "s": 42593467, "affiliations": [ "Canada", "Northwest Territories" @@ -2046,7 +2046,7 @@ "g": [ { "id": "Canada_Nova Scotia_Halifax", - "s": 45154196, + "s": 45207780, "affiliations": [ "Canada", "Nova Scotia" @@ -2057,7 +2057,7 @@ }, { "id": "Canada_Nova Scotia_Sydney", - "s": 19901312, + "s": 19901928, "affiliations": [ "Canada", "Nova Scotia", @@ -2074,7 +2074,7 @@ "g": [ { "id": "Canada_Nunavut_North", - "s": 35339312, + "s": 35349464, "affiliations": [ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" @@ -2085,7 +2085,7 @@ }, { "id": "Canada_Nunavut_South", - "s": 75860301, + "s": 75868053, "affiliations": [ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" @@ -2101,7 +2101,7 @@ "g": [ { "id": "Canada_Ontario_Bame", - "s": 48233341, + "s": 48258405, "affiliations": [ "Canada", "Ontario" @@ -2112,7 +2112,7 @@ }, { "id": "Canada_Ontario_Kingston", - "s": 65372464, + "s": 65665712, "affiliations": [ "Canada", "Ontario" @@ -2123,7 +2123,7 @@ }, { "id": "Canada_Ontario_London", - "s": 53152349, + "s": 53187253, "affiliations": [ "Canada", "Ontario" @@ -2134,7 +2134,7 @@ }, { "id": "Canada_Ontario_Northeastern_Central", - "s": 33334502, + "s": 33336886, "affiliations": [ "Canada", "Ontario" @@ -2145,7 +2145,7 @@ }, { "id": "Canada_Ontario_Northeastern_North", - "s": 37362907, + "s": 37371003, "affiliations": [ "Canada", "Ontario", @@ -2158,7 +2158,7 @@ }, { "id": "Canada_Ontario_Northeastern_S", - "s": 36673546, + "s": 36678514, "affiliations": [ "Canada", "Ontario" @@ -2169,7 +2169,7 @@ }, { "id": "Canada_Ontario_Northeastern_SE", - "s": 20842109, + "s": 20841693, "affiliations": [ "Canada", "Ontario" @@ -2180,7 +2180,7 @@ }, { "id": "Canada_Ontario_Northeastern_SW", - "s": 40834499, + "s": 40839011, "affiliations": [ "Canada", "Ontario" @@ -2191,7 +2191,7 @@ }, { "id": "Canada_Ontario_Northeastern_Wawa", - "s": 31106251, + "s": 31105987, "affiliations": [ "Canada", "Ontario" @@ -2202,7 +2202,7 @@ }, { "id": "Canada_Ontario_Northern", - "s": 42716650, + "s": 42716634, "affiliations": [ "Canada", "Ontario" @@ -2213,7 +2213,7 @@ }, { "id": "Canada_Ontario_Northwestern", - "s": 80448009, + "s": 80713913, "affiliations": [ "Canada", "NU", @@ -2227,7 +2227,7 @@ }, { "id": "Canada_Ontario_Toronto", - "s": 69946783, + "s": 70020231, "affiliations": [ "Canada", "Ontario" @@ -2240,7 +2240,7 @@ }, { "id": "Canada_Prince Edward Island", - "s": 7848734, + "s": 7858566, "affiliations": [ "Canada", "Prince Edward Island" @@ -2254,7 +2254,7 @@ "g": [ { "id": "Canada_Quebec_Quebec", - "s": 51749627, + "s": 51808443, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2265,7 +2265,7 @@ }, { "id": "Canada_Quebek_Far North", - "s": 45374651, + "s": 45520291, "affiliations": [ "Canada", "NU", @@ -2279,7 +2279,7 @@ }, { "id": "Canada_Quebek_Montreal", - "s": 41027552, + "s": 41044808, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2290,7 +2290,7 @@ }, { "id": "Canada_Quebek_Lachute", - "s": 41786713, + "s": 41761233, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2301,7 +2301,7 @@ }, { "id": "Canada_Quebek_North", - "s": 44616839, + "s": 44612703, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2312,7 +2312,7 @@ }, { "id": "Canada_Quebek_Southeast_Rimouski", - "s": 20842570, + "s": 20843178, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2323,7 +2323,7 @@ }, { "id": "Canada_Quebek_Southeast_Saguenay", - "s": 37140671, + "s": 37153951, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2334,7 +2334,7 @@ }, { "id": "Canada_Quebek_West_Chibougamau", - "s": 49860111, + "s": 49841215, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2345,7 +2345,7 @@ }, { "id": "Canada_Quebek_West_Rouyn-Noranda", - "s": 33676109, + "s": 33655325, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2361,7 +2361,7 @@ "g": [ { "id": "Canada_Saskatchewan_North", - "s": 34068831, + "s": 34264359, "affiliations": [ "Canada", "Saskatchewan" @@ -2372,7 +2372,7 @@ }, { "id": "Canada_Saskatchewan_Saskatoon", - "s": 31443684, + "s": 31451300, "affiliations": [ "Canada", "Saskatchewan" @@ -2383,7 +2383,7 @@ }, { "id": "Canada_Saskatchewan_Regina", - "s": 43898101, + "s": 43898581, "affiliations": [ "Canada", "Saskatchewan" @@ -2399,7 +2399,7 @@ "g": [ { "id": "Canada_Yukon_North", - "s": 29371514, + "s": 29374954, "affiliations": [ "Canada", "Yukon" @@ -2410,7 +2410,7 @@ }, { "id": "Canada_Yukon_Whitehorse", - "s": 35718952, + "s": 35719808, "affiliations": [ "Canada", "Yukon" @@ -2425,7 +2425,7 @@ }, { "id": "Cape Verde", - "s": 3348170, + "s": 3346194, "affiliations": [ "Cabo Verde" ], @@ -2435,7 +2435,7 @@ }, { "id": "Cayman Islands", - "s": 1250209, + "s": 1252073, "affiliations": [ "Cayman Islands" ], @@ -2445,7 +2445,7 @@ }, { "id": "Central African Republic", - "s": 18231471, + "s": 18246343, "affiliations": [ "Bamingui-Bangoran", "Basse-Kotto", @@ -2471,7 +2471,7 @@ }, { "id": "Chad", - "s": 15257887, + "s": 15379783, "affiliations": [ "Bahr el Gazel", "Batha", @@ -2506,7 +2506,7 @@ "g": [ { "id": "Colombia_North", - "s": 56127506, + "s": 56317090, "affiliations": [ "Bol\u00edvar", "Antioquia", @@ -2528,7 +2528,7 @@ }, { "id": "Colombia_West", - "s": 57092713, + "s": 57152409, "affiliations": [ "Cauca", "Bogot\u00e1", @@ -2551,7 +2551,7 @@ }, { "id": "Colombia_East", - "s": 14043248, + "s": 14181216, "affiliations": [ "Amazonas", "Arauca", @@ -2573,7 +2573,7 @@ }, { "id": "Comoros", - "s": 1451660, + "s": 1460556, "affiliations": [ "Komori", "Ngazidja", @@ -2586,7 +2586,7 @@ }, { "id": "Congo-Brazzaville", - "s": 14485010, + "s": 14522946, "affiliations": [ "Bouenza", "Brazzaville", @@ -2611,7 +2611,7 @@ "g": [ { "id": "Congo-Kinshasa_West", - "s": 59730845, + "s": 60031029, "affiliations": [ "Bas-Uele", "Haut-Katanga", @@ -2645,7 +2645,7 @@ }, { "id": "Congo-Kinshasa_Kivu", - "s": 21824367, + "s": 21959007, "affiliations": [ "R\u00e9publique d\u00e9mocratique du Congo", "Nord-Kivu", @@ -2669,7 +2669,7 @@ }, { "id": "Costa Rica", - "s": 20501803, + "s": 20562539, "affiliations": [ "Alajuela", "Cartago", @@ -2691,7 +2691,7 @@ "g": [ { "id": "Croatia_Central", - "s": 37304716, + "s": 37430325, "affiliations": [ "Hrvatska" ], @@ -2701,7 +2701,7 @@ }, { "id": "Croatia_West", - "s": 51148734, + "s": 51349118, "affiliations": [ "Hrvatska", "Italia" @@ -2714,7 +2714,7 @@ }, { "id": "Cuba", - "s": 39856643, + "s": 39905139, "affiliations": [ "Artemisa", "Ciego de \u00c1vila", @@ -2738,7 +2738,7 @@ }, { "id": "Cyprus", - "s": 15546043, + "s": 15786595, "affiliations": [ "British Sovereign Base Areas", "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s" @@ -2752,7 +2752,7 @@ "g": [ { "id": "Czech_Praha", - "s": 24183600, + "s": 24207544, "affiliations": [ "Praha", "\u010cesko" @@ -2763,7 +2763,7 @@ }, { "id": "Czech_Severovychod_Pardubicky kraj", - "s": 30978955, + "s": 30988467, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2774,7 +2774,7 @@ }, { "id": "Czech_Karlovasky kraj", - "s": 16324840, + "s": 16326200, "affiliations": [ "Severoz\u00e1pad", "\u010cesko" @@ -2785,7 +2785,7 @@ }, { "id": "Czech_Ustecky kraj", - "s": 39407067, + "s": 39464795, "affiliations": [ "Severoz\u00e1pad", "\u010cesko" @@ -2796,7 +2796,7 @@ }, { "id": "Czech_Jihozapad_Plzensky kraj", - "s": 40975291, + "s": 41061643, "affiliations": [ "Jihoz\u00e1pad", "\u010cesko" @@ -2807,7 +2807,7 @@ }, { "id": "Czech_Severovychod_Kralovehradecky kraj", - "s": 35552683, + "s": 35565843, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2818,7 +2818,7 @@ }, { "id": "Czech_Olomoucky kraj", - "s": 33272235, + "s": 33285419, "affiliations": [ "St\u0159edn\u00ed Morava", "\u010cesko" @@ -2829,7 +2829,7 @@ }, { "id": "Czech_Zlinsky Kraj", - "s": 30700042, + "s": 30715186, "affiliations": [ "St\u0159edn\u00ed Morava", "\u010cesko" @@ -2840,7 +2840,7 @@ }, { "id": "Czech_Stredni Cechy_East", - "s": 49678576, + "s": 49700496, "affiliations": [ "St\u0159edn\u00ed \u010cechy", "\u010cesko" @@ -2851,7 +2851,7 @@ }, { "id": "Czech_Jihozapad_Jihocesky kraj", - "s": 56694033, + "s": 56793073, "affiliations": [ "Jihoz\u00e1pad", "\u010cesko" @@ -2862,7 +2862,7 @@ }, { "id": "Czech_Jihovychod_Kraj Vysocina", - "s": 45747942, + "s": 45774478, "affiliations": [ "Jihov\u00fdchod", "\u010cesko" @@ -2873,7 +2873,7 @@ }, { "id": "Czech_Severovychod_Liberecky kraj", - "s": 27022706, + "s": 27107346, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2884,7 +2884,7 @@ }, { "id": "Czech_Stredni Cechy_West", - "s": 37966659, + "s": 37992483, "affiliations": [ "St\u0159edn\u00ed \u010cechy", "\u010cesko" @@ -2895,7 +2895,7 @@ }, { "id": "Czech_Moravskoslezsko", - "s": 48795625, + "s": 48833761, "affiliations": [ "Moravskoslezsko", "\u010cesko" @@ -2906,7 +2906,7 @@ }, { "id": "Czech_Jihovychod_Jihomoravsky kraj", - "s": 55093456, + "s": 55142472, "affiliations": [ "Jihov\u00fdchod", "\u010cesko" @@ -2919,7 +2919,7 @@ }, { "id": "Cote dIvoire", - "s": 21003880, + "s": 21126401, "affiliations": [ "Abidjan", "Bas-Sassandra", @@ -2946,7 +2946,7 @@ "g": [ { "id": "Denmark_North Denmark Region", - "s": 37849326, + "s": 37881342, "affiliations": [ "Danmark", "Region Nordjylland" @@ -2957,7 +2957,7 @@ }, { "id": "Denmark_Central Denmark Region", - "s": 66638781, + "s": 66685837, "affiliations": [ "Danmark", "Region Midtjylland" @@ -2968,7 +2968,7 @@ }, { "id": "Denmark_Capital Region of Denmark", - "s": 48085830, + "s": 48136030, "affiliations": [ "Danmark", "Region Hovedstaden", @@ -2980,7 +2980,7 @@ }, { "id": "Denmark_Region Zealand", - "s": 43597463, + "s": 43666751, "affiliations": [ "Danmark", "Region Sj\u00e6lland" @@ -2991,7 +2991,7 @@ }, { "id": "Denmark_Region of Southern Denmark", - "s": 74507281, + "s": 74547657, "affiliations": [ "Danmark", "Region Syddanmark" @@ -3004,7 +3004,7 @@ }, { "id": "Djibouti", - "s": 1905867, + "s": 1905619, "affiliations": [ "Ali Sabieh", "Arta", @@ -3020,7 +3020,7 @@ }, { "id": "Dominican Republic", - "s": 27923445, + "s": 27932013, "affiliations": [ "Azua", "Baoruco", @@ -3062,7 +3062,7 @@ }, { "id": "East Timor", - "s": 3135505, + "s": 3135905, "affiliations": [ "Aileu", "Ainaro", @@ -3098,7 +3098,7 @@ }, { "id": "Chile_Central", - "s": 62933630, + "s": 63145470, "affiliations": [ "Chile", "Islote Gaviota", @@ -3115,7 +3115,7 @@ }, { "id": "Chile_North", - "s": 18864626, + "s": 18874650, "affiliations": [ "Chile", "I Regi\u00f3n de Tarapac\u00e1", @@ -3131,7 +3131,7 @@ }, { "id": "Chile_South", - "s": 60427892, + "s": 60736780, "affiliations": [ "Chile", "IX Regi\u00f3n de la Araucan\u00eda", @@ -3152,7 +3152,7 @@ "g": [ { "id": "Ecuador_East", - "s": 33410723, + "s": 33526971, "affiliations": [ "Azuay", "Carchi", @@ -3177,7 +3177,7 @@ }, { "id": "Ecuador_West", - "s": 48962354, + "s": 48984786, "affiliations": [ "Bol\u00edvar", "Azuay", @@ -3206,7 +3206,7 @@ }, { "id": "Egypt", - "s": 127730563, + "s": 115052338, "affiliations": [ "\u062f\u0645\u064a\u0627\u0637\u200e\u200e", "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0646\u0649 \u0633\u0648\u064a\u0641", @@ -3242,7 +3242,7 @@ }, { "id": "El Salvador", - "s": 15265758, + "s": 15359774, "affiliations": [ "Departamento de Cuscatl\u00e1n", "Departamento de La Libertad", @@ -3266,7 +3266,7 @@ }, { "id": "Equatorial Guinea", - "s": 1445833, + "s": 1445873, "affiliations": [ "Centro Sur", "Annob\u00f3n", @@ -3283,7 +3283,7 @@ }, { "id": "Eritrea", - "s": 4129069, + "s": 4186013, "affiliations": [ "Debub", "Debubawi Kayih Bahri", @@ -3302,7 +3302,7 @@ "g": [ { "id": "Estonia_West", - "s": 36014360, + "s": 36017009, "affiliations": [ "Eesti" ], @@ -3312,7 +3312,7 @@ }, { "id": "Estonia_East", - "s": 41375547, + "s": 41388883, "affiliations": [ "Eesti" ], @@ -3324,7 +3324,7 @@ }, { "id": "Ethiopia", - "s": 37903917, + "s": 38363845, "affiliations": [ "Addis Abeba", "Afar", @@ -3347,7 +3347,7 @@ }, { "id": "Faroe Islands", - "s": 2077499, + "s": 2077963, "affiliations": [ "Eysturoyar s\u00fdsla", "F\u00f8royar", @@ -3379,7 +3379,7 @@ }, { "id": "Fiji", - "s": 6498670, + "s": 6532006, "affiliations": [ "Central", "Eastern", @@ -3395,7 +3395,7 @@ "g": [ { "id": "Finland_Western Finland_Jyvaskyla", - "s": 22630175, + "s": 22634495, "affiliations": [ "L\u00e4nsi-Suomi", "Suomi" @@ -3406,7 +3406,7 @@ }, { "id": "Finland_Western Finland_Tampere", - "s": 43068786, + "s": 43185370, "affiliations": [ "L\u00e4nsi-Suomi", "Suomi" @@ -3417,7 +3417,7 @@ }, { "id": "Finland_Northern Finland", - "s": 42834664, + "s": 42740472, "affiliations": [ "Pohjois-Suomi", "Suomi" @@ -3428,7 +3428,7 @@ }, { "id": "Finland_Eastern Finland_North", - "s": 25219931, + "s": 25335107, "affiliations": [ "It\u00e4-Suomi", "Suomi" @@ -3439,7 +3439,7 @@ }, { "id": "Finland_Eastern Finland_South", - "s": 32596366, + "s": 32709518, "affiliations": [ "It\u00e4-Suomi", "Suomi" @@ -3450,7 +3450,7 @@ }, { "id": "Finland_Southern Finland_West", - "s": 23030398, + "s": 23116318, "affiliations": [ "Etel\u00e4-Suomi", "Suomi", @@ -3462,7 +3462,7 @@ }, { "id": "Finland_Southern Finland_Helsinki", - "s": 61889138, + "s": 61983378, "affiliations": [ "Etel\u00e4-Suomi", "Suomi" @@ -3473,7 +3473,7 @@ }, { "id": "Finland_Southern Finland_Lappeenranta", - "s": 35612513, + "s": 35711033, "affiliations": [ "Etel\u00e4-Suomi", "Suomi" @@ -3492,7 +3492,7 @@ "g": [ { "id": "France_Alsace_Bas-Rhin", - "s": 44823484, + "s": 44816332, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3503,7 +3503,7 @@ }, { "id": "France_Alsace_Haut-Rhin", - "s": 33208475, + "s": 33298300, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3519,7 +3519,7 @@ "g": [ { "id": "France_Aquitaine_Dordogne", - "s": 26041498, + "s": 26114754, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3530,7 +3530,7 @@ }, { "id": "France_Aquitaine_Gironde", - "s": 57436072, + "s": 57553840, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3541,7 +3541,7 @@ }, { "id": "France_Aquitaine_Landes", - "s": 25673530, + "s": 25679554, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3552,7 +3552,7 @@ }, { "id": "France_Aquitaine_Lot-et-Garonne", - "s": 21762916, + "s": 21853300, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3563,7 +3563,7 @@ }, { "id": "France_Aquitaine_Pyrenees-Atlantiques", - "s": 36696298, + "s": 36718306, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3579,7 +3579,7 @@ "g": [ { "id": "France_Auvergne_Allier", - "s": 24841438, + "s": 24877574, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3590,7 +3590,7 @@ }, { "id": "France_Auvergne_Cantal", - "s": 14751785, + "s": 14753800, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3601,7 +3601,7 @@ }, { "id": "France_Auvergne_Haute-Loire", - "s": 16839375, + "s": 17376889, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3612,7 +3612,7 @@ }, { "id": "France_Auvergne_Puy-de-Dome", - "s": 38504971, + "s": 38504994, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3628,7 +3628,7 @@ "g": [ { "id": "France_Brittany_Cotes-dArmor", - "s": 40008993, + "s": 40046363, "affiliations": [ "Bretagne", "France", @@ -3641,7 +3641,7 @@ }, { "id": "France_Brittany_Finistere", - "s": 57923396, + "s": 57964118, "affiliations": [ "Bretagne", "France" @@ -3652,7 +3652,7 @@ }, { "id": "France_Brittany_Ille-et-Vilaine", - "s": 51541464, + "s": 51557720, "affiliations": [ "Bretagne", "France", @@ -3664,7 +3664,7 @@ }, { "id": "France_Brittany_Morbihan", - "s": 41680414, + "s": 41724478, "affiliations": [ "Bretagne", "France" @@ -3680,7 +3680,7 @@ "g": [ { "id": "France_Burgundy_Cote-dOr", - "s": 27016478, + "s": 27038441, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3691,7 +3691,7 @@ }, { "id": "France_Burgundy_Nievre", - "s": 14782244, + "s": 14801500, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3702,7 +3702,7 @@ }, { "id": "France_Burgundy_Saone-et-Loire", - "s": 46125971, + "s": 46147147, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3713,7 +3713,7 @@ }, { "id": "France_Burgundy_Yonne", - "s": 24224849, + "s": 24253761, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3729,7 +3729,7 @@ "g": [ { "id": "France_Centre-Val de Loire_Cher", - "s": 16556004, + "s": 16565604, "affiliations": [ "Centre-Val de Loire", "France" @@ -3740,7 +3740,7 @@ }, { "id": "France_Centre-Val de Loire_Eure-et-Loir", - "s": 15452033, + "s": 15485577, "affiliations": [ "Centre-Val de Loire", "France" @@ -3751,7 +3751,7 @@ }, { "id": "France_Centre-Val de Loire_Indre", - "s": 20518612, + "s": 20568172, "affiliations": [ "Centre-Val de Loire", "France" @@ -3762,7 +3762,7 @@ }, { "id": "France_Centre-Val de Loire_Indre-et-Loire", - "s": 29159897, + "s": 29180761, "affiliations": [ "Centre-Val de Loire", "France" @@ -3773,7 +3773,7 @@ }, { "id": "France_Centre-Val de Loire_Loir-et-Cher", - "s": 17109318, + "s": 17093398, "affiliations": [ "Centre-Val de Loire", "France" @@ -3784,7 +3784,7 @@ }, { "id": "France_Centre-Val de Loire_Loiret", - "s": 27893193, + "s": 27913737, "affiliations": [ "Centre-Val de Loire", "France" @@ -3797,7 +3797,7 @@ }, { "id": "France_Champagne-Ardenne", - "s": 53818444, + "s": 53980763, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3808,7 +3808,7 @@ }, { "id": "France_Corsica", - "s": 11818175, + "s": 11825631, "affiliations": [ "Corse - Mer M\u00e9diterran\u00e9e", "Corse", @@ -3822,7 +3822,7 @@ }, { "id": "France_Free County_North", - "s": 36029191, + "s": 36130199, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3833,7 +3833,7 @@ }, { "id": "France_Free County_South", - "s": 26549232, + "s": 26578136, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3844,7 +3844,7 @@ }, { "id": "France_French Guiana", - "s": 6876607, + "s": 6918895, "affiliations": [ "France", "Guyane" @@ -3858,7 +3858,7 @@ "g": [ { "id": "France_Ile-de-France_Essonne", - "s": 28811660, + "s": 28822228, "affiliations": [ "France", "\u00cele-de-France" @@ -3869,7 +3869,7 @@ }, { "id": "France_Ile-de-France_Hauts-de-Seine", - "s": 13669185, + "s": 13715833, "affiliations": [ "France", "\u00cele-de-France" @@ -3880,7 +3880,7 @@ }, { "id": "France_Ile-de-France_Paris", - "s": 17413105, + "s": 17429081, "affiliations": [ "France", "\u00cele-de-France" @@ -3891,7 +3891,7 @@ }, { "id": "France_Ile-de-France_Seine-Saint-Denis", - "s": 17010797, + "s": 17092375, "affiliations": [ "France", "\u00cele-de-France" @@ -3902,7 +3902,7 @@ }, { "id": "France_Ile-de-France_Seine-et-Marne", - "s": 38517963, + "s": 38549739, "affiliations": [ "France", "\u00cele-de-France" @@ -3913,7 +3913,7 @@ }, { "id": "France_Ile-de-France_Val-dOise", - "s": 20477068, + "s": 20490332, "affiliations": [ "France", "\u00cele-de-France" @@ -3924,7 +3924,7 @@ }, { "id": "France_Ile-de-France_Val-de-Marne", - "s": 15812487, + "s": 15819119, "affiliations": [ "France", "\u00cele-de-France" @@ -3935,7 +3935,7 @@ }, { "id": "France_Ile-de-France_Yvelines", - "s": 27532674, + "s": 27544162, "affiliations": [ "France", "\u00cele-de-France" @@ -3951,7 +3951,7 @@ "g": [ { "id": "France_Languedoc-Roussillon_Aude", - "s": 27375751, + "s": 27461791, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3962,7 +3962,7 @@ }, { "id": "France_Languedoc-Roussillon_Gard", - "s": 30642628, + "s": 30672620, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3973,7 +3973,7 @@ }, { "id": "France_Languedoc-Roussillon_Herault", - "s": 46089680, + "s": 46130040, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3984,7 +3984,7 @@ }, { "id": "France_Languedoc-Roussillon_Lozere", - "s": 10947823, + "s": 10968337, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3995,7 +3995,7 @@ }, { "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", - "s": 25238890, + "s": 25264066, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4008,7 +4008,7 @@ }, { "id": "France_Limousin", - "s": 56634733, + "s": 56660037, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4022,7 +4022,7 @@ "g": [ { "id": "France_Lorraine_Meurthe-et-Moselle", - "s": 26547786, + "s": 26562885, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4033,7 +4033,7 @@ }, { "id": "France_Lorraine_Meuse", - "s": 12879533, + "s": 12879741, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4044,7 +4044,7 @@ }, { "id": "France_Lorraine_Moselle", - "s": 38480674, + "s": 38546881, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4055,7 +4055,7 @@ }, { "id": "France_Lorraine_Vosges", - "s": 25685544, + "s": 25702769, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4071,7 +4071,7 @@ "g": [ { "id": "France_Lower Normandy_Calvados", - "s": 30040260, + "s": 30046236, "affiliations": [ "France", "Normandie" @@ -4082,7 +4082,7 @@ }, { "id": "France_Lower Normandy_Manche", - "s": 30172612, + "s": 30183380, "affiliations": [ "France", "Jersey", @@ -4094,7 +4094,7 @@ }, { "id": "France_Lower Normandy_Orne", - "s": 21351572, + "s": 21356580, "affiliations": [ "France", "Normandie" @@ -4110,7 +4110,7 @@ "g": [ { "id": "France_Midi-Pyrenees_Ariege", - "s": 12291775, + "s": 12264703, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4121,7 +4121,7 @@ }, { "id": "France_Midi-Pyrenees_Aveyron", - "s": 31670467, + "s": 31718299, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4132,7 +4132,7 @@ }, { "id": "France_Midi-Pyrenees_Gers", - "s": 18371058, + "s": 18409066, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4143,7 +4143,7 @@ }, { "id": "France_Midi-Pyrenees_Haute-Garonne", - "s": 49637007, + "s": 49726007, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4154,7 +4154,7 @@ }, { "id": "France_Midi-Pyrenees_Hautes-Pyrenees", - "s": 32168057, + "s": 32172281, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4165,7 +4165,7 @@ }, { "id": "France_Midi-Pyrenees_Lot", - "s": 16763831, + "s": 16765711, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4176,7 +4176,7 @@ }, { "id": "France_Midi-Pyrenees_Tarn", - "s": 24519961, + "s": 24529697, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4187,7 +4187,7 @@ }, { "id": "France_Midi-Pyrenees_Tarn-et-Garonne", - "s": 15855900, + "s": 15867028, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4200,7 +4200,7 @@ }, { "id": "France_New Caledonia", - "s": 7059821, + "s": 7060853, "affiliations": [ "France", "France, Nouvelle-Cal\u00e9donie, Grande Terre et r\u00e9cifs d'Entrecasteaux (eaux territoriales)", @@ -4222,7 +4222,7 @@ "g": [ { "id": "France_Nord-Pas-de-Calais_Nord", - "s": 35099138, + "s": 35107738, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4233,7 +4233,7 @@ }, { "id": "France_Nord-Pas-de-Calais_Lille", - "s": 40973894, + "s": 40985974, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4244,7 +4244,7 @@ }, { "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", - "s": 55215422, + "s": 55239190, "affiliations": [ "England", "France", @@ -4262,7 +4262,7 @@ "g": [ { "id": "France_Pays de la Loire_Loire-Atlantique_Nantes", - "s": 41910410, + "s": 41922314, "affiliations": [ "France", "Pays de la Loire" @@ -4273,7 +4273,7 @@ }, { "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", - "s": 23177261, + "s": 23181277, "affiliations": [ "France", "Pays de la Loire" @@ -4284,7 +4284,7 @@ }, { "id": "France_Pays de la Loire_Maine-et-Loire", - "s": 42035147, + "s": 42042123, "affiliations": [ "France", "Pays de la Loire" @@ -4295,7 +4295,7 @@ }, { "id": "France_Pays de la Loire_Mayenne", - "s": 22185803, + "s": 22186795, "affiliations": [ "France", "Pays de la Loire" @@ -4306,7 +4306,7 @@ }, { "id": "France_Pays de la Loire_Sarthe", - "s": 35684920, + "s": 35697960, "affiliations": [ "France", "Pays de la Loire" @@ -4317,7 +4317,7 @@ }, { "id": "France_Pays de la Loire_Vendee", - "s": 54236815, + "s": 54217911, "affiliations": [ "France", "Pays de la Loire" @@ -4333,7 +4333,7 @@ "g": [ { "id": "France_Picardy_Aisne", - "s": 25852287, + "s": 25881551, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4344,7 +4344,7 @@ }, { "id": "France_Picardy_Oise", - "s": 31396236, + "s": 31414068, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4355,7 +4355,7 @@ }, { "id": "France_Picardy_Somme", - "s": 30407523, + "s": 30405051, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4371,7 +4371,7 @@ "g": [ { "id": "France_Poitou-Charentes_Charente", - "s": 26282341, + "s": 26285909, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4382,7 +4382,7 @@ }, { "id": "France_Poitou-Charentes_Charente-Maritime", - "s": 48286622, + "s": 48275582, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4393,7 +4393,7 @@ }, { "id": "France_Poitou-Charentes_Deux-Sevres", - "s": 34078000, + "s": 34101240, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4404,7 +4404,7 @@ }, { "id": "France_Poitou-Charentes_Vienne", - "s": 30071532, + "s": 30076348, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4420,7 +4420,7 @@ "g": [ { "id": "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence", - "s": 15222432, + "s": 15233632, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4431,7 +4431,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", - "s": 50855185, + "s": 50902585, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4442,7 +4442,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", - "s": 13128833, + "s": 13127561, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4453,7 +4453,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", - "s": 28123294, + "s": 28137254, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4465,7 +4465,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Var", - "s": 38959316, + "s": 38980100, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4476,7 +4476,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", - "s": 28801513, + "s": 28847001, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4492,7 +4492,7 @@ "g": [ { "id": "France_Rhone-Alpes_Ain", - "s": 35017444, + "s": 35080924, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4503,7 +4503,7 @@ }, { "id": "France_Rhone-Alpes_Ardeche", - "s": 23342261, + "s": 23386034, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4514,7 +4514,7 @@ }, { "id": "France_Rhone-Alpes_Drome", - "s": 29364827, + "s": 29426147, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France", @@ -4526,7 +4526,7 @@ }, { "id": "France_Rhone-Alpes_Haute-Savoie", - "s": 32089042, + "s": 32159010, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4537,7 +4537,7 @@ }, { "id": "France_Rhone-Alpes_Isere", - "s": 46541052, + "s": 46625244, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4548,7 +4548,7 @@ }, { "id": "France_Rhone-Alpes_Loire", - "s": 28747335, + "s": 28875845, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4559,7 +4559,7 @@ }, { "id": "France_Rhone-Alpes_Rhone", - "s": 44174616, + "s": 44185120, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4570,7 +4570,7 @@ }, { "id": "France_Rhone-Alpes_Savoie", - "s": 23102239, + "s": 23125775, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4583,7 +4583,7 @@ }, { "id": "France_Southern Islands", - "s": 24578820, + "s": 24729380, "affiliations": [ "France", "France, Mayotte (eaux territoriales)", @@ -4605,7 +4605,7 @@ }, { "id": "France_Upper Normandy", - "s": 57249764, + "s": 57299132, "affiliations": [ "France", "Normandie" @@ -4616,7 +4616,7 @@ }, { "id": "French Polynesia", - "s": 2872266, + "s": 2896914, "affiliations": [ "France", "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Gambier (eaux territoriales)", @@ -4634,7 +4634,7 @@ }, { "id": "Wallis and Futuna", - "s": 357673, + "s": 358265, "affiliations": [ "France", "France, Wallis-et-Futuna (eaux territoriales)" @@ -4647,7 +4647,7 @@ }, { "id": "Gabon", - "s": 5041477, + "s": 5045269, "affiliations": [ "Estuaire", "Gabon", @@ -4669,7 +4669,7 @@ "g": [ { "id": "Georgia", - "s": 39869502, + "s": 39974014, "affiliations": [ "\u10d7\u10d1\u10d8\u10da\u10d8\u10e1\u10d8", "\u10d8\u10db\u10d4\u10e0\u10d4\u10d7\u10d8", @@ -4690,7 +4690,7 @@ }, { "id": "Abkhazia", - "s": 5239162, + "s": 5245738, "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", @@ -4702,7 +4702,7 @@ }, { "id": "South Ossetia", - "s": 1667494, + "s": 1669150, "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", @@ -4722,7 +4722,7 @@ "g": [ { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", - "s": 90360043, + "s": 90505941, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland", @@ -4735,7 +4735,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", - "s": 91126546, + "s": 91262690, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4746,7 +4746,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", - "s": 29281534, + "s": 29300630, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4757,7 +4757,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", - "s": 85172338, + "s": 85269282, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4768,7 +4768,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", - "s": 64670299, + "s": 64846443, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4781,7 +4781,7 @@ }, { "id": "Germany_Berlin", - "s": 50576306, + "s": 50632722, "affiliations": [ "Berlin", "Deutschland" @@ -4792,7 +4792,7 @@ }, { "id": "Germany_Brandenburg_North", - "s": 46050132, + "s": 46200390, "affiliations": [ "Brandenburg", "Deutschland" @@ -4803,7 +4803,7 @@ }, { "id": "Germany_Brandenburg_South", - "s": 48682350, + "s": 48734894, "affiliations": [ "Brandenburg", "Deutschland" @@ -4817,7 +4817,7 @@ "g": [ { "id": "Germany_Free State of Bavaria_Lower Bavaria", - "s": 52364958, + "s": 52402590, "affiliations": [ "Bayern", "Deutschland" @@ -4828,7 +4828,7 @@ }, { "id": "Germany_Free State of Bavaria_Lower Franconia", - "s": 46980784, + "s": 47078544, "affiliations": [ "Bayern", "Deutschland" @@ -4839,7 +4839,7 @@ }, { "id": "Germany_Free State of Bavaria_Middle Franconia", - "s": 52723692, + "s": 52881260, "affiliations": [ "Bayern", "Deutschland" @@ -4850,7 +4850,7 @@ }, { "id": "Germany_Free State of Bavaria_Swabia", - "s": 72899547, + "s": 73017531, "affiliations": [ "Bayern", "Deutschland" @@ -4861,7 +4861,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_East", - "s": 47016674, + "s": 47141610, "affiliations": [ "Bayern", "Deutschland" @@ -4872,7 +4872,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", - "s": 24520659, + "s": 24729115, "affiliations": [ "Bayern", "Deutschland" @@ -4883,7 +4883,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", - "s": 45777324, + "s": 45809556, "affiliations": [ "Bayern", "Deutschland" @@ -4894,7 +4894,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_South", - "s": 20719218, + "s": 20729130, "affiliations": [ "Bayern", "Deutschland" @@ -4905,7 +4905,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Franconia", - "s": 48059302, + "s": 48140006, "affiliations": [ "Bayern", "Deutschland" @@ -4916,7 +4916,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Palatinate", - "s": 47047099, + "s": 47174723, "affiliations": [ "Bayern", "Deutschland" @@ -4929,7 +4929,7 @@ }, { "id": "Germany_Hamburg_main", - "s": 26813007, + "s": 26833751, "affiliations": [ "Deutschland", "Hamburg" @@ -4943,7 +4943,7 @@ "g": [ { "id": "Germany_Hesse_Regierungsbezirk Darmstadt", - "s": 89698292, + "s": 89838748, "affiliations": [ "Deutschland", "Hessen" @@ -4954,7 +4954,7 @@ }, { "id": "Germany_Hesse_Regierungsbezirk Giessen", - "s": 36654192, + "s": 36693296, "affiliations": [ "Deutschland", "Hessen" @@ -4965,7 +4965,7 @@ }, { "id": "Germany_Hesse_Regierungsbezirk Kassel", - "s": 51889043, + "s": 51980859, "affiliations": [ "Deutschland", "Hessen" @@ -4981,7 +4981,7 @@ "g": [ { "id": "Germany_Lower Saxony_Bremen_Bremen", - "s": 49636426, + "s": 49689986, "affiliations": [ "Bremen", "Deutschland", @@ -4995,7 +4995,7 @@ }, { "id": "Germany_Lower Saxony_Bremen_Munster", - "s": 51143856, + "s": 51175337, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5006,7 +5006,7 @@ }, { "id": "Germany_Lower Saxony_Hannover", - "s": 44779136, + "s": 44855904, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5017,7 +5017,7 @@ }, { "id": "Germany_Lower Saxony_Braunschweig", - "s": 53055722, + "s": 53099570, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5028,7 +5028,7 @@ }, { "id": "Germany_Lower Saxony_Oldenburg", - "s": 77005276, + "s": 77157524, "affiliations": [ "Bremen", "Deutschland", @@ -5042,7 +5042,7 @@ }, { "id": "Germany_Mecklenburg-Vorpommern", - "s": 74237234, + "s": 74318547, "affiliations": [ "Deutschland", "Mecklenburg-Vorpommern" @@ -5056,7 +5056,7 @@ "g": [ { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg", - "s": 44035802, + "s": 44331171, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5067,7 +5067,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", - "s": 73961657, + "s": 74007953, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5078,7 +5078,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", - "s": 81707380, + "s": 81831836, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5089,7 +5089,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", - "s": 65287501, + "s": 65321325, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5100,7 +5100,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", - "s": 56097133, + "s": 56236278, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5111,7 +5111,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", - "s": 17875243, + "s": 17913459, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5122,7 +5122,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", - "s": 58660430, + "s": 58735004, "affiliations": [ "Deutschland", "Deutschland - Belgique / Belgi\u00eb / Belgien", @@ -5134,7 +5134,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", - "s": 77363007, + "s": 77443071, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5145,7 +5145,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", - "s": 44690639, + "s": 44701295, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5156,7 +5156,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", - "s": 52009669, + "s": 52091438, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5169,7 +5169,7 @@ }, { "id": "Germany_Rhineland-Palatinate_Koblenz", - "s": 61577369, + "s": 61717921, "affiliations": [ "Deutschland", "Rheinland-Pfalz" @@ -5180,7 +5180,7 @@ }, { "id": "Germany_Rhineland-Palatinate_South", - "s": 61818823, + "s": 61908511, "affiliations": [ "Deutschland", "Rheinland-Pfalz" @@ -5191,7 +5191,7 @@ }, { "id": "Germany_Saarland", - "s": 28277699, + "s": 28314779, "affiliations": [ "Deutschland", "Saarland" @@ -5202,7 +5202,7 @@ }, { "id": "Germany_Saxony-Anhalt_Magdeburg", - "s": 41665602, + "s": 41737097, "affiliations": [ "Deutschland", "Sachsen-Anhalt" @@ -5213,7 +5213,7 @@ }, { "id": "Germany_Saxony-Anhalt_Halle", - "s": 37243334, + "s": 37279414, "affiliations": [ "Deutschland", "Sachsen-Anhalt" @@ -5224,7 +5224,7 @@ }, { "id": "Germany_Saxony_Dresden", - "s": 51654137, + "s": 51707177, "affiliations": [ "Deutschland", "Sachsen" @@ -5235,7 +5235,7 @@ }, { "id": "Germany_Saxony_Leipzig", - "s": 88148487, + "s": 88291991, "affiliations": [ "Deutschland", "Sachsen" @@ -5246,7 +5246,7 @@ }, { "id": "Germany_Schleswig-Holstein_Kiel", - "s": 47606805, + "s": 47660317, "affiliations": [ "Danmark", "Deutschland", @@ -5258,7 +5258,7 @@ }, { "id": "Germany_Schleswig-Holstein_Flensburg", - "s": 46757328, + "s": 46857976, "affiliations": [ "Deutschland", "Schleswig-Holstein" @@ -5269,7 +5269,7 @@ }, { "id": "Germany_Thuringia", - "s": 81419756, + "s": 81494852, "affiliations": [ "Deutschland", "Th\u00fcringen" @@ -5282,7 +5282,7 @@ }, { "id": "Ghana", - "s": 15629607, + "s": 15634511, "affiliations": [ "Ashanti Region", "Brong-Ahafo Region", @@ -5317,7 +5317,7 @@ "g": [ { "id": "Greece_Decentralized Administration of Crete", - "s": 10378770, + "s": 10414154, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "Territorial waters of Greece - Gavdos and Gavdopoula", @@ -5329,7 +5329,7 @@ }, { "id": "Greece_Decentralized Administration of West Greece", - "s": 27405826, + "s": 27432490, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "Territorial waters of Greece - Strofades", @@ -5342,7 +5342,7 @@ }, { "id": "Greece_Decentralized Administration of Aegean", - "s": 18598362, + "s": 18617135, "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\u03b9\u03b3\u03b1\u03af\u03bf\u03c5" @@ -5353,7 +5353,7 @@ }, { "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", - "s": 15564473, + "s": 15506529, "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 \u0397\u03c0\u03b5\u03af\u03c1\u03bf\u03c5 - \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2" @@ -5364,7 +5364,7 @@ }, { "id": "Greece_Decentralized Administration of Macedonia and Thrace", - "s": 34524197, + "s": 34567509, "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 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2 - \u0398\u03c1\u03ac\u03ba\u03b7\u03c2" @@ -5375,7 +5375,7 @@ }, { "id": "Greece_Decentralized Administration of Thessaly - Central Greece", - "s": 34327366, + "s": 34363902, "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", @@ -5387,7 +5387,7 @@ }, { "id": "Greece_Decentralized Administration of Attica", - "s": 28785876, + "s": 28928732, "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" @@ -5400,7 +5400,7 @@ }, { "id": "Greenland", - "s": 23087349, + "s": 23092957, "affiliations": [ "Kalaallit Nunaat" ], @@ -5410,7 +5410,7 @@ }, { "id": "Guatemala", - "s": 22849309, + "s": 24017949, "affiliations": [ "Alta Verapaz", "Baja Verapaz", @@ -5442,7 +5442,7 @@ }, { "id": "Guernsey", - "s": 974469, + "s": 978221, "affiliations": [ "Alderney", "Brecqhou", @@ -5475,7 +5475,7 @@ }, { "id": "Guinea", - "s": 37457656, + "s": 37590541, "affiliations": [ "Conakry", "Faranah", @@ -5511,7 +5511,7 @@ }, { "id": "Guyana", - "s": 4628938, + "s": 4632618, "affiliations": [ "Guyana" ], @@ -5521,7 +5521,7 @@ }, { "id": "Haiti", - "s": 24025345, + "s": 24036929, "affiliations": [ "Ayiti", "D\u00e9partement de l'Artibonite", @@ -5541,7 +5541,7 @@ }, { "id": "Honduras", - "s": 21798351, + "s": 21804847, "affiliations": [ "Atl\u00e1ntida", "Chinandega", @@ -5573,7 +5573,7 @@ "g": [ { "id": "Hungary_Northern Great Plain", - "s": 52589574, + "s": 52736507, "affiliations": [ "Alf\u00f6ld \u00e9s \u00c9szak", "Magyarorsz\u00e1g" @@ -5584,7 +5584,7 @@ }, { "id": "Hungary_Transdanubia", - "s": 58904190, + "s": 58985974, "affiliations": [ "Dun\u00e1nt\u00fal", "Magyarorsz\u00e1g" @@ -5595,7 +5595,7 @@ }, { "id": "Hungary_Kozep-Magyarorszag", - "s": 33597468, + "s": 33654796, "affiliations": [ "K\u00f6z\u00e9p-Magyarorsz\u00e1g", "Magyarorsz\u00e1g" @@ -5608,7 +5608,7 @@ }, { "id": "Iceland", - "s": 21064081, + "s": 21173441, "affiliations": [ "\u00cdsland" ], @@ -5621,7 +5621,7 @@ "g": [ { "id": "India_Andaman and Nicobar Islands", - "s": 1501439, + "s": 1501639, "affiliations": [ "Andaman and Nicobar Islands", "India" @@ -5632,7 +5632,7 @@ }, { "id": "India_Lakshadweep", - "s": 280164, + "s": 280884, "affiliations": [ "India", "Lakshadweep" @@ -5643,7 +5643,7 @@ }, { "id": "India_Andhra Pradesh", - "s": 28970442, + "s": 29092694, "affiliations": [ "Andhra Pradesh", "India", @@ -5655,7 +5655,7 @@ }, { "id": "India_Gujarat", - "s": 27065504, + "s": 27156968, "affiliations": [ "Gujarat", "India", @@ -5668,7 +5668,7 @@ }, { "id": "India_Kerala", - "s": 14265000, + "s": 14315312, "affiliations": [ "India", "Kerala" @@ -5679,7 +5679,7 @@ }, { "id": "India_Madhya Pradesh", - "s": 26691408, + "s": 26687040, "affiliations": [ "India", "Madhya Pradesh" @@ -5690,7 +5690,7 @@ }, { "id": "India_Rajasthan", - "s": 36774314, + "s": 36813687, "affiliations": [ "India", "Rajasthan" @@ -5701,7 +5701,7 @@ }, { "id": "India_Tamil Nadu", - "s": 53712256, + "s": 53877753, "affiliations": [ "Cuddalore-Puducherry Administrative Boundary", "India", @@ -5718,7 +5718,7 @@ }, { "id": "India_Haryana", - "s": 40217418, + "s": 40337537, "affiliations": [ "Haryana", "India" @@ -5729,7 +5729,7 @@ }, { "id": "India_Goa", - "s": 2890430, + "s": 2900118, "affiliations": [ "Goa", "India" @@ -5740,7 +5740,7 @@ }, { "id": "India_Karnataka_North", - "s": 24611481, + "s": 24656121, "affiliations": [ "India", "Karnataka" @@ -5751,7 +5751,7 @@ }, { "id": "India_Karnataka_South", - "s": 52703374, + "s": 52732150, "affiliations": [ "India", "Karnataka" @@ -5762,7 +5762,7 @@ }, { "id": "India_Maharashtra", - "s": 71418226, + "s": 71811271, "affiliations": [ "Ankisha", "Ganjiramannapeta", @@ -5778,7 +5778,7 @@ }, { "id": "India_Telangana", - "s": 73308139, + "s": 73306827, "affiliations": [ "India", "Telangana" @@ -5789,7 +5789,7 @@ }, { "id": "India_Delhi", - "s": 23950033, + "s": 23948369, "affiliations": [ "Delhi", "India" @@ -5800,7 +5800,7 @@ }, { "id": "India_Uttar Pradesh", - "s": 40316753, + "s": 40348667, "affiliations": [ "Uttar Pradesh", "India" @@ -5811,7 +5811,7 @@ }, { "id": "India_Odisha", - "s": 10702661, + "s": 10687268, "affiliations": [ "India", "Odisha" @@ -5822,7 +5822,7 @@ }, { "id": "India_Chhattisgarh", - "s": 6571391, + "s": 6583672, "affiliations": [ "Chhattisgarh", "India" @@ -5833,7 +5833,7 @@ }, { "id": "India_Jharkhand", - "s": 5019741, + "s": 5019789, "affiliations": [ "Jharkhand", "India" @@ -5844,7 +5844,7 @@ }, { "id": "India_Bihar", - "s": 8695706, + "s": 8724794, "affiliations": [ "Bihar", "India" @@ -5866,7 +5866,7 @@ }, { "id": "India_West Bengal", - "s": 32431262, + "s": 32454118, "affiliations": [ "Border India - Bangladesh", "Dist. Judges Court", @@ -5879,7 +5879,7 @@ }, { "id": "India_Sikkim", - "s": 688958, + "s": 688726, "affiliations": [ "India", "Sikkim" @@ -5890,7 +5890,7 @@ }, { "id": "India_Uttarakhand", - "s": 7626265, + "s": 7629721, "affiliations": [ "Uttarakhand", "India" @@ -5912,7 +5912,7 @@ }, { "id": "India_Meghalaya", - "s": 969805, + "s": 973393, "affiliations": [ "India", "Meghalaya" @@ -5923,7 +5923,7 @@ }, { "id": "India_Manipur", - "s": 729910, + "s": 729990, "affiliations": [ "India", "Manipur" @@ -5934,7 +5934,7 @@ }, { "id": "India_Nagaland", - "s": 590795, + "s": 591011, "affiliations": [ "India", "Nagaland" @@ -5945,7 +5945,7 @@ }, { "id": "India_Assam", - "s": 3557227, + "s": 3549428, "affiliations": [ "Assam", "India" @@ -5956,7 +5956,7 @@ }, { "id": "India_Arunachal Pradesh", - "s": 1858248, + "s": 1845800, "affiliations": [ "Arunachal Pradesh", "India" @@ -5967,7 +5967,7 @@ }, { "id": "India_Himachal Pradesh", - "s": 3996252, + "s": 4019276, "affiliations": [ "Himachal Pradesh", "India" @@ -5978,7 +5978,7 @@ }, { "id": "India_Jammu and Kashmir", - "s": 5889111, + "s": 5904879, "affiliations": [ "India", "Jammu and Kashmir" @@ -5989,7 +5989,7 @@ }, { "id": "India_Chandigarh", - "s": 1210172, + "s": 1210156, "affiliations": [ "India", "Union Territory of Chand\u012bgarh" @@ -6000,7 +6000,7 @@ }, { "id": "India_Punjab", - "s": 18759821, + "s": 18748461, "affiliations": [ "India", "Punjab" @@ -6016,7 +6016,7 @@ "g": [ { "id": "Indonesia_Central", - "s": 60304445, + "s": 60494949, "affiliations": [ "Gorontalo", "Indonesia", @@ -6037,7 +6037,7 @@ }, { "id": "Indonesia_West", - "s": 40891587, + "s": 41142467, "affiliations": [ "Aceh", "Banten", @@ -6059,7 +6059,7 @@ }, { "id": "Indonesia_Jawa Tengah", - "s": 34828900, + "s": 34896404, "affiliations": [ "Daerah Istimewa Yogyakarta", "Indonesia", @@ -6071,7 +6071,7 @@ }, { "id": "Indonesia_Jawa Barat", - "s": 43376826, + "s": 43421778, "affiliations": [ "Banten", "Daerah Khusus Ibukota Jakarta", @@ -6084,7 +6084,7 @@ }, { "id": "Indonesia_Nusa Tenggara", - "s": 41606669, + "s": 41624525, "affiliations": [ "Bali", "Batas Dusun Muntigunung Induk", @@ -6099,7 +6099,7 @@ }, { "id": "Indonesia_Jawa Timur", - "s": 39198624, + "s": 39216192, "affiliations": [ "Indonesia", "Jawa Timur" @@ -6110,7 +6110,7 @@ }, { "id": "Indonesia_East", - "s": 13483645, + "s": 13508565, "affiliations": [ "Indonesia", "Maluku", @@ -6129,7 +6129,7 @@ "g": [ { "id": "Iran_East", - "s": 35717004, + "s": 35953612, "affiliations": [ "\u06cc\u0632\u062f\u200e", "\u06a9\u0631\u0645\u0627\u0646", @@ -6145,7 +6145,7 @@ }, { "id": "Iran_South", - "s": 52857453, + "s": 53270853, "affiliations": [ "\u0644\u0631\u0633\u062a\u0627\u0646\u200e", "\u0641\u0627\u0631\u0633\u200e", @@ -6168,7 +6168,7 @@ }, { "id": "Iran_North", - "s": 54635841, + "s": 55274289, "affiliations": [ "\u0642\u0645\u200e", "\u0627\u0644\u0628\u0631\u0632", @@ -6197,7 +6197,7 @@ "g": [ { "id": "Iraq_North", - "s": 36997426, + "s": 37309754, "affiliations": [ "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", "garaki handren", @@ -6217,7 +6217,7 @@ }, { "id": "Iraq_South", - "s": 31006710, + "s": 32023662, "affiliations": [ "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", "\u0630\u064a \u0642\u0627\u0631", @@ -6257,7 +6257,7 @@ "g": [ { "id": "Jerusalem", - "s": 4160942, + "s": 4162374, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" @@ -6269,7 +6269,7 @@ }, { "id": "Israel", - "s": 42758686, + "s": 42812326, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d7\u05d9\u05e4\u05d4", "\u05de\u05d7\u05d5\u05d6 \u05ea\u05dc \u05d0\u05d1\u05d9\u05d1", @@ -6291,7 +6291,7 @@ "g": [ { "id": "Italy_Abruzzo", - "s": 16102139, + "s": 16110899, "affiliations": [ "Abruzzo", "Italia" @@ -6302,7 +6302,7 @@ }, { "id": "Italy_Aosta Valley", - "s": 8884528, + "s": 9080824, "affiliations": [ "Italia", "Valle d'Aosta/Vall\u00e9e d'Aoste" @@ -6313,7 +6313,7 @@ }, { "id": "Italy_Apulia", - "s": 92014115, + "s": 92001595, "affiliations": [ "Isola della Chianca", "Isola della Malva", @@ -6329,7 +6329,7 @@ }, { "id": "Italy_Basilicata", - "s": 10529200, + "s": 10549480, "affiliations": [ "Basilicata", "Italia" @@ -6340,7 +6340,7 @@ }, { "id": "Italy_Calabria", - "s": 23773200, + "s": 23800992, "affiliations": [ "Calabria", "Isola di Cirella", @@ -6353,7 +6353,7 @@ }, { "id": "Italy_Campania", - "s": 33793218, + "s": 33897458, "affiliations": [ "Campania", "Isola Licosa", @@ -6373,7 +6373,7 @@ "g": [ { "id": "Italy_Emilia-Romagna_Bologna", - "s": 23808415, + "s": 23796791, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6384,7 +6384,7 @@ }, { "id": "Italy_Emilia-Romagna_Ferrara", - "s": 10619173, + "s": 10619493, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6395,7 +6395,7 @@ }, { "id": "Italy_Emilia-Romagna_Forli-Cesena", - "s": 10394514, + "s": 10399931, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6406,7 +6406,7 @@ }, { "id": "Italy_Emilia-Romagna_Modena", - "s": 20306411, + "s": 20322715, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6417,7 +6417,7 @@ }, { "id": "Italy_Emilia-Romagna_Parma", - "s": 14891296, + "s": 14962766, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6428,7 +6428,7 @@ }, { "id": "Italy_Emilia-Romagna_Piacenza", - "s": 9834562, + "s": 9840234, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6439,7 +6439,7 @@ }, { "id": "Italy_Emilia-Romagna_Ravenna", - "s": 9018146, + "s": 9008194, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6450,7 +6450,7 @@ }, { "id": "Italy_Emilia-Romagna_Reggio Emilia", - "s": 12214035, + "s": 12218131, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6461,7 +6461,7 @@ }, { "id": "Italy_Emilia-Romagna_Rimini", - "s": 7607325, + "s": 7575322, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6477,7 +6477,7 @@ "g": [ { "id": "Italy_Friuli-Venezia Giulia_Gorizia", - "s": 7264964, + "s": 7265492, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6488,7 +6488,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Pordenone", - "s": 18719225, + "s": 18731193, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6499,7 +6499,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Trieste", - "s": 6631780, + "s": 6633020, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6510,7 +6510,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Udine", - "s": 40885510, + "s": 40886086, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6523,7 +6523,7 @@ }, { "id": "Italy_Lazio", - "s": 51349915, + "s": 51598515, "affiliations": [ "Civitatis Vatican\u00e6", "Gavi", @@ -6540,7 +6540,7 @@ }, { "id": "Italy_Liguria", - "s": 40187880, + "s": 40225797, "affiliations": [ "Italia", "Liguria" @@ -6554,7 +6554,7 @@ "g": [ { "id": "Italy_Lombardy_Bergamo", - "s": 14852435, + "s": 14903795, "affiliations": [ "Italia", "Lombardia" @@ -6565,7 +6565,7 @@ }, { "id": "Italy_Lombardy_Brescia", - "s": 23545153, + "s": 23554729, "affiliations": [ "Italia", "Lombardia" @@ -6576,7 +6576,7 @@ }, { "id": "Italy_Lombardy_Como", - "s": 10790004, + "s": 10800756, "affiliations": [ "Italia", "Lombardia" @@ -6587,7 +6587,7 @@ }, { "id": "Italy_Lombardy_Cremona", - "s": 5340817, + "s": 5342049, "affiliations": [ "Italia", "Lombardia" @@ -6598,7 +6598,7 @@ }, { "id": "Italy_Lombardy_Lecco", - "s": 8279521, + "s": 8288801, "affiliations": [ "Italia", "Lombardia" @@ -6609,7 +6609,7 @@ }, { "id": "Italy_Lombardy_Lodi", - "s": 5129694, + "s": 5131838, "affiliations": [ "Italia", "Lombardia" @@ -6620,7 +6620,7 @@ }, { "id": "Italy_Lombardy_Mantua", - "s": 6298409, + "s": 6357129, "affiliations": [ "Italia", "Lombardia" @@ -6631,7 +6631,7 @@ }, { "id": "Italy_Lombardy_Milan", - "s": 25714639, + "s": 25788951, "affiliations": [ "Italia", "Lombardia" @@ -6642,7 +6642,7 @@ }, { "id": "Italy_Lombardy_Monza and Brianza", - "s": 9503513, + "s": 9507649, "affiliations": [ "Italia", "Lombardia" @@ -6653,7 +6653,7 @@ }, { "id": "Italy_Lombardy_Pavia", - "s": 19945634, + "s": 20011938, "affiliations": [ "Italia", "Lombardia" @@ -6664,7 +6664,7 @@ }, { "id": "Italy_Lombardy_Sondrio", - "s": 7923926, + "s": 7948718, "affiliations": [ "Italia", "Lombardia" @@ -6675,7 +6675,7 @@ }, { "id": "Italy_Lombardy_Varese", - "s": 14137444, + "s": 14162204, "affiliations": [ "Italia", "Lombardia" @@ -6688,7 +6688,7 @@ }, { "id": "Italy_Marche", - "s": 22185823, + "s": 22220623, "affiliations": [ "Italia", "Marche" @@ -6699,7 +6699,7 @@ }, { "id": "Italy_Molise", - "s": 7477746, + "s": 7535370, "affiliations": [ "Italia", "Molise" @@ -6713,7 +6713,7 @@ "g": [ { "id": "Italy_Piemont_Alessandria", - "s": 11169516, + "s": 11176756, "affiliations": [ "Italia", "Piemonte" @@ -6724,7 +6724,7 @@ }, { "id": "Italy_Piemont_Asti", - "s": 3394359, + "s": 3408160, "affiliations": [ "Italia", "Piemonte" @@ -6735,7 +6735,7 @@ }, { "id": "Italy_Piemont_Biella", - "s": 3142187, + "s": 3159051, "affiliations": [ "Italia", "Piemonte" @@ -6746,7 +6746,7 @@ }, { "id": "Italy_Piemont_Cuneo", - "s": 24369961, + "s": 24438257, "affiliations": [ "Italia", "Piemonte" @@ -6757,7 +6757,7 @@ }, { "id": "Italy_Piemont_Novara", - "s": 7489221, + "s": 7489429, "affiliations": [ "Italia", "Piemonte" @@ -6768,7 +6768,7 @@ }, { "id": "Italy_Piemont_Torino", - "s": 24261795, + "s": 24309027, "affiliations": [ "Italia", "Piemonte" @@ -6779,7 +6779,7 @@ }, { "id": "Italy_Piemont_Verbano-Cusio-Ossola", - "s": 5565112, + "s": 5581184, "affiliations": [ "Italia", "Piemonte" @@ -6790,7 +6790,7 @@ }, { "id": "Italy_Piemont_Vercelli", - "s": 6854276, + "s": 6860964, "affiliations": [ "Italia", "Piemonte" @@ -6803,7 +6803,7 @@ }, { "id": "Italy_Sardinia", - "s": 53355112, + "s": 53562096, "affiliations": [ "Isola Tuaredda", "Isola de Sa tonnara", @@ -6824,7 +6824,7 @@ }, { "id": "Italy_Sicily", - "s": 70778731, + "s": 71022123, "affiliations": [ "Isola dei Cani", "Isola delle Correnti", @@ -6872,7 +6872,7 @@ }, { "id": "Italy_Trentino-Alto Adige Sudtirol", - "s": 57008120, + "s": 57133984, "affiliations": [ "Italia", "Trentino-Alto Adige/S\u00fcdtirol" @@ -6883,7 +6883,7 @@ }, { "id": "Italy_Tuscany_Grosseto", - "s": 22227605, + "s": 22278181, "affiliations": [ "Formica Piccola", "Formica Grande", @@ -6900,7 +6900,7 @@ }, { "id": "Italy_Tuscany_Massa e Carrara", - "s": 49852720, + "s": 49926608, "affiliations": [ "Cerboli", "Isola della Peraiola", @@ -6918,7 +6918,7 @@ }, { "id": "Italy_Umbria", - "s": 18358426, + "s": 18397026, "affiliations": [ "Italia", "Umbria" @@ -6932,7 +6932,7 @@ "g": [ { "id": "Italy_Veneto_Belluno", - "s": 11897094, + "s": 11909934, "affiliations": [ "Italia", "Veneto" @@ -6943,7 +6943,7 @@ }, { "id": "Italy_Veneto_Padova", - "s": 26327352, + "s": 26330389, "affiliations": [ "Italia", "Veneto" @@ -6954,7 +6954,7 @@ }, { "id": "Italy_Veneto_Rovigo", - "s": 9155219, + "s": 9149315, "affiliations": [ "Italia", "Veneto" @@ -6965,7 +6965,7 @@ }, { "id": "Italy_Veneto_Treviso", - "s": 31307659, + "s": 31320427, "affiliations": [ "Italia", "Veneto" @@ -6976,7 +6976,7 @@ }, { "id": "Italy_Veneto_Venezia", - "s": 20384304, + "s": 20373669, "affiliations": [ "Italia", "Veneto" @@ -6987,7 +6987,7 @@ }, { "id": "Italy_Veneto_Verona", - "s": 26173749, + "s": 26168093, "affiliations": [ "Italia", "Veneto" @@ -6998,7 +6998,7 @@ }, { "id": "Italy_Veneto_Vicenza", - "s": 25030127, + "s": 25018879, "affiliations": [ "Italia", "Veneto" @@ -7013,7 +7013,7 @@ }, { "id": "Jamaica", - "s": 7638355, + "s": 7645219, "affiliations": [ "Jamaica" ], @@ -7029,7 +7029,7 @@ "g": [ { "id": "Japan_Chubu Region_Aichi_Nagoya", - "s": 67403843, + "s": 67492003, "affiliations": [ "\u65e5\u672c", "\u4e09\u91cd\u770c", @@ -7041,7 +7041,7 @@ }, { "id": "Japan_Chubu Region_Aichi_Toyohashi", - "s": 22124734, + "s": 22190374, "affiliations": [ "\u65e5\u672c", "\u611b\u77e5\u770c" @@ -7052,7 +7052,7 @@ }, { "id": "Japan_Chubu Region_Fukui", - "s": 16382639, + "s": 16615486, "affiliations": [ "\u65e5\u672c", "\u798f\u4e95\u770c" @@ -7063,7 +7063,7 @@ }, { "id": "Japan_Chubu Region_Gifu", - "s": 34720725, + "s": 34714589, "affiliations": [ "\u65e5\u672c", "\u5c90\u961c\u770c" @@ -7074,7 +7074,7 @@ }, { "id": "Japan_Chubu Region_Ishikawa", - "s": 18009922, + "s": 18012352, "affiliations": [ "\u65e5\u672c", "\u77f3\u5ddd\u770c" @@ -7085,7 +7085,7 @@ }, { "id": "Japan_Chubu Region_Nagano", - "s": 43118081, + "s": 43216337, "affiliations": [ "\u9577\u91ce\u770c", "\u65e5\u672c" @@ -7096,7 +7096,7 @@ }, { "id": "Japan_Chubu Region_Niigata", - "s": 46283805, + "s": 46224549, "affiliations": [ "\u65e5\u672c", "\u65b0\u6f5f\u770c", @@ -7108,7 +7108,7 @@ }, { "id": "Japan_Chubu Region_Shizuoka", - "s": 64026729, + "s": 64095241, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c" @@ -7119,7 +7119,7 @@ }, { "id": "Japan_Chubu Region_Toyama", - "s": 17974722, + "s": 18002202, "affiliations": [ "\u65e5\u672c", "\u5bcc\u5c71\u770c", @@ -7131,7 +7131,7 @@ }, { "id": "Japan_Chubu Region_Yamanashi", - "s": 19555538, + "s": 19579562, "affiliations": [ "\u65e5\u672c", "\u5c71\u68a8\u770c" @@ -7147,7 +7147,7 @@ "g": [ { "id": "Japan_Chugoku Region_Hiroshima", - "s": 42045088, + "s": 42062264, "affiliations": [ "\u65e5\u672c", "\u5e83\u5cf6\u770c" @@ -7158,7 +7158,7 @@ }, { "id": "Japan_Chugoku Region_Okayama", - "s": 25653452, + "s": 25691676, "affiliations": [ "\u65e5\u672c", "\u5ca1\u5c71\u770c" @@ -7169,7 +7169,7 @@ }, { "id": "Japan_Chugoku Region_Shimane", - "s": 17870278, + "s": 17908382, "affiliations": [ "\u65e5\u672c", "\u5cf6\u6839\u770c" @@ -7180,7 +7180,7 @@ }, { "id": "Japan_Chugoku Region_Tottori", - "s": 17023609, + "s": 17165057, "affiliations": [ "\u9ce5\u53d6\u770c", "\u65e5\u672c" @@ -7191,7 +7191,7 @@ }, { "id": "Japan_Chugoku Region_Yamaguchi", - "s": 20742370, + "s": 20773306, "affiliations": [ "\u65e5\u672c", "\u5c71\u53e3\u770c" @@ -7207,7 +7207,7 @@ "g": [ { "id": "Japan_Hokkaido Region_East", - "s": 24755070, + "s": 24741510, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7218,7 +7218,7 @@ }, { "id": "Japan_Hokkaido Region_North", - "s": 32091392, + "s": 32225177, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7229,7 +7229,7 @@ }, { "id": "Japan_Hokkaido Region_West", - "s": 19131396, + "s": 19131420, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7240,7 +7240,7 @@ }, { "id": "Japan_Hokkaido Region_Sapporo", - "s": 48246522, + "s": 48650474, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7256,7 +7256,7 @@ "g": [ { "id": "Japan_Kanto_Chiba", - "s": 58796556, + "s": 58810436, "affiliations": [ "\u65e5\u672c", "\u5343\u8449\u770c", @@ -7269,7 +7269,7 @@ }, { "id": "Japan_Kanto_Gunma", - "s": 35725094, + "s": 35734736, "affiliations": [ "\u65e5\u672c", "\u7fa4\u99ac\u770c" @@ -7280,7 +7280,7 @@ }, { "id": "Japan_Kanto_Ibaraki", - "s": 41004352, + "s": 41051272, "affiliations": [ "\u8328\u57ce\u770c", "\u65e5\u672c", @@ -7293,7 +7293,7 @@ }, { "id": "Japan_Kanto_Kanagawa", - "s": 64778446, + "s": 65106027, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c", @@ -7307,7 +7307,7 @@ }, { "id": "Japan_Kanto_Saitama", - "s": 63906641, + "s": 64068403, "affiliations": [ "\u65e5\u672c", "\u57fc\u7389\u770c" @@ -7318,7 +7318,7 @@ }, { "id": "Japan_Kanto_Tochigi", - "s": 33696001, + "s": 33711305, "affiliations": [ "\u65e5\u672c", "\u6803\u6728\u770c" @@ -7329,7 +7329,7 @@ }, { "id": "Japan_Kanto_Tokyo", - "s": 81340040, + "s": 81449520, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c", @@ -7346,7 +7346,7 @@ "g": [ { "id": "Japan_Kinki Region_Mie", - "s": 25962896, + "s": 26070728, "affiliations": [ "\u65e5\u672c", "\u4e09\u91cd\u770c", @@ -7358,7 +7358,7 @@ }, { "id": "Japan_Kinki Region_Nara", - "s": 15918223, + "s": 15931199, "affiliations": [ "\u65e5\u672c", "\u5948\u826f\u770c", @@ -7370,7 +7370,7 @@ }, { "id": "Japan_Kinki Region_Osaka_Osaka", - "s": 53965872, + "s": 54114304, "affiliations": [ "\u65e5\u672c", "\u5175\u5eab\u770c", @@ -7382,7 +7382,7 @@ }, { "id": "Japan_Kinki Region_Osaka_West", - "s": 39076092, + "s": 39074948, "affiliations": [ "\u65e5\u672c", "\u5175\u5eab\u770c" @@ -7393,7 +7393,7 @@ }, { "id": "Japan_Kinki Region_Wakayama", - "s": 12241790, + "s": 12254038, "affiliations": [ "\u65e5\u672c", "\u548c\u6b4c\u5c71\u770c" @@ -7409,7 +7409,7 @@ "g": [ { "id": "Japan_Kyushu Region_Fukuoka", - "s": 41838606, + "s": 41864710, "affiliations": [ "\u65e5\u672c", "\u798f\u5ca1\u770c" @@ -7420,7 +7420,7 @@ }, { "id": "Japan_Kyushu Region_Kagoshima", - "s": 33271356, + "s": 33316876, "affiliations": [ "\u65e5\u672c", "\u9e7f\u5150\u5cf6\u770c" @@ -7431,7 +7431,7 @@ }, { "id": "Japan_Kyushu Region_Kumamoto", - "s": 35072585, + "s": 35104737, "affiliations": [ "\u65e5\u672c", "\u718a\u672c\u770c" @@ -7442,7 +7442,7 @@ }, { "id": "Japan_Kyushu Region_Miyazaki", - "s": 19277820, + "s": 19292332, "affiliations": [ "\u65e5\u672c", "\u5bae\u5d0e\u770c" @@ -7453,7 +7453,7 @@ }, { "id": "Japan_Kyushu Region_Nagasaki", - "s": 17575452, + "s": 17621892, "affiliations": [ "\u9577\u5d0e\u770c", "\u65e5\u672c" @@ -7464,7 +7464,7 @@ }, { "id": "Japan_Kyushu Region_Oita", - "s": 21700002, + "s": 21727186, "affiliations": [ "\u65e5\u672c", "\u5927\u5206\u770c" @@ -7475,7 +7475,7 @@ }, { "id": "Japan_Kyushu Region_Okinawa", - "s": 15410986, + "s": 15447498, "affiliations": [ "\u65e5\u672c", "\u6c96\u7e04\u770c" @@ -7486,7 +7486,7 @@ }, { "id": "Japan_Kyushu Region_Saga", - "s": 14235450, + "s": 14232210, "affiliations": [ "\u65e5\u672c", "\u4f50\u8cc0\u770c" @@ -7502,7 +7502,7 @@ "g": [ { "id": "Japan_Shikoku Region_Ehime", - "s": 25363122, + "s": 25399210, "affiliations": [ "\u65e5\u672c", "\u611b\u5a9b\u770c" @@ -7513,7 +7513,7 @@ }, { "id": "Japan_Shikoku Region_Kagawa", - "s": 11793237, + "s": 11799629, "affiliations": [ "\u9999\u5ddd\u770c", "\u65e5\u672c" @@ -7524,7 +7524,7 @@ }, { "id": "Japan_Shikoku Region_Kochi", - "s": 14145602, + "s": 14151754, "affiliations": [ "\u9ad8\u77e5\u770c", "\u65e5\u672c" @@ -7535,7 +7535,7 @@ }, { "id": "Japan_Shikoku Region_Kyoto", - "s": 46114582, + "s": 46247919, "affiliations": [ "\u65e5\u672c", "\u4eac\u90fd\u5e9c", @@ -7547,7 +7547,7 @@ }, { "id": "Japan_Shikoku Region_Tokushima", - "s": 15159538, + "s": 15159706, "affiliations": [ "\u65e5\u672c", "\u5fb3\u5cf6\u770c" @@ -7563,7 +7563,7 @@ "g": [ { "id": "Japan_Tohoku_Akita", - "s": 25259408, + "s": 25309064, "affiliations": [ "\u65e5\u672c", "\u79cb\u7530\u770c" @@ -7574,7 +7574,7 @@ }, { "id": "Japan_Tohoku_Aomori", - "s": 23507794, + "s": 23537842, "affiliations": [ "\u9752\u68ee\u770c", "\u65e5\u672c" @@ -7585,7 +7585,7 @@ }, { "id": "Japan_Tohoku_Fukushima", - "s": 50560440, + "s": 50640115, "affiliations": [ "\u65e5\u672c", "\u798f\u5cf6\u770c" @@ -7596,7 +7596,7 @@ }, { "id": "Japan_Tohoku_Iwate", - "s": 30980602, + "s": 31016298, "affiliations": [ "\u65e5\u672c", "\u5ca9\u624b\u770c" @@ -7607,7 +7607,7 @@ }, { "id": "Japan_Tohoku_Miyagi", - "s": 28606287, + "s": 28574399, "affiliations": [ "\u65e5\u672c", "\u5bae\u57ce\u770c", @@ -7619,7 +7619,7 @@ }, { "id": "Japan_Tohoku_Yamagata", - "s": 23714489, + "s": 23666345, "affiliations": [ "\u65e5\u672c", "\u5c71\u5f62\u770c" @@ -7634,7 +7634,7 @@ }, { "id": "Jersey", - "s": 1517136, + "s": 1517304, "affiliations": [ "France", "Guernsey", @@ -7653,7 +7653,7 @@ }, { "id": "Jordan", - "s": 21995267, + "s": 21997691, "affiliations": [ "Ajloun", "Amman", @@ -7678,7 +7678,7 @@ "g": [ { "id": "Kazakhstan_North", - "s": 37890053, + "s": 37915517, "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", @@ -7694,7 +7694,7 @@ }, { "id": "Kazakhstan_South", - "s": 45641692, + "s": 45781228, "affiliations": [ "\u0410\u043b\u043c\u0430\u0442\u044b", "\u0410\u0442\u044b\u0440\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", @@ -7716,7 +7716,7 @@ }, { "id": "Kenya", - "s": 25023451, + "s": 25531924, "affiliations": [ "Baringo", "Bungoma", @@ -7773,7 +7773,7 @@ }, { "id": "Kingdom of Lesotho", - "s": 50476315, + "s": 50945517, "affiliations": [ "Lesotho" ], @@ -7783,7 +7783,7 @@ }, { "id": "Kiribati", - "s": 983013, + "s": 984397, "affiliations": [ "Kiribati" ], @@ -7793,7 +7793,7 @@ }, { "id": "Kuwait", - "s": 6078189, + "s": 6238989, "affiliations": [ "\u062d\u0648\u0644\u064a", "\u0645\u0628\u0627\u0631\u0643 \u0627\u0644\u0643\u0628\u064a\u0631\u200e", @@ -7809,7 +7809,7 @@ }, { "id": "Kyrgyzstan", - "s": 27356485, + "s": 27568117, "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", @@ -7830,7 +7830,7 @@ }, { "id": "Laos", - "s": 11207565, + "s": 11248709, "affiliations": [ "\u0e84\u0ecd\u0eb2\u0ea1\u0ec8\u0ea7\u0e99", "\u0e88\u0eb3\u0e9b\u0eb2\u0eaa\u0eb1\u0e81", @@ -7857,7 +7857,7 @@ }, { "id": "Latvia", - "s": 58871951, + "s": 58965100, "affiliations": [ "Latgale", "Latvija", @@ -7871,7 +7871,7 @@ }, { "id": "Lebanon", - "s": 8100557, + "s": 8171573, "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", @@ -7906,7 +7906,7 @@ }, { "id": "Liberia", - "s": 17055038, + "s": 17074414, "affiliations": [ "Bomi County", "Bong County", @@ -7931,7 +7931,7 @@ }, { "id": "Libya", - "s": 20691775, + "s": 20724623, "affiliations": [ "Libya \u2d4d\u2d49\u2d31\u2d62\u2d30 \u0644\u064a\u0628\u064a\u0627", "\u0633\u0631\u062a", @@ -7963,7 +7963,7 @@ }, { "id": "Liechtenstein", - "s": 1432623, + "s": 1432615, "affiliations": [ "Liechtenstein" ], @@ -7976,7 +7976,7 @@ "g": [ { "id": "Lithuania_East", - "s": 48154024, + "s": 48299640, "affiliations": [ "Alytaus apskritis", "Kauno apskritis", @@ -7990,7 +7990,7 @@ }, { "id": "Lithuania_West", - "s": 48346620, + "s": 48510484, "affiliations": [ "Klaip\u0117dos apskritis", "Lietuva", @@ -8008,7 +8008,7 @@ }, { "id": "Luxembourg", - "s": 16256225, + "s": 16297625, "affiliations": [ "L\u00ebtzebuerg" ], @@ -8018,7 +8018,7 @@ }, { "id": "Macedonia", - "s": 17686393, + "s": 17809289, "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", @@ -8036,7 +8036,7 @@ }, { "id": "Madagascar", - "s": 36804015, + "s": 36896703, "affiliations": [ "Madagasikara", "Region de Anosy", @@ -8050,7 +8050,7 @@ }, { "id": "Malawi", - "s": 23277967, + "s": 24736609, "affiliations": [ "Border Malawi - Mozambique", "Central", @@ -8066,7 +8066,7 @@ }, { "id": "Malaysia", - "s": 66343178, + "s": 66404538, "affiliations": [ "Terengganu / \u062a\u0631\u06a0\u06ac\u0627\u0646\u0648", "Johor", @@ -8112,7 +8112,7 @@ }, { "id": "Maldives", - "s": 2115660, + "s": 2118676, "affiliations": [ "Mathi-Dhekunu Province", "Mathi-Uthuru Province", @@ -8131,7 +8131,7 @@ }, { "id": "Mali", - "s": 44470693, + "s": 44498701, "affiliations": [ "District de Bamako", "Gao", @@ -8150,7 +8150,7 @@ }, { "id": "Malta", - "s": 4335845, + "s": 4339965, "affiliations": [ "Comino", "Cominotto", @@ -8178,7 +8178,7 @@ }, { "id": "Mauritania", - "s": 9727221, + "s": 9771845, "affiliations": [ "\u0646\u0648\u0627\u0643\u0634\u0648\u0637", "Mauritanie \u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627", @@ -8200,7 +8200,7 @@ }, { "id": "Mauritius", - "s": 3754561, + "s": 3801138, "affiliations": [ "Black River", "Mauritius", @@ -8238,7 +8238,7 @@ "g": [ { "id": "Mexico_California", - "s": 20248921, + "s": 20509257, "affiliations": [ "Baja California", "Baja California Sur", @@ -8254,7 +8254,7 @@ }, { "id": "Mexico_Central_East", - "s": 50469161, + "s": 50989344, "affiliations": [ "Coahuila de Zaragoza", "Estados Unidos Mexicanos", @@ -8268,7 +8268,7 @@ }, { "id": "Mexico_Central_West", - "s": 61852883, + "s": 61992749, "affiliations": [ "Aguascalientes", "Colima", @@ -8285,7 +8285,7 @@ }, { "id": "Mexico_East", - "s": 44708853, + "s": 44748566, "affiliations": [ "Campeche", "Chiapas", @@ -8303,7 +8303,7 @@ }, { "id": "Mexico_Mexico", - "s": 84462785, + "s": 84739734, "affiliations": [ "Distrito Federal", "Estados Unidos Mexicanos", @@ -8320,7 +8320,7 @@ }, { "id": "Mexico_Chihuahua", - "s": 35954131, + "s": 36043594, "affiliations": [ "Chihuahua", "Coahuila de Zaragoza", @@ -8335,7 +8335,7 @@ }, { "id": "Mexico_Sonora", - "s": 29887323, + "s": 29907771, "affiliations": [ "Chihuahua", "Durango", @@ -8349,7 +8349,7 @@ }, { "id": "Mexico_South", - "s": 58547508, + "s": 59044043, "affiliations": [ "Estados Unidos Mexicanos", "Guerrero", @@ -8367,7 +8367,7 @@ }, { "id": "Moldova", - "s": 35867141, + "s": 36002997, "affiliations": [ "G\u0103g\u0103uzia - Gagauz Yeri - \u0413\u0430\u0433\u0430\u0443\u0437\u0438\u044f", "Moldova", @@ -8379,7 +8379,7 @@ }, { "id": "Monaco", - "s": 251274, + "s": 251626, "affiliations": [ "France", "Monaco" @@ -8390,7 +8390,7 @@ }, { "id": "Mongolia", - "s": 18114587, + "s": 18128899, "affiliations": [ "Border Darkhan-Uul - Selenge", "\u0423\u0432\u0441 \u0430\u0439\u043c\u0430\u0433", @@ -8425,7 +8425,7 @@ }, { "id": "Montenegro", - "s": 15644592, + "s": 15685536, "affiliations": [ "Crna Gora" ], @@ -8438,7 +8438,7 @@ "g": [ { "id": "Morocco_Western Sahara", - "s": 7459332, + "s": 7532572, "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", @@ -8453,7 +8453,7 @@ }, { "id": "Morocco_Southern", - "s": 37249459, + "s": 37456892, "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", @@ -8469,7 +8469,7 @@ }, { "id": "Morocco_Doukkala-Abda", - "s": 27996952, + "s": 28019472, "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", @@ -8482,7 +8482,7 @@ }, { "id": "Morocco_Rabat-Sale-Zemmour-Zaer", - "s": 19598651, + "s": 19643524, "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", @@ -8498,7 +8498,7 @@ }, { "id": "Mozambique", - "s": 89628074, + "s": 89715682, "affiliations": [ "Cabo Delgado", "Gaza", @@ -8518,7 +8518,7 @@ }, { "id": "Myanmar", - "s": 49259285, + "s": 49444941, "affiliations": [ "Ayeyarwady", "Bago Region", @@ -8543,7 +8543,7 @@ }, { "id": "Namibia", - "s": 15361460, + "s": 15458124, "affiliations": [ "Arandis", "Aranos7", @@ -8588,7 +8588,7 @@ "g": [ { "id": "Nepal_West", - "s": 47394447, + "s": 47591031, "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", @@ -8601,7 +8601,7 @@ }, { "id": "Nepal_Kathmandu", - "s": 28577272, + "s": 28592200, "affiliations": [ "\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" @@ -8612,7 +8612,7 @@ }, { "id": "Nepal_Madhyamanchal", - "s": 25106855, + "s": 25111423, "affiliations": [ "\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" @@ -8623,7 +8623,7 @@ }, { "id": "Nepal_Purwanchal", - "s": 11693559, + "s": 11709943, "affiliations": [ "\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" @@ -8636,7 +8636,7 @@ }, { "id": "Nicaragua", - "s": 18604252, + "s": 18628604, "affiliations": [ "Boaco", "Carazo", @@ -8664,7 +8664,7 @@ }, { "id": "Niger", - "s": 18500735, + "s": 18893009, "affiliations": [ "Agadez", "Dosso", @@ -8685,7 +8685,7 @@ "g": [ { "id": "Nigeria_South", - "s": 59484107, + "s": 59686335, "affiliations": [ "Abia", "Adamawa", @@ -8723,7 +8723,7 @@ }, { "id": "Nigeria_North", - "s": 37453167, + "s": 37529477, "affiliations": [ "Bauchi", "Borno", @@ -8746,7 +8746,7 @@ }, { "id": "Niue", - "s": 216455, + "s": 216607, "affiliations": [ "Niu\u0113" ], @@ -8756,7 +8756,7 @@ }, { "id": "North Korea", - "s": 19826871, + "s": 19848711, "affiliations": [ "\uac15\uc6d0\ub3c4", "\ub7c9\uac15\ub3c4", @@ -8780,7 +8780,7 @@ "g": [ { "id": "Norway_Northern", - "s": 42844235, + "s": 42936307, "affiliations": [ "Finnmark", "Norge", @@ -8792,7 +8792,7 @@ }, { "id": "Norway_Hordaland", - "s": 46003741, + "s": 46010941, "affiliations": [ "Hordaland", "Norge" @@ -8803,7 +8803,7 @@ }, { "id": "Norway_Nordland", - "s": 30353212, + "s": 30474660, "affiliations": [ "Nordland", "Norge", @@ -8815,7 +8815,7 @@ }, { "id": "Norway_Svalbard", - "s": 1266774, + "s": 1271862, "affiliations": [ "Norge", "Svalbard" @@ -8826,7 +8826,7 @@ }, { "id": "Norway_Oppland", - "s": 36286302, + "s": 36294678, "affiliations": [ "Norge", "Oppland" @@ -8837,7 +8837,7 @@ }, { "id": "Norway_Rogaland", - "s": 22192927, + "s": 22202632, "affiliations": [ "Norge", "Rogaland" @@ -8848,7 +8848,7 @@ }, { "id": "Norway_Hedmark", - "s": 40529477, + "s": 40529013, "affiliations": [ "Hedmark", "Norge" @@ -8867,7 +8867,7 @@ }, { "id": "Norway_North Trondelag", - "s": 48002192, + "s": 48006376, "affiliations": [ "Nord-Tr\u00f8ndelag", "Norge", @@ -8879,7 +8879,7 @@ }, { "id": "Norway_South Trondelag", - "s": 52911423, + "s": 52967375, "affiliations": [ "Norge", "S\u00f8r-Tr\u00f8ndelag" @@ -8890,7 +8890,7 @@ }, { "id": "Norway_Southern", - "s": 67187917, + "s": 67403389, "affiliations": [ "Aust-Agder", "\u00d8stfold", @@ -8905,7 +8905,7 @@ }, { "id": "Norway_Western", - "s": 59427422, + "s": 59428134, "affiliations": [ "M\u00f8re og Romsdal", "Norge", @@ -8917,7 +8917,7 @@ }, { "id": "Norway_Central", - "s": 61569885, + "s": 61678173, "affiliations": [ "Akershus", "Buskerud", @@ -8943,7 +8943,7 @@ }, { "id": "Oman", - "s": 15156472, + "s": 15237480, "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", @@ -8963,7 +8963,7 @@ }, { "id": "Pakistan", - "s": 57554463, + "s": 57670767, "affiliations": [ "\u0633\u0646\u068c", "\u0622\u0632\u0627\u062f \u062c\u0645\u0648\u06ba \u0648 \u06a9\u0634\u0645\u06cc\u0631", @@ -8981,7 +8981,7 @@ }, { "id": "Palau", - "s": 431906, + "s": 434842, "affiliations": [ "Belau", "PW" @@ -8992,7 +8992,7 @@ }, { "id": "Panama", - "s": 12737698, + "s": 12738274, "affiliations": [ "Bocas del Toro", "Chiriqu\u00ed", @@ -9019,7 +9019,7 @@ }, { "id": "Papua New Guinea", - "s": 6771971, + "s": 6780955, "affiliations": [ "Border Central-NCD", "Bougainville", @@ -9052,7 +9052,7 @@ }, { "id": "Paraguay", - "s": 31105288, + "s": 31164784, "affiliations": [ "Alto Paraguay", "Alto Paran\u00e1", @@ -9085,7 +9085,7 @@ "g": [ { "id": "China_Anhui", - "s": 12631452, + "s": 12673445, "affiliations": [ "\u4e2d\u56fd", "\u5b89\u5fbd\u7701" @@ -9096,7 +9096,7 @@ }, { "id": "China_Chongqing", - "s": 5377841, + "s": 5373881, "affiliations": [ "\u91cd\u5e86\u5e02", "\u4e2d\u56fd" @@ -9107,7 +9107,7 @@ }, { "id": "China_Fujian", - "s": 11355329, + "s": 11376246, "affiliations": [ "\u4e2d\u56fd", "\u798f\u5efa\u7701" @@ -9118,7 +9118,7 @@ }, { "id": "China_Gansu", - "s": 11876019, + "s": 11911396, "affiliations": [ "\u4e2d\u56fd", "\u7518\u8083\u7701" @@ -9129,7 +9129,7 @@ }, { "id": "China_Guangdong", - "s": 60516940, + "s": 61079045, "affiliations": [ "\u4e2d\u56fd", "\u5e7f\u4e1c\u7701", @@ -9141,7 +9141,7 @@ }, { "id": "China_Guangxi", - "s": 8761762, + "s": 8846546, "affiliations": [ "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" @@ -9152,7 +9152,7 @@ }, { "id": "China_Guizhou", - "s": 5398798, + "s": 5581921, "affiliations": [ "\u8d35\u5dde\u7701", "\u4e2d\u56fd" @@ -9163,7 +9163,7 @@ }, { "id": "China_Hebei", - "s": 30729390, + "s": 30921294, "affiliations": [ "\u4e2d\u56fd", "\u5317\u4eac\u5e02", @@ -9176,7 +9176,7 @@ }, { "id": "China_Heilongjiang", - "s": 10522197, + "s": 10543765, "affiliations": [ "\u4e2d\u56fd", "\u9ed1\u9f99\u6c5f\u7701" @@ -9187,7 +9187,7 @@ }, { "id": "China_Henan", - "s": 12626849, + "s": 12630849, "affiliations": [ "\u4e2d\u56fd", "\u6cb3\u5357\u7701" @@ -9198,7 +9198,7 @@ }, { "id": "China_Hubei", - "s": 11223495, + "s": 11224311, "affiliations": [ "Border Henan - Hubei", "\u4e2d\u56fd", @@ -9210,7 +9210,7 @@ }, { "id": "China_Hunan", - "s": 10521840, + "s": 10564464, "affiliations": [ "\u4e2d\u56fd", "\u6e56\u5357\u7701" @@ -9221,7 +9221,7 @@ }, { "id": "China_Inner Mongolia", - "s": 16582634, + "s": 16616586, "affiliations": [ "\u4e2d\u56fd", "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia" @@ -9232,7 +9232,7 @@ }, { "id": "China_Jiangsu", - "s": 38458428, + "s": 38696868, "affiliations": [ "\u4e2d\u56fd", "\u6c5f\u82cf\u7701", @@ -9244,7 +9244,7 @@ }, { "id": "China_Jiangxi", - "s": 11619466, + "s": 11757778, "affiliations": [ "\u4e2d\u56fd", "\u6c5f\u897f\u7701" @@ -9255,7 +9255,7 @@ }, { "id": "China_Jilin", - "s": 11282594, + "s": 11286554, "affiliations": [ "\u4e2d\u56fd", "\u5409\u6797\u7701" @@ -9266,7 +9266,7 @@ }, { "id": "China_Liaoning", - "s": 12717498, + "s": 12867515, "affiliations": [ "\u8fbd\u5b81\u7701", "\u4e2d\u56fd" @@ -9277,7 +9277,7 @@ }, { "id": "China_Ningxia Hui", - "s": 3328451, + "s": 3328379, "affiliations": [ "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" @@ -9288,7 +9288,7 @@ }, { "id": "China_Qinghai", - "s": 7976602, + "s": 7981882, "affiliations": [ "\u9752\u6d77\u7701", "\u4e2d\u56fd" @@ -9299,7 +9299,7 @@ }, { "id": "China_Shaanxi", - "s": 12574419, + "s": 12691333, "affiliations": [ "\u9655\u897f\u7701", "\u4e2d\u56fd" @@ -9310,7 +9310,7 @@ }, { "id": "China_Shandong", - "s": 25459991, + "s": 25615871, "affiliations": [ "\u4e2d\u56fd", "\u5c71\u4e1c\u7701" @@ -9321,7 +9321,7 @@ }, { "id": "China_Shanghai", - "s": 14606998, + "s": 14674598, "affiliations": [ "\u4e2d\u56fd", "\u4e0a\u6d77\u5e02", @@ -9333,7 +9333,7 @@ }, { "id": "China_Shanxi", - "s": 7219184, + "s": 7261784, "affiliations": [ "\u4e2d\u56fd", "\u5c71\u897f\u7701" @@ -9344,7 +9344,7 @@ }, { "id": "China_Sichuan", - "s": 17425055, + "s": 17447343, "affiliations": [ "\u4e2d\u56fd", "\u56db\u5ddd\u7701" @@ -9355,7 +9355,7 @@ }, { "id": "China_Tibet Autonomous Region", - "s": 14176658, + "s": 14176626, "affiliations": [ "\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)" @@ -9366,7 +9366,7 @@ }, { "id": "China_Xinjiang", - "s": 15243125, + "s": 15256149, "affiliations": [ "\u4e2d\u56fd", "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a" @@ -9377,7 +9377,7 @@ }, { "id": "China_Yunnan", - "s": 18365975, + "s": 18485694, "affiliations": [ "\u4e2d\u56fd", "\u4e91\u5357\u7701" @@ -9388,7 +9388,7 @@ }, { "id": "China_Zhejiang", - "s": 23884746, + "s": 23903946, "affiliations": [ "\u4e2d\u56fd", "\u6d59\u6c5f\u7701" @@ -9404,7 +9404,7 @@ "g": [ { "id": "Taiwan_North", - "s": 47113498, + "s": 47553250, "affiliations": [ "\u4e2d\u56fd", "\u65b0\u5317\u5e02", @@ -9421,7 +9421,7 @@ }, { "id": "Taiwan_South", - "s": 49745826, + "s": 49875178, "affiliations": [ "\u9ad8\u96c4\u5e02", "\u53f0\u5357\u5e02", @@ -9439,7 +9439,7 @@ "g": [ { "id": "Peru_North", - "s": 36876232, + "s": 37131664, "affiliations": [ "Amazonas", "Ancash", @@ -9461,7 +9461,7 @@ }, { "id": "Peru_Lima", - "s": 34849592, + "s": 35030928, "affiliations": [ "Callao", "Huancavelica", @@ -9476,7 +9476,7 @@ }, { "id": "Peru_South", - "s": 32073069, + "s": 32140597, "affiliations": [ "Apur\u00edmac", "Arequipa", @@ -9499,7 +9499,7 @@ "g": [ { "id": "Philippines_Mindanao", - "s": 30892638, + "s": 31261702, "affiliations": [ "Agusan Del Sur", "Agusan del Norte", @@ -9540,7 +9540,7 @@ }, { "id": "Philippines_Visayas", - "s": 44807102, + "s": 44862086, "affiliations": [ "Aklan", "Bohol", @@ -9571,7 +9571,7 @@ }, { "id": "Philippines_Luzon_South", - "s": 7369827, + "s": 7384523, "affiliations": [ "Antique", "Ban Than (Zhongzhou) Reef", @@ -9594,7 +9594,7 @@ }, { "id": "Philippines_Luzon_Manila", - "s": 81832173, + "s": 82171205, "affiliations": [ "Catanduanes", "Cavite", @@ -9616,7 +9616,7 @@ }, { "id": "Philippines_Luzon_North", - "s": 45414659, + "s": 46789955, "affiliations": [ "Abra", "Cavite", @@ -9667,7 +9667,7 @@ "g": [ { "id": "Poland_West Pomeranian Voivodeship", - "s": 54387164, + "s": 54438140, "affiliations": [ "Polska", "Territorial waters of Bornholm", @@ -9679,7 +9679,7 @@ }, { "id": "Poland_Pomeranian Voivodeship", - "s": 54562598, + "s": 54643750, "affiliations": [ "Polska", "Territorial waters of Bornholm", @@ -9691,7 +9691,7 @@ }, { "id": "Poland_Podlaskie Voivodeship", - "s": 31912680, + "s": 31998304, "affiliations": [ "Polska", "wojew\u00f3dztwo podlaskie" @@ -9702,7 +9702,7 @@ }, { "id": "Poland_Masovian Voivodeship", - "s": 111303696, + "s": 111510605, "affiliations": [ "Polska", "wojew\u00f3dztwo mazowieckie" @@ -9713,7 +9713,7 @@ }, { "id": "Poland_Lubusz Voivodeship", - "s": 31073889, + "s": 31143817, "affiliations": [ "Polska", "wojew\u00f3dztwo lubuskie" @@ -9724,7 +9724,7 @@ }, { "id": "Poland_Lublin Voivodeship", - "s": 65946799, + "s": 65953839, "affiliations": [ "Polska", "wojew\u00f3dztwo lubelskie" @@ -9735,7 +9735,7 @@ }, { "id": "Poland_Lower Silesian Voivodeship", - "s": 85766369, + "s": 85937761, "affiliations": [ "Polska", "wojew\u00f3dztwo dolno\u015bl\u0105skie" @@ -9746,7 +9746,7 @@ }, { "id": "Poland_Warmian-Masurian Voivodeship", - "s": 40815794, + "s": 40866410, "affiliations": [ "Polska", "wojew\u00f3dztwo warmi\u0144sko-mazurskie" @@ -9757,7 +9757,7 @@ }, { "id": "Poland_Lodz Voivodeship", - "s": 59621111, + "s": 60340095, "affiliations": [ "Polska", "wojew\u00f3dztwo \u0142\u00f3dzkie" @@ -9768,7 +9768,7 @@ }, { "id": "Poland_Subcarpathian Voivodeship", - "s": 71993158, + "s": 72157446, "affiliations": [ "Polska", "wojew\u00f3dztwo podkarpackie" @@ -9779,7 +9779,7 @@ }, { "id": "Poland_Lesser Poland Voivodeship", - "s": 92138426, + "s": 92255920, "affiliations": [ "Polska", "wojew\u00f3dztwo ma\u0142opolskie" @@ -9790,7 +9790,7 @@ }, { "id": "Poland_Silesian Voivodeship", - "s": 100521594, + "s": 100732943, "affiliations": [ "Polska", "wojew\u00f3dztwo \u015bl\u0105skie" @@ -9801,7 +9801,7 @@ }, { "id": "Poland_Kuyavian-Pomeranian Voivodeship", - "s": 41158725, + "s": 41485285, "affiliations": [ "Polska", "wojew\u00f3dztwo kujawsko-pomorskie" @@ -9812,7 +9812,7 @@ }, { "id": "Poland_Greater Poland Voivodeship", - "s": 74019454, + "s": 74200334, "affiliations": [ "Polska", "wojew\u00f3dztwo wielkopolskie" @@ -9823,7 +9823,7 @@ }, { "id": "Poland_Opole Voivodeship", - "s": 32633195, + "s": 32966547, "affiliations": [ "Polska", "wojew\u00f3dztwo opolskie" @@ -9834,7 +9834,7 @@ }, { "id": "Poland_Swietokrzyskie Voivodeship", - "s": 42899723, + "s": 43930416, "affiliations": [ "Polska", "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie" @@ -9850,7 +9850,7 @@ "g": [ { "id": "Portugal_Porto", - "s": 53347470, + "s": 53517046, "affiliations": [ "Centro", "Norte", @@ -9862,7 +9862,7 @@ }, { "id": "Portugal_South", - "s": 57678800, + "s": 57829216, "affiliations": [ "Centro", "Alentejo", @@ -9876,7 +9876,7 @@ }, { "id": "Portugal_Islands", - "s": 9490899, + "s": 9522091, "affiliations": [ "Ilh\u00e9u dos Rosais", "Ilh\u00e9us dos Rosais", @@ -9918,7 +9918,7 @@ }, { "id": "Portugal_Viseu", - "s": 43684366, + "s": 43771534, "affiliations": [ "Centro", "Norte", @@ -9932,7 +9932,7 @@ }, { "id": "Qatar", - "s": 6513345, + "s": 6521521, "affiliations": [ "Ad Dawhah", "Al Ghuwariyah", @@ -9952,7 +9952,7 @@ }, { "id": "Republic of Kosovo", - "s": 10263746, + "s": 10284386, "affiliations": [ "Republika e Kosov\u00ebs" ], @@ -9965,7 +9965,7 @@ "g": [ { "id": "Romania_South_East", - "s": 24051370, + "s": 24054530, "affiliations": [ "Br\u0103ila", "Buz\u0103u", @@ -9981,7 +9981,7 @@ }, { "id": "Romania_Centre", - "s": 40619876, + "s": 40641148, "affiliations": [ "Alba", "Bra\u0219ov", @@ -9997,7 +9997,7 @@ }, { "id": "Romania_West", - "s": 28856460, + "s": 28875388, "affiliations": [ "Arad", "Cara\u0219 Severin", @@ -10011,7 +10011,7 @@ }, { "id": "Romania_North_West", - "s": 38022279, + "s": 38050487, "affiliations": [ "Bihor", "Bistri\u021ba-N\u0103s\u0103ud", @@ -10027,7 +10027,7 @@ }, { "id": "Romania_South_West", - "s": 22859873, + "s": 22870233, "affiliations": [ "Dolj", "Gorj", @@ -10042,7 +10042,7 @@ }, { "id": "Romania_North_East", - "s": 33645212, + "s": 33661260, "affiliations": [ "Bac\u0103u", "Boto\u0219ani", @@ -10058,7 +10058,7 @@ }, { "id": "Romania_South", - "s": 42502046, + "s": 42522542, "affiliations": [ "Arge\u0219", "Bucure\u0219ti", @@ -10083,7 +10083,7 @@ "g": [ { "id": "Crimea", - "s": 29521114, + "s": 29585970, "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", @@ -10098,7 +10098,7 @@ }, { "id": "Russia_Altai Krai", - "s": 26373798, + "s": 26858854, "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", @@ -10110,7 +10110,7 @@ }, { "id": "Russia_Altai Republic", - "s": 7986826, + "s": 7995834, "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", @@ -10122,7 +10122,7 @@ }, { "id": "Russia_Amur Oblast", - "s": 8585406, + "s": 8593430, "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", @@ -10134,7 +10134,7 @@ }, { "id": "Russia_Arkhangelsk Oblast_Central", - "s": 53149752, + "s": 53166440, "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", @@ -10146,7 +10146,7 @@ }, { "id": "Russia_Arkhangelsk Oblast_North", - "s": 21692339, + "s": 21818515, "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", @@ -10160,7 +10160,7 @@ }, { "id": "Russia_Astrakhan Oblast", - "s": 7621397, + "s": 7784149, "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", @@ -10172,7 +10172,7 @@ }, { "id": "Russia_Bashkortostan", - "s": 36020357, + "s": 36137725, "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", @@ -10184,7 +10184,7 @@ }, { "id": "Russia_Belgorod Oblast", - "s": 19332714, + "s": 19363506, "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", @@ -10196,7 +10196,7 @@ }, { "id": "Russia_Bryansk Oblast", - "s": 15654380, + "s": 15660572, "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", @@ -10208,7 +10208,7 @@ }, { "id": "Russia_Buryatia", - "s": 8673646, + "s": 8681782, "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", @@ -10220,7 +10220,7 @@ }, { "id": "Russia_Chechen Republic", - "s": 5512723, + "s": 5513851, "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", @@ -10232,7 +10232,7 @@ }, { "id": "Russia_Chelyabinsk Oblast", - "s": 47928240, + "s": 47995912, "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", @@ -10244,7 +10244,7 @@ }, { "id": "Russia_Chukotka Autonomous Okrug", - "s": 7436690, + "s": 7442234, "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", @@ -10256,7 +10256,7 @@ }, { "id": "Russia_Chuvashia", - "s": 13359442, + "s": 13367578, "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", @@ -10280,7 +10280,7 @@ }, { "id": "Russia_Irkutsk Oblast", - "s": 26555883, + "s": 26788308, "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", @@ -10292,7 +10292,7 @@ }, { "id": "Russia_Ivanovo Oblast", - "s": 12017501, + "s": 12236813, "affiliations": [ "\u0418\u0432\u0430\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10304,7 +10304,7 @@ }, { "id": "Russia_Jewish Autonomous Oblast", - "s": 4401644, + "s": 4403428, "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", @@ -10316,7 +10316,7 @@ }, { "id": "Russia_Kabardino-Balkaria", - "s": 4051969, + "s": 4110729, "affiliations": [ "\u041a\u0430\u0431\u0430\u0440\u0434\u0438\u043d\u043e-\u0411\u0430\u043b\u043a\u0430\u0440\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10328,7 +10328,7 @@ }, { "id": "Russia_Kaliningrad Oblast", - "s": 8974237, + "s": 8988685, "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", @@ -10340,7 +10340,7 @@ }, { "id": "Russia_Kaluga Oblast", - "s": 23610511, + "s": 23630708, "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", @@ -10352,7 +10352,7 @@ }, { "id": "Russia_Kamchatka Krai", - "s": 10729942, + "s": 10733582, "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", @@ -10364,7 +10364,7 @@ }, { "id": "Russia_Karachay-Cherkessia", - "s": 10067158, + "s": 10096150, "affiliations": [ "\u041a\u0430\u0440\u0430\u0447\u0430\u0435\u0432\u043e-\u0427\u0435\u0440\u043a\u0435\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10376,7 +10376,7 @@ }, { "id": "Russia_Kemerov Oblast", - "s": 20620152, + "s": 20628432, "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", @@ -10388,7 +10388,7 @@ }, { "id": "Russia_Khabarovsk Krai", - "s": 44509688, + "s": 44239989, "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", @@ -10400,7 +10400,7 @@ }, { "id": "Russia_Khakassia", - "s": 6289215, + "s": 6298599, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0425\u0430\u043a\u0430\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10412,7 +10412,7 @@ }, { "id": "Russia_Kirov Oblast", - "s": 53615851, + "s": 53667331, "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", @@ -10424,7 +10424,7 @@ }, { "id": "Russia_Komi Republic", - "s": 24313613, + "s": 24430981, "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", @@ -10436,7 +10436,7 @@ }, { "id": "Russia_Kostroma Oblast", - "s": 9477644, + "s": 9495244, "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", @@ -10448,7 +10448,7 @@ }, { "id": "Russia_Krasnodar Krai", - "s": 58577224, + "s": 58622953, "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", @@ -10460,7 +10460,7 @@ }, { "id": "Russia_Krasnodar Krai_Adygeya", - "s": 42092282, + "s": 42136522, "affiliations": [ "\u0410\u0434\u044b\u0433\u0435\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10473,7 +10473,7 @@ }, { "id": "Russia_Krasnoyarsk Krai_North", - "s": 23821003, + "s": 23860667, "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", @@ -10485,7 +10485,7 @@ }, { "id": "Russia_Krasnoyarsk Krai_South", - "s": 33897264, + "s": 33903776, "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", @@ -10497,7 +10497,7 @@ }, { "id": "Russia_Kurgan Oblast", - "s": 11508692, + "s": 11512684, "affiliations": [ "\u041a\u0443\u0440\u0433\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10509,7 +10509,7 @@ }, { "id": "Russia_Kursk Oblast", - "s": 31109050, + "s": 31118554, "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", @@ -10521,7 +10521,7 @@ }, { "id": "Russia_Leningradskaya Oblast_Karelsky", - "s": 27436255, + "s": 27507847, "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", @@ -10533,7 +10533,7 @@ }, { "id": "Russia_Leningradskaya Oblast_Southeast", - "s": 49418987, + "s": 49504319, "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", @@ -10545,7 +10545,7 @@ }, { "id": "Russia_Lipetsk Oblast", - "s": 25165975, + "s": 25216111, "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", @@ -10557,7 +10557,7 @@ }, { "id": "Russia_Magadan Oblast", - "s": 4203826, + "s": 4205770, "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", @@ -10569,7 +10569,7 @@ }, { "id": "Russia_Mari El", - "s": 15798077, + "s": 15989077, "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", @@ -10581,7 +10581,7 @@ }, { "id": "Russia_Moscow Oblast_East", - "s": 59512563, + "s": 59643633, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10593,7 +10593,7 @@ }, { "id": "Russia_Moscow Oblast_West", - "s": 32728049, + "s": 32835955, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10606,7 +10606,7 @@ }, { "id": "Russia_Moscow", - "s": 43511962, + "s": 43627061, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10619,7 +10619,7 @@ }, { "id": "Russia_Murmansk Oblast", - "s": 33497009, + "s": 33514729, "affiliations": [ "\u041c\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10631,7 +10631,7 @@ }, { "id": "Russia_Nenets Autonomous Okrug", - "s": 13194223, + "s": 13194607, "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", @@ -10643,7 +10643,7 @@ }, { "id": "Russia_Nizhny Novgorod Oblast", - "s": 42450236, + "s": 42591084, "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", @@ -10655,7 +10655,7 @@ }, { "id": "Russia_North Ossetia-Alania", - "s": 3398442, + "s": 3407058, "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", @@ -10667,7 +10667,7 @@ }, { "id": "Russia_Novgorod Oblast", - "s": 15190578, + "s": 15217514, "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", @@ -10679,7 +10679,7 @@ }, { "id": "Russia_Novosibirsk Oblast", - "s": 45394751, + "s": 45483247, "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", @@ -10691,7 +10691,7 @@ }, { "id": "Russia_Omsk Oblast", - "s": 33464380, + "s": 33556789, "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", @@ -10703,7 +10703,7 @@ }, { "id": "Russia_Orenburg Oblast", - "s": 25546590, + "s": 25565974, "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", @@ -10715,7 +10715,7 @@ }, { "id": "Russia_Oryol Oblast", - "s": 5786316, + "s": 5789924, "affiliations": [ "\u041e\u0440\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10727,7 +10727,7 @@ }, { "id": "Russia_Penza Oblast", - "s": 15688300, + "s": 15709748, "affiliations": [ "\u041f\u0435\u043d\u0437\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10739,7 +10739,7 @@ }, { "id": "Russia_Perm Krai_North", - "s": 25911330, + "s": 25915514, "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", @@ -10751,7 +10751,7 @@ }, { "id": "Russia_Perm Krai_South", - "s": 38477322, + "s": 38481946, "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", @@ -10763,7 +10763,7 @@ }, { "id": "Russia_Primorsky Krai", - "s": 19783414, + "s": 19486127, "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", @@ -10775,7 +10775,7 @@ }, { "id": "Russia_Pskov Oblast", - "s": 27454625, + "s": 27480809, "affiliations": [ "\u041f\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10787,7 +10787,7 @@ }, { "id": "Russia_Republic of Dagestan", - "s": 9356274, + "s": 9364746, "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", @@ -10799,7 +10799,7 @@ }, { "id": "Russia_Republic of Kalmykia", - "s": 4598979, + "s": 4599107, "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", @@ -10812,7 +10812,7 @@ }, { "id": "Russia_Republic of Karelia_North", - "s": 34346903, + "s": 34355135, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10824,7 +10824,7 @@ }, { "id": "Russia_Republic of Karelia_South", - "s": 26255844, + "s": 26381004, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10836,7 +10836,7 @@ }, { "id": "Russia_Republic of Mordovia", - "s": 13240022, + "s": 13239886, "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", @@ -10848,7 +10848,7 @@ }, { "id": "Russia_Rostov Oblast", - "s": 41494788, + "s": 41548081, "affiliations": [ "\u0420\u043e\u0441\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10860,7 +10860,7 @@ }, { "id": "Russia_Ryazan Oblast", - "s": 19603790, + "s": 19637390, "affiliations": [ "\u0420\u044f\u0437\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10872,7 +10872,7 @@ }, { "id": "Russia_Saint Petersburg", - "s": 32963838, + "s": 33079898, "affiliations": [ "\u0421\u0430\u043d\u043a\u0442-\u041f\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10885,7 +10885,7 @@ }, { "id": "Russia_Sakha Republic", - "s": 48383030, + "s": 48469838, "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", @@ -10897,7 +10897,7 @@ }, { "id": "Russia_Sakhalin Oblast", - "s": 25671099, + "s": 25723539, "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", @@ -10909,7 +10909,7 @@ }, { "id": "Russia_Samara Oblast", - "s": 28372248, + "s": 28457960, "affiliations": [ "\u0421\u0430\u043c\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10921,7 +10921,7 @@ }, { "id": "Russia_Saratov Oblast", - "s": 21618599, + "s": 21633367, "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", @@ -10933,7 +10933,7 @@ }, { "id": "Russia_Smolensk Oblast", - "s": 18207386, + "s": 18339994, "affiliations": [ "\u0421\u043c\u043e\u043b\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10945,7 +10945,7 @@ }, { "id": "Russia_Stavropol Krai", - "s": 22555142, + "s": 22630806, "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", @@ -10957,7 +10957,7 @@ }, { "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", - "s": 35768904, + "s": 35805072, "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", @@ -10969,7 +10969,7 @@ }, { "id": "Russia_Sverdlovsk Oblast_North", - "s": 31027990, + "s": 31076310, "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", @@ -10981,7 +10981,7 @@ }, { "id": "Russia_Tambov Oblast", - "s": 10170348, + "s": 10300348, "affiliations": [ "\u0422\u0430\u043c\u0431\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10993,7 +10993,7 @@ }, { "id": "Russia_Tatarstan", - "s": 38106877, + "s": 38126453, "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", @@ -11005,7 +11005,7 @@ }, { "id": "Russia_Tomsk Oblast", - "s": 17215336, + "s": 17221384, "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", @@ -11017,7 +11017,7 @@ }, { "id": "Russia_Tula Oblast", - "s": 17238345, + "s": 17280442, "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", @@ -11029,7 +11029,7 @@ }, { "id": "Russia_Tuva", - "s": 2882446, + "s": 2882854, "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", @@ -11041,7 +11041,7 @@ }, { "id": "Russia_Tver Oblast", - "s": 34143917, + "s": 34396095, "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", @@ -11053,7 +11053,7 @@ }, { "id": "Russia_Tyumen Oblast", - "s": 19219192, + "s": 19237264, "affiliations": [ "\u0422\u044e\u043c\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -11065,7 +11065,7 @@ }, { "id": "Russia_Udmurt Republic", - "s": 22628154, + "s": 22665426, "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", @@ -11077,7 +11077,7 @@ }, { "id": "Russia_Ulyanovsk Oblast", - "s": 15495439, + "s": 15986999, "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", @@ -11089,7 +11089,7 @@ }, { "id": "Russia_Vladimir Oblast", - "s": 36266106, + "s": 36327354, "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", @@ -11101,7 +11101,7 @@ }, { "id": "Russia_Volgograd Oblast", - "s": 32914996, + "s": 33025604, "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", @@ -11113,7 +11113,7 @@ }, { "id": "Russia_Vologda Oblast", - "s": 28738896, + "s": 28869240, "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", @@ -11125,7 +11125,7 @@ }, { "id": "Russia_Voronezh Oblast", - "s": 35598934, + "s": 35682174, "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", @@ -11137,7 +11137,7 @@ }, { "id": "Russia_Yamalo-Nenets Autonomous Okrug", - "s": 17559612, + "s": 17596868, "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", @@ -11149,7 +11149,7 @@ }, { "id": "Russia_Yaroslavl Oblast", - "s": 29654692, + "s": 29794564, "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", @@ -11161,7 +11161,7 @@ }, { "id": "Russia_Yugra_Khanty", - "s": 35097861, + "s": 35142909, "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", @@ -11173,7 +11173,7 @@ }, { "id": "Russia_Yugra_Surgut", - "s": 28743212, + "s": 28922460, "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", @@ -11185,7 +11185,7 @@ }, { "id": "Russia_Zabaykalsky Krai", - "s": 17347127, + "s": 17347559, "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", @@ -11199,7 +11199,7 @@ }, { "id": "Rwanda", - "s": 6855785, + "s": 6865105, "affiliations": [ "Amajvepfo", "Iburasirasuba", @@ -11214,7 +11214,7 @@ }, { "id": "Sahrawi Arab Democratic Republic", - "s": 313524, + "s": 313532, "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", @@ -11240,7 +11240,7 @@ }, { "id": "Samoa", - "s": 2626700, + "s": 2627460, "affiliations": [ "American Samoa", "AS", @@ -11254,7 +11254,7 @@ }, { "id": "San Marino", - "s": 383845, + "s": 383669, "affiliations": [ "Italia", "San Marino" @@ -11269,7 +11269,7 @@ "g": [ { "id": "Saudi Arabia_South", - "s": 38195890, + "s": 38219290, "affiliations": [ "\u0639\u0633\u064a\u0631", "\u062c\u0627\u0632\u0627\u0646", @@ -11284,7 +11284,7 @@ }, { "id": "Saudi Arabia_North", - "s": 31710329, + "s": 31764681, "affiliations": [ "\u0645\u0643\u0629 \u0627\u0644\u0645\u0643\u0631\u0645\u0629", "\u062a\u0628\u0648\u0643", @@ -11304,7 +11304,7 @@ }, { "id": "Senegal", - "s": 45190035, + "s": 45358056, "affiliations": [ "Basse", "Janjanbureh", @@ -11318,7 +11318,7 @@ }, { "id": "Serbia", - "s": 56493791, + "s": 56633616, "affiliations": [ "\u0421\u0440\u0431\u0438\u0458\u0430", "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430", @@ -11330,7 +11330,7 @@ }, { "id": "Seychelles", - "s": 669321, + "s": 673305, "affiliations": [ "Sesel" ], @@ -11340,7 +11340,7 @@ }, { "id": "Sierra Leone", - "s": 25629982, + "s": 25655990, "affiliations": [ "Eastern Province", "Northern Province", @@ -11354,7 +11354,7 @@ }, { "id": "Singapore", - "s": 8041549, + "s": 8053085, "affiliations": [ "Johor", "Malaysia", @@ -11369,7 +11369,7 @@ "g": [ { "id": "Slovakia_Region of Presov", - "s": 21616587, + "s": 21639683, "affiliations": [ "Pre\u0161ovsk\u00fd kraj", "Slovensko" @@ -11380,7 +11380,7 @@ }, { "id": "Slovakia_Region of Kosice", - "s": 20099570, + "s": 20104538, "affiliations": [ "Ko\u0161ick\u00fd kraj", "Slovensko" @@ -11391,7 +11391,7 @@ }, { "id": "Slovakia_Region of Banska Bystrica", - "s": 23369984, + "s": 23442328, "affiliations": [ "Banskobystrick\u00fd kraj", "Slovensko" @@ -11402,7 +11402,7 @@ }, { "id": "Slovakia_Region of Trnava", - "s": 13540063, + "s": 13549719, "affiliations": [ "Slovensko", "Trnavsk\u00fd kraj" @@ -11413,7 +11413,7 @@ }, { "id": "Slovakia_Region of Trencin", - "s": 17230842, + "s": 17251410, "affiliations": [ "Slovensko", "Tren\u010diansky kraj" @@ -11424,7 +11424,7 @@ }, { "id": "Slovakia_Region of Nitra", - "s": 17063968, + "s": 17083320, "affiliations": [ "Nitriansky kraj", "Slovensko" @@ -11435,7 +11435,7 @@ }, { "id": "Slovakia_Region of Bratislava", - "s": 13245055, + "s": 13271519, "affiliations": [ "Bratislavsk\u00fd kraj", "Slovensko" @@ -11446,7 +11446,7 @@ }, { "id": "Slovakia_Region of Zilina", - "s": 22220153, + "s": 22281649, "affiliations": [ "Slovensko", "\u017dilinsk\u00fd kraj" @@ -11462,7 +11462,7 @@ "g": [ { "id": "Slovenia_East", - "s": 55611894, + "s": 56427102, "affiliations": [ "Border SI-HR", "Slovenija" @@ -11473,7 +11473,7 @@ }, { "id": "Slovenia_West", - "s": 61678545, + "s": 61906577, "affiliations": [ "Slovenija" ], @@ -11505,7 +11505,7 @@ }, { "id": "Somalia", - "s": 19253529, + "s": 19254073, "affiliations": [ "Awdal", "Bakool", @@ -11536,7 +11536,7 @@ "g": [ { "id": "South Africa_Western Cape", - "s": 29647885, + "s": 29665853, "affiliations": [ "Prince Edward Islands", "South Africa", @@ -11548,7 +11548,7 @@ }, { "id": "South Africa_Gauteng", - "s": 31740646, + "s": 31881731, "affiliations": [ "Gauteng", "South Africa" @@ -11559,7 +11559,7 @@ }, { "id": "South Africa_North West", - "s": 10072629, + "s": 10189280, "affiliations": [ "North West", "South Africa" @@ -11570,7 +11570,7 @@ }, { "id": "South Africa_Free State", - "s": 12170358, + "s": 12256582, "affiliations": [ "Free State", "South Africa" @@ -11581,7 +11581,7 @@ }, { "id": "South Africa_Eastern Cape", - "s": 18691328, + "s": 18691224, "affiliations": [ "Eastern Cape", "South Africa" @@ -11592,7 +11592,7 @@ }, { "id": "South Africa_Northern Cape", - "s": 9862474, + "s": 9860802, "affiliations": [ "Northern Cape", "South Africa" @@ -11603,7 +11603,7 @@ }, { "id": "South Africa_Mpumalanga", - "s": 10523370, + "s": 10875292, "affiliations": [ "Mpumalanga", "South Africa" @@ -11614,7 +11614,7 @@ }, { "id": "South Africa_Limpopo", - "s": 16036106, + "s": 16195545, "affiliations": [ "Limpopo", "South Africa" @@ -11625,7 +11625,7 @@ }, { "id": "South Africa_KwaZulu-Natal", - "s": 24328927, + "s": 24399905, "affiliations": [ "KwaZulu-Natal", "South Africa" @@ -11649,7 +11649,7 @@ }, { "id": "South Ossetia", - "s": 1667494, + "s": 1669150, "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", @@ -11661,7 +11661,7 @@ }, { "id": "South Sudan", - "s": 28470384, + "s": 28474912, "affiliations": [ "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", "Central Equatoria", @@ -11685,7 +11685,7 @@ "g": [ { "id": "Spain_Andalusia_Granada", - "s": 38984812, + "s": 39143388, "affiliations": [ "Andaluc\u00eda", "Espa\u00f1a (mare territorial)", @@ -11697,7 +11697,7 @@ }, { "id": "Spain_Andalusia_Sevilla", - "s": 51533697, + "s": 51584697, "affiliations": [ "Andaluc\u00eda", "Espa\u00f1a" @@ -11708,7 +11708,7 @@ }, { "id": "Spain_Aragon", - "s": 34260215, + "s": 34426708, "affiliations": [ "Arag\u00f3n", "Espa\u00f1a" @@ -11719,7 +11719,7 @@ }, { "id": "Spain_Balearic Islands", - "s": 19268347, + "s": 19293083, "affiliations": [ "Illes Balears", "Espa\u00f1a" @@ -11730,7 +11730,7 @@ }, { "id": "Spain_Basque Country", - "s": 31562333, + "s": 31673677, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a", @@ -11742,7 +11742,7 @@ }, { "id": "Spain_Canary Islands", - "s": 30406055, + "s": 30457455, "affiliations": [ "Canarias", "Espa\u00f1a" @@ -11753,7 +11753,7 @@ }, { "id": "Spain_Cantabria", - "s": 15217716, + "s": 15230459, "affiliations": [ "Cantabria", "Espa\u00f1a" @@ -11764,7 +11764,7 @@ }, { "id": "Spain_Castile and Leon_West", - "s": 52857536, + "s": 52955632, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a" @@ -11775,7 +11775,7 @@ }, { "id": "Spain_Castile and Leon_East", - "s": 38312162, + "s": 38349117, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a" @@ -11786,7 +11786,7 @@ }, { "id": "Spain_Castile-La Mancha", - "s": 54509374, + "s": 54575782, "affiliations": [ "Castilla-La Mancha", "Espa\u00f1a" @@ -11797,7 +11797,7 @@ }, { "id": "Spain_Catalonia_Provincia de Barcelona", - "s": 43038408, + "s": 43065544, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11808,7 +11808,7 @@ }, { "id": "Spain_Catalonia_Provincia de Girona", - "s": 21776800, + "s": 21791512, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11819,7 +11819,7 @@ }, { "id": "Spain_Catalonia_Provincia de Lleida", - "s": 21197437, + "s": 21265194, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11830,7 +11830,7 @@ }, { "id": "Spain_Catalonia_Provincia de Tarragona", - "s": 15886842, + "s": 15914026, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11841,7 +11841,7 @@ }, { "id": "Spain_Ceuta", - "s": 308667, + "s": 308027, "affiliations": [ "Ceuta", "Espa\u00f1a", @@ -11853,7 +11853,7 @@ }, { "id": "Spain_Community of Madrid", - "s": 42984472, + "s": 43136528, "affiliations": [ "Comunidad de Madrid", "Espa\u00f1a" @@ -11864,7 +11864,7 @@ }, { "id": "Spain_Comunidad Foral de Navarra", - "s": 13596610, + "s": 13673138, "affiliations": [ "Comunidad Foral de Navarra", "Espa\u00f1a" @@ -11875,7 +11875,7 @@ }, { "id": "Spain_Extremadura", - "s": 23159029, + "s": 23181941, "affiliations": [ "Espa\u00f1a", "Extremadura" @@ -11886,7 +11886,7 @@ }, { "id": "Spain_Galicia_North", - "s": 37726073, + "s": 37765681, "affiliations": [ "Espa\u00f1a", "Galicia" @@ -11897,7 +11897,7 @@ }, { "id": "Spain_Galicia_South", - "s": 29983645, + "s": 30002661, "affiliations": [ "Espa\u00f1a", "Galicia" @@ -11908,7 +11908,7 @@ }, { "id": "Spain_La Rioja", - "s": 5464002, + "s": 5474322, "affiliations": [ "Espa\u00f1a", "La Rioja" @@ -11932,7 +11932,7 @@ }, { "id": "Spain_Principado de Asturias", - "s": 20069367, + "s": 20104967, "affiliations": [ "Espa\u00f1a", "Principado de Asturias" @@ -11943,7 +11943,7 @@ }, { "id": "Spain_Region de Murcia", - "s": 18523562, + "s": 18528634, "affiliations": [ "Espa\u00f1a", "Regi\u00f3n de Murcia" @@ -11954,7 +11954,7 @@ }, { "id": "Spain_Valencian Community", - "s": 59656610, + "s": 59803938, "affiliations": [ "Comunitat Valenciana", "Espa\u00f1a" @@ -11970,7 +11970,7 @@ "g": [ { "id": "Jerusalem", - "s": 4160942, + "s": 4162374, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" @@ -11982,7 +11982,7 @@ }, { "id": "Palestine", - "s": 20154469, + "s": 20196349, "affiliations": [ "Area A", "Area B", @@ -11996,7 +11996,7 @@ }, { "id": "Sri Lanka", - "s": 46549581, + "s": 46782637, "affiliations": [ "Central Province", "Eastern Province", @@ -12018,7 +12018,7 @@ "g": [ { "id": "Sudan_East", - "s": 17208379, + "s": 17217803, "affiliations": [ "Al Ba\u1e29r al A\u1e29mar", "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", @@ -12038,7 +12038,7 @@ }, { "id": "Sudan_West", - "s": 65853586, + "s": 66018106, "affiliations": [ "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", "Gharb Darfur", @@ -12065,7 +12065,7 @@ }, { "id": "Suriname", - "s": 5065603, + "s": 5082003, "affiliations": [ "Brokopondo", "Commewijne", @@ -12085,7 +12085,7 @@ }, { "id": "Swaziland", - "s": 17496192, + "s": 17522520, "affiliations": [ "Sifundza seHhohho", "Sifundza seLubombo", @@ -12102,7 +12102,7 @@ "g": [ { "id": "Sweden_Malardalen", - "s": 27963591, + "s": 28002351, "affiliations": [ "S\u00f6dermanlands l\u00e4n", "Sverige", @@ -12115,7 +12115,7 @@ }, { "id": "Sweden_Stockholm", - "s": 42684787, + "s": 42716155, "affiliations": [ "Stockholms l\u00e4n", "Sverige" @@ -12126,7 +12126,7 @@ }, { "id": "Sweden_Ostra Gotaland", - "s": 52615953, + "s": 52703977, "affiliations": [ "Gotlands l\u00e4n", "J\u00f6nk\u00f6pings l\u00e4n", @@ -12143,7 +12143,7 @@ }, { "id": "Sweden_Norra Sverige", - "s": 33231856, + "s": 33302072, "affiliations": [ "Norrbottens l\u00e4n", "Sverige", @@ -12155,7 +12155,7 @@ }, { "id": "Sweden_Mellannorrland", - "s": 24712316, + "s": 24726436, "affiliations": [ "J\u00e4mtlands l\u00e4n", "Sverige", @@ -12167,7 +12167,7 @@ }, { "id": "Sweden_Bergslagen", - "s": 55256491, + "s": 55384091, "affiliations": [ "Dalarnas l\u00e4n", "G\u00e4vleborgs l\u00e4n", @@ -12181,7 +12181,7 @@ }, { "id": "Sweden_Vastra Gotaland", - "s": 61765956, + "s": 62073636, "affiliations": [ "Danmark", "Hallands l\u00e4n", @@ -12194,7 +12194,7 @@ }, { "id": "Sweden_Sodra Gotaland", - "s": 43131794, + "s": 43260250, "affiliations": [ "Blekinge l\u00e4n", "Danmark", @@ -12213,7 +12213,7 @@ "g": [ { "id": "Switzerland_Eastern", - "s": 43487001, + "s": 43588770, "affiliations": [ "Appenzell Ausserrhoden", "Appenzell Innerrhoden", @@ -12230,7 +12230,7 @@ }, { "id": "Switzerland_Central", - "s": 20795961, + "s": 20812490, "affiliations": [ "Luzern", "Nidwalden", @@ -12246,7 +12246,7 @@ }, { "id": "Switzerland_Espace Mittelland_Bern", - "s": 45105514, + "s": 45168444, "affiliations": [ "Basel-Landschaft", "Bern - Berne", @@ -12263,7 +12263,7 @@ }, { "id": "Switzerland_Espace Mittelland_East", - "s": 19384175, + "s": 19398415, "affiliations": [ "Bern - Berne", "Schweiz, Suisse, Svizzera, Svizra" @@ -12274,7 +12274,7 @@ }, { "id": "Switzerland_Ticino", - "s": 9636381, + "s": 9644925, "affiliations": [ "Schweiz, Suisse, Svizzera, Svizra", "Ticino" @@ -12285,7 +12285,7 @@ }, { "id": "Switzerland_Northwestern", - "s": 30300215, + "s": 30368200, "affiliations": [ "Aargau", "Basel-Landschaft", @@ -12298,7 +12298,7 @@ }, { "id": "Switzerland_Lake Geneva region", - "s": 51616483, + "s": 51755171, "affiliations": [ "Fribourg - Freiburg", "Gen\u00e8ve", @@ -12312,7 +12312,7 @@ }, { "id": "Switzerland_Zurich", - "s": 34247997, + "s": 34280868, "affiliations": [ "Schweiz, Suisse, Svizzera, Svizra", "Z\u00fcrich" @@ -12325,7 +12325,7 @@ }, { "id": "Syria", - "s": 48367425, + "s": 48516067, "affiliations": [ "Al-Hasakah", "Aleppo", @@ -12349,7 +12349,7 @@ }, { "id": "Sao Tome and Principe", - "s": 508720, + "s": 509680, "affiliations": [ "Pr\u00edncipe Province", "S\u00e3o Tom\u00e9 Province", @@ -12361,7 +12361,7 @@ }, { "id": "Tajikistan", - "s": 12043309, + "s": 12059749, "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", @@ -12375,7 +12375,7 @@ }, { "id": "Tanzania", - "s": 59149134, + "s": 62594516, "affiliations": [ "Arusha", "Dar es Salaam", @@ -12413,7 +12413,7 @@ "g": [ { "id": "Thailand_North", - "s": 29297834, + "s": 29379218, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e30\u0e40\u0e22\u0e32", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12436,7 +12436,7 @@ }, { "id": "Thailand_Central", - "s": 54569039, + "s": 54559799, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e48\u0e32\u0e07\u0e17\u0e2d\u0e07", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12482,7 +12482,7 @@ }, { "id": "Thailand_South", - "s": 54944197, + "s": 55055757, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e38\u0e21\u0e1e\u0e23", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12526,7 +12526,7 @@ }, { "id": "The Bahamas", - "s": 6780929, + "s": 6804809, "affiliations": [ "Ciego de \u00c1vila", "The Bahamas" @@ -12537,7 +12537,7 @@ }, { "id": "The Gambia", - "s": 4850276, + "s": 4849292, "affiliations": [ "Brikama", "Banjul", @@ -12559,7 +12559,7 @@ "g": [ { "id": "Netherlands_Drenthe", - "s": 40797059, + "s": 40813235, "affiliations": [ "Drenthe", "Nederland" @@ -12570,7 +12570,7 @@ }, { "id": "Netherlands_Flevoland", - "s": 24945370, + "s": 24942833, "affiliations": [ "Flevoland", "Nederland" @@ -12581,7 +12581,7 @@ }, { "id": "Netherlands_Friesland", - "s": 54686604, + "s": 54696428, "affiliations": [ "Friesland", "Nederland" @@ -12592,7 +12592,7 @@ }, { "id": "Netherlands_Gelderland_Nijmegen", - "s": 39597013, + "s": 39607541, "affiliations": [ "Gelderland", "Nederland" @@ -12603,7 +12603,7 @@ }, { "id": "Netherlands_Gelderland_North", - "s": 63462513, + "s": 63490913, "affiliations": [ "Gelderland", "Nederland" @@ -12614,7 +12614,7 @@ }, { "id": "Netherlands_Gelderland_Zutphen", - "s": 27614547, + "s": 27628411, "affiliations": [ "Gelderland", "Nederland" @@ -12625,7 +12625,7 @@ }, { "id": "Netherlands_Groningen", - "s": 40787042, + "s": 40764050, "affiliations": [ "Deutschland", "Groningen", @@ -12638,7 +12638,7 @@ }, { "id": "Netherlands_Limburg", - "s": 70955847, + "s": 70970095, "affiliations": [ "Limburg", "Nederland" @@ -12649,7 +12649,7 @@ }, { "id": "Netherlands_North Brabant_Eindhoven", - "s": 61384808, + "s": 61454128, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12660,7 +12660,7 @@ }, { "id": "Netherlands_North Brabant_Roosendaal", - "s": 21309627, + "s": 21314259, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12671,7 +12671,7 @@ }, { "id": "Netherlands_North Brabant_Tiburg", - "s": 46069035, + "s": 46143115, "affiliations": [ "Nederland", "Nederland - Belgique / Belgi\u00eb / Belgien", @@ -12683,7 +12683,7 @@ }, { "id": "Netherlands_North Brabant_Uden", - "s": 21711330, + "s": 21716146, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12694,7 +12694,7 @@ }, { "id": "Netherlands_North Holland_Alkmaar", - "s": 36160728, + "s": 36172544, "affiliations": [ "Nederland", "Noord-Holland" @@ -12705,7 +12705,7 @@ }, { "id": "Netherlands_North Holland_Amsterdam", - "s": 78109287, + "s": 78178936, "affiliations": [ "Nederland", "Noord-Holland" @@ -12716,7 +12716,7 @@ }, { "id": "Netherlands_North Holland_Zaandam", - "s": 27503672, + "s": 27522344, "affiliations": [ "Nederland", "Noord-Holland" @@ -12727,7 +12727,7 @@ }, { "id": "Netherlands_Overijssel_Enschede", - "s": 42188853, + "s": 42209357, "affiliations": [ "Nederland", "Overijssel" @@ -12738,7 +12738,7 @@ }, { "id": "Netherlands_Overijssel_Zwolle", - "s": 37068899, + "s": 37094442, "affiliations": [ "Nederland", "Overijssel" @@ -12749,7 +12749,7 @@ }, { "id": "Netherlands_South Holland_Brielle", - "s": 20222203, + "s": 20237163, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12760,7 +12760,7 @@ }, { "id": "Netherlands_South Holland_Den Haag", - "s": 61185685, + "s": 61222170, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12771,7 +12771,7 @@ }, { "id": "Netherlands_South Holland_Leiden", - "s": 25514465, + "s": 25529246, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12782,7 +12782,7 @@ }, { "id": "Netherlands_South Holland_Rotterdam", - "s": 64317081, + "s": 64330497, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12793,7 +12793,7 @@ }, { "id": "Netherlands_Utrecht_Amersfoort", - "s": 30248654, + "s": 30265286, "affiliations": [ "Utrecht", "Nederland" @@ -12804,7 +12804,7 @@ }, { "id": "Netherlands_Utrecht_Utrecht", - "s": 35218782, + "s": 35282703, "affiliations": [ "Utrecht", "Nederland" @@ -12815,7 +12815,7 @@ }, { "id": "Netherlands_Zeeland", - "s": 32507375, + "s": 32581839, "affiliations": [ "Nederland", "Zeeland" @@ -12828,7 +12828,7 @@ }, { "id": "Togo", - "s": 23403943, + "s": 23462803, "affiliations": [ "R\u00e9gion Centrale", "R\u00e9gion Maritime", @@ -12843,7 +12843,7 @@ }, { "id": "Tonga", - "s": 3056531, + "s": 3056219, "affiliations": [ "Ha\u02bbapai", "Ongo Niua", @@ -12863,7 +12863,7 @@ }, { "id": "Tunisia", - "s": 42909434, + "s": 42980514, "affiliations": [ "Tunisie \u2d5c\u2d53\u2d4f\u2d59 \u062a\u0648\u0646\u0633", "\u0628\u0627\u062c\u0629", @@ -12900,7 +12900,7 @@ "g": [ { "id": "Turkey_Mediterranean Region", - "s": 40639732, + "s": 40737044, "affiliations": [ "Adana", "Antalya", @@ -12918,7 +12918,7 @@ }, { "id": "Turkey_Southeastern Anatolia Region", - "s": 24896151, + "s": 24918745, "affiliations": [ "Ad\u0131yaman", "Batman", @@ -12938,7 +12938,7 @@ }, { "id": "Turkey_Marmara Region_Istanbul", - "s": 47953527, + "s": 48004359, "affiliations": [ "Edirne", "Kocaeli", @@ -12955,7 +12955,7 @@ }, { "id": "Turkey_Marmara Region_Bursa", - "s": 35765188, + "s": 35800228, "affiliations": [ "Bal\u0131kesir", "Bilecik", @@ -12975,7 +12975,7 @@ }, { "id": "Turkey_Eastern Anatolia Region", - "s": 26466088, + "s": 26544672, "affiliations": [ "Ardahan", "A\u011fr\u0131", @@ -12999,7 +12999,7 @@ }, { "id": "Turkey_Black Sea Region", - "s": 33928456, + "s": 34004112, "affiliations": [ "Amasya", "Bolu", @@ -13027,7 +13027,7 @@ }, { "id": "Turkey_Central Anatolia Region_Ankara", - "s": 43130151, + "s": 43185855, "affiliations": [ "Aksaray", "Ankara", @@ -13045,7 +13045,7 @@ }, { "id": "Turkey_Central Anatolia Region_Kayseri", - "s": 18619489, + "s": 18622345, "affiliations": [ "Kayseri", "K\u0131r\u015fehir", @@ -13061,7 +13061,7 @@ }, { "id": "Turkey_Aegean Region", - "s": 47657031, + "s": 47655008, "affiliations": [ "Afyonkarahisar", "Ayd\u0131n", @@ -13081,7 +13081,7 @@ }, { "id": "Turkmenistan", - "s": 9363750, + "s": 9399511, "affiliations": [ "Ahal", "Balkan", @@ -13096,7 +13096,7 @@ }, { "id": "Turks and Caicos Islands", - "s": 659856, + "s": 659952, "affiliations": [ "Rep\u00fablica Dominicana", "The Bahamas", @@ -13118,7 +13118,7 @@ }, { "id": "Uganda", - "s": 31982455, + "s": 33201291, "affiliations": [ "Abim", "Agago", @@ -13170,7 +13170,7 @@ "g": [ { "id": "Ukraine_Cherkasy Oblast", - "s": 13039190, + "s": 13093134, "affiliations": [ "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13181,7 +13181,7 @@ }, { "id": "Ukraine_Chernihiv Oblast", - "s": 14304786, + "s": 14405818, "affiliations": [ "\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" @@ -13192,7 +13192,7 @@ }, { "id": "Ukraine_Chernivtsi Oblast", - "s": 11843790, + "s": 11864990, "affiliations": [ "\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" @@ -13203,7 +13203,7 @@ }, { "id": "Ukraine_Dnipropetrovsk Oblast", - "s": 35388253, + "s": 35489797, "affiliations": [ "\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" @@ -13214,7 +13214,7 @@ }, { "id": "Ukraine_Donetsk Oblast", - "s": 41673721, + "s": 41722305, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13225,7 +13225,7 @@ }, { "id": "Ukraine_Ivano-Frankivsk Oblast", - "s": 14618001, + "s": 14644481, "affiliations": [ "\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" @@ -13236,7 +13236,7 @@ }, { "id": "Ukraine_Kharkiv Oblast", - "s": 25284758, + "s": 25341502, "affiliations": [ "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13247,7 +13247,7 @@ }, { "id": "Ukraine_Kherson Oblast", - "s": 9621439, + "s": 9824711, "affiliations": [ "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13258,7 +13258,7 @@ }, { "id": "Ukraine_Khmelnytskyi Oblast", - "s": 12519976, + "s": 12533424, "affiliations": [ "\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" @@ -13269,7 +13269,7 @@ }, { "id": "Ukraine_Kirovohrad Oblast", - "s": 13610083, + "s": 13629547, "affiliations": [ "\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" @@ -13280,7 +13280,7 @@ }, { "id": "Ukraine_Kyiv Oblast", - "s": 35449490, + "s": 35581362, "affiliations": [ "\u041a\u0438\u0457\u0432", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", @@ -13292,7 +13292,7 @@ }, { "id": "Ukraine_Luhansk Oblast", - "s": 22855620, + "s": 23073540, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13303,7 +13303,7 @@ }, { "id": "Ukraine_Lviv Oblast", - "s": 26222786, + "s": 26408714, "affiliations": [ "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13314,7 +13314,7 @@ }, { "id": "Ukraine_Mykolaiv Oblast", - "s": 11089458, + "s": 11145114, "affiliations": [ "\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" @@ -13325,7 +13325,7 @@ }, { "id": "Ukraine_Odessa Oblast", - "s": 22876917, + "s": 22937493, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13336,7 +13336,7 @@ }, { "id": "Ukraine_Poltava Oblast", - "s": 15178532, + "s": 15218916, "affiliations": [ "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13347,7 +13347,7 @@ }, { "id": "Ukraine_Rivne Oblast", - "s": 8907873, + "s": 8915969, "affiliations": [ "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13358,7 +13358,7 @@ }, { "id": "Ukraine_Sumy Oblast", - "s": 15884910, + "s": 16020974, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13369,7 +13369,7 @@ }, { "id": "Ukraine_Ternopil Oblast", - "s": 17174778, + "s": 17176522, "affiliations": [ "\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" @@ -13380,7 +13380,7 @@ }, { "id": "Ukraine_Vinnytsia Oblast", - "s": 15770099, + "s": 15777115, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13391,7 +13391,7 @@ }, { "id": "Ukraine_Volyn Oblast", - "s": 12686109, + "s": 12714965, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13402,7 +13402,7 @@ }, { "id": "Ukraine_Zakarpattia Oblast", - "s": 12984561, + "s": 13146761, "affiliations": [ "\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" @@ -13413,7 +13413,7 @@ }, { "id": "Ukraine_Zaporizhia Oblast", - "s": 11098119, + "s": 11240495, "affiliations": [ "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13424,7 +13424,7 @@ }, { "id": "Ukraine_Zhytomyr Oblast", - "s": 8198062, + "s": 8339038, "affiliations": [ "\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" @@ -13435,7 +13435,7 @@ }, { "id": "Crimea", - "s": 29521114, + "s": 29585970, "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", @@ -13452,7 +13452,7 @@ }, { "id": "United Arab Emirates", - "s": 27538431, + "s": 27562015, "affiliations": [ "\u0623\u0628\u0648 \u0638\u0628\u064a", "\u200f\u0623\u0645 \u0627\u0644\u0642\u064a\u0648\u064a\u0646\u200e", @@ -13470,7 +13470,7 @@ }, { "id": "Falkland Islands", - "s": 1695138, + "s": 1699994, "affiliations": [ "Falkland Islands" ], @@ -13493,7 +13493,7 @@ }, { "id": "UK_England_East Midlands", - "s": 75134990, + "s": 75305678, "affiliations": [ "England", "United Kingdom" @@ -13504,7 +13504,7 @@ }, { "id": "UK_England_East of England_Essex", - "s": 46193156, + "s": 46230228, "affiliations": [ "England", "United Kingdom" @@ -13515,7 +13515,7 @@ }, { "id": "UK_England_East of England_Norfolk", - "s": 56149938, + "s": 56245898, "affiliations": [ "England", "United Kingdom" @@ -13526,7 +13526,7 @@ }, { "id": "UK_England_Greater London", - "s": 49994303, + "s": 50018671, "affiliations": [ "England", "United Kingdom" @@ -13537,7 +13537,7 @@ }, { "id": "UK_England_North East England", - "s": 34498797, + "s": 34648363, "affiliations": [ "England", "United Kingdom" @@ -13548,7 +13548,7 @@ }, { "id": "UK_England_North West England_Manchester", - "s": 62892249, + "s": 62995201, "affiliations": [ "England", "United Kingdom" @@ -13559,7 +13559,7 @@ }, { "id": "UK_England_North West England_Lancaster", - "s": 20776816, + "s": 20798824, "affiliations": [ "England", "United Kingdom" @@ -13570,7 +13570,7 @@ }, { "id": "UK_England_South East_Brighton", - "s": 54683954, + "s": 54783908, "affiliations": [ "England", "United Kingdom" @@ -13581,7 +13581,7 @@ }, { "id": "UK_England_South East_Oxford", - "s": 59609551, + "s": 59704393, "affiliations": [ "England", "United Kingdom" @@ -13592,7 +13592,7 @@ }, { "id": "UK_England_South West England_Bristol", - "s": 63209935, + "s": 63304935, "affiliations": [ "England", "United Kingdom" @@ -13603,7 +13603,7 @@ }, { "id": "UK_England_South West England_Cornwall", - "s": 34668220, + "s": 34709084, "affiliations": [ "England", "United Kingdom" @@ -13614,7 +13614,7 @@ }, { "id": "UK_England_West Midlands", - "s": 87570895, + "s": 87753399, "affiliations": [ "England", "United Kingdom" @@ -13625,7 +13625,7 @@ }, { "id": "UK_England_Yorkshire and the Humber", - "s": 85218459, + "s": 85325182, "affiliations": [ "England", "United Kingdom" @@ -13636,7 +13636,7 @@ }, { "id": "UK_Northern Ireland", - "s": 22440105, + "s": 22469609, "affiliations": [ "Northern Ireland", "Scotland", @@ -13648,7 +13648,7 @@ }, { "id": "UK_Scotland_North", - "s": 64816878, + "s": 64904526, "affiliations": [ "Scotland", "United Kingdom" @@ -13659,7 +13659,7 @@ }, { "id": "UK_Scotland_South", - "s": 61917927, + "s": 62101591, "affiliations": [ "Isle of Man", "Scotland", @@ -13671,7 +13671,7 @@ }, { "id": "UK_Wales", - "s": 59054682, + "s": 59164786, "affiliations": [ "United Kingdom", "Wales" @@ -13687,7 +13687,7 @@ "g": [ { "id": "Ireland_Connacht", - "s": 26059506, + "s": 26064410, "affiliations": [ "Ireland" ], @@ -13697,7 +13697,7 @@ }, { "id": "Ireland_Leinster", - "s": 44241969, + "s": 44301353, "affiliations": [ "Ireland" ], @@ -13707,7 +13707,7 @@ }, { "id": "Ireland_Munster", - "s": 33692796, + "s": 33723828, "affiliations": [ "Ireland" ], @@ -13717,7 +13717,7 @@ }, { "id": "Ireland_Northern Counties", - "s": 11122848, + "s": 11124504, "affiliations": [ "Ireland" ], @@ -13735,7 +13735,7 @@ "g": [ { "id": "US_Alabama_Birmingham", - "s": 47138584, + "s": 47180096, "affiliations": [ "Alabama", "AL", @@ -13747,7 +13747,7 @@ }, { "id": "US_Alabama_Montgomery", - "s": 55818052, + "s": 55833100, "affiliations": [ "Alabama", "AL", @@ -13761,7 +13761,7 @@ }, { "id": "US_Alaska", - "s": 44136364, + "s": 44272420, "affiliations": [ "Alaska", "AK", @@ -13776,7 +13776,7 @@ "g": [ { "id": "US_Arizona_Flagstaff", - "s": 36262938, + "s": 36258605, "affiliations": [ "Arizona", "AZ", @@ -13788,7 +13788,7 @@ }, { "id": "US_Arizona_Phoenix", - "s": 65320952, + "s": 65420527, "affiliations": [ "Arizona", "AZ", @@ -13800,7 +13800,7 @@ }, { "id": "US_Arizona_Tucson", - "s": 24856332, + "s": 24901076, "affiliations": [ "Arizona", "AZ", @@ -13817,7 +13817,7 @@ "g": [ { "id": "US_Arkansas_North", - "s": 47459653, + "s": 47475741, "affiliations": [ "Arkansas", "AR", @@ -13829,7 +13829,7 @@ }, { "id": "US_Arkansas_South", - "s": 30520766, + "s": 30529798, "affiliations": [ "Arkansas", "AR", @@ -13846,7 +13846,7 @@ "g": [ { "id": "US_California_Chico", - "s": 36982018, + "s": 36973234, "affiliations": [ "California", "CA", @@ -13858,7 +13858,7 @@ }, { "id": "US_California_Bakersfield_Bakersfield", - "s": 39061289, + "s": 39103041, "affiliations": [ "California", "CA", @@ -13870,7 +13870,7 @@ }, { "id": "US_California_Bakersfield_Lancaster", - "s": 23582767, + "s": 23581767, "affiliations": [ "California", "CA", @@ -13882,7 +13882,7 @@ }, { "id": "US_California_LA", - "s": 142633527, + "s": 150202090, "affiliations": [ "California", "CA", @@ -13894,7 +13894,7 @@ }, { "id": "US_California_LA North", - "s": 50137189, + "s": 50179788, "affiliations": [ "California", "CA", @@ -13906,7 +13906,7 @@ }, { "id": "US_California_Redding", - "s": 44415445, + "s": 44458845, "affiliations": [ "California", "CA", @@ -13919,7 +13919,7 @@ }, { "id": "US_California_Sacramento_Sacramento", - "s": 30892488, + "s": 30877401, "affiliations": [ "California", "CA", @@ -13931,7 +13931,7 @@ }, { "id": "US_California_Sacramento_Fresno", - "s": 34453655, + "s": 34450647, "affiliations": [ "California", "CA", @@ -13943,7 +13943,7 @@ }, { "id": "US_California_Sacramento_Stockton", - "s": 39676231, + "s": 39683911, "affiliations": [ "California", "CA", @@ -13955,7 +13955,7 @@ }, { "id": "US_California_San Diego", - "s": 67240141, + "s": 67244669, "affiliations": [ "California", "CA", @@ -13967,7 +13967,7 @@ }, { "id": "US_California_Santa_Clara_Santa Cruz", - "s": 19571790, + "s": 19573670, "affiliations": [ "California", "CA", @@ -13979,7 +13979,7 @@ }, { "id": "US_California_Santa_Clara_Palo Alto", - "s": 85618936, + "s": 85734713, "affiliations": [ "California", "CA", @@ -13996,7 +13996,7 @@ "g": [ { "id": "US_Colorado_Aspen", - "s": 41545804, + "s": 41540612, "affiliations": [ "Colorado", "CO", @@ -14008,7 +14008,7 @@ }, { "id": "US_Colorado_Denver", - "s": 76849426, + "s": 76692770, "affiliations": [ "Colorado", "CO", @@ -14020,7 +14020,7 @@ }, { "id": "US_Colorado_South", - "s": 40450666, + "s": 40457138, "affiliations": [ "Colorado", "CO", @@ -14034,7 +14034,7 @@ }, { "id": "US_Connecticut", - "s": 34192503, + "s": 34289278, "affiliations": [ "Connecticut", "CT", @@ -14046,7 +14046,7 @@ }, { "id": "US_Delaware", - "s": 11627839, + "s": 11644319, "affiliations": [ "Delaware", "DE", @@ -14061,7 +14061,7 @@ "g": [ { "id": "US_Florida_Jacksonville", - "s": 43030620, + "s": 43106820, "affiliations": [ "Florida", "FL", @@ -14073,7 +14073,7 @@ }, { "id": "US_Florida_Miami", - "s": 68286310, + "s": 68288718, "affiliations": [ "Florida", "FL", @@ -14085,7 +14085,7 @@ }, { "id": "US_Florida_Orlando", - "s": 28449919, + "s": 28490431, "affiliations": [ "Florida", "FL", @@ -14097,7 +14097,7 @@ }, { "id": "US_Florida_Tampa", - "s": 58132538, + "s": 58161466, "affiliations": [ "Florida", "FL", @@ -14109,7 +14109,7 @@ }, { "id": "US_Florida_Gainesville", - "s": 36075287, + "s": 36129999, "affiliations": [ "Florida", "FL", @@ -14126,7 +14126,7 @@ "g": [ { "id": "US_Georgia_Atlanta", - "s": 68861285, + "s": 68919273, "affiliations": [ "Georgia", "GA", @@ -14138,7 +14138,7 @@ }, { "id": "US_Georgia_Macon", - "s": 49659923, + "s": 49695023, "affiliations": [ "Georgia", "GA", @@ -14150,7 +14150,7 @@ }, { "id": "US_Georgia_North", - "s": 31002609, + "s": 31010041, "affiliations": [ "Georgia", "GA", @@ -14162,7 +14162,7 @@ }, { "id": "US_Georgia_South", - "s": 46595231, + "s": 46588455, "affiliations": [ "Georgia", "GA", @@ -14176,7 +14176,7 @@ }, { "id": "US_Guam", - "s": 2677750, + "s": 2678526, "affiliations": [ "Guam", "GU", @@ -14191,7 +14191,7 @@ }, { "id": "US_Hawaii", - "s": 11049146, + "s": 11057995, "affiliations": [ "Hawaii", "HI", @@ -14206,7 +14206,7 @@ "g": [ { "id": "US_Idaho_North", - "s": 25697699, + "s": 25690795, "affiliations": [ "Idaho", "ID", @@ -14218,7 +14218,7 @@ }, { "id": "US_Idaho_South", - "s": 38688999, + "s": 38707823, "affiliations": [ "Idaho", "ID", @@ -14235,7 +14235,7 @@ "g": [ { "id": "US_Illinois_South", - "s": 41711631, + "s": 41704375, "affiliations": [ "Illinois", "IL", @@ -14247,7 +14247,7 @@ }, { "id": "US_Illinois_Chickago", - "s": 74854768, + "s": 74873720, "affiliations": [ "Illinois", "IL", @@ -14259,7 +14259,7 @@ }, { "id": "US_Illinois_Elgin", - "s": 29822971, + "s": 29881875, "affiliations": [ "Illinois", "IL", @@ -14271,7 +14271,7 @@ }, { "id": "US_Illinois_Rockford", - "s": 21074909, + "s": 21080416, "affiliations": [ "Illinois", "IL", @@ -14283,7 +14283,7 @@ }, { "id": "US_Illinois_Springfield", - "s": 54250545, + "s": 54216737, "affiliations": [ "Illinois", "IL", @@ -14300,7 +14300,7 @@ "g": [ { "id": "US_Indiana_North", - "s": 49971401, + "s": 50142329, "affiliations": [ "Indiana", "IN", @@ -14312,7 +14312,7 @@ }, { "id": "US_Indiana_Evansville", - "s": 25753675, + "s": 25737603, "affiliations": [ "Indiana", "IN", @@ -14324,7 +14324,7 @@ }, { "id": "US_Indiana_Indianapolis", - "s": 40987793, + "s": 40992953, "affiliations": [ "Indiana", "IN", @@ -14341,7 +14341,7 @@ "g": [ { "id": "US_Iowa_Des Moines", - "s": 36294768, + "s": 36276312, "affiliations": [ "Iowa", "IA", @@ -14353,7 +14353,7 @@ }, { "id": "US_Iowa_Waterloo", - "s": 32332014, + "s": 32327774, "affiliations": [ "Iowa", "IA", @@ -14365,7 +14365,7 @@ }, { "id": "US_Iowa_West", - "s": 39865283, + "s": 39866203, "affiliations": [ "Iowa", "IA", @@ -14382,7 +14382,7 @@ "g": [ { "id": "US_Kansas_East", - "s": 42346837, + "s": 42381421, "affiliations": [ "Kansas", "KS", @@ -14394,7 +14394,7 @@ }, { "id": "US_Kansas_West", - "s": 23870002, + "s": 23898986, "affiliations": [ "Kansas", "KS", @@ -14406,7 +14406,7 @@ }, { "id": "US_Kansas_Wichita", - "s": 36749262, + "s": 36775094, "affiliations": [ "Kansas", "KS", @@ -14423,7 +14423,7 @@ "g": [ { "id": "US_Kentucky_East", - "s": 43871599, + "s": 43886191, "affiliations": [ "Kentucky", "KY", @@ -14435,7 +14435,7 @@ }, { "id": "US_Kentucky_West", - "s": 30635903, + "s": 30635943, "affiliations": [ "Kentucky", "KY", @@ -14447,7 +14447,7 @@ }, { "id": "US_Kentucky_Louisville", - "s": 36938687, + "s": 36952479, "affiliations": [ "Kentucky", "KY", @@ -14464,7 +14464,7 @@ "g": [ { "id": "US_Louisiana_Central", - "s": 50085829, + "s": 50107893, "affiliations": [ "Louisiana", "LA", @@ -14476,7 +14476,7 @@ }, { "id": "US_Louisiana_New Orleans", - "s": 55264604, + "s": 55281700, "affiliations": [ "Louisiana", "LA", @@ -14490,7 +14490,7 @@ }, { "id": "US_Maine", - "s": 40426218, + "s": 40511749, "affiliations": [ "Maine", "ME", @@ -14505,7 +14505,7 @@ "g": [ { "id": "US_Maryland_Baltimore", - "s": 92400997, + "s": 92560813, "affiliations": [ "Maryland", "MD", @@ -14517,7 +14517,7 @@ }, { "id": "US_Maryland_and_DC", - "s": 52408099, + "s": 52470881, "affiliations": [ "District of Columbia", "DC", @@ -14537,7 +14537,7 @@ "g": [ { "id": "US_Massachusetts_Boston", - "s": 66503528, + "s": 66535688, "affiliations": [ "Massachusetts", "MA", @@ -14549,7 +14549,7 @@ }, { "id": "US_Massachusetts_Central", - "s": 31188470, + "s": 31189118, "affiliations": [ "Massachusetts", "MA", @@ -14561,7 +14561,7 @@ }, { "id": "US_Massachusetts_Plymouth", - "s": 33484718, + "s": 33508774, "affiliations": [ "Massachusetts", "MA", @@ -14573,7 +14573,7 @@ }, { "id": "US_Massachusetts_Southeastern", - "s": 16597312, + "s": 16598960, "affiliations": [ "Massachusetts", "MA", @@ -14585,7 +14585,7 @@ }, { "id": "US_Massachusetts_West", - "s": 27014525, + "s": 27030092, "affiliations": [ "Massachusetts", "MA", @@ -14602,7 +14602,7 @@ "g": [ { "id": "US_Michigan_Detroit", - "s": 47138331, + "s": 47538995, "affiliations": [ "Michigan", "MI", @@ -14614,7 +14614,7 @@ }, { "id": "US_Michigan_North", - "s": 34870402, + "s": 34872922, "affiliations": [ "Michigan", "MI", @@ -14626,7 +14626,7 @@ }, { "id": "US_Michigan_Grand Rapids", - "s": 40831956, + "s": 40834900, "affiliations": [ "Little Traverse Bay Band of Odawas Reservation", "Little Traverse Bay Bands Of Odawa Reservation", @@ -14644,7 +14644,7 @@ }, { "id": "US_Michigan_Lansing", - "s": 44330213, + "s": 44379533, "affiliations": [ "Little Traverse Bay Band of Odawas Reservation", "Little Traverse Bay Bands of Odawas Reservation", @@ -14663,7 +14663,7 @@ "g": [ { "id": "US_Minnesota_Rochester", - "s": 43127171, + "s": 43143515, "affiliations": [ "Minnesota", "MN", @@ -14675,7 +14675,7 @@ }, { "id": "US_Minnesota_Minneapolis", - "s": 41377880, + "s": 41610320, "affiliations": [ "Minnesota", "MN", @@ -14687,7 +14687,7 @@ }, { "id": "US_Minnesota_North", - "s": 48109643, + "s": 48157187, "affiliations": [ "Minnesota", "MN", @@ -14699,7 +14699,7 @@ }, { "id": "US_Minnesota_Saint Cloud", - "s": 35677719, + "s": 35692591, "affiliations": [ "Minnesota", "MN", @@ -14716,7 +14716,7 @@ "g": [ { "id": "US_Mississippi_Gulfport", - "s": 22790494, + "s": 22795766, "affiliations": [ "Mississippi", "MS", @@ -14728,7 +14728,7 @@ }, { "id": "US_Mississippi_North", - "s": 50115830, + "s": 50168102, "affiliations": [ "Mississippi", "MS", @@ -14745,7 +14745,7 @@ "g": [ { "id": "US_Missouri_East", - "s": 16727551, + "s": 16729079, "affiliations": [ "Missouri", "MO", @@ -14757,7 +14757,7 @@ }, { "id": "US_Missouri_Springfield", - "s": 37961855, + "s": 37991311, "affiliations": [ "Missouri", "MO", @@ -14769,7 +14769,7 @@ }, { "id": "US_Missouri_Kansas", - "s": 35583228, + "s": 35591756, "affiliations": [ "Missouri", "MO", @@ -14781,7 +14781,7 @@ }, { "id": "US_Missouri_St Louis", - "s": 42240297, + "s": 42271329, "affiliations": [ "Missouri", "MO", @@ -14798,7 +14798,7 @@ "g": [ { "id": "US_Montana_East", - "s": 34672270, + "s": 34689630, "affiliations": [ "Montana", "MT", @@ -14810,7 +14810,7 @@ }, { "id": "US_Montana_West", - "s": 33436878, + "s": 33548854, "affiliations": [ "Montana", "MT", @@ -14827,7 +14827,7 @@ "g": [ { "id": "US_Nebraska_East", - "s": 37246494, + "s": 37301086, "affiliations": [ "Nebraska", "NE", @@ -14839,7 +14839,7 @@ }, { "id": "US_Nebraska_West", - "s": 45567037, + "s": 45530117, "affiliations": [ "Nebraska", "NE", @@ -14853,7 +14853,7 @@ }, { "id": "US_Nevada", - "s": 41444069, + "s": 41507541, "affiliations": [ "Nevada", "NV", @@ -14865,7 +14865,7 @@ }, { "id": "US_New Hampshire", - "s": 36388539, + "s": 36416315, "affiliations": [ "New Hampshire", "NH", @@ -14880,7 +14880,7 @@ "g": [ { "id": "US_New Jersey_North", - "s": 42191684, + "s": 42325900, "affiliations": [ "New Jersey", "NJ", @@ -14892,7 +14892,7 @@ }, { "id": "US_New Jersey_South", - "s": 54169695, + "s": 54251399, "affiliations": [ "New Jersey", "NJ", @@ -14909,7 +14909,7 @@ "g": [ { "id": "US_New Mexico_Albuquerque", - "s": 39019931, + "s": 39046907, "affiliations": [ "New Mexico", "NM", @@ -14921,7 +14921,7 @@ }, { "id": "US_New Mexico_Roswell", - "s": 42462259, + "s": 42534566, "affiliations": [ "New Mexico", "NM", @@ -14938,7 +14938,7 @@ "g": [ { "id": "US_New York_East", - "s": 36153167, + "s": 36226623, "affiliations": [ "Gardiners Island", "New York", @@ -14951,7 +14951,7 @@ }, { "id": "US_New York_New York", - "s": 78474681, + "s": 78558497, "affiliations": [ "Ellis Island (historical)", "Liberty Island", @@ -14965,7 +14965,7 @@ }, { "id": "US_New York_North", - "s": 43534393, + "s": 43739569, "affiliations": [ "New York", "NY", @@ -14977,7 +14977,7 @@ }, { "id": "US_New York_West", - "s": 63290323, + "s": 63313419, "affiliations": [ "New York", "NY", @@ -14994,7 +14994,7 @@ "g": [ { "id": "US_North Carolina_Wilson", - "s": 32793067, + "s": 32787067, "affiliations": [ "North Carolina", "NC", @@ -15006,7 +15006,7 @@ }, { "id": "US_North Carolina_Asheville", - "s": 29783603, + "s": 29812355, "affiliations": [ "North Carolina", "NC", @@ -15018,7 +15018,7 @@ }, { "id": "US_North Carolina_Charlotte", - "s": 42224472, + "s": 42269112, "affiliations": [ "North Carolina", "NC", @@ -15030,7 +15030,7 @@ }, { "id": "US_North Carolina_Greensboro", - "s": 35867471, + "s": 35882647, "affiliations": [ "North Carolina", "NC", @@ -15042,7 +15042,7 @@ }, { "id": "US_North Carolina_Raleigh", - "s": 42608724, + "s": 42604692, "affiliations": [ "North Carolina", "NC", @@ -15054,7 +15054,7 @@ }, { "id": "US_North Carolina_Wilmington", - "s": 32259931, + "s": 32265499, "affiliations": [ "North Carolina", "NC", @@ -15071,7 +15071,7 @@ "g": [ { "id": "US_North Dakota_Bismarck", - "s": 23504120, + "s": 23505952, "affiliations": [ "North Dakota", "ND", @@ -15083,7 +15083,7 @@ }, { "id": "US_North Dakota_East", - "s": 36167407, + "s": 36169703, "affiliations": [ "North Dakota", "ND", @@ -15095,7 +15095,7 @@ }, { "id": "US_North Dakota_Minot", - "s": 22387681, + "s": 22375705, "affiliations": [ "North Dakota", "ND", @@ -15112,7 +15112,7 @@ "g": [ { "id": "US_Ohio_Cleveland", - "s": 50646194, + "s": 50666858, "affiliations": [ "Ohio", "OH", @@ -15124,7 +15124,7 @@ }, { "id": "US_Ohio_Cincinnati", - "s": 43740202, + "s": 43792322, "affiliations": [ "Ohio", "OH", @@ -15136,7 +15136,7 @@ }, { "id": "US_Ohio_Columbus", - "s": 33772853, + "s": 33888381, "affiliations": [ "Ohio", "OH", @@ -15148,7 +15148,7 @@ }, { "id": "US_Ohio_Toledo", - "s": 29002949, + "s": 29023285, "affiliations": [ "Ohio", "OH", @@ -15165,7 +15165,7 @@ "g": [ { "id": "US_Oklahoma_East", - "s": 20853357, + "s": 20939085, "affiliations": [ "Oklahoma", "OK", @@ -15177,7 +15177,7 @@ }, { "id": "US_Oklahoma_West", - "s": 25311187, + "s": 25314467, "affiliations": [ "Oklahoma", "OK", @@ -15189,7 +15189,7 @@ }, { "id": "US_Oklahoma_Tulsa", - "s": 41145835, + "s": 41157379, "affiliations": [ "Oklahoma", "OK", @@ -15201,7 +15201,7 @@ }, { "id": "US_Oklahoma_Oklahoma", - "s": 38594701, + "s": 38599037, "affiliations": [ "Oklahoma", "OK", @@ -15218,7 +15218,7 @@ "g": [ { "id": "US_Oregon_Eugene", - "s": 31317240, + "s": 31328968, "affiliations": [ "Oregon", "OR", @@ -15230,7 +15230,7 @@ }, { "id": "US_Oregon_Portland", - "s": 82118163, + "s": 82142555, "affiliations": [ "Oregon", "OR", @@ -15242,7 +15242,7 @@ }, { "id": "US_Oregon_West", - "s": 34963724, + "s": 34938331, "affiliations": [ "Oregon", "OR", @@ -15259,7 +15259,7 @@ "g": [ { "id": "US_Pennsylvania_Central", - "s": 53060609, + "s": 53098297, "affiliations": [ "Pennsylvania", "PA", @@ -15271,7 +15271,7 @@ }, { "id": "US_Pennsylvania_Pittsburgh", - "s": 45455223, + "s": 45596363, "affiliations": [ "Pennsylvania", "PA", @@ -15283,7 +15283,7 @@ }, { "id": "US_Pennsylvania_Reading", - "s": 42887323, + "s": 42922443, "affiliations": [ "Pennsylvania", "PA", @@ -15295,7 +15295,7 @@ }, { "id": "US_Pennsylvania_Scranton", - "s": 49718562, + "s": 49781674, "affiliations": [ "Pennsylvania", "PA", @@ -15309,7 +15309,7 @@ }, { "id": "US_Puerto Rico", - "s": 37015489, + "s": 37022353, "affiliations": [ "Puerto Rico", "PR", @@ -15322,7 +15322,7 @@ }, { "id": "US_Rhode Island", - "s": 11978717, + "s": 12001773, "affiliations": [ "Patience Island", "Rhode Island", @@ -15338,7 +15338,7 @@ "g": [ { "id": "US_South Carolina_Charleston", - "s": 24786996, + "s": 24849900, "affiliations": [ "South Carolina", "SC", @@ -15350,7 +15350,7 @@ }, { "id": "US_South Carolina_Columbia", - "s": 45872613, + "s": 45914949, "affiliations": [ "South Carolina", "SC", @@ -15362,7 +15362,7 @@ }, { "id": "US_South Carolina_Florence", - "s": 33155438, + "s": 33217918, "affiliations": [ "South Carolina", "SC", @@ -15376,7 +15376,7 @@ }, { "id": "US_South Dakota", - "s": 42365077, + "s": 42358253, "affiliations": [ "South Dakota", "SD", @@ -15391,7 +15391,7 @@ "g": [ { "id": "US_Tennessee_East", - "s": 59943786, + "s": 59971394, "affiliations": [ "Tennessee", "TN", @@ -15403,7 +15403,7 @@ }, { "id": "US_Tennessee_West", - "s": 43889155, + "s": 43957019, "affiliations": [ "Tennessee", "TN", @@ -15420,7 +15420,7 @@ "g": [ { "id": "US_Texas_Austin", - "s": 60605378, + "s": 60618426, "affiliations": [ "Texas", "TX", @@ -15432,7 +15432,7 @@ }, { "id": "US_Texas_Victoria", - "s": 18881446, + "s": 18888118, "affiliations": [ "Texas", "TX", @@ -15444,7 +15444,7 @@ }, { "id": "US_Texas_Dallas", - "s": 62288339, + "s": 62383587, "affiliations": [ "Texas", "TX", @@ -15456,7 +15456,7 @@ }, { "id": "US_Texas_Houston", - "s": 67475284, + "s": 67550092, "affiliations": [ "Texas", "TX", @@ -15468,7 +15468,7 @@ }, { "id": "US_Texas_Amarillo", - "s": 25951558, + "s": 26228358, "affiliations": [ "Texas", "TX", @@ -15480,7 +15480,7 @@ }, { "id": "US_Texas_Lubbock", - "s": 30539830, + "s": 30808177, "affiliations": [ "Texas", "TX", @@ -15492,7 +15492,7 @@ }, { "id": "US_Texas_San Antonio", - "s": 42202581, + "s": 42204829, "affiliations": [ "Texas", "TX", @@ -15504,7 +15504,7 @@ }, { "id": "US_Texas_Southwest", - "s": 30827822, + "s": 30807982, "affiliations": [ "Texas", "TX", @@ -15516,7 +15516,7 @@ }, { "id": "US_Texas_Tyler", - "s": 41825558, + "s": 41814598, "affiliations": [ "Texas", "TX", @@ -15528,7 +15528,7 @@ }, { "id": "US_Texas_Wako", - "s": 30500807, + "s": 30513223, "affiliations": [ "Texas", "TX", @@ -15540,7 +15540,7 @@ }, { "id": "US_Texas_West", - "s": 45505790, + "s": 45496966, "affiliations": [ "Texas", "TX", @@ -15554,7 +15554,7 @@ }, { "id": "US_United States Minor Outlying Islands", - "s": 478000, + "s": 478024, "affiliations": [ "Navassa Island", "United States Minor Outlying Islands" @@ -15565,7 +15565,7 @@ "g": [ { "id": "US_Utah_South", - "s": 20276079, + "s": 20286023, "affiliations": [ "United States of America", "Utah", @@ -15577,7 +15577,7 @@ }, { "id": "US_Utah_North", - "s": 37894010, + "s": 37933722, "affiliations": [ "United States of America", "Utah", @@ -15591,7 +15591,7 @@ }, { "id": "US_Vermont", - "s": 18505393, + "s": 18547417, "affiliations": [ "United States of America", "Vermont", @@ -15606,7 +15606,7 @@ "g": [ { "id": "US_Virginia_Roanoke", - "s": 42299914, + "s": 42296370, "affiliations": [ "Virginia", "VA", @@ -15618,7 +15618,7 @@ }, { "id": "US_Virginia_Norfolk", - "s": 70035408, + "s": 70049816, "affiliations": [ "Virginia", "VA", @@ -15630,7 +15630,7 @@ }, { "id": "US_Virginia_Lynchburg", - "s": 50623989, + "s": 50677766, "affiliations": [ "Virginia", "VA", @@ -15642,7 +15642,7 @@ }, { "id": "US_Virginia_Richmond", - "s": 26928424, + "s": 26926656, "affiliations": [ "Virginia", "VA", @@ -15654,7 +15654,7 @@ }, { "id": "US_Virginia_Alexandria", - "s": 40127295, + "s": 40182440, "affiliations": [ "Virginia", "VA", @@ -15671,7 +15671,7 @@ "g": [ { "id": "US_Washington_Coast", - "s": 56908065, + "s": 57110833, "affiliations": [ "Puyallup Tribe", "Puyallup Tribe Reservation", @@ -15685,7 +15685,7 @@ }, { "id": "US_Washington_Seattle", - "s": 52711308, + "s": 52777060, "affiliations": [ "United States of America", "Washington", @@ -15697,7 +15697,7 @@ }, { "id": "US_Washington_Yakima", - "s": 41682584, + "s": 41766975, "affiliations": [ "United States of America", "Washington", @@ -15711,7 +15711,7 @@ }, { "id": "US_West Virginia", - "s": 41675567, + "s": 41652680, "affiliations": [ "United States of America", "West Virginia", @@ -15726,7 +15726,7 @@ "g": [ { "id": "US_Wisconsin_Milwaukee", - "s": 45019548, + "s": 45053396, "affiliations": [ "United States of America", "Wisconsin", @@ -15738,7 +15738,7 @@ }, { "id": "US_Wisconsin_North", - "s": 29619031, + "s": 29686311, "affiliations": [ "United States of America", "Wisconsin", @@ -15750,7 +15750,7 @@ }, { "id": "US_Wisconsin_Madison", - "s": 32121828, + "s": 32229695, "affiliations": [ "United States of America", "Wisconsin", @@ -15762,7 +15762,7 @@ }, { "id": "US_Wisconsin_Eau Claire", - "s": 30146093, + "s": 30172941, "affiliations": [ "United States of America", "Wisconsin", @@ -15776,7 +15776,7 @@ }, { "id": "US_Wyoming", - "s": 43020537, + "s": 42998529, "affiliations": [ "United States of America", "Wyoming", @@ -15790,7 +15790,7 @@ }, { "id": "Uruguay", - "s": 32050156, + "s": 32170988, "affiliations": [ "Cerro Largo", "Artigas", @@ -15820,7 +15820,7 @@ }, { "id": "Uzbekistan", - "s": 49259716, + "s": 49497988, "affiliations": [ "Andijon Viloyati", "Border Kyrgyzstan - Uzbekistan", @@ -15845,7 +15845,7 @@ }, { "id": "Vanuatu", - "s": 3784287, + "s": 3783815, "affiliations": [ "Malampa", "Penama", @@ -15864,7 +15864,7 @@ "g": [ { "id": "Venezuela_North", - "s": 33719015, + "s": 33798679, "affiliations": [ "Barinas", "Carabobo", @@ -15896,7 +15896,7 @@ }, { "id": "Venezuela_South", - "s": 29136312, + "s": 29167688, "affiliations": [ "Amazonas", "Apure", @@ -15919,7 +15919,7 @@ }, { "id": "Vietnam", - "s": 56313356, + "s": 56551812, "affiliations": [ "T\u1ec9nh H\u00e0 Nam", "T\u1ec9nh H\u00e0 T\u0129nh", @@ -15992,7 +15992,7 @@ }, { "id": "Yemen", - "s": 19601280, + "s": 19629424, "affiliations": [ "Abyan", "Ad Dali'", @@ -16023,7 +16023,7 @@ }, { "id": "Zambia", - "s": 27208690, + "s": 27164192, "affiliations": [ "Central Province", "Copperbelt Province", @@ -16043,7 +16043,7 @@ }, { "id": "Zimbabwe", - "s": 26275250, + "s": 26298914, "affiliations": [ "Bulawayo Province", "Mashonaland Central", @@ -16083,7 +16083,7 @@ }, { "id": "New Zealand North_Auckland", - "s": 57162658, + "s": 57500330, "affiliations": [ "Auckland", "Bay of Plenty", @@ -16097,7 +16097,7 @@ }, { "id": "New Zealand North_Wellington", - "s": 45297769, + "s": 45495857, "affiliations": [ "Gisborne", "Hawke's Bay", @@ -16112,7 +16112,7 @@ }, { "id": "New Zealand South_Canterbury", - "s": 43430651, + "s": 43476219, "affiliations": [ "Canterbury", "Chatham Islands", @@ -16128,7 +16128,7 @@ }, { "id": "New Zealand South_Southland", - "s": 30902154, + "s": 30916354, "affiliations": [ "New Zealand/Aotearoa", "Otago", @@ -16146,7 +16146,7 @@ "g": [ { "id": "South Korea_North", - "s": 71137711, + "s": 71293956, "affiliations": [ "\uac15\uc6d0\ub3c4", "\uacbd\uae30\ub3c4", @@ -16165,7 +16165,7 @@ }, { "id": "South Korea_South", - "s": 58050072, + "s": 58182332, "affiliations": [ "\uc81c\uc8fc\ub3c4", "Gyeongnam-Busan Border", diff --git a/data/external_resources.txt b/data/external_resources.txt index 418c457e17..4069eec2da 100644 --- a/data/external_resources.txt +++ b/data/external_resources.txt @@ -1,6 +1,6 @@ -WorldCoasts.mwm 4631224 +WorldCoasts.mwm 4635218 WorldCoasts_obsolete.mwm 4513802 -World.mwm 35166831 +World.mwm 35208957 01_dejavusans.ttf 633604 02_droidsans-fallback.ttf 4033420 03_jomolhari-id-a3d.ttf 1817160 -- cgit v1.2.3 From c6bad6db2748beb0a9955ff46e52102891b34eb2 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Wed, 21 Sep 2016 09:56:53 +0300 Subject: [ios] Attempt to fix iOS 7 crash. https://jira.mail.ru/browse/MAPSME-2464 --- iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index c6e522e047..0750026ace 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -225,6 +225,7 @@ CGAffineTransform rotation(UIInterfaceOrientation orientation) { [super layoutSubviews]; self.frame = self.superview.bounds; + [super layoutSubviews]; } @end -- cgit v1.2.3 From 2f2bb22100755f6dc9c4ffd6f975dfe03301d7d3 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Wed, 21 Sep 2016 12:18:01 +0300 Subject: [android] Updated gradle plugin --- android/3rd_party/BottomSheet/build.gradle | 2 +- android/UnitTests/build.gradle | 2 +- android/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/3rd_party/BottomSheet/build.gradle b/android/3rd_party/BottomSheet/build.gradle index e313682ba2..5dd95985bd 100644 --- a/android/3rd_party/BottomSheet/build.gradle +++ b/android/3rd_party/BottomSheet/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/android/UnitTests/build.gradle b/android/UnitTests/build.gradle index 76e83eef25..c3a14bd93f 100644 --- a/android/UnitTests/build.gradle +++ b/android/UnitTests/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/build.gradle b/android/build.gradle index 9957ceb38b..296dbd8891 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'io.fabric.tools:gradle:1.+' } } -- cgit v1.2.3 From 7bf8328b21eef8402e814580164d18a4298157d8 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 21 Sep 2016 12:46:39 +0300 Subject: review fixes --- android/jni/com/mapswithme/platform/Platform.cpp | 2 +- .../src/com/mapswithme/maps/base/BaseActivityDelegate.java | 3 +++ android/src/com/mapswithme/util/statistics/Statistics.java | 12 ------------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index 817b8f1001..ee36652ffe 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -101,7 +101,7 @@ void Platform::SendMarketingEvent(string const & tag, map const env->GetStaticMethodID(g_myTrackerClazz, "trackEvent", "(Ljava/lang/String;)V"); env->CallStaticVoidMethod(g_myTrackerClazz, myTrackerTrackEvent, - jni::ToJavaString(env, eventData)); + jni::TScopedLocalRef(env, jni::ToJavaString(env, eventData)).get()); } Platform::EConnectionType Platform::ConnectionStatus() diff --git a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java index 21e5dbc873..c3e89e1e67 100644 --- a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java +++ b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java @@ -8,6 +8,7 @@ import com.mapswithme.util.UiUtils; import com.mapswithme.util.ViewServer; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.statistics.Statistics; +import com.my.tracker.MyTracker; public class BaseActivityDelegate { @@ -38,11 +39,13 @@ public class BaseActivityDelegate public void onStart() { Statistics.INSTANCE.startActivity(mActivity.get()); + MyTracker.onStartActivity(mActivity.get()); } public void onStop() { Statistics.INSTANCE.stopActivity(mActivity.get()); + MyTracker.onStopActivity(mActivity.get()); } public void onResume() diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index e96c26ddb9..f1199db1e7 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -26,8 +26,6 @@ import com.mapswithme.maps.editor.Editor; import com.mapswithme.maps.editor.OsmOAuth; import com.mapswithme.util.Config; import com.mapswithme.util.ConnectionState; -import com.my.tracker.MyTracker; -import com.my.tracker.MyTrackerParams; public enum Statistics { @@ -232,13 +230,6 @@ public enum Statistics FlurryAgent.setVersionName(BuildConfig.VERSION_NAME); FlurryAgent.setCaptureUncaughtExceptions(false); FlurryAgent.init(context, PrivateVariables.flurryKey()); - - MyTracker.setDebugMode(BuildConfig.DEBUG); - MyTracker.createTracker(PrivateVariables.myTrackerKey(), context); - final MyTrackerParams myParams = MyTracker.getTrackerParams(); - myParams.setDefaultVendorAppPackage(); - myParams.setTrackingLaunchEnabled(true); - MyTracker.initTracker(); } // At the moment, need to always initialize engine for correct JNI http part reusing. // Statistics is still enabled/disabled separately and never sent anywhere if turned off. @@ -295,7 +286,6 @@ public enum Statistics { FlurryAgent.onStartSession(activity); AppEventsLogger.activateApp(activity); - MyTracker.onStartActivity(activity); org.alohalytics.Statistics.onStart(activity); } } @@ -306,7 +296,6 @@ public enum Statistics { FlurryAgent.onEndSession(activity); AppEventsLogger.deactivateApp(activity); - MyTracker.onStopActivity(activity); org.alohalytics.Statistics.onStop(activity); } } @@ -377,7 +366,6 @@ public enum Statistics if (mEnabled) { final ParameterBuilder params = params().add(EventParam.COUNT, String.valueOf(MapManager.nativeGetDownloadedCount())); - MyTracker.trackEvent(event, params.get()); trackEvent(event, params); } } -- cgit v1.2.3 From f7221c6c069154464e8f6a9c99f2a3380ca353bf Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Fri, 16 Sep 2016 03:10:41 +0300 Subject: [android] fix: Failed to jump to given geo url. --- .../mapswithme/maps/DownloadResourcesActivity.java | 48 ++++++++++++---------- android/src/com/mapswithme/maps/MapFragment.java | 14 +++++++ android/src/com/mapswithme/maps/MwmActivity.java | 16 ++++++-- 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index e029ccc90b..fa028d2d24 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -17,12 +17,6 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; - import com.mapswithme.maps.MwmActivity.MapTask; import com.mapswithme.maps.MwmActivity.OpenUrlTask; import com.mapswithme.maps.api.Const; @@ -42,6 +36,12 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.concurrency.ThreadPool; import com.mapswithme.util.statistics.Statistics; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.List; + @SuppressLint("StringFormatMatches") public class DownloadResourcesActivity extends BaseMwmFragmentActivity { @@ -213,19 +213,23 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity { super.onCreate(savedInstanceState); - Utils.keepScreenOn(true, getWindow()); - suggestRemoveLiteOrSamsung(); - dispatchIntent(); - setContentView(R.layout.activity_download_resources); - initViewsAndListeners(); - - if (prepareFilesDownload()) + if (prepareFilesDownload(false)) { + Utils.keepScreenOn(true, getWindow()); + suggestRemoveLiteOrSamsung(); + setContentView(R.layout.activity_download_resources); + initViewsAndListeners(); + setAction(DOWNLOAD); if (ConnectionState.isWifiConnected()) onDownloadClicked(); + + return; } + + dispatchIntent(); + showMap(); } @Override @@ -244,7 +248,9 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity protected void onResume() { super.onResume(); - LocationHelper.INSTANCE.addListener(mLocationListener, true); + + if (!isFinishing()) + LocationHelper.INSTANCE.addListener(mLocationListener, true); } @Override @@ -265,14 +271,15 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity mTvMessage.setText(getString(R.string.download_resources, StringUtils.getFileSizeString(bytesToDownload))); } - private boolean prepareFilesDownload() + private boolean prepareFilesDownload(boolean showMap) { final int bytes = nativeGetBytesToDownload(); - if (bytes == 0) { mAreResourcesDownloaded = true; - showMap(); + if (showMap) + showMap(); + return false; } @@ -383,7 +390,7 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity private void onTryAgainClicked() { - if (prepareFilesDownload()) + if (prepareFilesDownload(true)) { setAction(PAUSE); doDownload(); @@ -478,11 +485,8 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity return false; for (final IntentProcessor ip : mIntentProcessors) - if (ip.isSupported(intent)) - { - ip.process(intent); + if (ip.isSupported(intent) && ip.process(intent)) return true; - } return false; } diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java index 778d625189..1b92d491e7 100644 --- a/android/src/com/mapswithme/maps/MapFragment.java +++ b/android/src/com/mapswithme/maps/MapFragment.java @@ -59,6 +59,7 @@ public class MapFragment extends BaseMwmFragment interface MapRenderingListener { void onRenderingInitialized(); + void onRenderingRestored(); } private void setupWidgets(int width, int height) @@ -119,6 +120,13 @@ public class MapFragment extends BaseMwmFragment ((MapRenderingListener) activity).onRenderingInitialized(); } + private void onRenderingRestored() + { + final Activity activity = getActivity(); + if (isAdded() && activity instanceof MapRenderingListener) + ((MapRenderingListener) activity).onRenderingRestored(); + } + private void reportUnsupported() { new AlertDialog.Builder(getActivity()) @@ -181,6 +189,7 @@ public class MapFragment extends BaseMwmFragment mRequireResize = false; setupWidgets(width, height); nativeApplyWidgets(); + onRenderingRestored(); } @Override @@ -280,6 +289,11 @@ public class MapFragment extends BaseMwmFragment return res; } + boolean isContextCreated() + { + return mContextCreated; + } + static native void nativeCompassUpdated(double magneticNorth, double trueNorth, boolean forceRedraw); static native void nativeScalePlus(); static native void nativeScaleMinus(); diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 95239c61bf..ad6434f32b 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -183,6 +183,12 @@ public class MwmActivity extends BaseMwmFragmentActivity runTasks(); } + @Override + public void onRenderingRestored() + { + runTasks(); + } + private void runTasks() { while (!mTasks.isEmpty()) @@ -714,7 +720,7 @@ public class MwmActivity extends BaseMwmFragmentActivity mTasks.add(mapTask); intent.removeExtra(EXTRA_TASK); - if (MapFragment.nativeIsEngineCreated()) + if (MapFragment.nativeIsEngineCreated() && mMapFragment.isContextCreated()) runTasks(); // mark intent as consumed @@ -725,7 +731,7 @@ public class MwmActivity extends BaseMwmFragmentActivity private void addTask(MapTask task) { mTasks.add(task); - if (MapFragment.nativeIsEngineCreated()) + if (MapFragment.nativeIsEngineCreated() && mMapFragment.isContextCreated()) runTasks(); } @@ -1147,10 +1153,12 @@ public class MwmActivity extends BaseMwmFragmentActivity switch (result) { case ParsedUrlMwmRequest.RESULT_INCORRECT: - // TODO handle error - break; + // TODO: Kernel recognizes "mapsme://", "mwm://" and "mapswithme://" schemas only!!! + return MapFragment.nativeShowMapForUrl(mUrl); + case ParsedUrlMwmRequest.RESULT_MAP: return MapFragment.nativeShowMapForUrl(mUrl); + case ParsedUrlMwmRequest.RESULT_ROUTE: final ParsedRoutingData data = Framework.nativeGetParsedRoutingData(); RoutingController.get().setRouterType(data.mRouterType); -- cgit v1.2.3 From 5d55ab9eb88798ce242c2684b63fd342932978f6 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Wed, 21 Sep 2016 15:42:24 +0300 Subject: [android] Added saving/restoring state of the altitude chart on tablet layout --- android/src/com/mapswithme/maps/MwmActivity.java | 10 +++++++--- .../mapswithme/maps/base/BaseMwmFragmentActivity.java | 16 ++++++++++++++++ .../maps/routing/RoutingPlanController.java | 19 ++++++++++++++----- .../mapswithme/maps/routing/RoutingPlanFragment.java | 17 +++++++++++++++-- .../maps/routing/RoutingPlanInplaceController.java | 14 +++++--------- 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index ad6434f32b..0f1cdb52cc 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -75,8 +75,6 @@ import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.concurrency.UiThread; -import com.mapswithme.util.log.DebugLogger; -import com.mapswithme.util.log.Logger; import com.mapswithme.util.sharing.ShareOption; import com.mapswithme.util.sharing.SharingHelper; import com.mapswithme.util.statistics.AlohaHelper; @@ -149,7 +147,6 @@ public class MwmActivity extends BaseMwmFragmentActivity // The first launch of application ever - onboarding screen will be shown. private boolean mFirstStart; - private final Logger mLogger = new DebugLogger(MwmActivity.class.getSimpleName()); public interface LeftAnimationTrackListener { @@ -675,6 +672,13 @@ public class MwmActivity extends BaseMwmFragmentActivity if (!mIsFragmentContainer && RoutingController.get().isPlanning()) mRoutingPlanInplaceController.onSaveState(outState); + if (mIsFragmentContainer) + { + RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class); + if (fragment != null) + fragment.saveAltitudeChartState(outState); + } + RoutingController.get().onSaveState(); super.onSaveInstanceState(outState); } diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index 6d354a7434..f1f6ef3f3e 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -21,6 +21,9 @@ public class BaseMwmFragmentActivity extends AppCompatActivity { private final BaseActivityDelegate mBaseDelegate = new BaseActivityDelegate(this); + @Nullable + private Bundle mSavedInstanceState; + @Override public Activity get() { @@ -91,6 +94,19 @@ public class BaseMwmFragmentActivity extends AppCompatActivity mBaseDelegate.onStop(); } + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) + { + super.onRestoreInstanceState(savedInstanceState); + mSavedInstanceState = savedInstanceState; + } + + @Nullable + public Bundle getSavedInstanceState() + { + return mSavedInstanceState; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index e50222835e..4d136618e1 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -3,8 +3,10 @@ package com.mapswithme.maps.routing; import android.animation.ValueAnimator; import android.app.Activity; import android.graphics.Bitmap; +import android.os.Bundle; import android.support.annotation.DrawableRes; import android.support.annotation.IdRes; +import android.support.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; @@ -27,6 +29,7 @@ import com.mapswithme.util.statistics.Statistics; public class RoutingPlanController extends ToolbarController { static final int ANIM_TOGGLE = MwmApplication.get().getResources().getInteger(R.integer.anim_slots_toggle); + private static final String STATE_ALTITUDE_CHART_SHOWN = "altitude chart shown"; protected final View mFrame; private final ImageView mToggle; @@ -203,11 +206,6 @@ public class RoutingPlanController extends ToolbarController mAltitudeChartShown = false; } - protected boolean isAltitudeChartShown() - { - return mAltitudeChartShown; - } - public void updateBuildProgress(int progress, @Framework.RouterType int router) { updateProgressLabels(); @@ -327,4 +325,15 @@ public class RoutingPlanController extends ToolbarController UiUtils.show(altitudeChart); } } + + public void saveAltitudeChartState(@NonNull Bundle outState) + { + outState.putBoolean(STATE_ALTITUDE_CHART_SHOWN, mAltitudeChartShown); + } + + public void restoreAltitudeChartState(@NonNull Bundle state) + { + if (state.getBoolean(STATE_ALTITUDE_CHART_SHOWN)) + showRouteAltitudeChart(!isVehicleRouteChecked()); + } } diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java index 2389c32373..3903cf0f80 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java @@ -1,13 +1,12 @@ package com.mapswithme.maps.routing; -import android.graphics.Bitmap; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.ImageView; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; @@ -38,6 +37,10 @@ public class RoutingPlanFragment extends BaseMwmFragment } }); + Bundle activityState = getMwmActivity().getSavedInstanceState(); + if (activityState != null) + restoreAltitudeChartState(activityState); + return res; } @@ -74,4 +77,14 @@ public class RoutingPlanFragment extends BaseMwmFragment { mPlanController.showRouteAltitudeChart(show); } + + public void restoreAltitudeChartState(@NonNull Bundle state) + { + mPlanController.restoreAltitudeChartState(state); + } + + public void saveAltitudeChartState(@NonNull Bundle outState) + { + mPlanController.saveAltitudeChartState(outState); + } } diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java index d1d1b80761..9027f85698 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java @@ -1,13 +1,12 @@ package com.mapswithme.maps.routing; -import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.View; import android.widget.Button; import android.widget.ImageView; -import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.MapObject; @@ -19,7 +18,6 @@ import com.mapswithme.util.statistics.Statistics; public class RoutingPlanInplaceController extends RoutingPlanController { private static final String STATE_OPEN = "slots panel open"; - private static final String STATE_ALTITUDE_CHART_SHOWN = "altitude chart shown"; private Boolean mSlotsRestoredState; @@ -81,19 +79,18 @@ public class RoutingPlanInplaceController extends RoutingPlanController }); } - public void onSaveState(Bundle outState) + public void onSaveState(@NonNull Bundle outState) { outState.putBoolean(STATE_OPEN, isOpen()); - outState.putBoolean(STATE_ALTITUDE_CHART_SHOWN, isAltitudeChartShown()); + saveAltitudeChartState(outState); } - public void restoreState(Bundle state) + public void restoreState(@NonNull Bundle state) { if (state.containsKey(STATE_OPEN)) mSlotsRestoredState = state.getBoolean(STATE_OPEN); - if (state.getBoolean(STATE_ALTITUDE_CHART_SHOWN)) - showRouteAltitudeChart(!isVehicleRouteChecked()); + restoreAltitudeChartState(state); } @Override @@ -102,5 +99,4 @@ public class RoutingPlanInplaceController extends RoutingPlanController ImageView altitudeChart = (ImageView) mActivity.findViewById(R.id.altitude_chart); showRouteAltitudeChartInternal(show, altitudeChart); } - } -- cgit v1.2.3 From f9cc68a13d8e54fb303c7186e8d85391e8838f0c Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 21 Sep 2016 16:36:12 +0300 Subject: fix initialization priority --- .../src/com/mapswithme/maps/MwmApplication.java | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index f7120e6a1b..33ea84f2a0 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -107,12 +107,12 @@ public class MwmApplication extends Application super.onCreate(); mMainLoopHandler = new Handler(getMainLooper()); - // Alohalytics generates installation id, - // it should be initialized before Crashlytics. - Statistics s = Statistics.INSTANCE; - initHockeyApp(); + initCrashlytics(); + final boolean isInstallationIdFound = + setInstallationIdToCrashlytics(); + initPushWoosh(); initTracker(); @@ -120,10 +120,16 @@ public class MwmApplication extends Application new File(settingsPath).mkdirs(); new File(getTempPath()).mkdirs(); + // First we need initialize paths and platform to have access to settings and other components. nativePreparePlatform(settingsPath); nativeInitPlatform(getApkPath(), getStoragePath(settingsPath), getTempPath(), getObbGooglePath(), BuildConfig.FLAVOR, BuildConfig.BUILD_TYPE, UiUtils.isTablet()); + Statistics s = Statistics.INSTANCE; + + if (!isInstallationIdFound) + setInstallationIdToCrashlytics(); + mPrefs = getSharedPreferences(getString(R.string.pref_file_name), MODE_PRIVATE); mBackgroundTracker = new AppBackgroundTracker(); TrackRecorder.init(); @@ -189,8 +195,17 @@ public class MwmApplication extends Application Fabric.with(this, new Crashlytics(), new CrashlyticsNdk()); nativeInitCrashlytics(); + } + + private boolean setInstallationIdToCrashlytics() + { + final String installationId = Utils.getInstallationId(); + // If it is a first run. + if (TextUtils.isEmpty(installationId)) + return false; - Crashlytics.setString("AlohalyticsInstallationId", Utils.getInstallationId()); + Crashlytics.setString("AlohalyticsInstallationId", installationId); + return true; } public boolean isFrameworkInitialized() -- cgit v1.2.3 From be97777a5cb91fdb2aa743be21cbeb5a012ef12a Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 21 Sep 2016 17:37:13 +0300 Subject: review fix --- android/src/com/mapswithme/maps/MwmApplication.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index 33ea84f2a0..a877bfc8a4 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -197,10 +197,11 @@ public class MwmApplication extends Application nativeInitCrashlytics(); } - private boolean setInstallationIdToCrashlytics() + private static boolean setInstallationIdToCrashlytics() { final String installationId = Utils.getInstallationId(); - // If it is a first run. + // If installation id is not found this means id was not + // generated by alohalytics yet and it is a first run. if (TextUtils.isEmpty(installationId)) return false; -- cgit v1.2.3 From 7aab38ca617c5371e5a624ea42131c1de16c466a Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Wed, 21 Sep 2016 19:29:24 +0300 Subject: [android] Fixed crash at cold launch, i.e. when MapsWithMe folder is absent --- android/src/com/mapswithme/maps/DownloadResourcesActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index fa028d2d24..566bf3d4e9 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -212,13 +212,13 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_download_resources); + initViewsAndListeners(); if (prepareFilesDownload(false)) { Utils.keepScreenOn(true, getWindow()); suggestRemoveLiteOrSamsung(); - setContentView(R.layout.activity_download_resources); - initViewsAndListeners(); setAction(DOWNLOAD); -- cgit v1.2.3 From 22f28f7593ebdfd855c703aecf2d347061032a15 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Wed, 21 Sep 2016 19:40:54 +0300 Subject: [android] Changed app version --- android/gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 94434558b6..0ebd996513 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=630 -propVersionName=6.3 +propVersionCode=641 +propVersionName=6.4.1 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1 -- cgit v1.2.3 From 0f566e7528cbecff3d75bf74b07157839d79d185 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 21 Sep 2016 19:14:27 +0300 Subject: Fixed return to map after migration --- .../MapDownloader/MWMBaseMapDownloaderViewController.mm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm index 099bf55614..1f64c30362 100644 --- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm @@ -161,6 +161,21 @@ using namespace mwm; } - (void)configMyTarget { [MWMMyTarget manager].delegate = self; } + +- (void)backTap +{ + // TODO(igrechuhin): In case, when downloaded maps view controller appears after migration + // we have trouble with poping view controller. We expect to see map but as result + // we see migration controller. + // Poping to root controller seems to be helpful in this case, but probably not the best way to determine + // how far we should pop from this view controller. + + if (self.dataSource.mode == mwm::DownloaderMode::Downloaded) + [self.navigationController popToRootViewControllerAnimated:YES]; + else + [super backTap]; +} + - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [self.cellHeightCache removeAllObjects]; -- cgit v1.2.3 From e580ec91d1b9a6976fc66d64ef3a60bc1d84311b Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 21 Sep 2016 19:46:42 +0300 Subject: [ios] Increased project version to 6.4 --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 9f35fc8b1e..7d92bc6e45 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4435,7 +4435,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -4555,7 +4555,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -4676,7 +4676,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4801,7 +4801,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4926,7 +4926,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -5049,7 +5049,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.3; + CURRENT_PROJECT_VERSION = 6.4; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; -- cgit v1.2.3 From 69e828aa22d4f8e86701c405d734b3b16cdb3f44 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 21 Sep 2016 20:20:18 +0300 Subject: noob dialog --- .../mapswithme/maps/editor/EditorHostFragment.java | 79 ++++++++++++++++------ 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index ef45818031..bf3214cac5 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.editor; import android.app.Activity; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -13,6 +14,7 @@ import android.view.View; import android.view.ViewGroup; import com.mapswithme.maps.MwmActivity; +import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.base.OnBackPressListener; @@ -55,6 +57,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment */ private int mMandatoryNamesCount = 0; + private static final String NOOB_ALERT_SHOWN = "Alert_for_noob_was_shown"; /** * Used in MultilanguageAdapter to show, select and remove items. */ @@ -281,35 +284,50 @@ public class EditorHostFragment extends BaseMwmToolbarFragment if (note.length() != 0) Editor.nativeCreateNote(note); // Save object edits - if (Editor.nativeSaveEditedFeature()) + if (!MwmApplication.get().prefs().contains(NOOB_ALERT_SHOWN)) { - Statistics.INSTANCE.trackEditorSuccess(mIsNewObject); - if (OsmOAuth.isAuthorized() || !ConnectionState.isConnected()) - Utils.navigateToParent(getActivity()); - else - { - final Activity parent = getActivity(); - Intent intent = new Intent(parent, MwmActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); - intent.putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowAuthorizationTask()); - parent.startActivity(intent); - - if (parent instanceof MwmActivity) - ((MwmActivity) parent).customOnNavigateUp(); - else - parent.finish(); - } + MwmApplication.get().prefs().edit() + .putBoolean(NOOB_ALERT_SHOWN, true) + .apply(); + + showNoobDialog(); } else - { - Statistics.INSTANCE.trackEditorError(mIsNewObject); - UiUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title); - } + saveMapObjectEdits(); + break; } } } + private void saveMapObjectEdits() + { + if (Editor.nativeSaveEditedFeature()) + { + Statistics.INSTANCE.trackEditorSuccess(mIsNewObject); + if (OsmOAuth.isAuthorized() || !ConnectionState.isConnected()) + Utils.navigateToParent(getActivity()); + else + { + final Activity parent = getActivity(); + Intent intent = new Intent(parent, MwmActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + intent.putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowAuthorizationTask()); + parent.startActivity(intent); + + if (parent instanceof MwmActivity) + ((MwmActivity) parent).customOnNavigateUp(); + else + parent.finish(); + } + } + else + { + Statistics.INSTANCE.trackEditorError(mIsNewObject); + UiUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title); + } + } + private void showMistakeDialog(@StringRes int resId) { new AlertDialog.Builder(getActivity()) @@ -318,6 +336,25 @@ public class EditorHostFragment extends BaseMwmToolbarFragment .show(); } + + private void showNoobDialog() + { + new AlertDialog.Builder(getActivity()) + .setTitle(R.string.editor_share_to_all_dialog_title) + .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + + " " + getString(R.string.editor_share_to_all_dialog_message_2)) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dlg, int which) + { + saveMapObjectEdits(); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); + } + public void setStreet(LocalizedStreet street) { Editor.nativeSetStreet(street); -- cgit v1.2.3 From 1da5d8ed920bfd8e04e257901185115dbad1751a Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 21 Sep 2016 14:35:52 +0300 Subject: [android] Whatsnew images. --- .../drawable-hdpi/ic_img_whatsnew_booking_improve.png | Bin 0 -> 47188 bytes .../drawable-hdpi/ic_img_whatsnew_route_profile.png | Bin 0 -> 59574 bytes .../drawable-mdpi/ic_img_whatsnew_booking_improve.png | Bin 0 -> 30953 bytes .../drawable-mdpi/ic_img_whatsnew_route_profile.png | Bin 0 -> 37157 bytes .../drawable-xhdpi/ic_img_whatsnew_booking_improve.png | Bin 0 -> 62177 bytes .../drawable-xhdpi/ic_img_whatsnew_route_profile.png | Bin 0 -> 80068 bytes .../ic_img_whatsnew_booking_improve.png | Bin 0 -> 93526 bytes .../drawable-xxhdpi/ic_img_whatsnew_route_profile.png | Bin 0 -> 128615 bytes .../ic_img_whatsnew_booking_improve.png | Bin 0 -> 73926 bytes .../drawable-xxxhdpi/ic_img_whatsnew_route_profile.png | Bin 0 -> 104828 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.png create mode 100644 android/res/drawable-hdpi/ic_img_whatsnew_route_profile.png create mode 100644 android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.png create mode 100644 android/res/drawable-mdpi/ic_img_whatsnew_route_profile.png create mode 100644 android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.png create mode 100644 android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.png create mode 100644 android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.png create mode 100644 android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.png create mode 100644 android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.png create mode 100644 android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.png diff --git a/android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.png b/android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.png new file mode 100644 index 0000000000..803c75f7e2 Binary files /dev/null and b/android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.png differ diff --git a/android/res/drawable-hdpi/ic_img_whatsnew_route_profile.png b/android/res/drawable-hdpi/ic_img_whatsnew_route_profile.png new file mode 100644 index 0000000000..2968f780ed Binary files /dev/null and b/android/res/drawable-hdpi/ic_img_whatsnew_route_profile.png differ diff --git a/android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.png b/android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.png new file mode 100644 index 0000000000..b3a64495d7 Binary files /dev/null and b/android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.png differ diff --git a/android/res/drawable-mdpi/ic_img_whatsnew_route_profile.png b/android/res/drawable-mdpi/ic_img_whatsnew_route_profile.png new file mode 100644 index 0000000000..f8d56278c1 Binary files /dev/null and b/android/res/drawable-mdpi/ic_img_whatsnew_route_profile.png differ diff --git a/android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.png b/android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.png new file mode 100644 index 0000000000..4c19e9414c Binary files /dev/null and b/android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.png differ diff --git a/android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.png b/android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.png new file mode 100644 index 0000000000..e1c2314ac4 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.png differ diff --git a/android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.png b/android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.png new file mode 100644 index 0000000000..b3e470589b Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.png differ diff --git a/android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.png b/android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.png new file mode 100644 index 0000000000..1deb14c97a Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.png differ diff --git a/android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.png b/android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.png new file mode 100644 index 0000000000..b61490b33d Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.png differ diff --git a/android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.png b/android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.png new file mode 100644 index 0000000000..fc1fd20ff6 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.png differ -- cgit v1.2.3 From 382e6592afc978f23061e23700656c37605a65df Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 21 Sep 2016 15:38:31 +0300 Subject: [android] New whatsnew. --- android/res/values/arrays.xml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml index 9a99a2cda7..7cea1ba554 100644 --- a/android/res/values/arrays.xml +++ b/android/res/values/arrays.xml @@ -29,38 +29,32 @@ - @drawable/img_whatsnew_car_navigation - @drawable/img_whatsnew_cycle_navigation_improved - @drawable/img_whatsnew_booking_improved + @drawable/ic_img_whatsnew_route_profile + @drawable/ic_img_whatsnew_booking_improve - @string/whatsnew_car_navigation_header - @string/whatsnew_cycle_navigation_2_header - @string/whatsnew_booking_2_header + @string/whats_new_route_profile_title + @string/whats_new_booking_improve_title - @string/whatsnew_car_navigation_message - @string/whatsnew_cycle_navigation_2_message - @string/whatsnew_booking_2_message + @string/whats_new_route_profile_message + @string/whats_new_booking_improve_message - - - -- cgit v1.2.3 From df24b46080ea85e9d9d5783c2df06f97b30a6968 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Thu, 22 Sep 2016 08:46:14 +0300 Subject: [android] Fixed random opens of wheel. --- android/src/com/mapswithme/maps/routing/SearchWheel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java index 1f550a8802..31ff672f2d 100644 --- a/android/src/com/mapswithme/maps/routing/SearchWheel.java +++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java @@ -227,6 +227,7 @@ class SearchWheel implements View.OnClickListener parent.showSearch(); mIsExpanded = false; refreshSearchVisibility(); + UiThread.cancelDelayedTasks(mCloseRunnable); } private void startSearch(SearchOption searchOption) -- cgit v1.2.3 From 10ba4a8e451e1c2c08c055bad4e9f9356bf4d0fc Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Thu, 22 Sep 2016 11:14:36 +0300 Subject: [android] Updated sharing messages. --- .../maps/bookmarks/BookmarksListFragment.java | 7 +-- .../maps/widget/placepage/PlacePageView.java | 2 +- .../maps/widget/placepage/SponsoredHotel.java | 24 ++++++++- .../com/mapswithme/util/sharing/BaseShareable.java | 2 +- .../util/sharing/MapObjectShareable.java | 60 ++++++++++++++++------ .../com/mapswithme/util/sharing/ShareOption.java | 9 ++-- 6 files changed, 80 insertions(+), 24 deletions(-) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index f87ee22110..3b0500e7f9 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -22,6 +22,7 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.Track; import com.mapswithme.maps.widget.placepage.EditBookmarkFragment; +import com.mapswithme.maps.widget.placepage.SponsoredHotel; import com.mapswithme.util.BottomSheetHelper; import com.mapswithme.util.sharing.ShareOption; import com.mapswithme.util.sharing.SharingHelper; @@ -161,15 +162,15 @@ public class BookmarksListFragment extends BaseMwmListFragment switch (menuItem.getItemId()) { case R.id.share_message: - ShareOption.SMS.shareMapObject(getActivity(), item); + ShareOption.SMS.shareMapObject(getActivity(), item, SponsoredHotel.nativeGetCurrent()); break; case R.id.share_email: - ShareOption.EMAIL.shareMapObject(getActivity(), item); + ShareOption.EMAIL.shareMapObject(getActivity(), item, SponsoredHotel.nativeGetCurrent()); break; case R.id.share: - ShareOption.ANY.shareMapObject(getActivity(), item); + ShareOption.ANY.shareMapObject(getActivity(), item, SponsoredHotel.nativeGetCurrent()); break; case R.id.edit: diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 33c03d33f8..250000d8b0 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -315,7 +315,7 @@ public class PlacePageView extends RelativeLayout case SHARE: Statistics.INSTANCE.trackEvent(Statistics.EventName.PP_SHARE); AlohaHelper.logClick(AlohaHelper.PP_SHARE); - ShareOption.ANY.shareMapObject(getActivity(), mMapObject); + ShareOption.ANY.shareMapObject(getActivity(), mMapObject, mSponsoredHotel); break; case BACK: diff --git a/android/src/com/mapswithme/maps/widget/placepage/SponsoredHotel.java b/android/src/com/mapswithme/maps/widget/placepage/SponsoredHotel.java index 538513d368..2b97298c41 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/SponsoredHotel.java +++ b/android/src/com/mapswithme/maps/widget/placepage/SponsoredHotel.java @@ -1,5 +1,6 @@ package com.mapswithme.maps.widget.placepage; +import android.support.annotation.Nullable; import android.support.annotation.UiThread; import android.text.TextUtils; @@ -11,7 +12,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.bookmarks.data.Metadata; @UiThread -final class SponsoredHotel +public final class SponsoredHotel { private static class Price { @@ -59,6 +60,26 @@ final class SponsoredHotel return mId; } + public String getRating() + { + return rating; + } + + public String getPrice() + { + return price; + } + + public String getUrlBook() + { + return urlBook; + } + + public String getUrlDescription() + { + return urlDescription; + } + public static void setListener(OnPriceReceivedListener listener) { sListener = new WeakReference<>(listener); @@ -88,6 +109,7 @@ final class SponsoredHotel listener.onPriceReceived(id, price, currency); } + @Nullable public static native SponsoredHotel nativeGetCurrent(); private static native void nativeRequestPrice(String id, String currencyCode); } diff --git a/android/src/com/mapswithme/util/sharing/BaseShareable.java b/android/src/com/mapswithme/util/sharing/BaseShareable.java index f01107bfe1..5ccfdcf5db 100644 --- a/android/src/com/mapswithme/util/sharing/BaseShareable.java +++ b/android/src/com/mapswithme/util/sharing/BaseShareable.java @@ -9,7 +9,7 @@ import android.text.TextUtils; import com.mapswithme.util.statistics.AlohaHelper; -public abstract class BaseShareable +abstract class BaseShareable { private final Activity mActivity; protected Intent mBaseIntent; diff --git a/android/src/com/mapswithme/util/sharing/MapObjectShareable.java b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java index 94b597492b..de59c16923 100644 --- a/android/src/com/mapswithme/util/sharing/MapObjectShareable.java +++ b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java @@ -1,32 +1,62 @@ package com.mapswithme.util.sharing; import android.app.Activity; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.text.TextUtils; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.MapObject; +import com.mapswithme.maps.widget.placepage.SponsoredHotel; import com.mapswithme.util.statistics.Statistics; -public class MapObjectShareable extends BaseShareable +class MapObjectShareable extends BaseShareable { - protected final MapObject mMapObject; - - public MapObjectShareable(Activity context, MapObject mapObject) + MapObjectShareable(Activity context, @NonNull MapObject mapObject, @Nullable SponsoredHotel sponsoredHotel) { super(context); - mMapObject = mapObject; final Activity activity = getActivity(); - final String ge0Url = Framework.nativeGetGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getTitle()); - final String httpUrl = Framework.getHttpGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getTitle()); - final String address = Framework.nativeGetNameAndAddress(mMapObject.getLat(), mMapObject.getLon()); - final int textId = MapObject.isOfType(MapObject.MY_POSITION, mMapObject) ? R.string.my_position_share_email - : R.string.bookmark_share_email; - final int subjectId = MapObject.isOfType(MapObject.MY_POSITION, mMapObject) ? R.string.my_position_share_email_subject - : R.string.bookmark_share_email_subject; - - setText(activity.getString(textId, address, ge0Url, httpUrl)); - setSubject(activity.getString(subjectId)); + final String ge0Url = Framework.nativeGetGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), mapObject.getTitle()); + + final String subject; + String text; + if (MapObject.isOfType(MapObject.MY_POSITION, mapObject)) + { + subject = activity.getString(R.string.my_position_share_email_subject); + text = activity.getString(R.string.my_position_share_email, + Framework.nativeGetNameAndAddress(mapObject.getLat(), mapObject.getLon()), + ge0Url, + Framework.getHttpGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), mapObject.getTitle())); + } + else + { + subject = activity.getString(R.string.bookmark_share_email_subject); + + text = lineWithBreak(activity.getString(R.string.sharing_call_action_look)) + + lineWithBreak(mapObject.getTitle()) + + lineWithBreak(mapObject.getSubtitle()) + + lineWithBreak(mapObject.getAddress()) + + lineWithBreak(ge0Url); + + if (sponsoredHotel != null) + { + text += lineWithBreak(activity.getString(R.string.sharing_booking)) + + sponsoredHotel.getUrlBook(); + } + } + + setSubject(subject); + setText(text); + } + + private String lineWithBreak(String title) + { + if (!TextUtils.isEmpty(title)) + return title + "\n"; + + return ""; } @Override diff --git a/android/src/com/mapswithme/util/sharing/ShareOption.java b/android/src/com/mapswithme/util/sharing/ShareOption.java index c5ce2f3622..7b7ce2497b 100644 --- a/android/src/com/mapswithme/util/sharing/ShareOption.java +++ b/android/src/com/mapswithme/util/sharing/ShareOption.java @@ -3,11 +3,14 @@ package com.mapswithme.util.sharing; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.StringRes; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.MapObject; +import com.mapswithme.maps.widget.placepage.SponsoredHotel; import com.mapswithme.util.Utils; import com.mapswithme.util.statistics.Statistics; @@ -32,9 +35,9 @@ public abstract class ShareOption return Utils.isIntentSupported(context, mBaseIntent); } - public void shareMapObject(Activity activity, MapObject mapObject) + public void shareMapObject(Activity activity, @NonNull MapObject mapObject, @Nullable SponsoredHotel sponsoredHotel) { - SharingHelper.shareOutside(new MapObjectShareable(activity, mapObject) + SharingHelper.shareOutside(new MapObjectShareable(activity, mapObject, sponsoredHotel) .setBaseIntent(new Intent(mBaseIntent)), mNameResId); } @@ -54,7 +57,7 @@ public abstract class ShareOption } @Override - public void shareMapObject(Activity activity, MapObject mapObject) + public void shareMapObject(Activity activity, MapObject mapObject, SponsoredHotel sponsoredHotel) { final String ge0Url = Framework.nativeGetGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), ""); final String httpUrl = Framework.getHttpGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), ""); -- cgit v1.2.3 From d171e73e2c7506d5ccb253aaae792c12d0873932 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Thu, 22 Sep 2016 11:42:57 +0300 Subject: review fixes --- android/src/com/mapswithme/maps/editor/EditorHostFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index bf3214cac5..1355a78d6f 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -284,16 +284,18 @@ public class EditorHostFragment extends BaseMwmToolbarFragment if (note.length() != 0) Editor.nativeCreateNote(note); // Save object edits - if (!MwmApplication.get().prefs().contains(NOOB_ALERT_SHOWN)) + if (!MwmApplication.prefs().contains(NOOB_ALERT_SHOWN)) { - MwmApplication.get().prefs().edit() + MwmApplication.prefs().edit() .putBoolean(NOOB_ALERT_SHOWN, true) .apply(); showNoobDialog(); } else + { saveMapObjectEdits(); + } break; } @@ -336,7 +338,6 @@ public class EditorHostFragment extends BaseMwmToolbarFragment .show(); } - private void showNoobDialog() { new AlertDialog.Builder(getActivity()) -- cgit v1.2.3 From 96e891952bf4f29db3bf3b0d7637687650dc385e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 22 Sep 2016 13:16:21 +0300 Subject: [ios] Increased deployment target to 8.0. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 7d92bc6e45..b1781b76a7 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4463,7 +4463,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-debug-i386/out/debug\"", "$(PROJECT_DIR)/Statistics", @@ -4584,7 +4584,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-debug-$(CURRENT_ARCH)/out/debug\"", "$(PROJECT_DIR)/Statistics", @@ -4709,7 +4709,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-production-$(CURRENT_ARCH)/out/production\"", "$(PROJECT_DIR)/Statistics", @@ -4834,7 +4834,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-production-$(CURRENT_ARCH)/out/production\"", "$(PROJECT_DIR)/Statistics", @@ -4957,7 +4957,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-release-$(CURRENT_ARCH)/out/release\"", "$(PROJECT_DIR)/Statistics", @@ -5080,7 +5080,7 @@ ../../3party/glm, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-release-i386/out/release\"", "$(PROJECT_DIR)/Statistics", -- cgit v1.2.3 From 6fc9cdf5632f57af6ca8ba79275dcd07962a6d6e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 22 Sep 2016 13:16:38 +0300 Subject: [ios] Added usage descriptions. --- iphone/Maps/MAPSME.plist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/MAPSME.plist index 1de30ca493..509fbe29b6 100644 --- a/iphone/Maps/MAPSME.plist +++ b/iphone/Maps/MAPSME.plist @@ -249,5 +249,9 @@ Pushwoosh_LOG_LEVEL WARNING + NSPhotoLibraryUsageDescription + Unused by an application + NSCameraUsageDescription + Unused by an application -- cgit v1.2.3 From b103dab1b8b4d8610bcb9565edbb9df178d42fe2 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 22 Sep 2016 13:17:20 +0300 Subject: [ios] Increased app version to 6.4.2. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index b1781b76a7..c3f362facd 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4435,7 +4435,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -4555,7 +4555,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -4676,7 +4676,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4801,7 +4801,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4926,7 +4926,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; @@ -5049,7 +5049,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6.4; + CURRENT_PROJECT_VERSION = 6.4.2; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics"; -- cgit v1.2.3 From 924270cf236230928baff2e37ed0284d79fc3c8e Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 22 Sep 2016 14:20:16 +0300 Subject: Android. RoutingController crash fix. --- android/src/com/mapswithme/maps/routing/RoutingController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index d15c4a649d..27d1682885 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -116,7 +116,8 @@ public class RoutingController mCachedRoutingInfo = Framework.nativeGetRouteFollowingInfo(); setBuildState(BuildState.BUILT); mLastBuildProgress = 100; - mContainer.onRouteBuilt(mLastRouterType); + if (mContainer != null) + mContainer.onRouteBuilt(mLastRouterType); } processRoutingEvent(); -- cgit v1.2.3 From 5aa24494e2509deb904a6b05810a9b80943225db Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 22 Sep 2016 15:38:54 +0300 Subject: Fixed crash in activating of map selection. --- map/framework.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index b51102dbb5..665f39ac8f 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1602,11 +1602,7 @@ void Framework::UpdateDrapeEngine(int width, int height) InvalidateUserMarks(); - if (m_lastTapEvent) - { - place_page::Info info; - ActivateMapSelection(false, OnTapEventImpl(*m_lastTapEvent, info), info); - } + UpdatePlacePageInfoForCurrentSelection(); } } -- cgit v1.2.3 From 96bb5ab6dc9f15bdd3d2770195f98f3c15e45e60 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Thu, 22 Sep 2016 15:52:37 +0300 Subject: [android] Fixed font sizes and margins in the navigation panel --- android/res/layout-land/layout_nav_bottom_numbers.xml | 16 ++++++++-------- android/res/layout/layout_nav_bottom_numbers.xml | 14 ++++++++------ android/res/values/styles-text.xml | 9 ++++----- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/android/res/layout-land/layout_nav_bottom_numbers.xml b/android/res/layout-land/layout_nav_bottom_numbers.xml index b28225cb58..054b5da0de 100644 --- a/android/res/layout-land/layout_nav_bottom_numbers.xml +++ b/android/res/layout-land/layout_nav_bottom_numbers.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@style/MwmTextAppearance.RoutingNumber" + android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation" tools:text="999"/> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@style/MwmTextAppearance.RoutingNumber" + android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation" tools:text="999"/> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@style/MwmTextAppearance.RoutingNumber" + android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation" tools:text="99999"/> \ No newline at end of file diff --git a/android/res/layout/layout_nav_bottom_numbers.xml b/android/res/layout/layout_nav_bottom_numbers.xml index 4ad8c8afbf..4157feb217 100644 --- a/android/res/layout/layout_nav_bottom_numbers.xml +++ b/android/res/layout/layout_nav_bottom_numbers.xml @@ -31,7 +31,7 @@ android:layout_marginBottom="@dimen/neg_margin_quarter" android:singleLine="true" android:includeFontPadding="false" - android:textAppearance="@style/MwmTextAppearance.RoutingNumber" + android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation" tools:text="999"/> @@ -101,6 +101,8 @@ android:orientation="horizontal" android:theme="?navigationTheme" android:layout_gravity="center_horizontal" + android:layout_marginLeft="@dimen/margin_eighth" + android:layout_marginStart="@dimen/margin_eighth" android:layout_marginTop="30dp"> bold + + - -